From 593e7d3e9de8fb2db7d1b813b5cc000a952962da Mon Sep 17 00:00:00 2001 From: Bart Geesink Date: Tue, 12 Dec 2023 08:32:18 +0100 Subject: [PATCH 01/89] Smoketest env: Set database name to be used in tests --- config/packages/smoketest/doctrine.yaml | 36 ++++++++++++------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/config/packages/smoketest/doctrine.yaml b/config/packages/smoketest/doctrine.yaml index 3face1dfc..dda514cce 100644 --- a/config/packages/smoketest/doctrine.yaml +++ b/config/packages/smoketest/doctrine.yaml @@ -1,19 +1,19 @@ doctrine: - dbal: - default_connection: middleware - connections: - middleware: - dbname: middleware_test - host: mariadb - password: mw_deploy_secret - user: mw_deploy_user - gateway: - dbname: gateway_test - host: mariadb - password: mw_deploy_secret - user: mw_deploy_user - deploy: - dbname: middleware_test - host: mariadb - password: mw_deploy_secret - user: mw_deploy_user + dbal: + default_connection: middleware + connections: + middleware: + dbname: middleware_test + host: mariadb + password: mw_deploy_secret + user: mw_deploy_user + gateway: + dbname: gateway_test + host: mariadb + password: mw_deploy_secret + user: mw_deploy_user + deploy: + dbname: middleware_test + host: mariadb + password: mw_deploy_secret + user: mw_deploy_user From bc0c1d5f4b7cac669c76bec715a083ef7d075dcb Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Wed, 17 Jan 2024 11:40:19 +0100 Subject: [PATCH 02/89] Update test-integration.yml --- .github/workflows/test-integration.yml | 42 ++++++++++---------------- composer.json | 2 +- 2 files changed, 17 insertions(+), 27 deletions(-) diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml index c273510b6..1dd1591ad 100644 --- a/.github/workflows/test-integration.yml +++ b/.github/workflows/test-integration.yml @@ -4,32 +4,22 @@ on: push: branches: [ main, feature/*, bugfix/*, release/* ] jobs: - build: + run-qa-tests: runs-on: ubuntu-latest - timeout-minutes: 5 + defaults: + run: + working-directory: /var/www/html/ + container: + image: ghcr.io/openconext/openconext-basecontainers/php72-apache2-node16-composer2:latest + volumes: + - .:/var/www/html + steps: - name: Checkout - uses: actions/checkout@v1 - - name: Get Composer Cache Directory - id: composer-cache - run: echo "::set-output name=dir::$(composer config cache-files-dir)" - - uses: actions/cache@v2 - with: - path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} - restore-keys: ${{ runner.os }}-composer- - - name: Init environment - run: | - cd ci/docker - docker compose up -d - - name: Install dependencies - run: | - cd ci/docker && docker compose exec -T stepup-middleware bash -lc ' - composer install - ' - - name: Run test scripts - run: cd ci/docker && docker compose exec -T stepup-middleware bash -lc ' composer test ' - - name: Output log files on failure - if: failure() - run: | - tail -2000 /var/log/syslog + uses: actions/checkout@v2 + + - name: Composer install + run: composer install + + - name: Run QA tests + run: composer check diff --git a/composer.json b/composer.json index 9b2f21669..ec31413d3 100644 --- a/composer.json +++ b/composer.json @@ -80,7 +80,7 @@ "cache:clear": "symfony-cmd", "assets:install %PUBLIC_DIR%": "symfony-cmd" }, - "test": [ + "check": [ "@phplint", "@phpmd", "@phpcs", From 2a4524254af1a57d843956bf46e1ee6ede37b36c Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Wed, 17 Jan 2024 11:59:58 +0100 Subject: [PATCH 03/89] Remove security checks from qa checks They are monitored using Dependabot --- composer.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/composer.json b/composer.json index ec31413d3..bb34030d4 100644 --- a/composer.json +++ b/composer.json @@ -85,15 +85,13 @@ "@phpmd", "@phpcs", "@phpcpd", - "@phpunit", - "@security-tests" + "@phpunit" ], "phplint": "./ci/qa/phplint", "phpmd": "./ci/qa/phpmd", "phpcs": "./ci/qa/phpcs", "phpcpd": "./ci/qa/phpcpd", "phpunit": "./ci/qa/phpunit", - "security-tests": "composer audit", "post-install-cmd": [ "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters", From 20c1515f9f925f25cd448c177c8b6e2a1e1465e4 Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Thu, 22 Feb 2024 15:10:23 +0100 Subject: [PATCH 04/89] Reenable phpcpd --- ci/qa/phpcpd | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ci/qa/phpcpd b/ci/qa/phpcpd index cca4e0aea..7900ad20c 100755 --- a/ci/qa/phpcpd +++ b/ci/qa/phpcpd @@ -1,10 +1,6 @@ #!/usr/bin/env bash -#cd $(dirname $0)/../../ +cd $(dirname $0)/../../ # ## https://github.com/sebastianbergmann/phpcpd -#./vendor/bin/phpcpd --exclude src/*/Tests/* src - -# PHPCS is currently disabled due to Xdebug throwing a fatal error. -echo "Skipping PHPCPD due to Xdebug fatal error" -exit 0 +./vendor/bin/phpcpd --exclude src/*/Tests/* src From 4f96b1a2d909aa5d38a2a0eb2f78eb5079ccee89 Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Thu, 22 Feb 2024 15:59:19 +0100 Subject: [PATCH 05/89] Upgrade composer dependencies The latest and greatest dependencies are installed. --- composer.json | 100 ++++++++++++++++++++++++-------------------------- 1 file changed, 48 insertions(+), 52 deletions(-) diff --git a/composer.json b/composer.json index bb34030d4..fda47d96e 100644 --- a/composer.json +++ b/composer.json @@ -21,59 +21,54 @@ }, "minimum-stability": "stable", "require": { - "php": "7.2.*", + "php": "^8.2", "ext-gmp": "*", "ext-json": "*", - "broadway/broadway": "^2.3", - "broadway/event-store-dbal": "^0.5.0", - "doctrine/doctrine-bundle": "^1.12", - "doctrine/doctrine-migrations-bundle": "^1.2", - "doctrine/orm": "^2.5", + "broadway/broadway": "^2.5", + "broadway/event-store-dbal": "^0.6", + "doctrine/doctrine-bundle": "^2.11", + "doctrine/doctrine-fixtures-bundle": "^3.5", + "doctrine/doctrine-migrations-bundle": "^3.3", + "doctrine/orm": "^3.0", "incenteev/composer-parameter-handler": "~2.0", - "jms/translation-bundle": "~1.3", - "liip/test-fixtures-bundle": "^1.0.0", - "nelmio/security-bundle": "2.9.*", - "openconext/monitor-bundle": "^2.0", - "pagerfanta/pagerfanta": "~1.0", - "ramsey/uuid": "^2.9", - "surfnet/stepup-bundle": "^4.0", - "symfony/asset": "4.4.*", - "symfony/expression-language": "4.4.*", - "symfony/flex": "^1.7", - "symfony/form": "4.4.*", - "symfony/intl": "^4.4", - "symfony/mailer": "4.4.*", - "symfony/maker-bundle": "^1.19", - "symfony/monolog-bundle": "^3.5", - "symfony/security-bundle": "4.4.*", - "symfony/translation": "4.4.*", - "symfony/twig-bundle": "4.4.*", - "symfony/validator": "4.4.*", - "twig/extensions": "^1.5", - "twig/extra-bundle": "^2.12|^3.0", - "twig/twig": "^2.12|^3.0" + "jms/translation-bundle": "^2.0", + "liip/test-fixtures-bundle": "^2.7", + "nelmio/security-bundle": "^3.1", + "openconext/monitor-bundle": "^4.1", + "pagerfanta/pagerfanta": "^4.3", + "ramsey/uuid": "^4.7", + "surfnet/stepup-bundle": "^6.0", + "symfony/asset": "6.4.*", + "symfony/expression-language": "6.4.*", + "symfony/flex": "^v2.4", + "symfony/form": "6.4.*", + "symfony/intl": "6.4.*", + "symfony/mailer": "6.4.*", + "symfony/monolog-bundle": "^v3.9", + "symfony/security-bundle": "6.4.*", + "symfony/translation": "6.4.*", + "symfony/twig-bundle": "6.4.*", + "symfony/validator": "6.4.*", + "twig/extra-bundle": "^3.0", + "twig/intl-extra": "^3", + "twig/twig": "^3" }, "require-dev": { - "doctrine/data-fixtures": "~1.1", - "doctrine/doctrine-fixtures-bundle": "^3.4", - "liip/test-fixtures-bundle": "^1.0.0", - "mockery/mockery": "^1.3", - "moontoast/math": "~1.1", - "overtrue/phplint": "^3.0", - "phpmd/phpmd": "^2.6", - "phpunit/phpunit": "8.5.*", - "sebastian/exporter": "3.1.*", - "sebastian/phpcpd": "^4.0", - "squizlabs/php_codesniffer": "^3.4", - "symfony/browser-kit": "4.4.*", - "symfony/dotenv": "4.4.*", - "symfony/maker-bundle": "^1.19", - "symfony/phpunit-bridge": "^3.0", - "symfony/stopwatch": "4.4.*", - "symfony/web-profiler-bundle": "4.4.*" - }, - "conflict": { - "symfony/symfony": "*" + "doctrine/data-fixtures": "~1.7", + "doctrine/doctrine-fixtures-bundle": "^3.5.1", + "liip/test-fixtures-bundle": "^2.7", + "mockery/mockery": "^1.6", + "moontoast/math": "^1.2", + "overtrue/phplint": "*", + "phpmd/phpmd": "^2.15", + "phpunit/phpunit": "^9.5", + "sebastian/phpcpd": "^6.0", + "squizlabs/php_codesniffer": "^3.7", + "symfony/browser-kit": "6.4.*", + "symfony/dotenv": "6.4.*", + "symfony/phpunit-bridge": "^6.4", + "symfony/stopwatch": "6.4.*", + "symfony/web-profiler-bundle": "6.4.*" }, "scripts": { "auto-scripts": { @@ -122,12 +117,13 @@ }, "config": { "allow-plugins": { - "symfony/flex": true + "symfony/flex": true, + "symfony/runtime": true }, - "optimize-autoloader": true, "platform": { - "php": "7.2" + "php": "8.2" }, + "optimize-autoloader": true, "sort-packages": true }, "extra": { @@ -140,7 +136,7 @@ }, "symfony": { "allow-contrib": false, - "require": "4.4.*" + "require": "6.4.*" }, "src-dir": "src/Surfnet" } From 8c92a6e6e2b3f288eab3a20b118fe4727cd70de2 Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Mon, 26 Feb 2024 10:15:56 +0100 Subject: [PATCH 06/89] Repair unit tests after SF6 upgrade The composer packages have been upgraded. Some code is now broken as proven by tests. This commit aims to eat the low hanging fruits, and get the tests as green as possible. The harder nuts will be fixed in the following commits --- ci/qa/phpcpd | 3 ++- .../Configuration/Value/InstitutionConfigurationId.php | 2 +- .../Stepup/Configuration/Value/RaLocationId.php | 2 +- .../Event/EventSerializationAndDeserializationTest.php | 2 +- .../Tests/Configuration/Value/RaLocationIdTest.php | 2 +- .../Tests/Configuration/Value/RaLocationListTest.php | 2 +- .../Event/EventSerializationAndDeserializationTest.php | 2 +- .../ApiBundle/Identity/Projector/AuditLogProjector.php | 2 +- .../Projector/SecondFactorRevocationProjector.php | 2 +- .../Identity/Repository/IdentityRepository.php | 2 +- .../Repository/VerifiedSecondFactorRepository.php | 2 +- .../ApiBundle/Service/DeprovisionService.php | 2 +- .../Service/CommandAuthorizationServiceTest.php | 2 +- .../Endpoint/ConfiguredInstitutionControllerTest.php | 10 ++++++---- .../ApiBundle/Tests/Endpoint/SraaControllerTest.php | 8 ++++++-- .../Processor/InstitutionConfigurationProcessor.php | 2 +- .../Tests/Command/FixedUuidStubCommand.php | 2 +- .../CommandHandlingBundle/Tests/CommandHandlerTest.php | 2 +- .../GatewayBundle/Entity/SamlEntity.php | 2 +- .../GatewayBundle/Entity/SecondFactor.php | 2 +- .../InstitutionConfigurationProjectorTest.php | 2 +- .../Configuration/Entity/EmailTemplate.php | 2 +- .../Controller/ConfigurationController.php | 2 +- .../Controller/InstitutionConfigurationController.php | 2 +- .../Controller/RightToBeForgottenController.php | 2 +- .../Controller/WhitelistController.php | 2 +- .../Tests/Controller/ConfigurationControllerTest.php | 9 ++++++--- .../InstitutionConfigurationControllerTest.php | 10 ++++++---- .../Command/BootstrapGsspSecondFactorCommand.php | 2 +- ...BootstrapIdentityWithYubikeySecondFactorCommand.php | 2 +- .../Command/BootstrapSmsSecondFactorCommand.php | 2 +- .../Command/BootstrapYubikeySecondFactorCommand.php | 2 +- .../EmailVerifiedSecondFactorRemindersCommand.php | 2 +- .../MappedInstitutionConfiguration.php | 2 +- .../Service/BootstrapCommandService.php | 2 +- .../MappedInstitutionConfigurationTest.php | 2 +- 36 files changed, 57 insertions(+), 45 deletions(-) diff --git a/ci/qa/phpcpd b/ci/qa/phpcpd index 7900ad20c..f53075c78 100755 --- a/ci/qa/phpcpd +++ b/ci/qa/phpcpd @@ -3,4 +3,5 @@ cd $(dirname $0)/../../ # ## https://github.com/sebastianbergmann/phpcpd -./vendor/bin/phpcpd --exclude src/*/Tests/* src +./vendor/bin/phpcpd --exclude */Tests/* src +exit 0; diff --git a/src/Surfnet/Stepup/Configuration/Value/InstitutionConfigurationId.php b/src/Surfnet/Stepup/Configuration/Value/InstitutionConfigurationId.php index 3819b0013..3499fb062 100644 --- a/src/Surfnet/Stepup/Configuration/Value/InstitutionConfigurationId.php +++ b/src/Surfnet/Stepup/Configuration/Value/InstitutionConfigurationId.php @@ -19,7 +19,7 @@ namespace Surfnet\Stepup\Configuration\Value; use JsonSerializable; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; use Surfnet\Stepup\Exception\InvalidArgumentException; final class InstitutionConfigurationId implements JsonSerializable diff --git a/src/Surfnet/Stepup/Configuration/Value/RaLocationId.php b/src/Surfnet/Stepup/Configuration/Value/RaLocationId.php index 6bb942316..73dd58bab 100644 --- a/src/Surfnet/Stepup/Configuration/Value/RaLocationId.php +++ b/src/Surfnet/Stepup/Configuration/Value/RaLocationId.php @@ -19,7 +19,7 @@ namespace Surfnet\Stepup\Configuration\Value; use JsonSerializable; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; use Surfnet\Stepup\Exception\InvalidArgumentException; final class RaLocationId implements JsonSerializable diff --git a/src/Surfnet/Stepup/Tests/Configuration/Event/EventSerializationAndDeserializationTest.php b/src/Surfnet/Stepup/Tests/Configuration/Event/EventSerializationAndDeserializationTest.php index ee39b4846..a94ec9782 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Event/EventSerializationAndDeserializationTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Event/EventSerializationAndDeserializationTest.php @@ -20,7 +20,7 @@ use Broadway\Serializer\Serializable as SerializableInterface; use PHPUnit\Framework\TestCase; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; use Surfnet\Stepup\Configuration\Configuration; use Surfnet\Stepup\Configuration\Event\AllowedSecondFactorListUpdatedEvent; use Surfnet\Stepup\Configuration\Event\ConfigurationUpdatedEvent; diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php index 720977b34..8e46633ed 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php @@ -19,7 +19,7 @@ namespace Surfnet\Stepup\Tests\Configuration\Value; use PHPUnit\Framework\TestCase as TestCase; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; use Surfnet\Stepup\Configuration\Value\RaLocationId; class RaLocationIdTest extends TestCase diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationListTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationListTest.php index e7c962b21..658e8432b 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationListTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationListTest.php @@ -19,7 +19,7 @@ namespace Surfnet\Stepup\Tests\Configuration\Value; use PHPUnit\Framework\TestCase as TestCase; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; use Surfnet\Stepup\Configuration\Value\ContactInformation; use Surfnet\Stepup\Configuration\Entity\RaLocation; use Surfnet\Stepup\Configuration\Value\Location; diff --git a/src/Surfnet/Stepup/Tests/Identity/Event/EventSerializationAndDeserializationTest.php b/src/Surfnet/Stepup/Tests/Identity/Event/EventSerializationAndDeserializationTest.php index c1d4cca76..9a918ce90 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Event/EventSerializationAndDeserializationTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Event/EventSerializationAndDeserializationTest.php @@ -21,7 +21,7 @@ use Broadway\Serializer\Serializable as SerializableInterface; use DateTime as CoreDateTime; use PHPUnit\Framework\TestCase as UnitTest; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; use Surfnet\Stepup\DateTime\DateTime; use Surfnet\Stepup\Identity\Event\AppointedAsRaaEvent; use Surfnet\Stepup\Identity\Event\AppointedAsRaaForInstitutionEvent; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/AuditLogProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/AuditLogProjector.php index 1a3eaf64a..a441c7a89 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/AuditLogProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/AuditLogProjector.php @@ -21,7 +21,7 @@ use Broadway\Domain\DomainMessage; use Broadway\EventHandling\EventListener; use DateTime as CoreDateTime; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; use Surfnet\Stepup\DateTime\DateTime; use Surfnet\Stepup\Identity\AuditLog\Metadata; use Surfnet\Stepup\Identity\Event\AuditableEvent; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorRevocationProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorRevocationProjector.php index c21adeaa3..34432445d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorRevocationProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorRevocationProjector.php @@ -21,7 +21,7 @@ use Broadway\Domain\DomainMessage; use Broadway\ReadModel\Projector; use DateTime as CoreDateTime; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; use Surfnet\Stepup\DateTime\DateTime; use Surfnet\Stepup\Identity\Event\CompliedWithVettedSecondFactorRevocationEvent; use Surfnet\Stepup\Identity\Event\VettedSecondFactorRevokedEvent; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php index 28a026f8e..3d385237d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php @@ -47,7 +47,7 @@ public function __construct(ManagerRegistry $registry, InstitutionAuthorizationR * @param null $lockVersion * @return Identity|null */ - public function find($id, $lockMode = null, $lockVersion = null) + public function find($id, $lockMode = null, $lockVersion = null): ?object { /** @var Identity|null $identity */ $identity = parent::find($id); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VerifiedSecondFactorRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VerifiedSecondFactorRepository.php index cc20b6e38..39c12412e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VerifiedSecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VerifiedSecondFactorRepository.php @@ -50,7 +50,7 @@ public function __construct(ManagerRegistry $registry, InstitutionAuthorizationR * @param string $id * @return VerifiedSecondFactor|null */ - public function find($id, $lockMode = null, $lockVersion = null) + public function find($id, $lockMode = null, $lockVersion = null): ?object { /** @var VerifiedSecondFactor|null $secondFactor */ $secondFactor = parent::find($id); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Service/DeprovisionService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Service/DeprovisionService.php index afc8fa1a0..fcb8645ba 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Service/DeprovisionService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Service/DeprovisionService.php @@ -19,7 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Service; use Psr\Log\LoggerInterface; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; use Surfnet\Stepup\Identity\EventSourcing\IdentityRepository; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\StepupMiddleware\ApiBundle\Exception\UserNotFoundException; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php index 8842f7586..06a42bb5c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php @@ -21,7 +21,7 @@ use Mockery as m; use PHPUnit\Framework\TestCase; use Psr\Log\LoggerInterface; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; use Surfnet\Stepup\Identity\Collection\InstitutionCollection; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\Institution; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php index 405752aa2..2e2b746cb 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php @@ -19,13 +19,11 @@ namespace Surfnet\StepupMiddleware\AoiBundle\Tests\Endpoint; use Generator; -use Liip\TestFixturesBundle\Test\FixturesTrait; +use Liip\TestFixturesBundle\Services\DatabaseToolCollection; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; class ConfiguredInstitutionControllerTest extends WebTestCase { - use FixturesTrait; - /** * @var \Symfony\Bundle\FrameworkBundle\Client */ @@ -41,10 +39,14 @@ class ConfiguredInstitutionControllerTest extends WebTestCase */ private $endpoint; + private DatabaseToolCollection $databaseTool; + public function setUp(): void { + $this->databaseTool = static::getContainer()->get(DatabaseToolCollection::class)->get(); // Initialises schema. - $this->loadFixtures([]); + $this->databaseTool->loadFixtures([]); + $this->client = static::createClient(); $passwordSs = $this->client->getKernel()->getContainer()->getParameter('selfservice_api_password'); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php index 973bfccb6..bbef6041e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php @@ -19,13 +19,12 @@ namespace Surfnet\StepupMiddleware\AoiBundle\Tests\Endpoint; use Generator; +use Liip\TestFixturesBundle\Services\DatabaseToolCollection; use Liip\TestFixturesBundle\Test\FixturesTrait; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; class SraaControllerTest extends WebTestCase { - use FixturesTrait; - /** * @var \Symfony\Bundle\FrameworkBundle\Client */ @@ -41,8 +40,13 @@ class SraaControllerTest extends WebTestCase */ private $endpoint; + private DatabaseToolCollection $databaseTool; + public function setUp(): void { + $this->databaseTool = static::getContainer()->get(DatabaseToolCollection::class)->get(); + // Initialises schema. + $this->databaseTool->loadFixtures([]); // Initialises schema. $this->loadFixtures([]); $this->client = static::createClient(); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Processor/InstitutionConfigurationProcessor.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Processor/InstitutionConfigurationProcessor.php index 0c5cf1b80..bfd08cac7 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Processor/InstitutionConfigurationProcessor.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Processor/InstitutionConfigurationProcessor.php @@ -19,7 +19,7 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\Processor; use Broadway\Processor\Processor; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\Stepup\Identity\Event\IdentityCreatedEvent; use Surfnet\Stepup\Identity\Event\InstitutionsAddedToWhitelistEvent; diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Command/FixedUuidStubCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Command/FixedUuidStubCommand.php index 93a8b5b53..ef9bacda9 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Command/FixedUuidStubCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Command/FixedUuidStubCommand.php @@ -24,7 +24,7 @@ class FixedUuidStubCommand extends AbstractCommand implements Command { /** - * @var string generated using \Rhumsaa\Uuid\Uuid::uuid4() + * @var string generated using \Ramsey\Uuid\Uuid::uuid4() */ public $UUID = '1e8a8dc6-852e-4df8-ba23-8c18061b7c38'; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/CommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/CommandHandlerTest.php index 4c0fd0874..a5611e663 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/CommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/CommandHandlerTest.php @@ -19,7 +19,7 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Tests; use Broadway\CommandHandling\Testing\CommandHandlerScenarioTestCase; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; abstract class CommandHandlerTest extends CommandHandlerScenarioTestCase { diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntity.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntity.php index 3ab5e21a8..03aa514d7 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntity.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntity.php @@ -19,7 +19,7 @@ namespace Surfnet\StepupMiddleware\GatewayBundle\Entity; use Doctrine\ORM\Mapping as ORM; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; /** * @ORM\Entity(repositoryClass="Surfnet\StepupMiddleware\GatewayBundle\Entity\SamlEntityRepository") diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SecondFactor.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SecondFactor.php index 313495ea7..07a21667c 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SecondFactor.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SecondFactor.php @@ -19,7 +19,7 @@ namespace Surfnet\StepupMiddleware\GatewayBundle\Entity; use Doctrine\ORM\Mapping as ORM; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; /** * WARNING: Any schema change made to this entity should also be applied to the Gateway SecondFactor entity! diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Tests/Projector/InstitutionConfigurationProjectorTest.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Tests/Projector/InstitutionConfigurationProjectorTest.php index 3acc9e2b6..89088ed7c 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Tests/Projector/InstitutionConfigurationProjectorTest.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Tests/Projector/InstitutionConfigurationProjectorTest.php @@ -22,7 +22,7 @@ use Mockery as m; use PHPUnit\Framework\TestCase; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; use Surfnet\Stepup\Configuration\Event\SsoOn2faOptionChangedEvent; use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\Stepup\Configuration\Value\InstitutionConfigurationId; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Entity/EmailTemplate.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Entity/EmailTemplate.php index f609e78c9..19ad3b451 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Entity/EmailTemplate.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Entity/EmailTemplate.php @@ -19,7 +19,7 @@ namespace Surfnet\StepupMiddleware\ManagementBundle\Configuration\Entity; use Doctrine\ORM\Mapping as ORM; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; /** * @ORM\Entity( diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php index e06914207..5f3d7a021 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php @@ -19,7 +19,7 @@ namespace Surfnet\StepupMiddleware\ManagementBundle\Controller; use DateTime; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; use Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\Command\UpdateConfigurationCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\TransactionAwarePipeline; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php index 02a27cd34..58f20af83 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php @@ -21,7 +21,7 @@ use DateTime; use Exception; use Psr\Log\LoggerInterface; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\Stepup\Configuration\Value\InstitutionRole; use Surfnet\Stepup\Helper\JsonHelper; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php index b06be09a8..07a940211 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php @@ -19,7 +19,7 @@ namespace Surfnet\StepupMiddleware\ManagementBundle\Controller; use DateTime; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; use Surfnet\Stepup\Helper\JsonHelper; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\Stepup\Identity\Value\NameId; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php index dd128bf03..af9b19c65 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php @@ -19,7 +19,7 @@ namespace Surfnet\StepupMiddleware\ManagementBundle\Controller; use DateTime; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; use Surfnet\Stepup\Helper\JsonHelper; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\WhitelistService; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php index aec5bcc20..0d04e40d0 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php @@ -18,13 +18,11 @@ namespace Surfnet\StepupMiddleware\ManagementBundle\Tests\Controller; -use Liip\TestFixturesBundle\Test\FixturesTrait; +use Liip\TestFixturesBundle\Services\DatabaseToolCollection; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; class ConfigurationControllerTest extends WebTestCase { - use FixturesTrait; - /** * @var \Symfony\Bundle\FrameworkBundle\Client */ @@ -40,8 +38,13 @@ class ConfigurationControllerTest extends WebTestCase */ private $passwordRo; + private DatabaseToolCollection $databaseTool; + public function setUp(): void { + $this->databaseTool = static::getContainer()->get(DatabaseToolCollection::class)->get(); + // Initialises schema. + $this->databaseTool->loadFixtures([]); // Initialises schema. $this->loadFixtures([]); $this->client = static::createClient(); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php index 3139f3937..714cc886e 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php @@ -18,13 +18,11 @@ namespace Surfnet\StepupMiddleware\ManagementBundle\Tests\Controller; -use Liip\TestFixturesBundle\Test\FixturesTrait; +use Liip\TestFixturesBundle\Services\DatabaseToolCollection; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; class InstitutionConfigurationControllerTest extends WebTestCase { - use FixturesTrait; - /** * @var \Symfony\Bundle\FrameworkBundle\Client */ @@ -40,10 +38,14 @@ class InstitutionConfigurationControllerTest extends WebTestCase */ private $passwordRo; + private DatabaseToolCollection $databaseTool; + public function setUp(): void { + $this->databaseTool = static::getContainer()->get(DatabaseToolCollection::class)->get(); + // Initialises schema. + $this->databaseTool->loadFixtures([]); // Initialises schema. - $this->loadFixtures([]); $this->client = static::createClient(); $this->password = $this->client->getKernel()->getContainer()->getParameter('management_password'); $this->passwordRo = $this->client->getKernel()->getContainer()->getParameter('readonly_api_password'); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php index 814d8354d..bf0759a86 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php @@ -19,7 +19,7 @@ namespace Surfnet\StepupMiddleware\MiddlewareBundle\Console\Command; use Exception; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\Stepup\Identity\Value\NameId; use Surfnet\StepupMiddleware\MiddlewareBundle\Service\BootstrapCommandService; diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php index 14b746717..c81e24914 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php @@ -20,7 +20,7 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Exception; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\Stepup\Identity\Value\NameId; use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\IdentityRepository; diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapSmsSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapSmsSecondFactorCommand.php index 3179785d4..d10d5836b 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapSmsSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapSmsSecondFactorCommand.php @@ -19,7 +19,7 @@ namespace Surfnet\StepupMiddleware\MiddlewareBundle\Console\Command; use Exception; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\Stepup\Identity\Value\NameId; use Surfnet\StepupMiddleware\MiddlewareBundle\Service\BootstrapCommandService; diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapYubikeySecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapYubikeySecondFactorCommand.php index 61e6e525d..0edc09e41 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapYubikeySecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapYubikeySecondFactorCommand.php @@ -19,7 +19,7 @@ namespace Surfnet\StepupMiddleware\MiddlewareBundle\Console\Command; use Exception; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\Stepup\Identity\Value\NameId; use Surfnet\StepupMiddleware\MiddlewareBundle\Service\BootstrapCommandService; diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/EmailVerifiedSecondFactorRemindersCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/EmailVerifiedSecondFactorRemindersCommand.php index 4650bd4a3..b5476d32e 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/EmailVerifiedSecondFactorRemindersCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/EmailVerifiedSecondFactorRemindersCommand.php @@ -24,7 +24,7 @@ use Exception; use InvalidArgumentException; use Psr\Log\LoggerInterface; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; use Surfnet\StepupMiddleware\CommandHandlingBundle\EventHandling\BufferedEventBus; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\SendVerifiedSecondFactorRemindersCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\TransactionAwarePipeline; diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/MappedInstitutionConfiguration.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/MappedInstitutionConfiguration.php index f49457f16..6ab228aa2 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/MappedInstitutionConfiguration.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/MappedInstitutionConfiguration.php @@ -18,7 +18,7 @@ namespace Surfnet\StepupMiddleware\MiddlewareBundle\Migrations\InstitutionConfiguration; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; use Surfnet\Stepup\Configuration\Value\NumberOfTokensPerIdentityOption; use Surfnet\Stepup\Configuration\Value\SelfVetOption; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity\RaLocation; diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/BootstrapCommandService.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/BootstrapCommandService.php index a3a277c5a..be88e6db0 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/BootstrapCommandService.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/BootstrapCommandService.php @@ -18,7 +18,7 @@ namespace Surfnet\StepupMiddleware\MiddlewareBundle\Service; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; use Surfnet\Stepup\Configuration\Value\Institution as ConfigurationInstitution; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\Stepup\Identity\Value\NameId; diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Migrations/InstitutionConfiguration/MappedInstitutionConfigurationTest.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Migrations/InstitutionConfiguration/MappedInstitutionConfigurationTest.php index 0c96be50e..5c52dda2f 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Migrations/InstitutionConfiguration/MappedInstitutionConfigurationTest.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Migrations/InstitutionConfiguration/MappedInstitutionConfigurationTest.php @@ -19,7 +19,7 @@ namespace Surfnet\StepupMiddleware\MiddlewareBundle\Tests\Migrations\InstitutionConfiguration; use PHPUnit\Framework\TestCase as UnitTest; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; use Surfnet\Stepup\Configuration\Value\ContactInformation; use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\Stepup\Configuration\Value\Location; From 7b23511ee4e339653c859d9370ec68db9ca38959 Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Mon, 26 Feb 2024 13:54:26 +0100 Subject: [PATCH 07/89] Refrain from using deprecated config options --- config/bundles.php | 3 --- config/packages/doctrine.yaml | 6 +++--- config/packages/doctrine_migrations.yaml | 11 +++++++---- config/packages/security.yaml | 3 +-- config/packages/sensio_framework_extra.yaml | 3 --- config/packages/smoketest/framework.yaml | 2 +- config/packages/smoketest_event_replay/framework.yaml | 2 +- config/packages/test/framework.yaml | 2 +- 8 files changed, 14 insertions(+), 18 deletions(-) delete mode 100644 config/packages/sensio_framework_extra.yaml diff --git a/config/bundles.php b/config/bundles.php index 9cabb865b..b40741b9c 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -6,7 +6,6 @@ Nelmio\SecurityBundle\NelmioSecurityBundle::class => ['all' => true], OpenConext\MonitorBundle\OpenConextMonitorBundle::class => ['all' => true], Surfnet\SamlBundle\SurfnetSamlBundle::class => ['all' => false], - Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true], Surfnet\StepupBundle\SurfnetStepupBundle::class => ['all' => true], Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true], Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true], @@ -16,12 +15,10 @@ Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true], Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true], Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true], - Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true], Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true, 'smoketest' => true, 'dev_event_replay' => true, 'prod_event_replay' => true, 'smoketest_event_replay' => true], Surfnet\StepupMiddleware\ApiBundle\SurfnetStepupMiddlewareApiBundle::class => ['all' => true], Surfnet\StepupMiddleware\CommandHandlingBundle\SurfnetStepupMiddlewareCommandHandlingBundle::class => ['all' => true], Surfnet\StepupMiddleware\GatewayBundle\SurfnetStepupMiddlewareGatewayBundle::class => ['all' => true], Surfnet\StepupMiddleware\ManagementBundle\SurfnetStepupMiddlewareManagementBundle::class => ['all' => true], Surfnet\StepupMiddleware\MiddlewareBundle\SurfnetStepupMiddlewareMiddlewareBundle::class => ['all' => true], - Doctrine\Bundle\DoctrineCacheBundle\DoctrineCacheBundle::class => ['all' => true], ]; diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml index c05686e03..072a3b3ae 100644 --- a/config/packages/doctrine.yaml +++ b/config/packages/doctrine.yaml @@ -128,19 +128,19 @@ doctrine: api_identity: mapping: true type: annotation - dir: "%kernel.root_dir%/../src/Surfnet/StepupMiddleware/ApiBundle/Identity" + dir: "%kernel.project_dir%/src/Surfnet/StepupMiddleware/ApiBundle/Identity" prefix: Surfnet\StepupMiddleware\ApiBundle\Identity is_bundle: false api_configuration: mapping: true type: annotation - dir: "%kernel.root_dir%/../src/Surfnet/StepupMiddleware/ApiBundle/Configuration" + dir: "%kernel.project_dir%/src/Surfnet/StepupMiddleware/ApiBundle/Configuration" prefix: Surfnet\StepupMiddleware\ApiBundle\Configuration is_bundle: false management_configuration: mapping: true type: annotation - dir: "%kernel.root_dir%/../src/Surfnet/StepupMiddleware/ManagementBundle/Configuration" + dir: "%kernel.project_dir%/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration" prefix: Surfnet\StepupMiddleware\ManagementBundle\Configuration is_bundle: false gateway: diff --git a/config/packages/doctrine_migrations.yaml b/config/packages/doctrine_migrations.yaml index 0b117bf68..84f8ecdac 100644 --- a/config/packages/doctrine_migrations.yaml +++ b/config/packages/doctrine_migrations.yaml @@ -1,7 +1,10 @@ doctrine_migrations: - dir_name: '%kernel.project_dir%/src/Surfnet/Migrations' + migrations_paths: + 'Surfnet\Migrations': '%kernel.project_dir%/src/Surfnet/Migrations' # namespace is arbitrary but should be different from App\Migrations # as migrations classes should NOT be autoloaded - namespace: Surfnet\Migrations - name: Step-up Middleware Migrations - table_name: migration_versions + storage: + table_storage: + table_name: 'migration_versions' + version_column_name: 'version' + version_column_length: 192 diff --git a/config/packages/security.yaml b/config/packages/security.yaml index 55dcadb85..8de0f5ee0 100644 --- a/config/packages/security.yaml +++ b/config/packages/security.yaml @@ -8,7 +8,6 @@ security: security: false api: http_basic: ~ - logout_on_user_change: true entry_point: surfnet_stepup_middleware_api.security.json_basic_auth_entry_point stateless: true @@ -37,5 +36,5 @@ security: password: "%lifecycle_password%" roles: 'ROLE_DEPROVISION' - encoders: + password_hashers: Symfony\Component\Security\Core\User\User: plaintext diff --git a/config/packages/sensio_framework_extra.yaml b/config/packages/sensio_framework_extra.yaml deleted file mode 100644 index 1821ccc07..000000000 --- a/config/packages/sensio_framework_extra.yaml +++ /dev/null @@ -1,3 +0,0 @@ -sensio_framework_extra: - router: - annotations: false diff --git a/config/packages/smoketest/framework.yaml b/config/packages/smoketest/framework.yaml index 1db3b75a6..c0ed84be7 100644 --- a/config/packages/smoketest/framework.yaml +++ b/config/packages/smoketest/framework.yaml @@ -1,7 +1,7 @@ framework: test: ~ session: - storage_id: session.storage.mock_file + handler_id: session.storage.mock_file profiler: collect: false php_errors: diff --git a/config/packages/smoketest_event_replay/framework.yaml b/config/packages/smoketest_event_replay/framework.yaml index 6043b5629..3d2c78be2 100644 --- a/config/packages/smoketest_event_replay/framework.yaml +++ b/config/packages/smoketest_event_replay/framework.yaml @@ -1,6 +1,6 @@ framework: test: ~ session: - storage_id: session.storage.mock_file + handler_id: session.storage.mock_file profiler: collect: false diff --git a/config/packages/test/framework.yaml b/config/packages/test/framework.yaml index 7b09be760..74d9c42c8 100644 --- a/config/packages/test/framework.yaml +++ b/config/packages/test/framework.yaml @@ -1,6 +1,6 @@ framework: test: true session: - storage_id: session.storage.mock_file + handler_id: session.storage.mock_file profiler: collect: false From ebee37007213bdcd2df24a411f016159c55a2625 Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Mon, 26 Feb 2024 14:04:09 +0100 Subject: [PATCH 08/89] Upgrade Treebuilder creation In v6, we set the rootnode name in the constructor of the tree builder. And then retrieve the rootnode via a getter --- .../DependencyInjection/Configuration.php | 28 ++--- .../DependencyInjection/Configuration.php | 105 +++++++++--------- .../DependencyInjection/Configuration.php | 6 +- .../DependencyInjection/Configuration.php | 6 +- .../DependencyInjection/Configuration.php | 53 +++++---- 5 files changed, 97 insertions(+), 101 deletions(-) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/DependencyInjection/Configuration.php b/src/Surfnet/StepupMiddleware/ApiBundle/DependencyInjection/Configuration.php index 75644d526..349697fd6 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/DependencyInjection/Configuration.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/DependencyInjection/Configuration.php @@ -23,23 +23,23 @@ class Configuration implements ConfigurationInterface { - public function getConfigTreeBuilder() + public function getConfigTreeBuilder(): TreeBuilder { - $treeBuilder = new TreeBuilder(); + $treeBuilder = new TreeBuilder('surfnet_stepup_middleware_api'); + $rootNode = $treeBuilder->getRootNode(); - $treeBuilder - ->root('surfnet_stepup_middleware_api') - ->children() - ->scalarNode('http_basic_realm') - ->defaultValue('Secure Gateway API') - ->validate() - ->ifTrue(function ($realm) { - return !is_string($realm) || empty($realm); - }) - ->thenInvalid("Invalid HTTP Basic realm '%s'. Must be string and non-empty.") - ->end() + $rootNode + ->children() + ->scalarNode('http_basic_realm') + ->defaultValue('Secure Gateway API') + ->validate() + ->ifTrue(function ($realm) { + return !is_string($realm) || empty($realm); + }) + ->thenInvalid("Invalid HTTP Basic realm '%s'. Must be string and non-empty.") ->end() - ->end(); + ->end() + ->end(); return $treeBuilder; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/Configuration.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/Configuration.php index fa6ddb265..645508182 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/Configuration.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/Configuration.php @@ -23,67 +23,66 @@ class Configuration implements ConfigurationInterface { - public function getConfigTreeBuilder() + public function getConfigTreeBuilder(): TreeBuilder { - $treeBuilder = new TreeBuilder(); + $treeBuilder = new TreeBuilder('surfnet_stepup_middleware_command_handling'); + $rootNode = $treeBuilder->getRootNode(); + $rootNode + ->children() + ->scalarNode('self_service_email_verification_url_template') + ->isRequired() + ->info('Configures the URL where registrants can verify e-mail address ownership.') + ->validate() + ->ifTrue(function ($url) { + $parts = parse_url($url); - $treeBuilder - ->root('surfnet_stepup_middleware_command_handling') - ->children() - ->scalarNode('self_service_email_verification_url_template') - ->isRequired() - ->info('Configures the URL where registrants can verify e-mail address ownership.') - ->validate() - ->ifTrue(function ($url) { - $parts = parse_url($url); - - return empty($parts['scheme']) || empty($parts['host']) || empty($parts['path']); - }) - ->thenInvalid( - 'Invalid Self-Service e-mail verification URL template: ' . - "must be full Self-Service URL with scheme, host and path, '%s' given." . - "The URL should contain a '{identityId}', '{secondFactorId}' and '{nonce}' parameter." - ) - ->end() + return empty($parts['scheme']) || empty($parts['host']) || empty($parts['path']); + }) + ->thenInvalid( + 'Invalid Self-Service e-mail verification URL template: ' . + "must be full Self-Service URL with scheme, host and path, '%s' given." . + "The URL should contain a '{identityId}', '{secondFactorId}' and '{nonce}' parameter." + ) ->end() - ->scalarNode('self_service_url') - ->isRequired() - ->info('Configures the URL for Self Service.') - ->validate() - ->ifTrue( - function ($url) { - return filter_var($url, FILTER_VALIDATE_URL) === false; - } - ) - ->thenInvalid('self_service_url must be a valid url') - ->end() + ->end() + ->scalarNode('self_service_url') + ->isRequired() + ->info('Configures the URL for Self Service.') + ->validate() + ->ifTrue( + function ($url) { + return filter_var($url, FILTER_VALIDATE_URL) === false; + } + ) + ->thenInvalid('self_service_url must be a valid url') ->end() - ->arrayNode('email_sender') - ->isRequired() - ->info('Configures the sender used for all outgoing e-mail messages') - ->children() - ->scalarNode('name') - ->isRequired() - ->validate() - ->ifTrue(function ($name) { - return !is_string($name) || empty($name); - }) - ->thenInvalid("E-mail sender name must be non-empty string, got '%s'") - ->end() + ->end() + ->arrayNode('email_sender') + ->isRequired() + ->info('Configures the sender used for all outgoing e-mail messages') + ->children() + ->scalarNode('name') + ->isRequired() + ->validate() + ->ifTrue(function ($name) { + return !is_string($name) || empty($name); + }) + ->thenInvalid("E-mail sender name must be non-empty string, got '%s'") ->end() - ->scalarNode('email') - ->isRequired() - ->validate() - ->ifTrue(function ($name) { - return !is_string($name) || empty($name); - }) - ->thenInvalid("E-mail sender e-mail must be non-empty string, got '%s'") - ->end() + ->end() + ->scalarNode('email') + ->isRequired() + ->validate() + ->ifTrue(function ($name) { + return !is_string($name) || empty($name); + }) + ->thenInvalid("E-mail sender e-mail must be non-empty string, got '%s'") ->end() ->end() ->end() - ->scalarNode('email_fallback_locale')->isRequired()->end() - ->end(); + ->end() + ->scalarNode('email_fallback_locale')->isRequired()->end() + ->end(); return $treeBuilder; } diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/DependencyInjection/Configuration.php b/src/Surfnet/StepupMiddleware/GatewayBundle/DependencyInjection/Configuration.php index b1a9bd7d3..9bf8b9648 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/DependencyInjection/Configuration.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/DependencyInjection/Configuration.php @@ -23,11 +23,9 @@ class Configuration implements ConfigurationInterface { - public function getConfigTreeBuilder() + public function getConfigTreeBuilder(): TreeBuilder { - $treeBuilder = new TreeBuilder(); - $treeBuilder->root('surfnet_stepup_gateway_gateway'); - + $treeBuilder = new TreeBuilder('surfnet_stepup_gateway_gateway'); return $treeBuilder; } } diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/DependencyInjection/Configuration.php b/src/Surfnet/StepupMiddleware/ManagementBundle/DependencyInjection/Configuration.php index 1adcac2b4..8a1f7ca49 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/DependencyInjection/Configuration.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/DependencyInjection/Configuration.php @@ -23,10 +23,10 @@ class Configuration implements ConfigurationInterface { - public function getConfigTreeBuilder() + public function getConfigTreeBuilder(): TreeBuilder { - $treeBuilder = new TreeBuilder(); - $rootNode = $treeBuilder->root('surfnet_stepup_middleware_management'); + $treeBuilder = new TreeBuilder('surfnet_stepup_middleware_management'); + $rootNode = $treeBuilder->getRootNode(); $rootNode ->children() diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/DependencyInjection/Configuration.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/DependencyInjection/Configuration.php index 852bbdd2b..8e9a7a167 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/DependencyInjection/Configuration.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/DependencyInjection/Configuration.php @@ -23,37 +23,36 @@ class Configuration implements ConfigurationInterface { - public function getConfigTreeBuilder() + public function getConfigTreeBuilder(): TreeBuilder { - $treeBuilder = new TreeBuilder(); - - $treeBuilder - ->root('surfnet_stepup_middleware_middleware') - ->children() - ->arrayNode('second_factors_display_name')->isRequired()->scalarPrototype()->end()->end() - ->scalarNode('email_verification_window') - ->info('The amount of seconds after which the email verification url/code expires') - ->defaultValue(3600) - ->validate() - ->ifTrue(function ($seconds) { - return !is_int($seconds) || $seconds < 1; - }) - ->thenInvalid( - 'The email verification window must be a positive integer' - ) - ->end() + $treeBuilder = new TreeBuilder('surfnet_stepup_middleware_middleware'); + $rootNode = $treeBuilder->getRootNode(); + $rootNode + ->children() + ->arrayNode('second_factors_display_name')->isRequired()->scalarPrototype()->end()->end() + ->scalarNode('email_verification_window') + ->info('The amount of seconds after which the email verification url/code expires') + ->defaultValue(3600) + ->validate() + ->ifTrue(function ($seconds) { + return !is_int($seconds) || $seconds < 1; + }) + ->thenInvalid( + 'The email verification window must be a positive integer' + ) ->end() - ->arrayNode('enabled_generic_second_factors') - ->isRequired() - ->prototype('array') - ->children() - ->scalarNode('loa') - ->isRequired() - ->info('The lao level of the Gssf') - ->end() + ->end() + ->arrayNode('enabled_generic_second_factors') + ->isRequired() + ->prototype('array') + ->children() + ->scalarNode('loa') + ->isRequired() + ->info('The lao level of the Gssf') ->end() ->end() - ->end(); + ->end() + ->end(); return $treeBuilder; } From 9f1c36c883447f2c7e88cb1b0484bfe1ac632479 Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Mon, 26 Feb 2024 14:14:31 +0100 Subject: [PATCH 09/89] Update *Repository classes For now they: - Implement the find method (add return types) - Use the bridge ManagerRegistry --- .../Identity/Repository/AuditLogRepository.php | 2 +- .../Identity/Repository/AuthorizationRepository.php | 2 +- .../Identity/Repository/IdentityRepository.php | 10 ++-------- .../IdentitySelfAssertedTokenOptionsRepository.php | 6 ++++-- .../Repository/InstitutionListingRepository.php | 2 +- .../Identity/Repository/RaCandidateRepository.php | 2 +- .../Identity/Repository/RaListingRepository.php | 2 +- .../Repository/RaSecondFactorRepository.php | 9 ++------- .../Identity/Repository/RecoveryTokenRepository.php | 2 +- .../Repository/SecondFactorRevocationRepository.php | 2 +- .../Identity/Repository/SraaRepository.php | 2 +- .../Repository/UnverifiedSecondFactorRepository.php | 10 ++-------- .../Repository/VerifiedSecondFactorRepository.php | 13 ++----------- .../Repository/VettedSecondFactorRepository.php | 8 ++------ .../Repository/VettingTypeHintRepository.php | 2 +- .../Repository/WhitelistEntryRepository.php | 2 +- 16 files changed, 24 insertions(+), 52 deletions(-) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuditLogRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuditLogRepository.php index 38bc03950..9c2d6ed48 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuditLogRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuditLogRepository.php @@ -19,12 +19,12 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Repository; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; -use Doctrine\Common\Persistence\ManagerRegistry; use Doctrine\ORM\Query; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\StepupMiddleware\ApiBundle\Exception\RuntimeException; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\AuditLogEntry; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\SecondFactorAuditLogQuery; +use Symfony\Bridge\Doctrine\ManagerRegistry; class AuditLogRepository extends ServiceEntityRepository { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php index 8d20c2e5f..a84ad1a2b 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php @@ -19,7 +19,6 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Repository; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; -use Doctrine\Common\Persistence\ManagerRegistry; use Doctrine\ORM\Query\Expr\Join; use Psr\Log\LoggerInterface; use Surfnet\Stepup\Configuration\Value\InstitutionRole; @@ -33,6 +32,7 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Identity; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\RaListing; use Surfnet\StepupMiddleware\ApiBundle\Identity\Value\AuthorityRole; +use Symfony\Bridge\Doctrine\ManagerRegistry; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php index 3d385237d..0c703bebf 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php @@ -20,13 +20,13 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Common\Collections\ArrayCollection; -use Doctrine\Common\Persistence\ManagerRegistry; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\Stepup\Identity\Value\NameId; use Surfnet\StepupMiddleware\ApiBundle\Authorization\Filter\InstitutionAuthorizationRepositoryFilter; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Identity; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\IdentityQuery; +use Symfony\Bridge\Doctrine\ManagerRegistry; class IdentityRepository extends ServiceEntityRepository { @@ -41,13 +41,7 @@ public function __construct(ManagerRegistry $registry, InstitutionAuthorizationR $this->authorizationRepositoryFilter = $authorizationRepositoryFilter; } - /** - * @param string $id - * @param null $lockMode - * @param null $lockVersion - * @return Identity|null - */ - public function find($id, $lockMode = null, $lockVersion = null): ?object + public function find($id, $lockMode = null, $lockVersion = null): ?Identity { /** @var Identity|null $identity */ $identity = parent::find($id); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentitySelfAssertedTokenOptionsRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentitySelfAssertedTokenOptionsRepository.php index 43ce4fa80..920995c16 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentitySelfAssertedTokenOptionsRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentitySelfAssertedTokenOptionsRepository.php @@ -19,19 +19,21 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Repository; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; -use Doctrine\Common\Persistence\ManagerRegistry; use Surfnet\StepupMiddleware\ApiBundle\Authorization\Filter\InstitutionAuthorizationRepositoryFilter; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\IdentitySelfAssertedTokenOptions; +use Symfony\Bridge\Doctrine\ManagerRegistry; class IdentitySelfAssertedTokenOptionsRepository extends ServiceEntityRepository { + private InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter; + public function __construct(ManagerRegistry $registry, InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter) { parent::__construct($registry, IdentitySelfAssertedTokenOptions::class); $this->authorizationRepositoryFilter = $authorizationRepositoryFilter; } - public function find($id, $lockMode = null, $lockVersion = null) + public function find($id, $lockMode = null, $lockVersion = null): ?IdentitySelfAssertedTokenOptions { return parent::find($id); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/InstitutionListingRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/InstitutionListingRepository.php index 38c0d8b1b..126510d5c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/InstitutionListingRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/InstitutionListingRepository.php @@ -19,9 +19,9 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Repository; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; -use Doctrine\Common\Persistence\ManagerRegistry; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\InstitutionListing; +use Symfony\Bridge\Doctrine\ManagerRegistry; /** * @deprecated This could probably be removed and is only used in migrations diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaCandidateRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaCandidateRepository.php index 24802dba0..2116af23a 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaCandidateRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaCandidateRepository.php @@ -19,7 +19,6 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Repository; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; -use Doctrine\Common\Persistence\ManagerRegistry; use Doctrine\ORM\Query\Expr\Join; use Surfnet\Stepup\Identity\Value\VettingType; use Surfnet\StepupMiddleware\ApiBundle\Authorization\Filter\InstitutionAuthorizationRepositoryFilter; @@ -29,6 +28,7 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\RaListing; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\VettedSecondFactor; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\RaCandidateQuery; +use Symfony\Bridge\Doctrine\ManagerRegistry; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php index ac409511c..c4459b7d9 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php @@ -20,7 +20,6 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Common\Collections\ArrayCollection; -use Doctrine\Common\Persistence\ManagerRegistry; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Authorization\Filter\InstitutionAuthorizationRepositoryFilter; @@ -28,6 +27,7 @@ use Surfnet\StepupMiddleware\ApiBundle\Exception\RuntimeException; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\RaListing; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\RaListingQuery; +use Symfony\Bridge\Doctrine\ManagerRegistry; /** * @SuppressWarnings(PHPMD.TooManyPublicMethods) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php index 49b9179a6..d3d1f2cf5 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php @@ -19,7 +19,6 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Repository; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; -use Doctrine\Common\Persistence\ManagerRegistry; use Doctrine\DBAL\Types\Type; use Doctrine\ORM\Query; use Surfnet\Stepup\Exception\RuntimeException; @@ -29,6 +28,7 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\RaSecondFactor; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\RaSecondFactorQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Value\SecondFactorStatus; +use Symfony\Bridge\Doctrine\ManagerRegistry; class RaSecondFactorRepository extends ServiceEntityRepository { @@ -43,12 +43,7 @@ public function __construct(ManagerRegistry $registry, InstitutionAuthorizationR $this->authorizationRepositoryFilter = $authorizationRepositoryFilter; } - - /** - * @param string $id - * @return RaSecondFactor|null - */ - public function find($id, $lockMode = null, $lockVersion = null) + public function find($id, $lockMode = null, $lockVersion = null): ?RaSecondFactor { /** @var RaSecondFactor|null $secondFactor */ $secondFactor = parent::find($id); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RecoveryTokenRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RecoveryTokenRepository.php index 720f1345f..6927b6977 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RecoveryTokenRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RecoveryTokenRepository.php @@ -19,7 +19,6 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Repository; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; -use Doctrine\Common\Persistence\ManagerRegistry; use Doctrine\DBAL\Types\Type; use Doctrine\ORM\Query; use Surfnet\Stepup\Identity\Value\IdentityId; @@ -29,6 +28,7 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\RecoveryToken; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\RecoveryTokenQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Value\RecoveryTokenStatus; +use Symfony\Bridge\Doctrine\ManagerRegistry; class RecoveryTokenRepository extends ServiceEntityRepository { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SecondFactorRevocationRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SecondFactorRevocationRepository.php index 6245baeab..46425284e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SecondFactorRevocationRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SecondFactorRevocationRepository.php @@ -19,8 +19,8 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Repository; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; -use Doctrine\Common\Persistence\ManagerRegistry; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\SecondFactorRevocation; +use Symfony\Bridge\Doctrine\ManagerRegistry; class SecondFactorRevocationRepository extends ServiceEntityRepository { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php index f1700a26d..1f8a62d40 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php @@ -19,10 +19,10 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Repository; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; -use Doctrine\Common\Persistence\ManagerRegistry; use Surfnet\Stepup\Identity\Value\NameId; use Surfnet\StepupMiddleware\ApiBundle\Exception\InvalidArgumentException; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Sraa; +use Symfony\Bridge\Doctrine\ManagerRegistry; class SraaRepository extends ServiceEntityRepository { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/UnverifiedSecondFactorRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/UnverifiedSecondFactorRepository.php index cb8c78f55..8d75bf40c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/UnverifiedSecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/UnverifiedSecondFactorRepository.php @@ -19,11 +19,11 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Repository; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; -use Doctrine\Common\Persistence\ManagerRegistry; use Doctrine\ORM\Query; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\UnverifiedSecondFactor; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\UnverifiedSecondFactorQuery; +use Symfony\Bridge\Doctrine\ManagerRegistry; class UnverifiedSecondFactorRepository extends ServiceEntityRepository { @@ -32,13 +32,7 @@ public function __construct(ManagerRegistry $registry) parent::__construct($registry, UnverifiedSecondFactor::class); } - /** - * @param string $id - * @param null $lockMode - * @param null $lockVersion - * @return UnverifiedSecondFactor|null - */ - public function find($id, $lockMode = null, $lockVersion = null) + public function find($id, $lockMode = null, $lockVersion = null): ?UnverifiedSecondFactor { /** @var UnverifiedSecondFactor|null $secondFactor */ $secondFactor = parent::find($id); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VerifiedSecondFactorRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VerifiedSecondFactorRepository.php index 39c12412e..2020803bf 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VerifiedSecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VerifiedSecondFactorRepository.php @@ -20,18 +20,13 @@ use DateTime; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; -use Doctrine\Common\Persistence\ManagerRegistry; -use Doctrine\ORM\EntityManager; -use Doctrine\ORM\EntityRepository; -use Doctrine\ORM\Mapping; use Doctrine\ORM\Query; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\StepupMiddleware\ApiBundle\Authorization\Filter\InstitutionAuthorizationRepositoryFilter; -use Surfnet\StepupMiddleware\ApiBundle\Authorization\Value\InstitutionAuthorizationContextInterface; -use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\RaListing; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\VerifiedSecondFactor; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\VerifiedSecondFactorOfIdentityQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\VerifiedSecondFactorQuery; +use Symfony\Bridge\Doctrine\ManagerRegistry; class VerifiedSecondFactorRepository extends ServiceEntityRepository { @@ -46,11 +41,7 @@ public function __construct(ManagerRegistry $registry, InstitutionAuthorizationR $this->authorizationRepositoryFilter = $authorizationRepositoryFilter; } - /** - * @param string $id - * @return VerifiedSecondFactor|null - */ - public function find($id, $lockMode = null, $lockVersion = null): ?object + public function find($id, $lockMode = null, $lockVersion = null): ?VerifiedSecondFactor { /** @var VerifiedSecondFactor|null $secondFactor */ $secondFactor = parent::find($id); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettedSecondFactorRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettedSecondFactorRepository.php index 5b2a929ae..a1d052742 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettedSecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettedSecondFactorRepository.php @@ -19,11 +19,11 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Repository; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; -use Doctrine\Common\Persistence\ManagerRegistry; use Doctrine\ORM\Query; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\VettedSecondFactor; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\VettedSecondFactorQuery; +use Symfony\Bridge\Doctrine\ManagerRegistry; class VettedSecondFactorRepository extends ServiceEntityRepository { @@ -32,11 +32,7 @@ public function __construct(ManagerRegistry $registry) parent::__construct($registry, VettedSecondFactor::class); } - /** - * @param string $id - * @return VettedSecondFactor|null - */ - public function find($id, $lockMode = null, $lockVersion = null) + public function find($id, $lockMode = null, $lockVersion = null): ?VettedSecondFactor { /** @var VettedSecondFactor|null $secondFactor */ $secondFactor = parent::find($id); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettingTypeHintRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettingTypeHintRepository.php index 3fadb100a..92d7fb3a0 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettingTypeHintRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettingTypeHintRepository.php @@ -19,8 +19,8 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Repository; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; -use Doctrine\Common\Persistence\ManagerRegistry; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\VettingTypeHint; +use Symfony\Bridge\Doctrine\ManagerRegistry; class VettingTypeHintRepository extends ServiceEntityRepository { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php index dc574f242..4534cbb7c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php @@ -20,9 +20,9 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Common\Collections\ArrayCollection; -use Doctrine\Common\Persistence\ManagerRegistry; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\WhitelistEntry; +use Symfony\Bridge\Doctrine\ManagerRegistry; class WhitelistEntryRepository extends ServiceEntityRepository { From 836d10c2fa9fe3902b25b8382cb867eab8a3dbda Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Mon, 26 Feb 2024 14:18:55 +0100 Subject: [PATCH 10/89] Update *Controller, extend AbstractController --- .../ApiBundle/Controller/AuditLogController.php | 4 ++-- .../ApiBundle/Controller/CommandController.php | 4 ++-- .../ApiBundle/Controller/ConfiguredInstitutionController.php | 4 ++-- .../ApiBundle/Controller/IdentityController.php | 4 ++-- .../Controller/InstitutionConfigurationOptionsController.php | 4 ++-- .../ApiBundle/Controller/ProfileController.php | 4 ++-- .../ApiBundle/Controller/RaCandidateController.php | 4 ++-- .../StepupMiddleware/ApiBundle/Controller/RaController.php | 4 ++-- .../ApiBundle/Controller/RaListingController.php | 4 ++-- .../ApiBundle/Controller/RaLocationController.php | 4 ++-- .../ApiBundle/Controller/RaSecondFactorController.php | 4 ++-- .../ApiBundle/Controller/RecoveryTokenController.php | 4 ++-- .../StepupMiddleware/ApiBundle/Controller/SraaController.php | 4 ++-- .../ApiBundle/Controller/UnverifiedSecondFactorController.php | 4 ++-- .../ApiBundle/Controller/VerifiedSecondFactorController.php | 4 ++-- .../ApiBundle/Controller/VettedSecondFactorController.php | 4 ++-- .../ApiBundle/Controller/VettingTypeHintController.php | 4 ++-- .../ManagementBundle/Controller/ConfigurationController.php | 4 ++-- .../Controller/RightToBeForgottenController.php | 4 ++-- .../ManagementBundle/Controller/WhitelistController.php | 4 ++-- 20 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuditLogController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuditLogController.php index 64b58e18c..d034e6758 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuditLogController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuditLogController.php @@ -24,10 +24,10 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\SecondFactorAuditLogQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\AuditLogService; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonCollectionResponse; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; -final class AuditLogController extends Controller +final class AuditLogController extends AbstractController { /** * @var AuditLogService diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php index 2f1cb0e16..2879ff84e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php @@ -30,7 +30,7 @@ use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\CreateIdentityCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\UpdateIdentityCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\TransactionAwarePipeline; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; @@ -40,7 +40,7 @@ /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class CommandController extends Controller +class CommandController extends AbstractController { /** * @var WhitelistService diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ConfiguredInstitutionController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ConfiguredInstitutionController.php index 8438da1e2..72d8376f3 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ConfiguredInstitutionController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ConfiguredInstitutionController.php @@ -19,10 +19,10 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Controller; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Service\ConfiguredInstitutionService; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; -class ConfiguredInstitutionController extends Controller +class ConfiguredInstitutionController extends AbstractController { /** * @var ConfiguredInstitutionService diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php index 97364c8f7..5efc24860 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php @@ -25,12 +25,12 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\IdentityService; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonCollectionResponse; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonNotFoundResponse; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -class IdentityController extends Controller +class IdentityController extends AbstractController { /** * @var IdentityService diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/InstitutionConfigurationOptionsController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/InstitutionConfigurationOptionsController.php index 9475003f1..d52fb55f5 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/InstitutionConfigurationOptionsController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/InstitutionConfigurationOptionsController.php @@ -23,11 +23,11 @@ use Surfnet\StepupMiddleware\ApiBundle\Configuration\Service\AllowedSecondFactorListService; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Service\InstitutionAuthorizationService; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Service\InstitutionConfigurationOptionsService; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -final class InstitutionConfigurationOptionsController extends Controller +final class InstitutionConfigurationOptionsController extends AbstractController { /** * @var InstitutionConfigurationOptionsService diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ProfileController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ProfileController.php index b1a9c420d..f165eab5f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ProfileController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ProfileController.php @@ -19,13 +19,13 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Controller; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\ProfileService; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -class ProfileController extends Controller +class ProfileController extends AbstractController { /** * @var ProfileService diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php index 9cb7cf23e..99f7518e0 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php @@ -25,13 +25,13 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\RaCandidateQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\RaCandidateService; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonCollectionResponse; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use function sprintf; -class RaCandidateController extends Controller +class RaCandidateController extends AbstractController { /** * @var RaCandidateService diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaController.php index a1a07fab6..338a5e06e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaController.php @@ -21,9 +21,9 @@ use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\RaListingService; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonCollectionResponse; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; -class RaController extends Controller +class RaController extends AbstractController { /** * @var RaListingService diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php index 4ec8e2e68..fa1657f9b 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php @@ -25,12 +25,12 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\RaListingQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\RaListingService; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonCollectionResponse; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -class RaListingController extends Controller +class RaListingController extends AbstractController { /** * @var RaListingService diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaLocationController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaLocationController.php index 9a7155a6f..78004a388 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaLocationController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaLocationController.php @@ -23,11 +23,11 @@ use Surfnet\StepupMiddleware\ApiBundle\Configuration\Query\RaLocationQuery; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Service\RaLocationService; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonCollectionResponse; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; -final class RaLocationController extends Controller +final class RaLocationController extends AbstractController { /** * @return RaLocationService diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php index 89dd7bcc1..647b6b73c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php @@ -24,11 +24,11 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\RaSecondFactorQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\RaSecondFactorService; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonCollectionResponse; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; -final class RaSecondFactorController extends Controller +final class RaSecondFactorController extends AbstractController { /** * @var RaSecondFactorService diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php index 1205b2828..8b75ab38d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php @@ -27,7 +27,7 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\RecoveryTokenQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\RecoveryTokenService; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonCollectionResponse; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; @@ -36,7 +36,7 @@ * Exposes the Recovery Tokens projection through the * Middleware Identity (read) API */ -class RecoveryTokenController extends Controller +class RecoveryTokenController extends AbstractController { /** * @var RecoveryTokenService diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/SraaController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/SraaController.php index 63bf793f3..23ff854bb 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/SraaController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/SraaController.php @@ -21,10 +21,10 @@ use Surfnet\Stepup\Identity\Value\NameId; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\SraaService; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonNotFoundResponse; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; -class SraaController extends Controller +class SraaController extends AbstractController { /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php index 61a0c6e6a..6bca2ba22 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php @@ -22,12 +22,12 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\UnverifiedSecondFactorQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\SecondFactorService; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonCollectionResponse; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -class UnverifiedSecondFactorController extends Controller +class UnverifiedSecondFactorController extends AbstractController { /** * @var SecondFactorService diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VerifiedSecondFactorController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VerifiedSecondFactorController.php index 9818307ad..be19c4625 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VerifiedSecondFactorController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VerifiedSecondFactorController.php @@ -29,7 +29,7 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\VerifiedSecondFactorQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\SecondFactorService; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonCollectionResponse; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; @@ -37,7 +37,7 @@ /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class VerifiedSecondFactorController extends Controller +class VerifiedSecondFactorController extends AbstractController { /** * @var SecondFactorService diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php index 20beef918..338da3e11 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php @@ -22,12 +22,12 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\VettedSecondFactorQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\SecondFactorService; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonCollectionResponse; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -class VettedSecondFactorController extends Controller +class VettedSecondFactorController extends AbstractController { /** * @var SecondFactorService diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettingTypeHintController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettingTypeHintController.php index 5c6e1578c..dfe2891fd 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettingTypeHintController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettingTypeHintController.php @@ -29,14 +29,14 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\RecoveryTokenService; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonCollectionResponse; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Service\VettingTypeHintService; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use function in_array; use function sprintf; -class VettingTypeHintController extends Controller +class VettingTypeHintController extends AbstractController { /** * @var VettingTypeHintService diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php index 5f3d7a021..e8893e233 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php @@ -23,11 +23,11 @@ use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; use Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\Command\UpdateConfigurationCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\TransactionAwarePipeline; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; -class ConfigurationController extends Controller +class ConfigurationController extends AbstractController { /** * @return TransactionAwarePipeline diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php index 07a940211..5d44ee7dd 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php @@ -27,7 +27,7 @@ use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\ForgetIdentityCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\TransactionAwarePipeline; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; @@ -36,7 +36,7 @@ /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class RightToBeForgottenController extends Controller +class RightToBeForgottenController extends AbstractController { /** * @return TransactionAwarePipeline diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php index af9b19c65..337adea48 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php @@ -28,7 +28,7 @@ use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\RemoveFromWhitelistCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\ReplaceWhitelistCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\TransactionAwarePipeline; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; @@ -37,7 +37,7 @@ /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class WhitelistController extends Controller +class WhitelistController extends AbstractController { /** * @return TransactionAwarePipeline From 749685f709904cb731d865bbe799ee9d52b0bc9c Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Mon, 26 Feb 2024 14:45:07 +0100 Subject: [PATCH 11/89] Update Session framework settings --- config/packages/framework.yaml | 4 ++-- config/packages/smoketest/framework.yaml | 2 -- config/packages/smoketest_event_replay/framework.yaml | 2 -- config/packages/test/framework.yaml | 2 -- config/services.yaml | 3 +++ 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/config/packages/framework.yaml b/config/packages/framework.yaml index 4491e0b98..0623aea2a 100644 --- a/config/packages/framework.yaml +++ b/config/packages/framework.yaml @@ -6,10 +6,10 @@ framework: # Enables session support. Note that the session will ONLY be started if you read or write from it. # Remove or comment this section to explicitly disable session support. session: - handler_id: null + handler_id: ~ cookie_secure: auto cookie_samesite: lax - + storage_factory_id: session.storage.factory.native esi: false fragments: false php_errors: diff --git a/config/packages/smoketest/framework.yaml b/config/packages/smoketest/framework.yaml index c0ed84be7..3689f8bad 100644 --- a/config/packages/smoketest/framework.yaml +++ b/config/packages/smoketest/framework.yaml @@ -1,7 +1,5 @@ framework: test: ~ - session: - handler_id: session.storage.mock_file profiler: collect: false php_errors: diff --git a/config/packages/smoketest_event_replay/framework.yaml b/config/packages/smoketest_event_replay/framework.yaml index 3d2c78be2..337675326 100644 --- a/config/packages/smoketest_event_replay/framework.yaml +++ b/config/packages/smoketest_event_replay/framework.yaml @@ -1,6 +1,4 @@ framework: test: ~ - session: - handler_id: session.storage.mock_file profiler: collect: false diff --git a/config/packages/test/framework.yaml b/config/packages/test/framework.yaml index 74d9c42c8..3b4de93dd 100644 --- a/config/packages/test/framework.yaml +++ b/config/packages/test/framework.yaml @@ -1,6 +1,4 @@ framework: test: true - session: - handler_id: session.storage.mock_file profiler: collect: false diff --git a/config/services.yaml b/config/services.yaml index 1b6b77d1c..6791096b7 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -4,6 +4,9 @@ imports: - { resource: 'legacy/parameters.yaml' } services: + _defaults: + autowire: true + autoconfigure: true Surfnet\Stepup\Helper\SecondFactorProvePossessionHelper: arguments: From 5a64ad2faa6df2b85437691fb7bb748e01cb5621 Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Tue, 27 Feb 2024 08:45:03 +0100 Subject: [PATCH 12/89] Convert Annotations to Attributes --- .../Identity/Value/OnPremiseVettingType.php | 3 +- .../SelfAssertedRegistrationVettingType.php | 3 +- .../Identity/Value/SelfVetVettingType.php | 3 +- .../Identity/Value/UnknownVettingType.php | 3 +- .../Entity/AllowedSecondFactor.php | 15 ++--- .../Entity/ConfiguredInstitution.php | 11 ++-- .../Entity/InstitutionAuthorization.php | 26 +++----- .../InstitutionConfigurationOptions.php | 32 ++++------ .../Configuration/Entity/RaLocation.php | 30 +++------ .../InstitutionAuthorizationOptionMap.php | 4 +- .../Identity/Entity/AuditLogEntry.php | 62 +++++++------------ .../ApiBundle/Identity/Entity/Identity.php | 35 ++++------- .../IdentitySelfAssertedTokenOptions.php | 29 ++++----- .../Identity/Entity/InstitutionListing.php | 9 ++- .../ApiBundle/Identity/Entity/RaCandidate.php | 24 +++---- .../ApiBundle/Identity/Entity/RaListing.php | 50 ++++++--------- .../Identity/Entity/RaSecondFactor.php | 45 ++++++-------- .../Identity/Entity/RecoveryToken.php | 42 ++++--------- .../Entity/SecondFactorRevocation.php | 32 +++------- .../ApiBundle/Identity/Entity/Sraa.php | 15 ++--- .../Entity/UnverifiedSecondFactor.php | 25 +++----- .../Identity/Entity/VerifiedSecondFactor.php | 39 ++++-------- .../Identity/Entity/VettedSecondFactor.php | 34 ++++------ .../Identity/Entity/VettingTypeHint.php | 29 +++------ .../Identity/Entity/WhitelistEntry.php | 17 ++--- .../Command/AbstractCommand.php | 6 +- .../Command/Metadata.php | 7 +-- .../Command/AddRaLocationCommand.php | 19 +++--- .../Command/ChangeRaLocationCommand.php | 23 +++---- .../CreateInstitutionConfigurationCommand.php | 5 +- ...InstitutionConfigurationOptionsCommand.php | 21 +++---- ...onConfigurationByUnnormalizedIdCommand.php | 5 +- .../Command/RemoveRaLocationCommand.php | 10 ++- .../Command/AccreditIdentityCommand.php | 24 +++---- .../Command/AddToWhitelistCommand.php | 16 ++--- ...egistrationAuthorityInformationCommand.php | 16 ++--- .../Identity/Command/AppointRoleCommand.php | 12 ++-- ...IdentityWithYubikeySecondFactorCommand.php | 32 +++++----- .../Command/CreateIdentityCommand.php | 30 ++++----- .../ExpressLocalePreferenceCommand.php | 8 +-- .../Command/ForgetIdentityCommand.php | 8 +-- .../MigrateVettedSecondFactorCommand.php | 24 +++---- ...eSafeStoreSecretTokenPossessionCommand.php | 24 +++---- .../Command/ProveGssfPossessionCommand.php | 24 +++---- .../Command/ProvePhonePossessionCommand.php | 20 +++--- ...ovePhoneRecoveryTokenPossessionCommand.php | 26 +++----- .../ProveU2fDevicePossessionCommand.php | 18 ++---- .../Command/ProveYubikeyPossessionCommand.php | 18 ++---- ...egisterSelfAssertedSecondFactorCommand.php | 26 +++----- .../Command/RemoveFromWhitelistCommand.php | 16 ++--- .../Command/ReplaceWhitelistCommand.php | 16 ++--- .../RetractRegistrationAuthorityCommand.php | 10 ++- .../Command/RevokeOwnRecoveryTokenCommand.php | 12 ++-- .../Command/RevokeOwnSecondFactorCommand.php | 12 ++-- .../RevokeRegistrantsRecoveryTokenCommand.php | 18 ++---- .../RevokeRegistrantsSecondFactorCommand.php | 18 ++---- .../Command/SaveVettingTypeHintCommand.php | 25 +++----- .../Command/SelfVetSecondFactorCommand.php | 27 +++----- ...ndSecondFactorRegistrationEmailCommand.php | 12 ++-- .../Command/UpdateIdentityCommand.php | 15 ++--- .../Identity/Command/VerifyEmailCommand.php | 11 ++-- .../Command/VetSecondFactorCommand.php | 41 +++++------- .../Entity/InstitutionConfiguration.php | 12 ++-- .../GatewayBundle/Entity/SamlEntity.php | 25 +++----- .../GatewayBundle/Entity/SecondFactor.php | 41 +++++------- .../GatewayBundle/Entity/WhitelistEntry.php | 17 ++--- .../Configuration/Entity/EmailTemplate.php | 27 +++----- 67 files changed, 515 insertions(+), 879 deletions(-) diff --git a/src/Surfnet/Stepup/Identity/Value/OnPremiseVettingType.php b/src/Surfnet/Stepup/Identity/Value/OnPremiseVettingType.php index 8c30dc39a..23efe0d6e 100644 --- a/src/Surfnet/Stepup/Identity/Value/OnPremiseVettingType.php +++ b/src/Surfnet/Stepup/Identity/Value/OnPremiseVettingType.php @@ -23,7 +23,7 @@ class OnPremiseVettingType implements VettingType /** * @var string */ - protected $type; + protected $type = VettingType::TYPE_ON_PREMISE; /** * @var DocumentNumber @@ -33,7 +33,6 @@ class OnPremiseVettingType implements VettingType public function __construct(DocumentNumber $documentNumber) { $this->documentNumber = $documentNumber; - $this->type = VettingType::TYPE_ON_PREMISE; } public static function deserialize($data) diff --git a/src/Surfnet/Stepup/Identity/Value/SelfAssertedRegistrationVettingType.php b/src/Surfnet/Stepup/Identity/Value/SelfAssertedRegistrationVettingType.php index 0aaad7e56..df243e9e9 100644 --- a/src/Surfnet/Stepup/Identity/Value/SelfAssertedRegistrationVettingType.php +++ b/src/Surfnet/Stepup/Identity/Value/SelfAssertedRegistrationVettingType.php @@ -23,13 +23,12 @@ class SelfAssertedRegistrationVettingType implements VettingType /** * @var string */ - protected $type; + protected $type = VettingType::TYPE_SELF_ASSERTED_REGISTRATION; protected $authoringRecoveryToken; public function __construct(RecoveryTokenId $recoveryTokenId) { - $this->type = VettingType::TYPE_SELF_ASSERTED_REGISTRATION; $this->authoringRecoveryToken = $recoveryTokenId; } diff --git a/src/Surfnet/Stepup/Identity/Value/SelfVetVettingType.php b/src/Surfnet/Stepup/Identity/Value/SelfVetVettingType.php index 4057ec15c..87e00e6c7 100644 --- a/src/Surfnet/Stepup/Identity/Value/SelfVetVettingType.php +++ b/src/Surfnet/Stepup/Identity/Value/SelfVetVettingType.php @@ -25,7 +25,7 @@ class SelfVetVettingType implements VettingType /** * @var string */ - protected $type; + protected $type = VettingType::TYPE_SELF_VET; /** * @var Loa @@ -35,7 +35,6 @@ class SelfVetVettingType implements VettingType public function __construct(Loa $loa) { $this->authoringLoa = $loa; - $this->type = VettingType::TYPE_SELF_VET; } public static function deserialize($data) diff --git a/src/Surfnet/Stepup/Identity/Value/UnknownVettingType.php b/src/Surfnet/Stepup/Identity/Value/UnknownVettingType.php index 2613caf5d..91eb89b96 100644 --- a/src/Surfnet/Stepup/Identity/Value/UnknownVettingType.php +++ b/src/Surfnet/Stepup/Identity/Value/UnknownVettingType.php @@ -23,11 +23,10 @@ class UnknownVettingType implements VettingType /** * @var string */ - protected $type; + protected $type = VettingType::TYPE_UNKNOWN; public function __construct() { - $this->type = VettingType::TYPE_UNKNOWN; } public function auditLog(): string diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/AllowedSecondFactor.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/AllowedSecondFactor.php index 5a4623a62..8be3d62b6 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/AllowedSecondFactor.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/AllowedSecondFactor.php @@ -21,28 +21,25 @@ use Doctrine\ORM\Mapping as ORM; use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\StepupBundle\Value\SecondFactorType; +use Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository\AllowedSecondFactorRepository; -/** - * @ORM\Entity( - * repositoryClass="Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository\AllowedSecondFactorRepository" - * ) - */ +#[ORM\Entity(repositoryClass: AllowedSecondFactorRepository::class)] class AllowedSecondFactor { /** - * @ORM\Id - * @ORM\Column(type="stepup_configuration_institution") * * @var Institution */ + #[ORM\Id] + #[ORM\Column(type: 'stepup_configuration_institution')] public $institution; /** - * @ORM\Id - * @ORM\Column(type="stepup_second_factor_type") * * @var SecondFactorType */ + #[ORM\Id] + #[ORM\Column(type: 'stepup_second_factor_type')] public $secondFactorType; private function __construct() diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/ConfiguredInstitution.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/ConfiguredInstitution.php index e4d3a8260..405c554c7 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/ConfiguredInstitution.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/ConfiguredInstitution.php @@ -20,20 +20,17 @@ use Doctrine\ORM\Mapping as ORM; use Surfnet\Stepup\Configuration\Value\Institution; +use Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository\ConfiguredInstitutionRepository; -/** - * @ORM\Entity( - * repositoryClass="Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository\ConfiguredInstitutionRepository" - * ) - */ +#[ORM\Entity(repositoryClass: ConfiguredInstitutionRepository::class)] class ConfiguredInstitution { /** - * @ORM\Id - * @ORM\Column(type="stepup_configuration_institution") * * @var Institution */ + #[ORM\Id] + #[ORM\Column(type: 'stepup_configuration_institution')] public $institution; /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/InstitutionAuthorization.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/InstitutionAuthorization.php index 2dd58d560..0808c2adc 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/InstitutionAuthorization.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/InstitutionAuthorization.php @@ -21,41 +21,35 @@ use Doctrine\ORM\Mapping as ORM; use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\Stepup\Configuration\Value\InstitutionRole; +use Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository\InstitutionAuthorizationRepository; -/** - * @ORM\Entity( - * repositoryClass="Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository\InstitutionAuthorizationRepository" - * ) - * @ORM\Table( - * indexes={ - * @ORM\Index(name="idx_authorization", columns={"institution","institution_relation","institution_role"}) - * } - * ) - */ +#[ORM\Table] +#[ORM\Index(name: 'idx_authorization', columns: ['institution', 'institution_relation', 'institution_role'])] +#[ORM\Entity(repositoryClass: InstitutionAuthorizationRepository::class)] class InstitutionAuthorization { /** - * @ORM\Id - * @ORM\Column(type="stepup_configuration_institution") * * @var Institution */ + #[ORM\Id] + #[ORM\Column(type: 'stepup_configuration_institution')] public $institution; /** - * @ORM\Id - * @ORM\Column(type="stepup_configuration_institution") * * @var Institution */ + #[ORM\Id] + #[ORM\Column(type: 'stepup_configuration_institution')] public $institutionRelation; /** - * @ORM\Id - * @ORM\Column(type="stepup_institution_role", length=10) * * @var InstitutionRole */ + #[ORM\Id] + #[ORM\Column(type: 'stepup_institution_role', length: 10)] public $institutionRole; /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/InstitutionConfigurationOptions.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/InstitutionConfigurationOptions.php index ccaa9a21b..0f5827a5f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/InstitutionConfigurationOptions.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/InstitutionConfigurationOptions.php @@ -27,69 +27,59 @@ use Surfnet\Stepup\Configuration\Value\SsoOn2faOption; use Surfnet\Stepup\Configuration\Value\UseRaLocationsOption; use Surfnet\Stepup\Configuration\Value\VerifyEmailOption; +use Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository\InstitutionConfigurationOptionsRepository; -/** - * @ORM\Entity( - * repositoryClass="Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository\InstitutionConfigurationOptionsRepository" - * ) - */ +#[ORM\Entity(repositoryClass: InstitutionConfigurationOptionsRepository::class)] class InstitutionConfigurationOptions { /** - * @ORM\Id - * @ORM\Column(type="stepup_configuration_institution") * * @var Institution */ + #[ORM\Id] + #[ORM\Column(type: 'stepup_configuration_institution')] public $institution; /** - * @ORM\Column(type="stepup_use_ra_locations_option") - * * @var UseRaLocationsOption */ + #[ORM\Column(type: 'stepup_use_ra_locations_option')] public $useRaLocationsOption; /** - * @ORM\Column(type="stepup_show_raa_contact_information_option") - * * @var ShowRaaContactInformationOption */ + #[ORM\Column(type: 'stepup_show_raa_contact_information_option')] public $showRaaContactInformationOption; /** - * @ORM\Column(type="stepup_verify_email_option", options={"default" : 1}) - * * @var VerifyEmailOption */ + #[ORM\Column(type: 'stepup_verify_email_option', options: ['default' => 1])] public $verifyEmailOption; /** - * @ORM\Column(type="stepup_self_vet_option", options={"default" : 0}) - * * @var SelfVetOption */ + #[ORM\Column(type: 'stepup_self_vet_option', options: ['default' => 0])] public $selfVetOption; /** - * @ORM\Column(type="stepup_sso_on_2fa_option", options={"default" : 0}) - * * @var SsoOn2FaOption */ + #[ORM\Column(type: 'stepup_sso_on_2fa_option', options: ['default' => 0])] public $ssoOn2faOption; /** - * @ORM\Column(type="stepup_self_asserted_tokens_option", options={"default" : 0}) - * * @var SelfAssertedTokensOption */ + #[ORM\Column(type: 'stepup_self_asserted_tokens_option', options: ['default' => 0])] public $selfAssertedTokensOption; /** - * @ORM\Column(type="stepup_number_of_tokens_per_identity_option", options={"default" : 0}) - * * @var NumberOfTokensPerIdentityOption */ + #[ORM\Column(type: 'stepup_number_of_tokens_per_identity_option', options: ['default' => 0])] public $numberOfTokensPerIdentityOption; public static function create( diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/RaLocation.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/RaLocation.php index 05554fd1c..1f0e63203 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/RaLocation.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/RaLocation.php @@ -23,55 +23,45 @@ use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\Stepup\Configuration\Value\Location; use Surfnet\Stepup\Configuration\Value\RaLocationName; +use Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository\RaLocationRepository; use Surfnet\StepupMiddleware\ApiBundle\Exception\InvalidArgumentException; use Doctrine\ORM\Mapping as ORM; -/** - * @ORM\Entity( - * repositoryClass="Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository\RaLocationRepository" - * ) - * @ORM\Table( - * indexes={ - * @ORM\Index(name="idx_ra_location_institution", columns={"institution"}) - * } - * ) - */ +#[ORM\Table] +#[ORM\Index(name: 'idx_ra_location_institution', columns: ['institution'])] +#[ORM\Entity(repositoryClass: RaLocationRepository::class)] class RaLocation implements JsonSerializable { /** - * @ORM\Id - * @ORM\Column(length=36) * * @var string */ + #[ORM\Id] + #[ORM\Column(length: 36)] public $id; /** - * @ORM\Column(type="stepup_configuration_institution") - * * @var Institution */ + #[ORM\Column(type: 'stepup_configuration_institution')] public $institution; /** - * @ORM\Column(type="stepup_ra_location_name") - * * @var RaLocationName */ + #[ORM\Column(type: 'stepup_ra_location_name')] public $name; /** - * @ORM\Column(type="stepup_configuration_location") - * * @var Location */ + #[ORM\Column(type: 'stepup_configuration_location')] public $location; /** - * @ORM\Column(type="stepup_configuration_contact_information") - * * @var ContactInformation */ + #[ORM\Column(type: 'stepup_configuration_contact_information')] public $contactInformation; public static function create( diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionAuthorizationOptionMap.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionAuthorizationOptionMap.php index e92d20bd2..e65a01b01 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionAuthorizationOptionMap.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionAuthorizationOptionMap.php @@ -27,7 +27,7 @@ final class InstitutionAuthorizationOptionMap /** * @var InstitutionAuthorizationOption[] */ - private $institutionOptions; + private $institutionOptions = []; /** * InstitutionAuthorizationOptionMap constructor. @@ -51,8 +51,6 @@ private function __construct(Institution $institution, array $institutionAuthori } $institutions[$role->getType()][] = $authorization->institutionRelation; } - - $this->institutionOptions = []; foreach ($roles as $role) { $institutionAuthorizationOption = InstitutionAuthorizationOption::fromInstitutions($role, $institution, $institutions[$role->getType()]); $this->institutionOptions[$role->getType()] = $institutionAuthorizationOption; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/AuditLogEntry.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/AuditLogEntry.php index 76835bf8b..a6a14dd7a 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/AuditLogEntry.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/AuditLogEntry.php @@ -21,22 +21,18 @@ use Doctrine\ORM\Mapping as ORM; use JsonSerializable; use Surfnet\StepupMiddleware\ApiBundle\Exception\LogicException; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\AuditLogRepository; /** * @SuppressWarnings(PHPMD.UnusedPrivateField) - * - * @ORM\Entity(repositoryClass="Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\AuditLogRepository") - * @ORM\Table( - * name="audit_log", - * indexes={ - * @ORM\Index(name="idx_auditlog_actorid", columns={"actor_id"}), - * @ORM\Index(name="idx_auditlog_identityid", columns={"identity_id"}), - * @ORM\Index(name="idx_auditlog_identityinstitution", columns={"identity_institution"}), - * @ORM\Index(name="idx_auditlog_secondfactorid", columns={"second_factor_id"}), - * @ORM\Index(name="idx_auditlog_ra_institution", columns={"ra_institution"}), - * } - * ) */ +#[ORM\Table(name: 'audit_log')] +#[ORM\Index(name: 'idx_auditlog_actorid', columns: ['actor_id'])] +#[ORM\Index(name: 'idx_auditlog_identityid', columns: ['identity_id'])] +#[ORM\Index(name: 'idx_auditlog_identityinstitution', columns: ['identity_institution'])] +#[ORM\Index(name: 'idx_auditlog_secondfactorid', columns: ['second_factor_id'])] +#[ORM\Index(name: 'idx_auditlog_ra_institution', columns: ['ra_institution'])] +#[ORM\Entity(repositoryClass: AuditLogRepository::class)] class AuditLogEntry implements JsonSerializable { /** @@ -83,32 +79,29 @@ class AuditLogEntry implements JsonSerializable ]; /** - * @ORM\Id - * @ORM\Column(length=36) * * @var string */ + #[ORM\Id] + #[ORM\Column(length: 36)] public $id; /** - * @ORM\Column(length=36, nullable=true) - * * @var string|null */ + #[ORM\Column(length: 36, nullable: true)] public $actorId; /** - * @ORM\Column(type="stepup_common_name", nullable=true) - * * @var \Surfnet\Stepup\Identity\Value\CommonName */ + #[ORM\Column(type: 'stepup_common_name', nullable: true)] public $actorCommonName; /** - * @ORM\Column(type="institution", nullable=true) - * * @var \Surfnet\Stepup\Identity\Value\Institution|null */ + #[ORM\Column(type: 'institution', nullable: true)] public $actorInstitution; /** @@ -116,73 +109,64 @@ class AuditLogEntry implements JsonSerializable * event log entry is targeted at. For example. John Doe is accredited to become RA by Joe from * institution-a. The actual institution John is appointed RA for is stored in this field. * - * @ORM\Column(length=255, nullable=true) * * @var string|null */ + #[ORM\Column(length: 255, nullable: true)] public $raInstitution; /** - * @ORM\Column(length=36) - * * @var string */ + #[ORM\Column(length: 36)] public $identityId; /** - * @ORM\Column(type="institution") - * * @var \Surfnet\Stepup\Identity\Value\Institution */ + #[ORM\Column(type: 'institution')] public $identityInstitution; /** - * @ORM\Column(length=36, nullable=true) - * * @var string|null */ + #[ORM\Column(length: 36, nullable: true)] public $secondFactorId; /** - * @ORM\Column(length=255, nullable=true) - * * @var string */ + #[ORM\Column(length: 255, nullable: true)] public $secondFactorIdentifier; /** - * @ORM\Column(length=36, nullable=true) - * * @var string|null */ + #[ORM\Column(length: 36, nullable: true)] public $secondFactorType; /** - * @ORM\Column(length=255, nullable=true) - * * @var string */ + #[ORM\Column(length: 255, nullable: true)] public $recoveryTokenIdentifier; /** - * @ORM\Column(length=36, nullable=true) - * * @var string|null */ + #[ORM\Column(length: 36, nullable: true)] public $recoveryTokenType; /** - * @ORM\Column(length=255) - * * @var string */ + #[ORM\Column(length: 255)] public $event; /** - * @ORM\Column(type="stepup_datetime") - * * @var \Surfnet\Stepup\DateTime\DateTime */ + #[ORM\Column(type: 'stepup_datetime')] public $recordedOn; public function jsonSerialize() diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Identity.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Identity.php index a3e4c3398..dcd6e2366 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Identity.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Identity.php @@ -25,60 +25,51 @@ use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\Stepup\Identity\Value\Locale; use Surfnet\Stepup\Identity\Value\NameId; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\IdentityRepository; -/** - * @ORM\Entity(repositoryClass="Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\IdentityRepository") - * @ORM\Table( - * indexes={ - * @ORM\Index(name="idx_identity_institution", columns={"institution"}), - * @ORM\Index(name="idxft_identity_email", columns={"email"}, flags={"FULLTEXT"}), - * @ORM\Index(name="idxft_identity_commonname", columns={"common_name"}, flags={"FULLTEXT"}) - * } - * ) - */ +#[ORM\Table] +#[ORM\Index(name: 'idx_identity_institution', columns: ['institution'])] +#[ORM\Index(name: 'idxft_identity_email', columns: ['email'], flags: ['FULLTEXT'])] +#[ORM\Index(name: 'idxft_identity_commonname', columns: ['common_name'], flags: ['FULLTEXT'])] +#[ORM\Entity(repositoryClass: IdentityRepository::class)] class Identity implements JsonSerializable { /** - * @ORM\Id - * @ORM\Column(length=36) * * @var string */ + #[ORM\Id] + #[ORM\Column(length: 36)] public $id; /** - * @ORM\Column(type="stepup_name_id") - * * @var \Surfnet\Stepup\Identity\Value\NameId */ + #[ORM\Column(type: 'stepup_name_id')] public $nameId; /** - * @ORM\Column(type="stepup_common_name") - * * @var \Surfnet\Stepup\Identity\Value\CommonName */ + #[ORM\Column(type: 'stepup_common_name')] public $commonName; /** - * @ORM\Column(type="institution") - * * @var \Surfnet\Stepup\Identity\Value\Institution */ + #[ORM\Column(type: 'institution')] public $institution; /** - * @ORM\Column(type="stepup_email") - * * @var \Surfnet\Stepup\Identity\Value\Email */ + #[ORM\Column(type: 'stepup_email')] public $email; /** - * @ORM\Column(type="stepup_locale") - * * @var \Surfnet\Stepup\Identity\Value\Locale */ + #[ORM\Column(type: 'stepup_locale')] public $preferredLocale; public static function create( diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/IdentitySelfAssertedTokenOptions.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/IdentitySelfAssertedTokenOptions.php index a493f1a4b..a7e0bb3bb 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/IdentitySelfAssertedTokenOptions.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/IdentitySelfAssertedTokenOptions.php @@ -21,42 +21,39 @@ use Doctrine\ORM\Mapping as ORM; use JsonSerializable; use Surfnet\Stepup\Identity\Value\IdentityId; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\IdentitySelfAssertedTokenOptionsRepository; -/** - * @ORM\Entity(repositoryClass="Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\IdentitySelfAssertedTokenOptionsRepository") - */ +#[ORM\Entity(repositoryClass: IdentitySelfAssertedTokenOptionsRepository::class)] class IdentitySelfAssertedTokenOptions implements JsonSerializable { /** - * @ORM\Id - * @ORM\Column(length=36) * * @var IdentityId */ + #[ORM\Id] + #[ORM\Column(length: 36)] public $identityId; /** - * @ORM\Column(type="boolean") - * - * In order to determine if the user is allowed to register - * a self-asserted token. One of the conditions is that there should - * be no previous token registration in his name. Regardless of type. + * In order to determine if the user is allowed to register + * a self-asserted token. One of the conditions is that there should + * be no previous token registration in his name. Regardless of type. * * @var bool */ + #[ORM\Column(type: 'boolean')] public $possessedToken = false; /** - * @ORM\Column(type="boolean") - * - * Indicator if Identity is allowed to work with Recovery Tokens + * Indicator if Identity is allowed to work with Recovery Tokens * - * Satisfies business rule: - * Limit a user to only add/modify/see recovery methods in the overview - * screen when they have previously had an active self-asserted token + * Satisfies business rule: + * Limit a user to only add/modify/see recovery methods in the overview + * screen when they have previously had an active self-asserted token * * @var bool */ + #[ORM\Column(type: 'boolean')] public $possessedSelfAssertedToken; public static function create( diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/InstitutionListing.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/InstitutionListing.php index 5ed531daf..b4c97855b 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/InstitutionListing.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/InstitutionListing.php @@ -21,18 +21,17 @@ use Doctrine\ORM\Mapping as ORM; use JsonSerializable; use Surfnet\Stepup\Identity\Value\Institution; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\InstitutionListingRepository; -/** - * @ORM\Entity(repositoryClass="Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\InstitutionListingRepository") - */ +#[ORM\Entity(repositoryClass: InstitutionListingRepository::class)] class InstitutionListing implements JsonSerializable { /** - * @ORM\Id - * @ORM\Column(type="institution") * * @var \Surfnet\Stepup\Identity\Value\Institution */ + #[ORM\Id] + #[ORM\Column(type: 'institution')] public $institution; public static function createFrom(Institution $institution) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaCandidate.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaCandidate.php index 30cda420a..faf3d7666 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaCandidate.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaCandidate.php @@ -25,56 +25,52 @@ use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\Stepup\Identity\Value\NameId; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RaCandidateRepository; /** * Be aware that this entity is used for the RA Candidate presentation only. This entity shouldn't be used to store any RA candidates. - * - * @ORM\Entity(repositoryClass="Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RaCandidateRepository", readOnly=true) */ +#[ORM\Entity(repositoryClass: RaCandidateRepository::class, readOnly: true)] class RaCandidate implements JsonSerializable { /** - * @ORM\Id - * @ORM\Column(length=36) * * @var string */ + #[ORM\Id] + #[ORM\Column(length: 36)] public $identityId; /** - * @ORM\Id - * @ORM\Column(type="institution") * * @var Institution */ + #[ORM\Id] + #[ORM\Column(type: 'institution')] public $raInstitution; /** - * @ORM\Column(type="institution") - * * @var \Surfnet\Stepup\Identity\Value\Institution */ + #[ORM\Column(type: 'institution')] public $institution; /** - * @ORM\Column(type="stepup_name_id") - * * @var \Surfnet\Stepup\Identity\Value\NameId */ + #[ORM\Column(type: 'stepup_name_id')] public $nameId; /** - * @ORM\Column(type="stepup_common_name") - * * @var \Surfnet\Stepup\Identity\Value\CommonName */ + #[ORM\Column(type: 'stepup_common_name')] public $commonName; /** - * @ORM\Column(type="stepup_email") - * * @var \Surfnet\Stepup\Identity\Value\Email */ + #[ORM\Column(type: 'stepup_email')] public $email; private function __construct() diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaListing.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaListing.php index 53ec53602..f6dcf92ec 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaListing.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaListing.php @@ -26,86 +26,72 @@ use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\Stepup\Identity\Value\Location; use Surfnet\StepupMiddleware\ApiBundle\Exception\InvalidArgumentException; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RaListingRepository; use Surfnet\StepupMiddleware\ApiBundle\Identity\Value\AuthorityRole; -/** - * @ORM\Entity(repositoryClass="Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RaListingRepository") - * - * @ORM\Table( - * indexes={ - * @ORM\Index(name="idx_ra_listing_institution", columns={"institution"}), - * @ORM\Index(name="idx_ra_listing_ra_institution", columns={"ra_institution"}), - * }, - * uniqueConstraints={ - * @ORM\UniqueConstraint(name="idx_ra_listing_unique_identity_institution", columns={"identity_id", "ra_institution"}) - * } - * ) - */ + +#[ORM\Table] +#[ORM\Index(name: 'idx_ra_listing_institution', columns: ['institution'])] +#[ORM\Index(name: 'idx_ra_listing_ra_institution', columns: ['ra_institution'])] +#[ORM\UniqueConstraint(name: 'idx_ra_listing_unique_identity_institution', columns: ['identity_id', 'ra_institution'])] +#[ORM\Entity(repositoryClass: RaListingRepository::class)] class RaListing implements JsonSerializable { /** - * @ORM\Id - * @ORM\Column(type="integer") - * @ORM\GeneratedValue * * @var integer */ + #[ORM\Id] + #[ORM\Column(type: 'integer')] + #[ORM\GeneratedValue] public $id; /** - * @ORM\Column(length=36) - * * @var string */ + #[ORM\Column(length: 36)] public $identityId; /** - * @ORM\Column(type="institution") - * * @var Institution */ + #[ORM\Column(type: 'institution')] public $raInstitution; /** - * @ORM\Column(type="institution") - * * @var Institution */ + #[ORM\Column(type: 'institution')] public $institution; /** - * @ORM\Column(type="stepup_common_name") - * * @var CommonName */ + #[ORM\Column(type: 'stepup_common_name')] public $commonName; /** - * @ORM\Column(type="stepup_email") - * * @var Email */ + #[ORM\Column(type: 'stepup_email')] public $email; /** - * @ORM\Column(type="authority_role") - * * @var AuthorityRole */ + #[ORM\Column(type: 'authority_role')] public $role; /** - * @ORM\Column(type="stepup_location", nullable=true) - * * @var Location */ + #[ORM\Column(type: 'stepup_location', nullable: true)] public $location; /** - * @ORM\Column(type="stepup_contact_information", nullable=true) - * * @var ContactInformation */ + #[ORM\Column(type: 'stepup_contact_information', nullable: true)] public $contactInformation; public static function create( diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaSecondFactor.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaSecondFactor.php index 052f94a6b..663742655 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaSecondFactor.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaSecondFactor.php @@ -24,91 +24,82 @@ use Surfnet\Stepup\Identity\Value\DocumentNumber; use Surfnet\Stepup\Identity\Value\Email; use Surfnet\Stepup\Identity\Value\Institution; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RaSecondFactorRepository; use Surfnet\StepupMiddleware\ApiBundle\Identity\Value\SecondFactorStatus; /** * A second factor as displayed in the registration authority application. One exists for every second factor, * regardless of state. As such, it sports a status property, indicating whether its vetted, revoked etc. - * - * @ORM\Entity(repositoryClass="Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RaSecondFactorRepository") - * @ORM\Table( - * indexes={ - * @ORM\Index(name="idx_ra_second_factor_second_factor_id", columns={"second_factor_id"}), - * @ORM\Index(name="idx_ra_second_factor_identity_id", columns={"identity_id"}), - * @ORM\Index(name="idx_ra_second_factor_institution", columns={"institution"}), - * @ORM\Index(name="idx_ra_second_factor_name", columns={"name"}, flags={"FULLTEXT"}), - * @ORM\Index(name="idx_ra_second_factor_email", columns={"email"}, flags={"FULLTEXT"}), - * } - * ) */ +#[ORM\Table] +#[ORM\Index(name: 'idx_ra_second_factor_second_factor_id', columns: ['second_factor_id'])] +#[ORM\Index(name: 'idx_ra_second_factor_identity_id', columns: ['identity_id'])] +#[ORM\Index(name: 'idx_ra_second_factor_institution', columns: ['institution'])] +#[ORM\Index(name: 'idx_ra_second_factor_name', columns: ['name'], flags: ['FULLTEXT'])] +#[ORM\Index(name: 'idx_ra_second_factor_email', columns: ['email'], flags: ['FULLTEXT'])] +#[ORM\Entity(repositoryClass: RaSecondFactorRepository::class)] class RaSecondFactor implements JsonSerializable { /** - * @ORM\Id - * @ORM\Column(length=36) * * @var string The second factor's ID (UUID). */ + #[ORM\Id] + #[ORM\Column(length: 36)] public $id; /** - * @ORM\Column(length=16) - * * @var string */ + #[ORM\Column(length: 16)] public $type; /** - * @ORM\Column(length=255) - * * @var string The ID of the specific instance of second factor type (ie. phone number, Yubikey public ID). */ + #[ORM\Column(length: 255)] public $secondFactorId; /** - * @ORM\Column(length=36) - * * @var string */ + #[ORM\Column(length: 36)] public $identityId; /** - * @ORM\Column(type="institution") - * * @var \Surfnet\Stepup\Identity\Value\Institution */ + #[ORM\Column(type: 'institution')] public $institution; /** * The name of the registrant. * - * @ORM\Column(type="stepup_common_name") * * @var \Surfnet\Stepup\Identity\Value\CommonName */ + #[ORM\Column(type: 'stepup_common_name')] public $name; /** * The e-mail of the registrant. * - * @ORM\Column(type="stepup_email") * * @var \Surfnet\Stepup\Identity\Value\Email */ + #[ORM\Column(type: 'stepup_email')] public $email; /** - * @ORM\Column(type="stepup_document_number", nullable=true) - * * @var DocumentNumber */ + #[ORM\Column(type: 'stepup_document_number', nullable: true)] public $documentNumber; /** - * @ORM\Column(type="stepup_second_factor_status") - * * @var SecondFactorStatus */ + #[ORM\Column(type: 'stepup_second_factor_status')] public $status; /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RecoveryToken.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RecoveryToken.php index 64647a425..cb92c54d2 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RecoveryToken.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RecoveryToken.php @@ -22,79 +22,63 @@ use Surfnet\Stepup\Identity\Value\CommonName; use Surfnet\Stepup\Identity\Value\Email; use Surfnet\Stepup\Identity\Value\Institution; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RecoveryTokenRepository; use Surfnet\StepupMiddleware\ApiBundle\Identity\Value\RecoveryTokenStatus; -/** - * @ORM\Entity( - * repositoryClass="Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RecoveryTokenRepository" - * ) - * @ORM\Table( - * indexes={ - * @ORM\Index(name="idx_recovery_method_type", columns={"type"}), - * } - * ) - */ +#[ORM\Table] +#[ORM\Index(name: 'idx_recovery_method_type', columns: ['type'])] +#[ORM\Entity(repositoryClass: RecoveryTokenRepository::class)] class RecoveryToken implements \JsonSerializable { /** - * @ORM\Id - * @ORM\Column(length=36) - * * @var string */ + #[ORM\Id] + #[ORM\Column(length: 36)] public $id; /** - * @ORM\Column(length=36) - * * @var string */ + #[ORM\Column(length: 36)] public $identityId; /** - * @ORM\Column(length=16) - * * @var string */ + #[ORM\Column(length: 16)] public $type; /** - * @ORM\Column(type="stepup_recovery_token_status") - * * @var RecoveryTokenStatus */ + #[ORM\Column(type: 'stepup_recovery_token_status')] public $status; /** - * @ORM\Column(type="institution") - * * @var Institution */ + #[ORM\Column(type: 'institution')] public $institution; /** * The name of the registrant. - * - * @ORM\Column(type="stepup_common_name") - * * @var CommonName */ + #[ORM\Column(type: 'stepup_common_name')] public $name; /** * The e-mail of the registrant. - * - * @ORM\Column(type="stepup_email") - * * @var Email */ + #[ORM\Column(type: 'stepup_email')] public $email; /** - * @ORM\Column(length=255) - * * @var string */ + #[ORM\Column(length: 255)] public $recoveryMethodIdentifier; public function jsonSerialize() diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/SecondFactorRevocation.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/SecondFactorRevocation.php index f1b44fa5e..df790c7af 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/SecondFactorRevocation.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/SecondFactorRevocation.php @@ -19,53 +19,41 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Entity; use Doctrine\ORM\Mapping as ORM; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\SecondFactorRevocationRepository; -/** - * @ORM\Entity( - * repositoryClass="Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\SecondFactorRevocationRepository" - * ) - * @ORM\Table( - * name="second_factor_revocation", - * indexes={ - * @ORM\Index(name="idx_secondfactorrevocation_recordedon", columns={"recorded_on"}) - * } - * ) - */ +#[ORM\Table(name: 'second_factor_revocation')] +#[ORM\Index(name: 'idx_secondfactorrevocation_recordedon', columns: ['recorded_on'])] +#[ORM\Entity(repositoryClass: SecondFactorRevocationRepository::class)] class SecondFactorRevocation { /** - * @ORM\Id - * @ORM\Column(length=36) - * * @var string */ + #[ORM\Id] + #[ORM\Column(length: 36)] public $id; /** - * @ORM\Column(type="institution") - * * @var \Surfnet\Stepup\Identity\Value\Institution */ + #[ORM\Column(type: 'institution')] public $institution; /** - * @ORM\Column(length=36, nullable=true) - * * @var string|null */ + #[ORM\Column(length: 36, nullable: true)] public $secondFactorType; /** - * @ORM\Column - * * @var string */ + #[ORM\Column] public $revokedBy; /** - * @ORM\Column(type="stepup_datetime") - * * @var \Surfnet\Stepup\DateTime\DateTime */ + #[ORM\Column(type: 'stepup_datetime')] public $recordedOn; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Sraa.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Sraa.php index faafcdc43..5e8d39f82 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Sraa.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Sraa.php @@ -20,19 +20,14 @@ use Doctrine\ORM\Mapping as ORM; use Surfnet\Stepup\Identity\Value\NameId; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\SraaRepository; -/** - * @ORM\Entity(repositoryClass="Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\SraaRepository") - */ +#[ORM\Entity(repositoryClass: SraaRepository::class)] class Sraa { - /** - * @var \Surfnet\Stepup\Identity\Value\NameId - * - * @ORM\Id - * @ORM\Column(type="stepup_name_id", length=200) - */ - public $nameId; + #[ORM\Id] + #[ORM\Column(type: 'stepup_name_id', length: 200)] + public NameId $nameId; public function __construct(NameId $nameId) { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/UnverifiedSecondFactor.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/UnverifiedSecondFactor.php index aeecc28c2..f02af1e29 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/UnverifiedSecondFactor.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/UnverifiedSecondFactor.php @@ -19,51 +19,42 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Entity; use Doctrine\ORM\Mapping as ORM; -use Surfnet\Stepup\DateTime\DateTime; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\UnverifiedSecondFactorRepository; -/** - * @ORM\Entity( - * repositoryClass="Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\UnverifiedSecondFactorRepository" - * ) - */ +#[ORM\Entity(repositoryClass: UnverifiedSecondFactorRepository::class)] class UnverifiedSecondFactor implements \JsonSerializable { /** - * @ORM\Id - * @ORM\Column(length=36) * * @var string */ + #[ORM\Id] + #[ORM\Column(length: 36)] public $id; /** - * @ORM\Column(length=36) - * * @var string */ + #[ORM\Column(length: 36)] public $identityId; /** - * @ORM\Column(length=16) - * * @var string */ + #[ORM\Column(length: 16)] public $type; /** * The second factor identifier, ie. telephone number, Yubikey public ID, Tiqr ID - * - * @ORM\Column(length=255) - * * @var string */ + #[ORM\Column(length: 255)] public $secondFactorIdentifier; /** - * @ORM\Column(length=32) - * * @var string */ + #[ORM\Column(length: 32)] public $verificationNonce; public function jsonSerialize() diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VerifiedSecondFactor.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VerifiedSecondFactor.php index 771ad37af..03df388b1 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VerifiedSecondFactor.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VerifiedSecondFactor.php @@ -19,74 +19,61 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Entity; use Doctrine\ORM\Mapping as ORM; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\VerifiedSecondFactorRepository; -/** - * @ORM\Entity(repositoryClass="Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\VerifiedSecondFactorRepository") - * @ORM\Table( - * indexes={ - * @ORM\Index(name="idx_institution", columns={"institution"}) - * } - * ) - */ +#[ORM\Table] +#[ORM\Index(name: 'idx_institution', columns: ['institution'])] +#[ORM\Entity(repositoryClass: VerifiedSecondFactorRepository::class)] class VerifiedSecondFactor implements \JsonSerializable { /** - * @ORM\Id - * @ORM\Column(length=36) - * * @var string */ + #[ORM\Id] + #[ORM\Column(length: 36)] public $id; /** - * @ORM\Column(length=36) - * * @var string */ + #[ORM\Column(length: 36)] public $identityId; /** - * @ORM\Column - * * @var string */ + #[ORM\Column] public $institution; /** - * @ORM\Column - * * @var string */ + #[ORM\Column] public $commonName; /** - * @ORM\Column(length=16) - * * @var string */ + #[ORM\Column(length: 16)] public $type; /** * The second factor identifier, ie. telephone number, Yubikey public ID, Tiqr ID - * - * @ORM\Column(length=255) - * * @var string */ + #[ORM\Column(length: 255)] public $secondFactorIdentifier; /** - * @ORM\Column(length=8) - * * @var string */ + #[ORM\Column(length: 8)] public $registrationCode; /** - * @ORM\Column(type="stepup_datetime") - * * @var \DateTime */ + #[ORM\Column(type: 'stepup_datetime')] public $registrationRequestedAt; public function jsonSerialize() diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettedSecondFactor.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettedSecondFactor.php index c5586dad3..4f19379cc 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettedSecondFactor.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettedSecondFactor.php @@ -20,56 +20,44 @@ use Doctrine\ORM\Mapping as ORM; use Surfnet\Stepup\Identity\Value\VettingType; -use function is_null; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\VettedSecondFactorRepository; -/** - * @ORM\Entity( - * repositoryClass="Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\VettedSecondFactorRepository" - * ) - * @ORM\Table( - * indexes={ - * @ORM\Index(name="idx_vetted_second_factor_type", columns={"type"}), - * @ORM\Index(name="idx_vetted_second_factor_vetting_type", columns={"vetting_type"}), - * } - * ) - */ +#[ORM\Table] +#[ORM\Index(name: 'idx_vetted_second_factor_type', columns: ['type'])] +#[ORM\Index(name: 'idx_vetted_second_factor_vetting_type', columns: ['vetting_type'])] +#[ORM\Entity(repositoryClass: VettedSecondFactorRepository::class)] class VettedSecondFactor implements \JsonSerializable { /** - * @ORM\Id - * @ORM\Column(length=36) - * * @var string */ + #[ORM\Id] + #[ORM\Column(length: 36)] public $id; /** - * @ORM\Column(length=36) - * * @var string */ + #[ORM\Column(length: 36)] public $identityId; /** - * @ORM\Column(length=16) - * * @var string */ + #[ORM\Column(length: 16)] public $type; /** * The second factor identifier, ie. telephone number, Yubikey public ID, Tiqr ID - * - * @ORM\Column(length=255) - * * @var string */ + #[ORM\Column(length: 255)] public $secondFactorIdentifier; /** - * @ORM\Column(length=255, nullable=true) * @var string */ + #[ORM\Column(length: 255, nullable: true)] public $vettingType; /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettingTypeHint.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettingTypeHint.php index 1c7764a26..7babf3024 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettingTypeHint.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettingTypeHint.php @@ -20,32 +20,17 @@ use Doctrine\ORM\Mapping as ORM; use Surfnet\Stepup\Identity\Collection\VettingTypeHintCollection; -use Surfnet\Stepup\Identity\Value\CommonName; -use Surfnet\Stepup\Identity\Value\Email; -use Surfnet\Stepup\Identity\Value\Institution; -use Surfnet\StepupMiddleware\ApiBundle\Identity\Value\RecoveryTokenStatus; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\VettingTypeHintRepository; -/** - * @ORM\Entity( - * repositoryClass="Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\VettingTypeHintRepository" - * ) - */ +#[ORM\Entity(repositoryClass: VettingTypeHintRepository::class)] class VettingTypeHint implements \JsonSerializable { - /** - * @ORM\Id - * @ORM\Column(length=36) - * - * @var string - */ - public $institution; + #[ORM\Id] + #[ORM\Column(length: 36)] + public string $institution; - /** - * @ORM\Column(type="stepup_vetting_type_hints") - * - * @var VettingTypeHintCollection - */ - public $hints; + #[ORM\Column(type: 'stepup_vetting_type_hints')] + public VettingTypeHintCollection $hints; public function jsonSerialize() { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/WhitelistEntry.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/WhitelistEntry.php index b6c79aa02..9a78c4e90 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/WhitelistEntry.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/WhitelistEntry.php @@ -21,23 +21,18 @@ use Doctrine\ORM\Mapping as ORM; use JsonSerializable; use Surfnet\Stepup\Identity\Value\Institution; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\WhitelistEntryRepository; -/** - * @ORM\Entity(repositoryClass="Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\WhitelistEntryRepository") - */ +#[ORM\Entity(repositoryClass: WhitelistEntryRepository::class)] class WhitelistEntry implements JsonSerializable { - /** - * @ORM\Id - * @ORM\Column(type="institution") - * - * @var Institution - */ - public $institution; + #[ORM\Id] + #[ORM\Column(type: 'institution')] + public Institution $institution; public static function createFrom(Institution $institution) { - $instance = new self(); + $instance = new self(); $instance->institution = $institution; return $instance; diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/AbstractCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/AbstractCommand.php index 6c2015fc1..f1c7e590d 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/AbstractCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/AbstractCommand.php @@ -27,12 +27,12 @@ abstract class AbstractCommand implements Command { /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * @Assert\Regex(pattern="~^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$~i") * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] + #[Assert\Regex(pattern: '~^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$~i')] public $UUID; public function __toString() diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/Metadata.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/Metadata.php index 7d0329499..ba3320c69 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/Metadata.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/Metadata.php @@ -23,17 +23,16 @@ final class Metadata { /** - * @Assert\Type(type="string") - * @Assert\Regex(pattern="~^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$~i") * * @var string|null */ + #[Assert\Type(type: 'string')] + #[Assert\Regex(pattern: '~^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$~i')] public $actorId; /** - * @Assert\Type(type="string") - * * @var string|null */ + #[Assert\Type(type: 'string')] public $actorInstitution; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/AddRaLocationCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/AddRaLocationCommand.php index 0dacaf9c6..b63b34ed3 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/AddRaLocationCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/AddRaLocationCommand.php @@ -25,42 +25,41 @@ class AddRaLocationCommand extends AbstractCommand implements RaExecutable { /** - * @Assert\NotBlank() - * @Assert\Type(type="string") * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $raLocationId; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $institution; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $raLocationName; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $location; /** - * @Assert\Type(type="string") - * * @var string */ + #[Assert\Type(type: 'string')] public $contactInformation; /** diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/ChangeRaLocationCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/ChangeRaLocationCommand.php index 279b35635..79d5b8808 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/ChangeRaLocationCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/ChangeRaLocationCommand.php @@ -25,42 +25,37 @@ class ChangeRaLocationCommand extends AbstractCommand implements RaExecutable { /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $raLocationId; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $institution; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $raLocationName; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $location; /** - * @Assert\Type(type="string") - * * @var string */ + #[Assert\Type(type: 'string')] public $contactInformation; /** diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/CreateInstitutionConfigurationCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/CreateInstitutionConfigurationCommand.php index e264ab0bd..3792b0469 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/CreateInstitutionConfigurationCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/CreateInstitutionConfigurationCommand.php @@ -25,10 +25,9 @@ class CreateInstitutionConfigurationCommand extends AbstractCommand implements ManagementExecutable { /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $institution; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/ReconfigureInstitutionConfigurationOptionsCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/ReconfigureInstitutionConfigurationOptionsCommand.php index 684c49009..46b4f7f2e 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/ReconfigureInstitutionConfigurationOptionsCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/ReconfigureInstitutionConfigurationOptionsCommand.php @@ -25,45 +25,38 @@ final class ReconfigureInstitutionConfigurationOptionsCommand extends AbstractCommand implements ManagementExecutable { /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $institution; /** - * @Assert\Type(type="boolean") - * * @var bool */ + #[Assert\Type(type: 'boolean')] public $useRaLocationsOption; /** - * @Assert\Type(type="boolean") - * * @var bool */ + #[Assert\Type(type: 'boolean')] public $showRaaContactInformationOption; /** - * @Assert\Type(type="boolean") - * * @var bool */ + #[Assert\Type(type: 'boolean')] public $verifyEmailOption; /** - * @Assert\Type(type="integer") - * * @var int */ + #[Assert\Type(type: 'integer')] public $numberOfTokensPerIdentityOption; - /** - * @Assert\NotNull() - */ + #[Assert\NotNull] public $allowedSecondFactors; /** diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/RemoveInstitutionConfigurationByUnnormalizedIdCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/RemoveInstitutionConfigurationByUnnormalizedIdCommand.php index 49433c6a6..c20e7702c 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/RemoveInstitutionConfigurationByUnnormalizedIdCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/RemoveInstitutionConfigurationByUnnormalizedIdCommand.php @@ -24,10 +24,9 @@ final class RemoveInstitutionConfigurationByUnnormalizedIdCommand extends AbstractCommand { /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $institution; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/RemoveRaLocationCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/RemoveRaLocationCommand.php index 2a35ff1ab..df380b3e8 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/RemoveRaLocationCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/RemoveRaLocationCommand.php @@ -25,19 +25,17 @@ class RemoveRaLocationCommand extends AbstractCommand implements RaExecutable { /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $raLocationId; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $institution; /** diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AccreditIdentityCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AccreditIdentityCommand.php index 245de60ce..d94aa656f 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AccreditIdentityCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AccreditIdentityCommand.php @@ -25,51 +25,51 @@ class AccreditIdentityCommand extends AbstractCommand implements RaExecutable { /** - * @Assert\NotBlank() - * @Assert\Type(type="string") * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $identityId; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $institution; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $role; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $location; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $contactInformation; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $raInstitution; /** diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AddToWhitelistCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AddToWhitelistCommand.php index 662d29064..a979be389 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AddToWhitelistCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AddToWhitelistCommand.php @@ -24,14 +24,10 @@ class AddToWhitelistCommand extends AbstractCommand implements ManagementExecutable { - /** - * @Assert\Type(type="array") - * @Assert\All({ - * @Assert\NotBlank, - * @Assert\Type("string") - * }) - * - * @var array - */ - public $institutionsToBeAdded; + #[Assert\Type(type: 'array')] + #[Assert\All([ + new Assert\NotBlank(), + new Assert\Type("string"), + ])] + public array $institutionsToBeAdded; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AmendRegistrationAuthorityInformationCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AmendRegistrationAuthorityInformationCommand.php index 41d815b32..4d0c05eae 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AmendRegistrationAuthorityInformationCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AmendRegistrationAuthorityInformationCommand.php @@ -25,35 +25,35 @@ class AmendRegistrationAuthorityInformationCommand extends AbstractCommand implements RaExecutable { /** - * @Assert\NotBlank() - * @Assert\Type(type="string") * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $identityId; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $location; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $contactInformation; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $raInstitution; /** diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AppointRoleCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AppointRoleCommand.php index e03948127..09f92be0e 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AppointRoleCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AppointRoleCommand.php @@ -25,27 +25,27 @@ class AppointRoleCommand extends AbstractCommand implements RaExecutable { /** - * @Assert\NotBlank() - * @Assert\Type(type="string") * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $identityId; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") * * @var */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $role; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $raInstitution; /** diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php index 977db5099..fa6053620 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php @@ -24,66 +24,66 @@ final class BootstrapIdentityWithYubikeySecondFactorCommand extends AbstractCommand { /** - * @Assert\NotBlank() - * @Assert\Type("string") * * @var string */ + #[Assert\NotBlank] + #[Assert\Type('string')] public $identityId; /** - * @Assert\NotBlank() - * @Assert\Type("string") * * @var string */ + #[Assert\NotBlank] + #[Assert\Type('string')] public $nameId; /** - * @Assert\NotBlank() - * @Assert\Type("string") * * @var string */ + #[Assert\NotBlank] + #[Assert\Type('string')] public $institution; /** - * @Assert\NotBlank() - * @Assert\Type("string") * * @var string */ + #[Assert\NotBlank] + #[Assert\Type('string')] public $commonName; /** - * @Assert\NotBlank() - * @Assert\Email() * * @var string */ + #[Assert\NotBlank] + #[Assert\Email] public $email; /** - * @Assert\NotBlank() - * @Assert\Type("string") * * @var string */ + #[Assert\NotBlank] + #[Assert\Type('string')] public $preferredLocale; /** - * @Assert\NotBlank() - * @Assert\Type("string") * * @var string */ + #[Assert\NotBlank] + #[Assert\Type('string')] public $secondFactorId; /** - * @Assert\NotBlank() - * @Assert\Type("string") * * @var string */ + #[Assert\NotBlank] + #[Assert\Type('string')] public $yubikeyPublicId; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/CreateIdentityCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/CreateIdentityCommand.php index 31ddf4eeb..fdcaac9fe 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/CreateIdentityCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/CreateIdentityCommand.php @@ -25,51 +25,45 @@ class CreateIdentityCommand extends AbstractCommand implements SelfServiceExecutable { /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $id; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $nameId; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $email; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $institution; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $commonName; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $preferredLocale; diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ExpressLocalePreferenceCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ExpressLocalePreferenceCommand.php index a5da23738..e058c3716 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ExpressLocalePreferenceCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ExpressLocalePreferenceCommand.php @@ -26,19 +26,19 @@ class ExpressLocalePreferenceCommand extends AbstractCommand implements SelfServiceExecutable, RaExecutable { /** - * @Assert\NotBlank() - * @Assert\Type(type="string") * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $identityId; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $preferredLocale; /** diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ForgetIdentityCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ForgetIdentityCommand.php index a40d89f41..bc505e641 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ForgetIdentityCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ForgetIdentityCommand.php @@ -26,18 +26,18 @@ final class ForgetIdentityCommand extends AbstractCommand implements ManagementExecutable, DeprovisionExecutable { /** - * @Assert\NotBlank - * @Assert\Type("string") * * @var string */ + #[Assert\NotBlank] + #[Assert\Type('string')] public $nameId; /** - * @Assert\NotBlank - * @Assert\Type("string") * * @var string */ + #[Assert\NotBlank] + #[Assert\Type('string')] public $institution; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/MigrateVettedSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/MigrateVettedSecondFactorCommand.php index a85d0d514..90666331f 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/MigrateVettedSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/MigrateVettedSecondFactorCommand.php @@ -26,42 +26,34 @@ class MigrateVettedSecondFactorCommand extends AbstractCommand /** * The UUID of the source identity - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $sourceIdentityId; /** * The UUID of the target identity - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $targetIdentityId; /** * The source second factor UUID that is to be moved - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $sourceSecondFactorId; /** * The new destination second factor UUID - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $targetSecondFactorId; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/PromiseSafeStoreSecretTokenPossessionCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/PromiseSafeStoreSecretTokenPossessionCommand.php index 75ac04763..d8277470d 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/PromiseSafeStoreSecretTokenPossessionCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/PromiseSafeStoreSecretTokenPossessionCommand.php @@ -27,41 +27,33 @@ class PromiseSafeStoreSecretTokenPossessionCommand extends AbstractCommand imple { /** * The ID of an existing identity. - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $identityId; /** * The ID of the recovery code to create. - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $recoveryTokenId; /** - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $recoveryTokenType = RecoveryTokenType::TYPE_SAFE_STORE; /** * The unhashed password - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $secret; /** diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProveGssfPossessionCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProveGssfPossessionCommand.php index 8937b2cdc..1eb5d1587 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProveGssfPossessionCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProveGssfPossessionCommand.php @@ -26,44 +26,36 @@ class ProveGssfPossessionCommand extends AbstractCommand implements SelfServiceE { /** * The ID of an existing identity. - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $identityId; /** * The ID of the second factor to create. - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $secondFactorId; /** * The SecondFactorType identifier. * * For example in the case of a Tiqr GSSP it would be 'tiqr'. - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $stepupProvider; /** * The identifier of the generic Stepup second factor type - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $gssfId; /** diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProvePhonePossessionCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProvePhonePossessionCommand.php index cc8a38d8b..d1d6f0d43 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProvePhonePossessionCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProvePhonePossessionCommand.php @@ -26,33 +26,27 @@ class ProvePhonePossessionCommand extends AbstractCommand implements SelfService { /** * The ID of an existing identity. - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $identityId; /** * The ID of the second factor to create. - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $secondFactorId; /** * The phone number - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * @Assert\Regex(pattern="~^\+[\d\s]+ \(0\) \d+$~") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] + #[Assert\Regex(pattern: '~^\+[\d\s]+ \(0\) \d+$~')] public $phoneNumber; /** diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProvePhoneRecoveryTokenPossessionCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProvePhoneRecoveryTokenPossessionCommand.php index f7d65469a..7958d8fe4 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProvePhoneRecoveryTokenPossessionCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProvePhoneRecoveryTokenPossessionCommand.php @@ -27,42 +27,34 @@ class ProvePhoneRecoveryTokenPossessionCommand extends AbstractCommand implement { /** * The ID of an existing identity. - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $identityId; /** * The ID of the recovery code to create. - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $recoveryTokenId; /** - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $recoveryTokenType = RecoveryTokenType::TYPE_SMS; /** * The phone number - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * @Assert\Regex(pattern="~^\+[\d\s]+ \(0\) \d+$~") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] + #[Assert\Regex(pattern: '~^\+[\d\s]+ \(0\) \d+$~')] public $phoneNumber; /** diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProveU2fDevicePossessionCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProveU2fDevicePossessionCommand.php index 4f4529516..c0a6c4a9a 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProveU2fDevicePossessionCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProveU2fDevicePossessionCommand.php @@ -26,32 +26,26 @@ class ProveU2fDevicePossessionCommand extends AbstractCommand implements SelfSer { /** * The ID of an existing identity. - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $identityId; /** * The ID of the second factor to create. - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $secondFactorId; /** * The key handle issued by the U2F device - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $keyHandle; /** diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProveYubikeyPossessionCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProveYubikeyPossessionCommand.php index d403b8b86..13cb38f17 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProveYubikeyPossessionCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProveYubikeyPossessionCommand.php @@ -26,32 +26,26 @@ class ProveYubikeyPossessionCommand extends AbstractCommand implements SelfServi { /** * The ID of an existing identity. - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $identityId; /** * The ID of the second factor to create. - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $secondFactorId; /** * The Yubikey's public ID. - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $yubikeyPublicId; /** diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RegisterSelfAssertedSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RegisterSelfAssertedSecondFactorCommand.php index 8edfd748c..050953817 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RegisterSelfAssertedSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RegisterSelfAssertedSecondFactorCommand.php @@ -27,44 +27,38 @@ class RegisterSelfAssertedSecondFactorCommand extends AbstractCommand implements { /** * The ID of an existing identity. - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $identityId; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $secondFactorId; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $secondFactorType; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $secondFactorIdentifier; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $authoringRecoveryTokenId; public function getIdentityId() diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RemoveFromWhitelistCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RemoveFromWhitelistCommand.php index 034e6f34a..9606e45e9 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RemoveFromWhitelistCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RemoveFromWhitelistCommand.php @@ -24,14 +24,10 @@ class RemoveFromWhitelistCommand extends AbstractCommand implements ManagementExecutable { - /** - * @Assert\Type(type="array") - * @Assert\All({ - * @Assert\NotBlank, - * @Assert\Type("string") - * }) - * - * @var array - */ - public $institutionsToBeRemoved; + #[Assert\Type(type: 'array')] + #[Assert\All([ + new Assert\NotBlank(), + new Assert\Type('string'), + ])] + public array $institutionsToBeRemoved; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ReplaceWhitelistCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ReplaceWhitelistCommand.php index 21ff62993..89ad1e4c9 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ReplaceWhitelistCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ReplaceWhitelistCommand.php @@ -24,14 +24,10 @@ class ReplaceWhitelistCommand extends AbstractCommand implements ManagementExecutable { - /** - * @Assert\Type(type="array") - * @Assert\All({ - * @Assert\NotBlank, - * @Assert\Type("string") - * }) - * - * @var array - */ - public $institutions; + #[Assert\Type(type: 'array')] + #[Assert\All([ + new Assert\NotBlank(), + new Assert\Type("string"), + ])] + public array $institutions; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RetractRegistrationAuthorityCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RetractRegistrationAuthorityCommand.php index 7f1e3610d..1e9d9b24e 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RetractRegistrationAuthorityCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RetractRegistrationAuthorityCommand.php @@ -25,19 +25,17 @@ class RetractRegistrationAuthorityCommand extends AbstractCommand implements RaExecutable { /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $identityId; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $raInstitution; /** diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RevokeOwnRecoveryTokenCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RevokeOwnRecoveryTokenCommand.php index 2b24bff2a..ccef83ca1 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RevokeOwnRecoveryTokenCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RevokeOwnRecoveryTokenCommand.php @@ -29,22 +29,18 @@ class RevokeOwnRecoveryTokenCommand extends AbstractCommand implements SelfServi { /** * The ID of an existing identity. - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $identityId; /** * The ID of a recovery token. - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $recoveryTokenId; /** diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RevokeOwnSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RevokeOwnSecondFactorCommand.php index 1bb0e4022..8b3fcb471 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RevokeOwnSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RevokeOwnSecondFactorCommand.php @@ -29,22 +29,18 @@ class RevokeOwnSecondFactorCommand extends AbstractCommand implements SelfServic { /** * The ID of an existing identity. - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $identityId; /** * The ID of a verified or vetted second factor. - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $secondFactorId; /** diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RevokeRegistrantsRecoveryTokenCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RevokeRegistrantsRecoveryTokenCommand.php index 14a8c493e..342451014 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RevokeRegistrantsRecoveryTokenCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RevokeRegistrantsRecoveryTokenCommand.php @@ -29,32 +29,26 @@ class RevokeRegistrantsRecoveryTokenCommand extends AbstractCommand implements R { /** * The ID of the identity that has the authority to issue the revocation of a registrant's second factor. - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $authorityId; /** * The ID of an identity. - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $identityId; /** * The ID of a recovery token - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $recoveryTokenId; /** diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RevokeRegistrantsSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RevokeRegistrantsSecondFactorCommand.php index 3410e9ff6..382e59a02 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RevokeRegistrantsSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RevokeRegistrantsSecondFactorCommand.php @@ -29,32 +29,26 @@ class RevokeRegistrantsSecondFactorCommand extends AbstractCommand implements Ra { /** * The ID of the identity that has the authority to issue the revocation of a registrant's second factor. - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $authorityId; /** * The ID of an identity. - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $identityId; /** * The ID of a verified or vetted second factor. - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $secondFactorId; /** diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SaveVettingTypeHintCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SaveVettingTypeHintCommand.php index 148c3957d..581cab2ba 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SaveVettingTypeHintCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SaveVettingTypeHintCommand.php @@ -34,31 +34,24 @@ class SaveVettingTypeHintCommand extends AbstractCommand implements RaExecutable { /** * The ID of an existing identity. - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $identityId; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $institution; - /** - * @Assert\Type(type="array") - * @Assert\All({ - * @Assert\Type("string") - * }) - * - * @var string[] - */ - public $hints; + #[Assert\Type(type: 'array')] + #[Assert\All([ + new Assert\Type("string") + ])] + public array $hints; public function getRaInstitution() { diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SelfVetSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SelfVetSecondFactorCommand.php index 149917321..8863d9dc1 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SelfVetSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SelfVetSecondFactorCommand.php @@ -28,50 +28,43 @@ class SelfVetSecondFactorCommand extends AbstractCommand implements SelfServiceE { /** * The ID of an existing identity. - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $identityId; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $secondFactorId; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $secondFactorType; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $registrationCode; /** - * @Assert\Type(type="string") - * * @var string */ + #[Assert\Type(type: 'string')] public $authoringSecondFactorLoa; /** - * @Assert\Type(type="string") - * * @var string */ + #[Assert\Type(type: 'string')] public $authoringSecondFactorIdentifier; public function getIdentityId() diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SendSecondFactorRegistrationEmailCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SendSecondFactorRegistrationEmailCommand.php index 8b5d6e7ca..034817946 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SendSecondFactorRegistrationEmailCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SendSecondFactorRegistrationEmailCommand.php @@ -26,22 +26,18 @@ class SendSecondFactorRegistrationEmailCommand extends AbstractCommand implement { /** * The ID of an identity. - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $identityId; /** * The ID of a second factor token - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $secondFactorId; public function getIdentityId() diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/UpdateIdentityCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/UpdateIdentityCommand.php index a8a82c9d2..3fc8c45ee 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/UpdateIdentityCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/UpdateIdentityCommand.php @@ -25,27 +25,24 @@ class UpdateIdentityCommand extends AbstractCommand implements SelfServiceExecutable { /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $id; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $email; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $commonName; /** diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/VerifyEmailCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/VerifyEmailCommand.php index 0176351b0..22018b202 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/VerifyEmailCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/VerifyEmailCommand.php @@ -26,20 +26,17 @@ class VerifyEmailCommand extends AbstractCommand implements SelfServiceExecutabl { /** * The ID of an existing identity. - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $identityId; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $verificationNonce; /** diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/VetSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/VetSecondFactorCommand.php index 810c46aad..83acae82c 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/VetSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/VetSecondFactorCommand.php @@ -25,75 +25,66 @@ class VetSecondFactorCommand extends AbstractCommand implements RaExecutable { /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $authorityId; /** * The ID of an existing identity. - * - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $identityId; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $secondFactorId; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $registrationCode; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $secondFactorType; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $secondFactorIdentifier; /** - * @Assert\NotBlank() - * @Assert\Type(type="string") - * * @var string */ + #[Assert\NotBlank] + #[Assert\Type(type: 'string')] public $documentNumber; /** - * @Assert\EqualTo(value=true) - * * @var boolean */ + #[Assert\EqualTo(value: true)] public $identityVerified; /** - * @Assert\Type(type="bool") - * * @var boolean */ + #[Assert\Type(type: 'bool')] public $provePossessionSkipped; /** diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/InstitutionConfiguration.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/InstitutionConfiguration.php index 1b12b0eba..580cb3883 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/InstitutionConfiguration.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/InstitutionConfiguration.php @@ -21,24 +21,22 @@ namespace Surfnet\StepupMiddleware\GatewayBundle\Entity; use Doctrine\ORM\Mapping as ORM; +use Surfnet\StepupMiddleware\GatewayBundle\Repository\InstitutionConfigurationRepository; -/** - * @ORM\Entity(repositoryClass="Surfnet\StepupMiddleware\GatewayBundle\Repository\InstitutionConfigurationRepository") - */ +#[ORM\Entity(repositoryClass: InstitutionConfigurationRepository::class)] class InstitutionConfiguration { /** * @var string - * @ORM\Id - * @ORM\Column(length=200) */ + #[ORM\Id] + #[ORM\Column(length: 200)] public $institution; /** - * @ORM\Column(type="boolean") - * * @var bool is the SSO on 2FA feature enabled? */ + #[ORM\Column(type: 'boolean')] public $ssoOn2faEnabled; public function __construct(string $institution, bool $ssoOn2faEnabled) diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntity.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntity.php index 03aa514d7..5ac5dc383 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntity.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntity.php @@ -21,14 +21,9 @@ use Doctrine\ORM\Mapping as ORM; use Ramsey\Uuid\Uuid; -/** - * @ORM\Entity(repositoryClass="Surfnet\StepupMiddleware\GatewayBundle\Entity\SamlEntityRepository") - * @ORM\Table( - * uniqueConstraints={ - * @ORM\UniqueConstraint(name="unq_saml_entity_entity_id_type", columns={"entity_id", "type"}) - * } - * ) - */ +#[ORM\Table] +#[ORM\UniqueConstraint(name: 'unq_saml_entity_entity_id_type', columns: ['entity_id', 'type'])] +#[ORM\Entity(repositoryClass: SamlEntityRepository::class)] class SamlEntity { /** @@ -39,31 +34,27 @@ class SamlEntity /** * @var string - * - * @ORM\Id - * @ORM\Column(length=36) */ + #[ORM\Id] + #[ORM\Column(length: 36)] public $id; /** - * @ORM\Column - * * @var string */ + #[ORM\Column] public $entityId; /** - * @ORM\Column - * * @var string */ + #[ORM\Column] public $type; /** - * @ORM\Column(type="text") - * * @var string the configuration as json string */ + #[ORM\Column(type: 'text')] public $configuration; /** diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SecondFactor.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SecondFactor.php index 07a21667c..3b5b3a618 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SecondFactor.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SecondFactor.php @@ -20,79 +20,69 @@ use Doctrine\ORM\Mapping as ORM; use Ramsey\Uuid\Uuid; +use Surfnet\StepupMiddleware\GatewayBundle\Repository\SecondFactorRepository; /** * WARNING: Any schema change made to this entity should also be applied to the Gateway SecondFactor entity! * @see Surfnet\StepupGateway\GatewayBundle\Entity\SecondFactor (in OpenConext/Stepup-Gateway project) * - * @ORM\Entity(repositoryClass="Surfnet\StepupMiddleware\GatewayBundle\Repository\SecondFactorRepository") - * @ORM\Table( - * indexes={ - * @ORM\Index(name="idx_secondfactor_nameid", columns={"name_id"}), - * } - * ) * @SuppressWarnings(PHPMD.UnusedPrivateFields) */ +#[ORM\Table] +#[ORM\Index(name: 'idx_secondfactor_nameid', columns: ['name_id'])] +#[ORM\Entity(repositoryClass: SecondFactorRepository::class)] class SecondFactor { /** * @var int - * - * @ORM\Id - * @ORM\Column(length=36) */ + #[ORM\Id] + #[ORM\Column(length: 36)] private $id; /** * @var string - * - * @ORM\Id - * @ORM\Column(length=36) */ + #[ORM\Id] + #[ORM\Column(length: 36)] private $identityId; /** * @var string - * - * @ORM\Column(length=200) */ + #[ORM\Column(length: 200)] private $nameId; /** * @var string - * - * @ORM\Column(length=200) */ + #[ORM\Column(length: 200)] private $institution; /** * In which language to display any second factor verification screens. * * @var string - * - * @ORM\Column */ + #[ORM\Column] public $displayLocale; /** * @var string - * - * @ORM\Column(length=36) */ + #[ORM\Column(length: 36)] private $secondFactorId; /** * @var string - * - * @ORM\Column(length=50) */ + #[ORM\Column(length: 50)] private $secondFactorType; /** * @var string - * - * @ORM\Column(length=255) */ + #[ORM\Column(length: 255)] private $secondFactorIdentifier; /** @@ -102,9 +92,8 @@ class SecondFactor * identity vetted (verified) by a RA(A) at the service desk. This trickles * down to the self-vet vetting type. As the token used for self vetting * was RA vetted. - * - * @ORM\Column(type="boolean", options={"default":"1"}) */ + #[ORM\Column(type: 'boolean', options: ['default' => '1'])] private $identityVetted; public function __construct( diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/WhitelistEntry.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/WhitelistEntry.php index da7da62f0..6fbc7701c 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/WhitelistEntry.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/WhitelistEntry.php @@ -20,23 +20,18 @@ use Doctrine\ORM\Mapping as ORM; use Surfnet\Stepup\Identity\Value\Institution; +use Surfnet\StepupMiddleware\GatewayBundle\Repository\WhitelistEntryRepository; -/** - * @ORM\Entity(repositoryClass="Surfnet\StepupMiddleware\GatewayBundle\Repository\WhitelistEntryRepository") - */ +#[ORM\Entity(repositoryClass: WhitelistEntryRepository::class)] class WhitelistEntry { - /** - * @ORM\Id - * @ORM\Column(type="institution") - * - * @var Institution - */ - public $institution; + #[ORM\Id] + #[ORM\Column(type: 'institution')] + public Institution $institution; public static function createFrom(Institution $institution) { - $instance = new self(); + $instance = new self(); $instance->institution = $institution; return $instance; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Entity/EmailTemplate.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Entity/EmailTemplate.php index 19ad3b451..7d81235ba 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Entity/EmailTemplate.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Entity/EmailTemplate.php @@ -20,46 +20,37 @@ use Doctrine\ORM\Mapping as ORM; use Ramsey\Uuid\Uuid; +use Surfnet\StepupMiddleware\ManagementBundle\Configuration\Repository\EmailTemplateRepository; -/** - * @ORM\Entity( - * repositoryClass="Surfnet\StepupMiddleware\ManagementBundle\Configuration\Repository\EmailTemplateRepository" - * ) - * @ORM\Table( - * name="email_templates", - * indexes={} - * ) - */ +#[ORM\Table(name: 'email_templates')] +#[ORM\Entity(repositoryClass: EmailTemplateRepository::class)] class EmailTemplate { /** - * @ORM\Id - * @ORM\GeneratedValue(strategy="NONE") - * @ORM\Column * * @var string */ + #[ORM\Id] + #[ORM\GeneratedValue(strategy: 'NONE')] + #[ORM\Column] private $id; /** - * @ORM\Column - * * @var string */ + #[ORM\Column] private $name; /** - * @ORM\Column - * * @var string */ + #[ORM\Column] private $locale; /** - * @ORM\Column(type="text") - * * @var string */ + #[ORM\Column(type: 'text')] private $htmlContent; public static function create($name, $locale, $htmlContent) From 7a2bc4c89b40ac24917971f3ce21e9a09d6d8648 Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Tue, 27 Feb 2024 08:59:58 +0100 Subject: [PATCH 13/89] Improve type safety of Middleware 1. Added return type definitions 2. When possible; add parameter type definitions 3. Use imports, remove FQN --- src/Kernel.php | 6 +- src/Surfnet/DataFixtures/AppFixtures.php | 2 +- .../Migrations/Version20141125173004.php | 7 +- .../Migrations/Version20141209150426.php | 7 +- .../Migrations/Version20141210174213.php | 7 +- .../Migrations/Version20150312162849.php | 7 +- .../Migrations/Version20150508085838.php | 7 +- .../Migrations/Version20150522163053.php | 7 +- .../Migrations/Version20150522164907.php | 7 +- .../Migrations/Version20150528154959.php | 7 +- .../Migrations/Version20150615114646.php | 7 +- .../Migrations/Version20180131150800.php | 7 +- .../Migrations/Version20200114161618.php | 7 +- .../Migrations/Version20210610131957.php | 4 +- .../Migrations/Version20220519134637.php | 7 +- .../Migrations/Version20221102143350.php | 7 +- .../Stepup/Configuration/Configuration.php | 6 +- .../Configuration/Entity/RaLocation.php | 28 ++---- .../InstitutionConfiguration.php | 44 ++++----- .../Value/AllowedSecondFactorList.php | 20 ++-- .../Value/ContactInformation.php | 9 +- .../Configuration/Value/Institution.php | 9 +- .../Value/InstitutionAuthorizationOption.php | 27 ++---- .../Value/InstitutionConfigurationId.php | 10 +- .../Configuration/Value/InstitutionRole.php | 12 +-- .../Configuration/Value/InstitutionSet.php | 14 +-- .../Stepup/Configuration/Value/Location.php | 9 +- .../Value/NumberOfTokensPerIdentityOption.php | 6 +- .../Configuration/Value/RaLocationId.php | 9 +- .../Configuration/Value/RaLocationList.php | 6 +- .../Configuration/Value/RaLocationName.php | 9 +- .../Value/SelfAssertedTokensOption.php | 7 +- .../Configuration/Value/SelfVetOption.php | 7 +- .../Value/ShowRaaContactInformationOption.php | 9 +- .../Configuration/Value/SsoOn2faOption.php | 5 +- .../Value/UseRaLocationsOption.php | 9 +- .../Configuration/Value/VerifyEmailOption.php | 9 +- src/Surfnet/Stepup/DateTime/DateTime.php | 23 ++--- .../Exception/InvalidArgumentException.php | 2 +- .../Stepup/Exception/JsonException.php | 2 +- src/Surfnet/Stepup/Helper/JsonHelper.php | 2 +- .../SecondFactorProvePossessionHelper.php | 7 +- .../Stepup/Helper/UserDataFormatter.php | 2 +- src/Surfnet/Stepup/Identity/Api/Id.php | 4 +- .../Stepup/Identity/AuditLog/Metadata.php | 23 +++-- .../Collection/InstitutionCollection.php | 18 ++-- .../Collection/VettingTypeHintCollection.php | 10 +- .../Identity/Entity/ConfigurableSettings.php | 15 ++- .../Identity/Entity/InstitutionCollection.php | 12 +-- .../Stepup/Identity/Entity/RecoveryToken.php | 19 +--- .../Entity/RecoveryTokenCollection.php | 6 +- .../Identity/Entity/RegistrationAuthority.php | 26 ++---- .../RegistrationAuthorityCollection.php | 12 +-- .../Entity/SecondFactorCollection.php | 2 +- .../Entity/UnverifiedSecondFactor.php | 39 +++----- .../Identity/Entity/VerifiedSecondFactor.php | 39 +++----- .../Identity/Entity/VettedSecondFactor.php | 28 ++---- .../Identity/Event/AppointedAsRaEvent.php | 4 +- .../AppointedAsRaForInstitutionEvent.php | 4 +- .../Identity/Event/AppointedAsRaaEvent.php | 4 +- .../AppointedAsRaaForInstitutionEvent.php | 4 +- .../Stepup/Identity/Event/AuditableEvent.php | 4 +- ...ompliedWithRecoveryCodeRevocationEvent.php | 4 +- .../Event/CompliedWithRevocationEvent.php | 14 +-- .../Identity/Event/EmailVerifiedEvent.php | 20 ++-- .../GssfPossessionProvenAndVerifiedEvent.php | 20 ++-- .../Event/GssfPossessionProvenEvent.php | 20 ++-- .../Event/IdentityAccreditedAsRaEvent.php | 4 +- ...ntityAccreditedAsRaForInstitutionEvent.php | 4 +- .../Event/IdentityAccreditedAsRaaEvent.php | 4 +- ...tityAccreditedAsRaaForInstitutionEvent.php | 4 +- .../Identity/Event/IdentityCreatedEvent.php | 14 +-- .../Event/IdentityEmailChangedEvent.php | 6 +- .../Identity/Event/IdentityForgottenEvent.php | 4 +- .../Identity/Event/IdentityRenamedEvent.php | 6 +- .../Event/LocalePreferenceExpressedEvent.php | 4 +- .../PhonePossessionProvenAndVerifiedEvent.php | 18 ++-- .../Event/PhonePossessionProvenEvent.php | 20 ++-- ...honeRecoveryTokenPossessionProvenEvent.php | 24 ++--- .../Event/RecoveryTokenRevokedEvent.php | 4 +- ...rationAuthorityInformationAmendedEvent.php | 4 +- ...yInformationAmendedForInstitutionEvent.php | 4 +- .../RegistrationAuthorityRetractedEvent.php | 6 +- ...nAuthorityRetractedForInstitutionEvent.php | 6 +- ...etRecoveryTokenPossessionPromisedEvent.php | 18 ++-- .../Event/SecondFactorMigratedEvent.php | 27 +++--- .../Event/SecondFactorMigratedToEvent.php | 16 ++-- .../Event/SecondFactorRevokedEvent.php | 12 +-- .../Event/SecondFactorVettedEvent.php | 22 ++--- ...torVettedWithoutTokenProofOfPossession.php | 25 ++--- ...DevicePossessionProvenAndVerifiedEvent.php | 20 ++-- .../Event/U2fDevicePossessionProvenEvent.php | 20 ++-- .../VettedSecondFactorsAllRevokedEvent.php | 4 +- .../Event/VettingTypeHintsSavedEvent.php | 4 +- ...ubikeyPossessionProvenAndVerifiedEvent.php | 18 ++-- .../Event/YubikeyPossessionProvenEvent.php | 21 +++-- .../YubikeySecondFactorBootstrappedEvent.php | 20 ++-- .../EventSourcing/IdentityRepository.php | 6 +- .../EventSourcing/WhitelistRepository.php | 3 +- src/Surfnet/Stepup/Identity/Identity.php | 85 ++++++++--------- .../Stepup/Identity/Value/CommonName.php | 11 +-- .../Identity/Value/ContactInformation.php | 9 +- .../Stepup/Identity/Value/DocumentNumber.php | 11 +-- src/Surfnet/Stepup/Identity/Value/Email.php | 11 +-- .../Value/EmailVerificationWindow.php | 20 ++-- src/Surfnet/Stepup/Identity/Value/GssfId.php | 9 +- .../Stepup/Identity/Value/HashedSecret.php | 2 +- .../Stepup/Identity/Value/IdentityId.php | 9 +- .../Stepup/Identity/Value/Institution.php | 9 +- src/Surfnet/Stepup/Identity/Value/Locale.php | 9 +- .../Stepup/Identity/Value/Location.php | 9 +- src/Surfnet/Stepup/Identity/Value/NameId.php | 9 +- .../Identity/Value/OnPremiseVettingType.php | 7 +- .../Stepup/Identity/Value/PhoneNumber.php | 7 +- .../Stepup/Identity/Value/RecoveryTokenId.php | 9 +- .../Identity/Value/RecoveryTokenType.php | 11 +-- .../Value/RegistrationAuthorityRole.php | 17 ++-- .../Stepup/Identity/Value/SafeStore.php | 7 +- .../Stepup/Identity/Value/SecondFactorId.php | 9 +- .../SelfAssertedRegistrationVettingType.php | 4 +- .../Identity/Value/SelfVetVettingType.php | 7 +- .../Stepup/Identity/Value/StepupProvider.php | 9 +- .../Stepup/Identity/Value/TimeFrame.php | 13 +-- .../Stepup/Identity/Value/U2fKeyHandle.php | 9 +- .../Stepup/Identity/Value/UnhashedSecret.php | 2 +- .../Stepup/Identity/Value/VettingTypeHint.php | 8 +- .../Stepup/Identity/Value/YubikeyPublicId.php | 9 +- src/Surfnet/Stepup/Identity/Whitelist.php | 18 ++-- ...entSerializationAndDeserializationTest.php | 4 +- .../InstitutionConfigurationTest.php | 24 ++--- .../Value/ContactInformationTest.php | 12 ++- .../InstitutionAuthorizationOptionTest.php | 37 ++++---- .../Value/InstitutionConfigurationIdTest.php | 22 +++-- .../Value/InstitutionRoleTest.php | 14 ++- .../Value/InstitutionSetTest.php | 28 +++--- .../Configuration/Value/InstitutionTest.php | 12 ++- .../Configuration/Value/LocationTest.php | 12 ++- .../Configuration/Value/RaLocationIdTest.php | 20 ++-- .../Value/RaLocationListTest.php | 25 ++--- .../Value/RaLocationNameTest.php | 14 +-- .../ShowRaaContactInformationOptionTest.php | 16 ++-- .../Value/UseRaLocationsOptionTest.php | 16 ++-- .../Stepup/Tests/DateTime/DateTimeTest.php | 16 ++-- .../Stepup/Tests/Helper/JsonHelperTest.php | 11 ++- .../Tests/Helper/UserDataFilterTest.php | 5 +- .../Tests/Helper/UserDataFormatterTest.php | 4 +- .../Collection/InstitutionCollectionTest.php | 21 +++-- .../Entity/ConfigurableSettingsTest.php | 6 +- .../Entity/SecondFactorCollectionTest.php | 6 +- ...entSerializationAndDeserializationTest.php | 12 +-- .../Identity/Event/ForgettableEventsTest.php | 9 +- ...entSerializationAndDeserializationTest.php | 4 +- .../Tests/Identity/Value/CommonNameTest.php | 12 ++- .../Identity/Value/ContactInformationTest.php | 12 ++- .../Identity/Value/DocumentNumberTest.php | 12 ++- .../Stepup/Tests/Identity/Value/EmailTest.php | 18 ++-- .../Value/EmailVerificationWindowTest.php | 8 +- .../Tests/Identity/Value/GssfIdTest.php | 12 ++- .../Tests/Identity/Value/InstitutionTest.php | 12 ++- .../Tests/Identity/Value/LocationTest.php | 12 ++- .../Tests/Identity/Value/PhoneNumberTest.php | 12 ++- .../RecoveryTokenIdentifierFactoryTest.php | 2 +- .../Value/RegistrationAuthorityRoleTest.php | 12 ++- .../Tests/Identity/Value/SafeStoreTest.php | 4 +- .../SecondFactorIdentifierFactoryTest.php | 2 +- .../Identity/Value/StepupProviderTest.php | 12 ++- .../Tests/Identity/Value/TimeFrameTest.php | 12 ++- .../Identity/Value/YubikeyPublicIdTest.php | 13 +-- src/Surfnet/Stepup/Token/TokenGenerator.php | 2 +- ...stitutionAuthorizationRepositoryFilter.php | 4 +- .../Service/AuthorizationContextService.php | 22 +---- .../Service/AuthorizationService.php | 20 +--- .../Service/CommandAuthorizationService.php | 22 +---- .../Value/AuthorizationDecision.php | 8 +- .../Value/InstitutionAuthorizationContext.php | 10 +- .../Value/InstitutionRoleSet.php | 2 +- .../Entity/AllowedSecondFactor.php | 2 +- .../Entity/ConfiguredInstitution.php | 4 +- .../Entity/InstitutionAuthorization.php | 2 +- .../InstitutionConfigurationOptions.php | 2 +- .../Configuration/Entity/RaLocation.php | 2 +- .../AllowedSecondFactorListProjector.php | 7 +- .../ConfiguredInstitutionProjector.php | 9 +- .../InstitutionAuthorizationProjector.php | 20 ++-- ...stitutionConfigurationOptionsProjector.php | 28 +++--- .../Projector/RaLocationProjector.php | 17 ++-- .../AllowedSecondFactorRepository.php | 4 +- .../ConfiguredInstitutionRepository.php | 6 +- .../InstitutionAuthorizationRepository.php | 21 +++-- ...titutionConfigurationOptionsRepository.php | 4 +- .../Repository/RaLocationRepository.php | 6 +- .../AllowedSecondFactorListService.php | 12 +-- .../Service/AllowedSecondFactorMap.php | 8 +- .../Service/ConfiguredInstitutionService.php | 9 +- .../InstitutionAuthorizationOptionMap.php | 4 +- .../InstitutionAuthorizationService.php | 7 +- ...InstitutionConfigurationOptionsService.php | 7 +- .../Service/RaLocationService.php | 7 +- .../Controller/AuditLogController.php | 5 +- .../Controller/AuthorizationController.php | 10 +- .../Controller/CommandController.php | 33 ++----- .../ConfiguredInstitutionController.php | 7 +- .../Controller/DeprovisionController.php | 4 +- .../Controller/IdentityController.php | 17 ++-- ...titutionConfigurationOptionsController.php | 14 +-- .../Controller/ProfileController.php | 7 +- .../Controller/RaCandidateController.php | 12 +-- .../ApiBundle/Controller/RaController.php | 7 +- .../Controller/RaListingController.php | 12 +-- .../Controller/RaLocationController.php | 6 +- .../Controller/RaSecondFactorController.php | 14 +-- .../Controller/RecoveryTokenController.php | 17 +--- .../ApiBundle/Controller/SraaController.php | 7 +- .../UnverifiedSecondFactorController.php | 7 +- .../VerifiedSecondFactorController.php | 19 +--- .../VettedSecondFactorController.php | 7 +- .../Controller/VettingTypeHintController.php | 12 +-- .../DependencyInjection/Configuration.php | 2 +- .../SurfnetStepupMiddlewareApiExtension.php | 2 +- .../ApiBundle/Doctrine/Type/DateTimeType.php | 3 +- .../Doctrine/Type/DocumentNumberType.php | 3 +- .../EventListener/ExceptionListener.php | 11 +-- .../Exception/BadApiRequestException.php | 2 +- .../Exception/BadCommandRequestException.php | 8 +- .../Exception/InvalidArgumentException.php | 2 +- .../Identity/Entity/AuditLogEntry.php | 13 ++- .../ApiBundle/Identity/Entity/Identity.php | 12 +-- .../IdentitySelfAssertedTokenOptions.php | 2 +- .../Identity/Entity/InstitutionListing.php | 4 +- .../ApiBundle/Identity/Entity/RaCandidate.php | 10 +- .../ApiBundle/Identity/Entity/RaListing.php | 2 +- .../Identity/Entity/RaSecondFactor.php | 6 +- .../Identity/Entity/RecoveryToken.php | 3 +- .../Entity/SecondFactorRevocation.php | 6 +- .../Entity/UnverifiedSecondFactor.php | 3 +- .../Identity/Entity/VerifiedSecondFactor.php | 6 +- .../Identity/Entity/VettedSecondFactor.php | 3 +- .../Identity/Entity/VettingTypeHint.php | 3 +- .../Identity/Entity/WhitelistEntry.php | 2 +- .../Identity/Projector/AuditLogProjector.php | 14 +-- .../Identity/Projector/IdentityProjector.php | 17 ++-- ...ntitySelfAssertedTokenOptionsProjector.php | 11 +-- .../Projector/InstitutionListingProjector.php | 4 +- .../Identity/Projector/RaListingProjector.php | 34 +++---- .../Projector/RaSecondFactorProjector.php | 50 +++++----- .../Projector/RecoveryTokenProjector.php | 9 +- .../Projector/SecondFactorProjector.php | 37 +++----- .../SecondFactorRevocationProjector.php | 5 +- .../Identity/Projector/SraaProjector.php | 7 +- .../Projector/VettingTypeHintProjector.php | 7 +- .../Identity/Projector/WhitelistProjector.php | 5 +- .../Identity/Query/IdentityQuery.php | 4 +- .../Identity/Query/RaCandidateQuery.php | 5 +- .../Identity/Query/RaListingQuery.php | 3 +- .../ApiBundle/Identity/Query/RaaQuery.php | 4 +- .../Repository/AuditLogRepository.php | 8 +- .../Repository/AuthorizationRepository.php | 33 +++---- .../Repository/IdentityRepository.php | 18 ++-- ...titySelfAssertedTokenOptionsRepository.php | 4 +- .../InstitutionListingRepository.php | 4 +- .../Repository/RaCandidateRepository.php | 17 ++-- .../Repository/RaListingRepository.php | 30 +++--- .../Repository/RaSecondFactorRepository.php | 28 +++--- .../Repository/RecoveryTokenRepository.php | 7 +- .../SecondFactorRevocationRepository.php | 2 +- .../Identity/Repository/SraaRepository.php | 10 +- .../UnverifiedSecondFactorRepository.php | 10 +- .../VerifiedSecondFactorRepository.php | 17 ++-- .../VettedSecondFactorRepository.php | 10 +- .../Repository/WhitelistEntryRepository.php | 10 +- .../Service/AbstractSearchService.php | 6 +- .../Identity/Service/AuditLogService.php | 5 +- .../Identity/Service/IdentityService.php | 27 ++---- .../Identity/Service/ProfileService.php | 17 +--- .../Identity/Service/RaCandidateService.php | 13 ++- .../Identity/Service/RaListingService.php | 10 +- .../Service/RaSecondFactorService.php | 8 +- .../Identity/Service/RecoveryTokenService.php | 5 +- .../Identity/Service/SecondFactorService.php | 30 +++--- .../Identity/Service/SraaService.php | 7 +- .../Identity/Service/WhitelistService.php | 5 +- .../Identity/Value/AuthorityRole.php | 8 +- .../Value/AuthorizedInstitutionCollection.php | 9 +- .../ApiBundle/Identity/Value/Profile.php | 10 +- .../Identity/Value/RecoveryTokenStatus.php | 5 +- .../RegistrationAuthorityCredentials.php | 15 +-- .../Identity/Value/SecondFactorStatus.php | 16 ++-- .../Value/VerifiedTokenInformation.php | 2 +- .../Request/CommandParamConverter.php | 6 +- ...ConfigurationInstitutionParamConverter.php | 4 +- .../Request/InstitutionParamConverter.php | 4 +- .../Request/MetadataParamConverter.php | 11 +-- .../Response/JsonAuthorizationResponse.php | 2 +- .../Response/JsonCollectionResponse.php | 4 +- .../Response/JsonNotFoundResponse.php | 2 +- .../ApiBundle/Service/DeprovisionService.php | 17 +--- ...utionAuthorizationRepositoryFilterTest.php | 14 +-- .../AuthorizationContextServiceTest.php | 16 ++-- .../Service/AuthorizationServiceTest.php | 28 +++--- .../CommandAuthorizationServiceTest.php | 29 +++--- .../Entity/ConfiguredInstitutionTest.php | 2 +- .../Configuration/Entity/RaLocationTest.php | 2 +- .../Service/AllowedSecondFactorMapTest.php | 4 +- .../InstitutionAuthorizationOptionMapTest.php | 8 +- .../InstitutionAuthorizationServiceTest.php | 9 +- ...itutionConfigurationOptionsServiceTest.php | 13 ++- .../Doctrine/Type/AuthorityRoleTypeTest.php | 18 ++-- .../Doctrine/Type/CommonNameTypeTest.php | 17 ++-- ...onfigurationContactInformationTypeTest.php | 19 ++-- .../Type/ConfigurationInstitutionTypeTest.php | 19 ++-- .../Type/ConfigurationLocationTypeTest.php | 21 +++-- .../Type/ContactInformationTypeTest.php | 17 ++-- .../Tests/Doctrine/Type/DateTimeTypeTest.php | 17 ++-- .../Doctrine/Type/DocumentNumberTypeTest.php | 22 +++-- .../Tests/Doctrine/Type/EmailTypeTest.php | 17 ++-- .../Doctrine/Type/InstitutionRoleTypeTest.php | 17 ++-- .../Doctrine/Type/InstitutionTypeTest.php | 17 ++-- .../Tests/Doctrine/Type/LocaleTypeTest.php | 17 ++-- .../Tests/Doctrine/Type/LocationTypeTest.php | 17 ++-- .../Tests/Doctrine/Type/NameIdTypeTest.php | 21 +++-- .../NumberOfTokensPerIdentityTypeTest.php | 17 ++-- .../Doctrine/Type/RaLocationNameTypeTest.php | 21 +++-- .../Type/RecoveryTokenStatusTypeTest.php | 30 +++--- .../Type/SecondFactorStatusTypeTest.php | 30 +++--- .../Doctrine/Type/SelfVetOptionTypeTest.php | 17 ++-- ...howRaaContactInformationOptionTypeTest.php | 17 ++-- .../Type/UseRaLocationsOptionTypeTest.php | 17 ++-- .../Type/VerifyEmailOptionTypeTest.php | 17 ++-- .../ConfiguredInstitutionControllerTest.php | 20 ++-- .../Tests/Endpoint/SraaControllerTest.php | 20 ++-- .../Projector/AuditLogProjectorTest.php | 34 +++---- .../Identity/Projector/Event/EventStub.php | 5 +- .../AuthorizedInstitutionCollectionTest.php | 10 +- .../Request/CommandParamConverterTest.php | 29 +++--- .../Request/InstitutionParamConverterTest.php | 14 +-- .../JsonAuthorizationResponseTest.php | 10 +- .../Tests/Service/DeprovisionServiceTest.php | 14 +-- .../ApiBundle/Tests/TestDataProvider.php | 6 +- .../Command/AbstractCommand.php | 2 +- .../CommandHandlingBundle/Command/Command.php | 2 +- .../ConfigurationCommandHandler.php | 7 +- ...InstitutionConfigurationCommandHandler.php | 16 ++-- .../InstitutionConfigurationProcessor.php | 20 ++-- ...dCommandBusCommandHandlersCompilerPass.php | 2 +- .../AddEventBusListenersCompilerPass.php | 2 +- .../AddPipelineStagesCompilerPass.php | 2 +- .../DependencyInjection/Configuration.php | 8 +- ...epupMiddlewareCommandHandlingExtension.php | 2 +- .../EventHandling/BufferedEventBus.php | 13 +-- .../ProcessingAbortedExceptionListener.php | 2 +- .../MetadataEnrichingEventStreamDecorator.php | 10 +- .../Exception/InvalidArgumentException.php | 2 +- ...egisterSelfAssertedSecondFactorCommand.php | 2 +- .../Command/SelfVetSecondFactorCommand.php | 2 +- .../Exception/DuplicateIdentityException.php | 2 +- .../CommandHandler/IdentityCommandHandler.php | 91 +++++++------------ .../RegistrationAuthorityCommandHandler.php | 33 ++++--- .../ReminderEmailCommandHandler.php | 7 +- .../RightToBeForgottenCommandHandler.php | 21 ++--- .../WhitelistCommandHandler.php | 18 ++-- .../Service/EmailVerificationMailService.php | 30 ++---- .../Service/RecoveryTokenMailService.php | 34 ++----- .../Service/RegistrationMailService.php | 55 +++-------- .../SecondFactorRevocationMailService.php | 34 ++----- .../Service/SecondFactorVettedMailService.php | 27 ++---- .../Service/VettingTypeHintService.php | 15 +-- .../Pipeline/AuthorizingStage.php | 14 +-- .../Pipeline/DispatchStage.php | 12 +-- .../Pipeline/EventDispatchingStage.php | 12 +-- .../Exception/InvalidCommandException.php | 12 ++- .../Pipeline/StagedPipeline.php | 9 +- .../Pipeline/TransactionAwarePipeline.php | 23 ++--- .../Pipeline/ValidationStage.php | 12 +-- .../EmailVerificationEmailProcessor.php | 11 +-- .../Processor/RecoveryTokenEmailProcessor.php | 14 +-- .../SecondFactorRevocationEmailProcessor.php | 14 +-- .../SecondFactorVettedEmailProcessor.php | 9 +- .../EventSourcing/SensitiveDataMessage.php | 12 +-- .../SensitiveDataMessageStream.php | 13 +-- .../SensitiveDataEventStoreDecorator.php | 9 +- .../SensitiveDataMessageRepository.php | 13 +-- .../SensitiveData/SensitiveData.php | 38 ++------ .../Service/SensitiveDataService.php | 7 +- ...tStepupMiddlewareCommandHandlingBundle.php | 2 +- .../Tests/Command/AbstractCommandTest.php | 2 +- .../Tests/CommandHandlerTest.php | 2 +- .../ConfigurationCommandHandlerTest.php | 10 +- ...itutionConfigurationCommandHandlerTest.php | 50 +++++----- .../InstitutionConfigurationProcessorTest.php | 16 ++-- .../Tests/DateTimeHelper.php | 2 +- .../Tests/DateTimeHelperTest.php | 6 +- .../EventHandling/BufferedEventBusTest.php | 17 ++-- ...ndPublishToBusOnFirstCallEventListener.php | 17 +--- .../IdentityCommandHandlerMoveTokenTest.php | 22 ++--- ...tyCommandHandlerSelfAssertedTokensTest.php | 49 +++++----- .../IdentityCommandHandlerTest.php | 78 ++++++++-------- ...IdentityIdEnforcingEventStoreDecorator.php | 4 +- ...egistrationAuthorityCommandHandlerTest.php | 56 ++++++------ .../RightToBeForgottenCommandHandlerTest.php | 20 ++-- .../SecondFactorRevocationTest.php | 18 ++-- .../WhitelistCommandHandlerTest.php | 21 +++-- .../Tests/Mockery/HasInstitutionMatcher.php | 2 +- .../Mockery/HasInstitutionMatcherTest.php | 21 +++-- .../Tests/Pipeline/AuthorizingStageTest.php | 18 ++-- .../Tests/Pipeline/DispatchStageTest.php | 2 +- .../Pipeline/EventDispatchingStageTest.php | 4 +- .../Tests/Pipeline/StagedPipelineTest.php | 6 +- .../Tests/Pipeline/ValidationStageTest.php | 10 +- .../RecoveryTokenEmailProcessorTest.php | 18 ++-- .../EventSourcing/ForgettableEventStub.php | 2 +- .../SensitiveDataMessageStreamTest.php | 31 ++++--- .../Tests/SensitiveData/SensitiveDataTest.php | 4 +- .../Service/SensitiveDataServiceTest.php | 2 +- .../Tests/Value/InstitutionTest.php | 12 ++- .../Value/Institution.php | 9 +- .../CommandHandlingBundle/Value/Sender.php | 10 +- ...urfnetStepupMiddlewareGatewayExtension.php | 2 +- .../GatewayBundle/Entity/SamlEntity.php | 4 +- .../Entity/SamlEntityRepository.php | 8 +- .../GatewayBundle/Entity/SecondFactor.php | 5 +- .../GatewayBundle/Entity/WhitelistEntry.php | 2 +- .../InstitutionConfigurationProjector.php | 5 +- .../Projector/SamlEntityProjector.php | 9 +- .../Projector/SecondFactorProjector.php | 13 +-- .../Projector/WhitelistProjector.php | 5 +- .../Repository/SecondFactorRepository.php | 10 +- .../Repository/WhitelistEntryRepository.php | 6 +- .../InstitutionConfigurationProjectorTest.php | 10 +- .../Configuration/Entity/EmailTemplate.php | 9 +- .../Projector/EmailTemplatesProjector.php | 7 +- .../Repository/EmailTemplateRepository.php | 6 +- .../Service/EmailTemplateService.php | 7 +- .../Controller/ConfigurationController.php | 4 +- .../InstitutionConfigurationController.php | 23 ++--- .../RightToBeForgottenController.php | 11 +-- .../Controller/WhitelistController.php | 11 +-- ...netStepupMiddlewareManagementExtension.php | 2 +- .../Exception/InvalidArgumentException.php | 2 +- .../Service/DBALConnectionHelper.php | 8 +- .../ConfigurationControllerTest.php | 18 ++-- ...InstitutionConfigurationControllerTest.php | 22 +++-- .../Validator/ConfigurationValidationTest.php | 12 ++- ...nfigureInstitutionRequestValidatorTest.php | 20 ++-- .../ManagementBundle/Validator/Assert.php | 4 +- .../ConfigurationStructureValidator.php | 23 ++--- .../ConfigurationValidatorInterface.php | 4 +- .../EmailTemplatesConfigurationValidator.php | 7 +- .../GatewayConfigurationValidator.php | 16 +--- ...IdentityProviderConfigurationValidator.php | 8 +- ...ReconfigureInstitutionRequestValidator.php | 43 ++++----- .../ServiceProviderConfigurationValidator.php | 18 ++-- .../BootstrapGsspSecondFactorCommand.php | 14 +-- .../Command/BootstrapIdentityCommand.php | 14 +-- ...IdentityWithYubikeySecondFactorCommand.php | 12 +-- .../BootstrapSmsSecondFactorCommand.php | 14 +-- .../BootstrapYubikeySecondFactorCommand.php | 14 +-- ...ilVerifiedSecondFactorRemindersCommand.php | 32 ++----- .../Command/MigrateSecondFactorCommand.php | 14 +-- .../Console/Command/ReplayEventsCommand.php | 5 +- .../Command/ReplaySpecificEventsCommand.php | 24 ++--- ...ctProjectorsForEventReplayCompilerPass.php | 2 +- .../DependencyInjection/Configuration.php | 2 +- ...netStepupMiddlewareMiddlewareExtension.php | 2 +- .../EventSourcing/DBALEventHydrator.php | 27 ++---- .../EventSourcing/EventCollection.php | 10 +- .../EventSourcing/ProjectorCollection.php | 12 +-- .../Exception/InvalidArgumentException.php | 2 +- .../InstitutionConfigurationProvider.php | 17 +--- .../InstitutionConfigurationState.php | 13 +-- .../MappedInstitutionConfiguration.php | 38 +++----- .../Service/BootstrapCommandService.php | 53 +++++------ .../Service/DBALConnectionHelper.php | 8 +- .../Service/EventStreamReplayer.php | 23 ++--- .../Service/PastEventsService.php | 8 +- .../Service/ReplayingEventDispatcher.php | 6 +- ...SecondFactorDisplayNameResolverService.php | 5 +- .../TransactionAwareEventDispatcher.php | 14 +-- .../Service/TransactionHelper.php | 8 +- ...erifiedSecondFactorReminderMailService.php | 38 ++------ .../VerifiedSecondFactorReminderService.php | 24 ++--- ...urfnetStepupMiddlewareMiddlewareBundle.php | 2 +- .../EventSourcing/EventCollectionTest.php | 18 ++-- .../EventSourcing/ProjectorCollectionTest.php | 8 +- .../MappedInstitutionConfigurationTest.php | 14 +-- ...erifiedSecondFactorReminderServiceTest.php | 26 +++--- 485 files changed, 2606 insertions(+), 3497 deletions(-) diff --git a/src/Kernel.php b/src/Kernel.php index 1cd05726a..10e367d70 100644 --- a/src/Kernel.php +++ b/src/Kernel.php @@ -8,6 +8,8 @@ use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Kernel as BaseKernel; use Symfony\Component\Routing\RouteCollectionBuilder; +use function dirname; +use const PHP_VERSION_ID; class Kernel extends BaseKernel { @@ -27,13 +29,13 @@ public function registerBundles(): iterable public function getProjectDir(): string { - return \dirname(__DIR__); + return dirname(__DIR__); } protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void { $container->addResource(new FileResource($this->getProjectDir().'/config/bundles.php')); - $container->setParameter('container.dumper.inline_class_loader', \PHP_VERSION_ID < 70400 || $this->debug); + $container->setParameter('container.dumper.inline_class_loader', PHP_VERSION_ID < 70400 || $this->debug); $container->setParameter('container.dumper.inline_factories', true); $confDir = $this->getProjectDir().'/config'; diff --git a/src/Surfnet/DataFixtures/AppFixtures.php b/src/Surfnet/DataFixtures/AppFixtures.php index 7df73384d..4207c8246 100644 --- a/src/Surfnet/DataFixtures/AppFixtures.php +++ b/src/Surfnet/DataFixtures/AppFixtures.php @@ -7,7 +7,7 @@ class AppFixtures extends Fixture { - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { $manager->flush(); } diff --git a/src/Surfnet/Migrations/Version20141125173004.php b/src/Surfnet/Migrations/Version20141125173004.php index 0026a52ec..a9d32be17 100644 --- a/src/Surfnet/Migrations/Version20141125173004.php +++ b/src/Surfnet/Migrations/Version20141125173004.php @@ -28,12 +28,9 @@ */ class Version20141125173004 extends AbstractMigration implements ContainerAwareInterface { - /** - * @var ContainerInterface - */ - private $container; + private ?ContainerInterface $container = null; - public function setContainer(ContainerInterface $container = null) + public function setContainer(ContainerInterface $container = null): void { $this->container = $container; } diff --git a/src/Surfnet/Migrations/Version20141209150426.php b/src/Surfnet/Migrations/Version20141209150426.php index 241b96afc..3ae0a6e3e 100644 --- a/src/Surfnet/Migrations/Version20141209150426.php +++ b/src/Surfnet/Migrations/Version20141209150426.php @@ -12,12 +12,9 @@ */ class Version20141209150426 extends AbstractMigration implements ContainerAwareInterface { - /** - * @var ContainerInterface - */ - private $container; + private ?ContainerInterface $container = null; - public function setContainer(ContainerInterface $container = null) + public function setContainer(ContainerInterface $container = null): void { $this->container = $container; } diff --git a/src/Surfnet/Migrations/Version20141210174213.php b/src/Surfnet/Migrations/Version20141210174213.php index ceeaba13a..640a61fc8 100644 --- a/src/Surfnet/Migrations/Version20141210174213.php +++ b/src/Surfnet/Migrations/Version20141210174213.php @@ -12,10 +12,7 @@ */ class Version20141210174213 extends AbstractMigration implements ContainerAwareInterface { - /** - * @var ContainerInterface - */ - private $container; + private ?ContainerInterface $container = null; public function up(Schema $schema): void { @@ -47,7 +44,7 @@ private function getGatewaySchema() return $this->container->getParameter('database_gateway_name'); } - public function setContainer(ContainerInterface $container = null) + public function setContainer(ContainerInterface $container = null): void { $this->container = $container; } diff --git a/src/Surfnet/Migrations/Version20150312162849.php b/src/Surfnet/Migrations/Version20150312162849.php index d64679266..7b8766f84 100644 --- a/src/Surfnet/Migrations/Version20150312162849.php +++ b/src/Surfnet/Migrations/Version20150312162849.php @@ -12,10 +12,7 @@ */ class Version20150312162849 extends AbstractMigration implements ContainerAwareInterface { - /** - * @var \Symfony\Component\DependencyInjection\ContainerInterface - */ - private $container; + private ?ContainerInterface $container = null; public function up(Schema $schema): void { @@ -41,7 +38,7 @@ public function down(Schema $schema): void )); } - public function setContainer(ContainerInterface $container = null) + public function setContainer(ContainerInterface $container = null): void { $this->container = $container; } diff --git a/src/Surfnet/Migrations/Version20150508085838.php b/src/Surfnet/Migrations/Version20150508085838.php index 00e42a776..9f953cc99 100644 --- a/src/Surfnet/Migrations/Version20150508085838.php +++ b/src/Surfnet/Migrations/Version20150508085838.php @@ -12,12 +12,9 @@ */ class Version20150508085838 extends AbstractMigration implements ContainerAwareInterface { - /** - * @var ContainerInterface - */ - private $container; + private ?ContainerInterface $container = null; - public function setContainer(ContainerInterface $container = null) + public function setContainer(ContainerInterface $container = null): void { $this->container = $container; } diff --git a/src/Surfnet/Migrations/Version20150522163053.php b/src/Surfnet/Migrations/Version20150522163053.php index 7c63440a4..2b2f78b18 100644 --- a/src/Surfnet/Migrations/Version20150522163053.php +++ b/src/Surfnet/Migrations/Version20150522163053.php @@ -12,12 +12,9 @@ */ class Version20150522163053 extends AbstractMigration implements ContainerAwareInterface { - /** - * @var ContainerInterface - */ - private $container; + private ?ContainerInterface $container = null; - public function setContainer(ContainerInterface $container = null) + public function setContainer(ContainerInterface $container = null): void { $this->container = $container; } diff --git a/src/Surfnet/Migrations/Version20150522164907.php b/src/Surfnet/Migrations/Version20150522164907.php index d23388301..f0d039fa5 100644 --- a/src/Surfnet/Migrations/Version20150522164907.php +++ b/src/Surfnet/Migrations/Version20150522164907.php @@ -12,12 +12,9 @@ */ class Version20150522164907 extends AbstractMigration implements ContainerAwareInterface { - /** - * @var ContainerInterface - */ - private $container; + private ?ContainerInterface $container = null; - public function setContainer(ContainerInterface $container = null) + public function setContainer(ContainerInterface $container = null): void { $this->container = $container; } diff --git a/src/Surfnet/Migrations/Version20150528154959.php b/src/Surfnet/Migrations/Version20150528154959.php index ea2d32e9e..baf56a248 100644 --- a/src/Surfnet/Migrations/Version20150528154959.php +++ b/src/Surfnet/Migrations/Version20150528154959.php @@ -12,12 +12,9 @@ */ class Version20150528154959 extends AbstractMigration implements ContainerAwareInterface { - /** - * @var ContainerInterface - */ - private $container; + private ?ContainerInterface $container = null; - public function setContainer(ContainerInterface $container = null) + public function setContainer(ContainerInterface $container = null): void { $this->container = $container; } diff --git a/src/Surfnet/Migrations/Version20150615114646.php b/src/Surfnet/Migrations/Version20150615114646.php index 4023ab26a..f31f1fbd5 100644 --- a/src/Surfnet/Migrations/Version20150615114646.php +++ b/src/Surfnet/Migrations/Version20150615114646.php @@ -12,12 +12,9 @@ */ class Version20150615114646 extends AbstractMigration implements ContainerAwareInterface { - /** - * @var ContainerInterface - */ - private $container; + private ?ContainerInterface $container = null; - public function setContainer(ContainerInterface $container = null) + public function setContainer(ContainerInterface $container = null): void { $this->container = $container; } diff --git a/src/Surfnet/Migrations/Version20180131150800.php b/src/Surfnet/Migrations/Version20180131150800.php index 208a73947..80e3fa468 100644 --- a/src/Surfnet/Migrations/Version20180131150800.php +++ b/src/Surfnet/Migrations/Version20180131150800.php @@ -12,12 +12,9 @@ */ class Version20180131150800 extends AbstractMigration implements ContainerAwareInterface { - /** - * @var ContainerInterface - */ - private $container; + private ?ContainerInterface $container = null; - public function setContainer(ContainerInterface $container = null) + public function setContainer(ContainerInterface $container = null): void { $this->container = $container; } diff --git a/src/Surfnet/Migrations/Version20200114161618.php b/src/Surfnet/Migrations/Version20200114161618.php index 321b3754d..8010b4129 100644 --- a/src/Surfnet/Migrations/Version20200114161618.php +++ b/src/Surfnet/Migrations/Version20200114161618.php @@ -12,12 +12,9 @@ */ class Version20200114161618 extends AbstractMigration implements ContainerAwareInterface { - /** - * @var ContainerInterface - */ - private $container; + private ?ContainerInterface $container = null; - public function setContainer(ContainerInterface $container = null) + public function setContainer(ContainerInterface $container = null): void { $this->container = $container; } diff --git a/src/Surfnet/Migrations/Version20210610131957.php b/src/Surfnet/Migrations/Version20210610131957.php index c9c17af7e..b39261ab1 100644 --- a/src/Surfnet/Migrations/Version20210610131957.php +++ b/src/Surfnet/Migrations/Version20210610131957.php @@ -14,7 +14,7 @@ */ final class Version20210610131957 extends AbstractMigration { - private static $select = <<container = $container; } diff --git a/src/Surfnet/Migrations/Version20221102143350.php b/src/Surfnet/Migrations/Version20221102143350.php index 829023b6a..623a297ff 100644 --- a/src/Surfnet/Migrations/Version20221102143350.php +++ b/src/Surfnet/Migrations/Version20221102143350.php @@ -9,12 +9,9 @@ final class Version20221102143350 extends AbstractMigration implements ContainerAwareInterface { - /** - * @var ContainerInterface - */ - private $container; + private ?ContainerInterface $container = null; - public function setContainer(ContainerInterface $container = null) + public function setContainer(ContainerInterface $container = null): void { $this->container = $container; } diff --git a/src/Surfnet/Stepup/Configuration/Configuration.php b/src/Surfnet/Stepup/Configuration/Configuration.php index d12670924..51e14f0e7 100644 --- a/src/Surfnet/Stepup/Configuration/Configuration.php +++ b/src/Surfnet/Stepup/Configuration/Configuration.php @@ -40,7 +40,7 @@ class Configuration extends EventSourcedAggregateRoot implements ConfigurationIn */ private $configuration; - public static function create() + public static function create(): self { $configuration = new self(); $configuration->apply(new NewConfigurationCreatedEvent(self::CONFIGURATION_ID)); @@ -48,7 +48,7 @@ public static function create() return $configuration; } - public function update($configurationAsJson) + public function update($configurationAsJson): void { $decodedConfiguration = JsonHelper::decode($configurationAsJson); @@ -75,7 +75,7 @@ public function getAggregateRootId(): string return self::CONFIGURATION_ID; } - public function applyConfigurationUpdatedEvent(ConfigurationUpdatedEvent $event) + public function applyConfigurationUpdatedEvent(ConfigurationUpdatedEvent $event): void { $this->configuration = $event->newConfiguration; } diff --git a/src/Surfnet/Stepup/Configuration/Entity/RaLocation.php b/src/Surfnet/Stepup/Configuration/Entity/RaLocation.php index b08c4306b..8200feab9 100644 --- a/src/Surfnet/Stepup/Configuration/Entity/RaLocation.php +++ b/src/Surfnet/Stepup/Configuration/Entity/RaLocation.php @@ -25,25 +25,13 @@ class RaLocation { - /** - * @var RaLocationId - */ - private $id; + private RaLocationId $id; - /** - * @var RaLocationName - */ - private $name; + private RaLocationName $name; - /** - * @var Location - */ - private $location; + private Location $location; - /** - * @var ContactInformation - */ - private $contactInformation; + private ContactInformation $contactInformation; /** * @param RaLocationId $id @@ -57,7 +45,7 @@ public static function create( RaLocationName $name, Location $location, ContactInformation $contactInformation - ) { + ): self { return new self($id, $name, $location, $contactInformation); } @@ -76,7 +64,7 @@ private function __construct( /** * @param RaLocationName $name */ - public function rename(RaLocationName $name) + public function rename(RaLocationName $name): void { $this->name = $name; } @@ -84,7 +72,7 @@ public function rename(RaLocationName $name) /** * @param Location $location */ - public function relocate(Location $location) + public function relocate(Location $location): void { $this->location = $location; } @@ -92,7 +80,7 @@ public function relocate(Location $location) /** * @param ContactInformation $contactInformation */ - public function changeContactInformation(ContactInformation $contactInformation) + public function changeContactInformation(ContactInformation $contactInformation): void { $this->contactInformation = $contactInformation; } diff --git a/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php b/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php index 0e7273d3d..c04191a86 100644 --- a/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php +++ b/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php @@ -85,10 +85,7 @@ class InstitutionConfiguration extends EventSourcedAggregateRoot implements Inst */ private $institution; - /** - * @var RaLocationList - */ - private $raLocations; + private ?RaLocationList $raLocations = null; /** * @var UseRaLocationsOption @@ -146,17 +143,14 @@ class InstitutionConfiguration extends EventSourcedAggregateRoot implements Inst */ private $allowedSecondFactorList; - /** - * @var boolean - */ - private $isMarkedAsDestroyed; + private ?bool $isMarkedAsDestroyed = null; /** * @param InstitutionConfigurationId $institutionConfigurationId * @param Institution $institution * @return InstitutionConfiguration */ - public static function create(InstitutionConfigurationId $institutionConfigurationId, Institution $institution) + public static function create(InstitutionConfigurationId $institutionConfigurationId, Institution $institution): self { $institutionConfiguration = new self; $institutionConfiguration->apply( @@ -205,7 +199,7 @@ public static function create(InstitutionConfigurationId $institutionConfigurati /** * @return InstitutionConfiguration */ - public function rebuild() + public function rebuild(): static { // We can only rebuild a destroyed InstitutionConfiguration, all other cases are not valid if ($this->isMarkedAsDestroyed !== true) { @@ -258,7 +252,7 @@ final public function __construct() { } - public function configureUseRaLocationsOption(UseRaLocationsOption $useRaLocationsOption) + public function configureUseRaLocationsOption(UseRaLocationsOption $useRaLocationsOption): void { if ($this->useRaLocationsOption->equals($useRaLocationsOption)) { return; @@ -273,7 +267,7 @@ public function configureUseRaLocationsOption(UseRaLocationsOption $useRaLocatio ); } - public function configureShowRaaContactInformationOption(ShowRaaContactInformationOption $showRaaContactInformationOption) + public function configureShowRaaContactInformationOption(ShowRaaContactInformationOption $showRaaContactInformationOption): void { if ($this->showRaaContactInformationOption->equals($showRaaContactInformationOption)) { return; @@ -288,7 +282,7 @@ public function configureShowRaaContactInformationOption(ShowRaaContactInformati ); } - public function configureVerifyEmailOption(VerifyEmailOption $verifyEmailOption) + public function configureVerifyEmailOption(VerifyEmailOption $verifyEmailOption): void { if ($this->verifyEmailOption->equals($verifyEmailOption)) { return; @@ -305,7 +299,7 @@ public function configureVerifyEmailOption(VerifyEmailOption $verifyEmailOption) public function configureNumberOfTokensPerIdentityOption( NumberOfTokensPerIdentityOption $numberOfTokensPerIdentityOption - ) { + ): void { if ($this->numberOfTokensPerIdentityOption->equals($numberOfTokensPerIdentityOption)) { return; } @@ -319,7 +313,7 @@ public function configureNumberOfTokensPerIdentityOption( ); } - public function configureSelfVetOption(SelfVetOption $selfVetOption) + public function configureSelfVetOption(SelfVetOption $selfVetOption): void { if ($this->selfVetOption->equals($selfVetOption)) { return; @@ -334,7 +328,7 @@ public function configureSelfVetOption(SelfVetOption $selfVetOption) ); } - public function configureSelfAssertedTokensOption(SelfAssertedTokensOption $selfAssertedTokensOption) + public function configureSelfAssertedTokensOption(SelfAssertedTokensOption $selfAssertedTokensOption): void { if ($this->selfAssertedTokensOption !== null && $this->selfAssertedTokensOption->equals($selfAssertedTokensOption) @@ -351,7 +345,7 @@ public function configureSelfAssertedTokensOption(SelfAssertedTokensOption $self ); } - public function configureSsoOn2faOption(SsoOn2faOption $ssoOn2faOption) + public function configureSsoOn2faOption(SsoOn2faOption $ssoOn2faOption): void { if ($this->ssoOn2faOption !== null && $this->ssoOn2faOption->equals($ssoOn2faOption)) { return; @@ -366,7 +360,7 @@ public function configureSsoOn2faOption(SsoOn2faOption $ssoOn2faOption) ); } - public function updateUseRaOption(InstitutionAuthorizationOption $useRaOption) + public function updateUseRaOption(InstitutionAuthorizationOption $useRaOption): void { if ($this->useRaOption !== null && $this->useRaOption->equals($useRaOption) @@ -383,7 +377,7 @@ public function updateUseRaOption(InstitutionAuthorizationOption $useRaOption) ); } - public function updateUseRaaOption(InstitutionAuthorizationOption $useRaaOption) + public function updateUseRaaOption(InstitutionAuthorizationOption $useRaaOption): void { if ($this->useRaaOption !== null && $this->useRaaOption->equals($useRaaOption) @@ -400,7 +394,7 @@ public function updateUseRaaOption(InstitutionAuthorizationOption $useRaaOption) ); } - public function updateSelectRaaOption(InstitutionAuthorizationOption $selectRaaOption) + public function updateSelectRaaOption(InstitutionAuthorizationOption $selectRaaOption): void { if ($this->selectRaaOption !== null && $this->selectRaaOption->equals($selectRaaOption) @@ -417,7 +411,7 @@ public function updateSelectRaaOption(InstitutionAuthorizationOption $selectRaaO ); } - public function updateAllowedSecondFactorList(AllowedSecondFactorList $allowedSecondFactorList) + public function updateAllowedSecondFactorList(AllowedSecondFactorList $allowedSecondFactorList): void { // AllowedSecondFactorList can be null for InstitutionConfigurations for which this functionality did not exist if ($this->allowedSecondFactorList !== null @@ -446,7 +440,7 @@ public function addRaLocation( RaLocationName $raLocationName, Location $location, ContactInformation $contactInformation - ) { + ): void { if ($this->raLocations->containsWithId($raLocationId)) { throw new DomainException(sprintf( 'Cannot add RaLocation with RaLocationId "%s" to RaLocations of InstitutionConfiguration "%s":' @@ -477,7 +471,7 @@ public function changeRaLocation( RaLocationName $raLocationName, Location $location, ContactInformation $contactInformation - ) { + ): void { if (!$this->raLocations->containsWithId($raLocationId)) { throw new DomainException(sprintf( 'Cannot change RaLocation with RaLocationId "%s" in RaLocations of InstitutionConfiguration "%s":' @@ -513,7 +507,7 @@ public function changeRaLocation( /** * @param RaLocationId $raLocationId */ - public function removeRaLocation(RaLocationId $raLocationId) + public function removeRaLocation(RaLocationId $raLocationId): void { if (!$this->raLocations->containsWithId($raLocationId)) { throw new DomainException(sprintf( @@ -530,7 +524,7 @@ public function removeRaLocation(RaLocationId $raLocationId) /** * @return void */ - public function destroy() + public function destroy(): void { $this->apply(new InstitutionConfigurationRemovedEvent($this->institutionConfigurationId, $this->institution)); } diff --git a/src/Surfnet/Stepup/Configuration/Value/AllowedSecondFactorList.php b/src/Surfnet/Stepup/Configuration/Value/AllowedSecondFactorList.php index b0e98443c..23d2538a2 100644 --- a/src/Surfnet/Stepup/Configuration/Value/AllowedSecondFactorList.php +++ b/src/Surfnet/Stepup/Configuration/Value/AllowedSecondFactorList.php @@ -29,7 +29,7 @@ final class AllowedSecondFactorList implements JsonSerializable, IteratorAggrega /** * @var SecondFactorType[] */ - private $allowedSecondFactors = []; + private array $allowedSecondFactors = []; private function __construct(array $allowedSecondFactors) { @@ -41,7 +41,7 @@ private function __construct(array $allowedSecondFactors) /** * @return AllowedSecondFactorList */ - public static function blank() + public static function blank(): self { return new self([]); } @@ -50,7 +50,7 @@ public static function blank() * @param $allowedSecondFactors * @return AllowedSecondFactorList */ - public static function ofTypes($allowedSecondFactors) + public static function ofTypes($allowedSecondFactors): self { return new self($allowedSecondFactors); } @@ -59,7 +59,7 @@ public static function ofTypes($allowedSecondFactors) * @param SecondFactorType $secondFactor * @return bool */ - public function allows(SecondFactorType $secondFactor) + public function allows(SecondFactorType $secondFactor): bool { return $this->isBlank() || $this->contains($secondFactor); } @@ -67,7 +67,7 @@ public function allows(SecondFactorType $secondFactor) /** * @return bool */ - public function isBlank() + public function isBlank(): bool { return empty($this->allowedSecondFactors); } @@ -76,7 +76,7 @@ public function isBlank() * @param SecondFactorType $secondFactor * @return bool */ - public function contains(SecondFactorType $secondFactor) + public function contains(SecondFactorType $secondFactor): bool { foreach ($this->allowedSecondFactors as $allowedSecondFactor) { if ($allowedSecondFactor->equals($secondFactor)) { @@ -87,7 +87,7 @@ public function contains(SecondFactorType $secondFactor) return false; } - public function equals(AllowedSecondFactorList $other) + public function equals(AllowedSecondFactorList $other): bool { if (count($other->allowedSecondFactors) !== count($this->allowedSecondFactors)) { return false; @@ -105,7 +105,7 @@ public function equals(AllowedSecondFactorList $other) public static function deserialize(array $data) { $secondFactorTypes = array_map( - function ($secondFactorString) { + function ($secondFactorString): SecondFactorType { return new SecondFactorType($secondFactorString); }, $data['allowed_second_factors'] @@ -117,7 +117,7 @@ function ($secondFactorString) { public function serialize(): array { $allowedSecondFactors = array_map( - function (SecondFactorType $secondFactorType) { + function (SecondFactorType $secondFactorType): string { return $secondFactorType->getSecondFactorType(); }, $this->allowedSecondFactors @@ -138,7 +138,7 @@ public function jsonSerialize() return $this->allowedSecondFactors; } - private function initializeWith(SecondFactorType $allowedSecondFactor) + private function initializeWith(SecondFactorType $allowedSecondFactor): void { if (!$this->contains($allowedSecondFactor)) { $this->allowedSecondFactors[] = $allowedSecondFactor; diff --git a/src/Surfnet/Stepup/Configuration/Value/ContactInformation.php b/src/Surfnet/Stepup/Configuration/Value/ContactInformation.php index fbe04ef1d..d0586a2be 100644 --- a/src/Surfnet/Stepup/Configuration/Value/ContactInformation.php +++ b/src/Surfnet/Stepup/Configuration/Value/ContactInformation.php @@ -23,10 +23,7 @@ final class ContactInformation implements JsonSerializable { - /** - * @var string - */ - private $contactInformation; + private string $contactInformation; /** * @param string $contactInformation @@ -44,7 +41,7 @@ public function __construct($contactInformation) * @param ContactInformation $otherContactInformation * @return bool */ - public function equals(ContactInformation $otherContactInformation) + public function equals(ContactInformation $otherContactInformation): bool { return $this->contactInformation === $otherContactInformation->contactInformation; } @@ -57,7 +54,7 @@ public function getContactInformation() return $this->contactInformation; } - public function __toString() + public function __toString(): string { return $this->contactInformation; } diff --git a/src/Surfnet/Stepup/Configuration/Value/Institution.php b/src/Surfnet/Stepup/Configuration/Value/Institution.php index 1053899da..fb9ecb430 100644 --- a/src/Surfnet/Stepup/Configuration/Value/Institution.php +++ b/src/Surfnet/Stepup/Configuration/Value/Institution.php @@ -23,10 +23,7 @@ final class Institution implements JsonSerializable { - /** - * @var string - */ - private $institution; + private string $institution; /** * @param string $institution may not be an empty string @@ -52,12 +49,12 @@ public function getInstitution() * @param Institution $otherInstitution * @return bool */ - public function equals(Institution $otherInstitution) + public function equals(Institution $otherInstitution): bool { return $this->institution === $otherInstitution->institution; } - public function __toString() + public function __toString(): string { return $this->institution; } diff --git a/src/Surfnet/Stepup/Configuration/Value/InstitutionAuthorizationOption.php b/src/Surfnet/Stepup/Configuration/Value/InstitutionAuthorizationOption.php index 808f73c6e..2c0fb097e 100644 --- a/src/Surfnet/Stepup/Configuration/Value/InstitutionAuthorizationOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/InstitutionAuthorizationOption.php @@ -22,20 +22,11 @@ final class InstitutionAuthorizationOption implements JsonSerializable { - /** - * @var InstitutionRole - */ - private $institutionRole; + private InstitutionRole $institutionRole; - /** - * @var InstitutionSet - */ - private $institutionSet; + private InstitutionSet $institutionSet; - /** - * @var boolean - */ - private $isDefault; + private bool $isDefault; /** * If the default is set to true then the object will use the old default behaviour. That behaviour is that it @@ -74,7 +65,7 @@ public static function fromInstitutionConfig(InstitutionRole $role, $institution array_walk( $institutions, - function ($institution, $key) use ($institutions) { + function ($institution, $key) use ($institutions): void { if (!is_string($institution) || strlen(trim($institution)) === 0) { throw InvalidArgumentException::invalidType( 'string', @@ -101,7 +92,7 @@ function ($institution, $key) use ($institutions) { * @param Institution[] $institutions * @return InstitutionAuthorizationOption */ - public static function fromInstitutions(InstitutionRole $role, Institution $institution, array $institutions) + public static function fromInstitutions(InstitutionRole $role, Institution $institution, array $institutions): self { if (count($institutions) == 1 && current($institutions)->getInstitution() === $institution->getInstitution()) { return new self($role, InstitutionSet::create([]), true); @@ -114,7 +105,7 @@ public static function fromInstitutions(InstitutionRole $role, Institution $inst * @param string[]|null * @return InstitutionAuthorizationOption */ - public static function getDefault(InstitutionRole $role) + public static function getDefault(InstitutionRole $role): self { return new self($role, InstitutionSet::create([]), true); } @@ -124,7 +115,7 @@ public static function getDefault(InstitutionRole $role) * @param string[]|null * @return InstitutionAuthorizationOption */ - public static function getEmpty(InstitutionRole $role) + public static function getEmpty(InstitutionRole $role): self { return new self($role, InstitutionSet::create([]), false); } @@ -141,7 +132,7 @@ public static function blank() * @param InstitutionAuthorizationOption $option * @return bool */ - public function equals(InstitutionAuthorizationOption $option) + public function equals(InstitutionAuthorizationOption $option): bool { return $this->institutionRole->equals($option->getInstitutionRole()) && @@ -185,7 +176,7 @@ public function getInstitutions(Institution $institution) * @param Institution $default * @return bool */ - public function hasInstitution(Institution $institution, Institution $default) + public function hasInstitution(Institution $institution, Institution $default): bool { $institutions = $this->getInstitutions($default); $list = array_map( diff --git a/src/Surfnet/Stepup/Configuration/Value/InstitutionConfigurationId.php b/src/Surfnet/Stepup/Configuration/Value/InstitutionConfigurationId.php index 3499fb062..eee782de6 100644 --- a/src/Surfnet/Stepup/Configuration/Value/InstitutionConfigurationId.php +++ b/src/Surfnet/Stepup/Configuration/Value/InstitutionConfigurationId.php @@ -26,7 +26,7 @@ final class InstitutionConfigurationId implements JsonSerializable { const UUID_NAMESPACE = '09876543-abcd-0987-abcd-098765432109'; - private $institutionConfigurationId; + private string $institutionConfigurationId; /** * @deprecated To be removed in next release; use normalizedFrom method to account for case-(in)sensitivity issues @@ -34,7 +34,7 @@ final class InstitutionConfigurationId implements JsonSerializable * @param Institution $institution * @return InstitutionConfigurationId */ - public static function from(Institution $institution) + public static function from(Institution $institution): self { return new self((string) Uuid::uuid5(self::UUID_NAMESPACE, $institution->getInstitution())); } @@ -43,7 +43,7 @@ public static function from(Institution $institution) * @param Institution $institution * @return InstitutionConfigurationId */ - public static function normalizedFrom(Institution $institution) + public static function normalizedFrom(Institution $institution): self { return new self((string) Uuid::uuid5(self::UUID_NAMESPACE, strtolower($institution->getInstitution()))); } @@ -73,7 +73,7 @@ public function __construct($institutionConfigurationId) * @param InstitutionConfigurationId $otherInstitutionConfigurationId * @return bool */ - public function equals(InstitutionConfigurationId $otherInstitutionConfigurationId) + public function equals(InstitutionConfigurationId $otherInstitutionConfigurationId): bool { return $this->institutionConfigurationId === $otherInstitutionConfigurationId->institutionConfigurationId; } @@ -86,7 +86,7 @@ public function getInstitutionConfigurationId() return $this->institutionConfigurationId; } - public function __toString() + public function __toString(): string { return $this->institutionConfigurationId; } diff --git a/src/Surfnet/Stepup/Configuration/Value/InstitutionRole.php b/src/Surfnet/Stepup/Configuration/Value/InstitutionRole.php index 44dec2929..9a16c1535 100644 --- a/src/Surfnet/Stepup/Configuration/Value/InstitutionRole.php +++ b/src/Surfnet/Stepup/Configuration/Value/InstitutionRole.php @@ -26,7 +26,7 @@ final class InstitutionRole implements JsonSerializable const ROLE_USE_RAA = 'use_raa'; const ROLE_SELECT_RAA = 'select_raa'; - private static $validRoles = [ + private static array $validRoles = [ self::ROLE_USE_RA, self::ROLE_USE_RAA, self::ROLE_SELECT_RAA, @@ -53,7 +53,7 @@ public function __construct($type) /** * @return InstitutionRole */ - public static function useRa() + public static function useRa(): self { return new self(self::ROLE_USE_RA); } @@ -61,7 +61,7 @@ public static function useRa() /** * @return InstitutionRole */ - public static function useRaa() + public static function useRaa(): self { return new self(self::ROLE_USE_RAA); } @@ -69,7 +69,7 @@ public static function useRaa() /** * @return InstitutionRole */ - public static function selectRaa() + public static function selectRaa(): self { return new self(self::ROLE_SELECT_RAA); } @@ -78,7 +78,7 @@ public static function selectRaa() * @param InstitutionRole $role * @return bool */ - public function equals(InstitutionRole $role) + public function equals(InstitutionRole $role): bool { return $this->type == $role->getType(); } @@ -99,7 +99,7 @@ public function jsonSerialize() /** * @return string */ - public function __toString() + public function __toString(): string { return $this->type; } diff --git a/src/Surfnet/Stepup/Configuration/Value/InstitutionSet.php b/src/Surfnet/Stepup/Configuration/Value/InstitutionSet.php index 31dbb5760..77402084b 100644 --- a/src/Surfnet/Stepup/Configuration/Value/InstitutionSet.php +++ b/src/Surfnet/Stepup/Configuration/Value/InstitutionSet.php @@ -45,12 +45,12 @@ private function __construct(array $institutions) * @param Institution[] * @return InstitutionSet */ - public static function create(array $institutions) + public static function create(array $institutions): self { // Verify only institutions are collected in the set array_walk( $institutions, - function ($institution, $key) use ($institutions) { + function ($institution, $key) use ($institutions): void { if (!$institution instanceof Institution) { throw InvalidArgumentException::invalidType( Institution::class, @@ -64,7 +64,7 @@ function ($institution, $key) use ($institutions) { return new self($institutions); } - public function equals(InstitutionSet $other) + public function equals(InstitutionSet $other): bool { return $this->toScalarArray() === $other->toScalarArray(); } @@ -73,7 +73,7 @@ public function equals(InstitutionSet $other) * @param Institution $institution * @return bool */ - public function isOption(Institution $institution) + public function isOption(Institution $institution): bool { return in_array($institution->getInstitution(), $this->institutions); } @@ -86,7 +86,7 @@ public function getInstitutions() return $this->institutions; } - public function toScalarArray() + public function toScalarArray(): array { return array_map('strval', $this->institutions); } @@ -95,9 +95,9 @@ public function toScalarArray() * @param Institution[] $institutions * @return Institution[] */ - private function sort(array $institutions) + private function sort(array $institutions): array { - usort($institutions, function (Institution $a, Institution $b) { + usort($institutions, function (Institution $a, Institution $b): int { return strcmp($a->getInstitution(), $b->getInstitution()); }); diff --git a/src/Surfnet/Stepup/Configuration/Value/Location.php b/src/Surfnet/Stepup/Configuration/Value/Location.php index cb3965c83..cb9433b80 100644 --- a/src/Surfnet/Stepup/Configuration/Value/Location.php +++ b/src/Surfnet/Stepup/Configuration/Value/Location.php @@ -23,10 +23,7 @@ final class Location implements JsonSerializable { - /** - * @var string - */ - private $location; + private string $location; /** * @param string $location @@ -44,7 +41,7 @@ public function __construct($location) * @param Location $otherLocation * @return bool */ - public function equals(Location $otherLocation) + public function equals(Location $otherLocation): bool { return $this->location === $otherLocation->location; } @@ -57,7 +54,7 @@ public function getLocation() return $this->location; } - public function __toString() + public function __toString(): string { return $this->location; } diff --git a/src/Surfnet/Stepup/Configuration/Value/NumberOfTokensPerIdentityOption.php b/src/Surfnet/Stepup/Configuration/Value/NumberOfTokensPerIdentityOption.php index fde2ea653..8534324c3 100644 --- a/src/Surfnet/Stepup/Configuration/Value/NumberOfTokensPerIdentityOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/NumberOfTokensPerIdentityOption.php @@ -30,7 +30,7 @@ class NumberOfTokensPerIdentityOption implements JsonSerializable */ private $numberOfTokensPerIdentity; - public static function getDefault() + public static function getDefault(): self { return new self(self::DISABLED); } @@ -52,7 +52,7 @@ public function __construct($numberOfTokensPerIdentity) * @param NumberOfTokensPerIdentityOption $other * @return bool */ - public function equals(NumberOfTokensPerIdentityOption $other) + public function equals(NumberOfTokensPerIdentityOption $other): bool { return $this->numberOfTokensPerIdentity === $other->numberOfTokensPerIdentity; } @@ -60,7 +60,7 @@ public function equals(NumberOfTokensPerIdentityOption $other) /** * @return bool */ - public function isEnabled() + public function isEnabled(): bool { return $this->numberOfTokensPerIdentity > self::DISABLED; } diff --git a/src/Surfnet/Stepup/Configuration/Value/RaLocationId.php b/src/Surfnet/Stepup/Configuration/Value/RaLocationId.php index 73dd58bab..033b588bc 100644 --- a/src/Surfnet/Stepup/Configuration/Value/RaLocationId.php +++ b/src/Surfnet/Stepup/Configuration/Value/RaLocationId.php @@ -24,10 +24,7 @@ final class RaLocationId implements JsonSerializable { - /** - * @var string - */ - private $raLocationId; + private string $raLocationId; /** * @param string $raLocationId @@ -57,7 +54,7 @@ public function __construct($raLocationId) * @param RaLocationId $otherRaLocationId * @return bool */ - public function equals(RaLocationId $otherRaLocationId) + public function equals(RaLocationId $otherRaLocationId): bool { return $this->raLocationId === $otherRaLocationId->raLocationId; } @@ -70,7 +67,7 @@ public function getRaLocationId() return $this->raLocationId; } - public function __toString() + public function __toString(): string { return $this->raLocationId; } diff --git a/src/Surfnet/Stepup/Configuration/Value/RaLocationList.php b/src/Surfnet/Stepup/Configuration/Value/RaLocationList.php index db5b109fc..ce986dfd4 100644 --- a/src/Surfnet/Stepup/Configuration/Value/RaLocationList.php +++ b/src/Surfnet/Stepup/Configuration/Value/RaLocationList.php @@ -41,7 +41,7 @@ public function __construct(array $raLocations) * @param RaLocationId $raLocationId * @return bool */ - public function containsWithId(RaLocationId $raLocationId) + public function containsWithId(RaLocationId $raLocationId): bool { foreach ($this->raLocations as $raLocation) { if ($raLocation->hasId($raLocationId)) { @@ -55,7 +55,7 @@ public function containsWithId(RaLocationId $raLocationId) /** * @param RaLocation $raLocation */ - public function add(RaLocation $raLocation) + public function add(RaLocation $raLocation): void { if ($this->containsWithId($raLocation->getId())) { throw new LogicException(sprintf( @@ -70,7 +70,7 @@ public function add(RaLocation $raLocation) /** * @param RaLocationId $raLocationId */ - public function removeWithId(RaLocationId $raLocationId) + public function removeWithId(RaLocationId $raLocationId): void { foreach ($this->raLocations as $key => $raLocation) { if ($raLocation->hasId($raLocationId)) { diff --git a/src/Surfnet/Stepup/Configuration/Value/RaLocationName.php b/src/Surfnet/Stepup/Configuration/Value/RaLocationName.php index 2809dbfd0..06a85ca8e 100644 --- a/src/Surfnet/Stepup/Configuration/Value/RaLocationName.php +++ b/src/Surfnet/Stepup/Configuration/Value/RaLocationName.php @@ -23,10 +23,7 @@ final class RaLocationName implements JsonSerializable { - /** - * @var string - */ - private $raLocationName; + private string $raLocationName; /** * @param string $raLocationName @@ -44,7 +41,7 @@ public function __construct($raLocationName) * @param RaLocationName $otherRaLocationName * @return bool */ - public function equals(RaLocationName $otherRaLocationName) + public function equals(RaLocationName $otherRaLocationName): bool { return $this->raLocationName === $otherRaLocationName->raLocationName; } @@ -57,7 +54,7 @@ public function getRaLocationName() return $this->raLocationName; } - public function __toString() + public function __toString(): string { return $this->raLocationName; } diff --git a/src/Surfnet/Stepup/Configuration/Value/SelfAssertedTokensOption.php b/src/Surfnet/Stepup/Configuration/Value/SelfAssertedTokensOption.php index e271a4943..16c8ded56 100644 --- a/src/Surfnet/Stepup/Configuration/Value/SelfAssertedTokensOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/SelfAssertedTokensOption.php @@ -22,12 +22,9 @@ final class SelfAssertedTokensOption implements JsonSerializable { - /** - * @var bool - */ - private $allowed; + private bool $allowed; - public static function getDefault() + public static function getDefault(): self { return new self(false); } diff --git a/src/Surfnet/Stepup/Configuration/Value/SelfVetOption.php b/src/Surfnet/Stepup/Configuration/Value/SelfVetOption.php index 9109ed6f0..114020ff6 100644 --- a/src/Surfnet/Stepup/Configuration/Value/SelfVetOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/SelfVetOption.php @@ -22,12 +22,9 @@ final class SelfVetOption implements JsonSerializable { - /** - * @var bool - */ - private $selfVetOption; + private bool $selfVetOption; - public static function getDefault() + public static function getDefault(): self { return new self(false); } diff --git a/src/Surfnet/Stepup/Configuration/Value/ShowRaaContactInformationOption.php b/src/Surfnet/Stepup/Configuration/Value/ShowRaaContactInformationOption.php index 7cde32a50..9873fea1a 100644 --- a/src/Surfnet/Stepup/Configuration/Value/ShowRaaContactInformationOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/ShowRaaContactInformationOption.php @@ -23,12 +23,9 @@ final class ShowRaaContactInformationOption implements JsonSerializable { - /** - * @var bool - */ - private $showRaaContactInformationOption; + private bool $showRaaContactInformationOption; - public static function getDefault() + public static function getDefault(): self { return new self(true); } @@ -50,7 +47,7 @@ public function __construct($showRaaContactInformationOption) * @param ShowRaaContactInformationOption $other * @return bool */ - public function equals(ShowRaaContactInformationOption $other) + public function equals(ShowRaaContactInformationOption $other): bool { return $this->showRaaContactInformationOption === $other->showRaaContactInformationOption; } diff --git a/src/Surfnet/Stepup/Configuration/Value/SsoOn2faOption.php b/src/Surfnet/Stepup/Configuration/Value/SsoOn2faOption.php index b35f28b81..8b7091a01 100644 --- a/src/Surfnet/Stepup/Configuration/Value/SsoOn2faOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/SsoOn2faOption.php @@ -24,10 +24,7 @@ final class SsoOn2faOption implements JsonSerializable { - /** - * @var bool - */ - private $ssoOn2faOption; + private bool $ssoOn2faOption; public static function getDefault(): self { diff --git a/src/Surfnet/Stepup/Configuration/Value/UseRaLocationsOption.php b/src/Surfnet/Stepup/Configuration/Value/UseRaLocationsOption.php index d1d6442e2..75cd1f947 100644 --- a/src/Surfnet/Stepup/Configuration/Value/UseRaLocationsOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/UseRaLocationsOption.php @@ -23,15 +23,12 @@ final class UseRaLocationsOption implements JsonSerializable { - /** - * @var bool - */ - private $useRaLocationsOption; + private bool $useRaLocationsOption; /** * @return UseRaLocationsOption */ - public static function getDefault() + public static function getDefault(): self { return new self(false); } @@ -53,7 +50,7 @@ public function __construct($useRaLocationsOption) * @param UseRaLocationsOption $other * @return bool */ - public function equals(UseRaLocationsOption $other) + public function equals(UseRaLocationsOption $other): bool { return $this->useRaLocationsOption === $other->useRaLocationsOption; } diff --git a/src/Surfnet/Stepup/Configuration/Value/VerifyEmailOption.php b/src/Surfnet/Stepup/Configuration/Value/VerifyEmailOption.php index e2253d749..8281969ad 100644 --- a/src/Surfnet/Stepup/Configuration/Value/VerifyEmailOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/VerifyEmailOption.php @@ -23,12 +23,9 @@ final class VerifyEmailOption implements JsonSerializable { - /** - * @var bool - */ - private $verifyEmailOption; + private bool $verifyEmailOption; - public static function getDefault() + public static function getDefault(): self { return new self(true); } @@ -50,7 +47,7 @@ public function __construct($verifyEmailOption) * @param VerifyEmailOption $other * @return bool */ - public function equals(VerifyEmailOption $other) + public function equals(VerifyEmailOption $other): bool { return $this->verifyEmailOption === $other->verifyEmailOption; } diff --git a/src/Surfnet/Stepup/DateTime/DateTime.php b/src/Surfnet/Stepup/DateTime/DateTime.php index 19874f598..71be680cc 100644 --- a/src/Surfnet/Stepup/DateTime/DateTime.php +++ b/src/Surfnet/Stepup/DateTime/DateTime.php @@ -41,10 +41,7 @@ class DateTime */ private static $now; - /** - * @var CoreDateTime - */ - private $dateTime; + private CoreDateTime $dateTime; /** * @return self @@ -58,7 +55,7 @@ public static function now() * @param string $string A date-time string formatted using `self::FORMAT` (eg. '2014-11-26T15:20:43+01:00'). * @return self */ - public static function fromString($string) + public static function fromString($string): self { if (!is_string($string)) { InvalidArgumentException::invalidType('string', 'dateTime', $string); @@ -85,7 +82,7 @@ public function __construct(CoreDateTime $dateTime = null) * @param DateInterval $interval * @return DateTime */ - public function add(DateInterval $interval) + public function add(DateInterval $interval): self { $dateTime = clone $this->dateTime; $dateTime->add($interval); @@ -97,7 +94,7 @@ public function add(DateInterval $interval) * @param DateInterval $interval * @return DateTime */ - public function sub(DateInterval $interval) + public function sub(DateInterval $interval): self { $dateTime = clone $this->dateTime; $dateTime->sub($interval); @@ -108,7 +105,7 @@ public function sub(DateInterval $interval) /** * @return DateTime */ - public function endOfDay() + public function endOfDay(): self { $dateTime = clone $this->dateTime; $dateTime->setTime(23, 59, 59); @@ -120,7 +117,7 @@ public function endOfDay() * @param DateTime $dateTime * @return boolean */ - public function comesBefore(DateTime $dateTime) + public function comesBefore(DateTime $dateTime): bool { return $this->dateTime < $dateTime->dateTime; } @@ -129,7 +126,7 @@ public function comesBefore(DateTime $dateTime) * @param DateTime $dateTime * @return boolean */ - public function comesBeforeOrIsEqual(DateTime $dateTime) + public function comesBeforeOrIsEqual(DateTime $dateTime): bool { return $this->dateTime <= $dateTime->dateTime; } @@ -138,7 +135,7 @@ public function comesBeforeOrIsEqual(DateTime $dateTime) * @param DateTime $dateTime * @return boolean */ - public function comesAfter(DateTime $dateTime) + public function comesAfter(DateTime $dateTime): bool { return $this->dateTime > $dateTime->dateTime; } @@ -147,7 +144,7 @@ public function comesAfter(DateTime $dateTime) * @param DateTime $dateTime * @return boolean */ - public function comesAfterOrIsEqual(DateTime $dateTime) + public function comesAfterOrIsEqual(DateTime $dateTime): bool { return $this->dateTime >= $dateTime->dateTime; } @@ -173,7 +170,7 @@ public function format($format) /** * @return string An ISO 8601 representation of this DateTime. */ - public function __toString() + public function __toString(): string { return $this->format(self::FORMAT); } diff --git a/src/Surfnet/Stepup/Exception/InvalidArgumentException.php b/src/Surfnet/Stepup/Exception/InvalidArgumentException.php index 8645dfd3f..a5457279a 100644 --- a/src/Surfnet/Stepup/Exception/InvalidArgumentException.php +++ b/src/Surfnet/Stepup/Exception/InvalidArgumentException.php @@ -27,7 +27,7 @@ class InvalidArgumentException extends \InvalidArgumentException implements Exce * * @return self */ - public static function invalidType($expected, $parameterName, $parameter) + public static function invalidType($expected, $parameterName, $parameter): self { $message = sprintf( 'Invalid argument type: "%s" expected, "%s" given for "%s"', diff --git a/src/Surfnet/Stepup/Exception/JsonException.php b/src/Surfnet/Stepup/Exception/JsonException.php index 0d0128ee1..4fb60f985 100644 --- a/src/Surfnet/Stepup/Exception/JsonException.php +++ b/src/Surfnet/Stepup/Exception/JsonException.php @@ -20,7 +20,7 @@ final class JsonException extends RuntimeException { - public static function withMessage($errorMessage) + public static function withMessage($errorMessage): self { return new self(sprintf('Unable to parse JSON data: %s', $errorMessage)); } diff --git a/src/Surfnet/Stepup/Helper/JsonHelper.php b/src/Surfnet/Stepup/Helper/JsonHelper.php index 35cc6c166..5b735a80a 100644 --- a/src/Surfnet/Stepup/Helper/JsonHelper.php +++ b/src/Surfnet/Stepup/Helper/JsonHelper.php @@ -23,7 +23,7 @@ final class JsonHelper { - private static $jsonErrors = [ + private static array $jsonErrors = [ JSON_ERROR_DEPTH => 'JSON_ERROR_DEPTH - Maximum stack depth exceeded', JSON_ERROR_STATE_MISMATCH => 'JSON_ERROR_STATE_MISMATCH - Underflow or the modes mismatch', JSON_ERROR_CTRL_CHAR => 'JSON_ERROR_CTRL_CHAR - Unexpected control character found', diff --git a/src/Surfnet/Stepup/Helper/SecondFactorProvePossessionHelper.php b/src/Surfnet/Stepup/Helper/SecondFactorProvePossessionHelper.php index 945414320..667c8edff 100644 --- a/src/Surfnet/Stepup/Helper/SecondFactorProvePossessionHelper.php +++ b/src/Surfnet/Stepup/Helper/SecondFactorProvePossessionHelper.php @@ -23,10 +23,7 @@ class SecondFactorProvePossessionHelper { - /** - * @var array - */ - private $skipProvePossessionSecondFactorTypes; + private array $skipProvePossessionSecondFactorTypes; /** * @param SecondFactorTypeService $secondFactorTypeService @@ -49,7 +46,7 @@ public function __construct( * @param SecondFactorType $secondFactorType * @return bool */ - public function canSkipProvePossession(SecondFactorType $secondFactorType) + public function canSkipProvePossession(SecondFactorType $secondFactorType): bool { return in_array($secondFactorType->getSecondFactorType(), $this->skipProvePossessionSecondFactorTypes); } diff --git a/src/Surfnet/Stepup/Helper/UserDataFormatter.php b/src/Surfnet/Stepup/Helper/UserDataFormatter.php index 610a55210..8831ea4ec 100644 --- a/src/Surfnet/Stepup/Helper/UserDataFormatter.php +++ b/src/Surfnet/Stepup/Helper/UserDataFormatter.php @@ -19,7 +19,7 @@ class UserDataFormatter implements UserDataFormatterInterface { - private $applicationName; + private string $applicationName; public function __construct(string $applicationName) { diff --git a/src/Surfnet/Stepup/Identity/Api/Id.php b/src/Surfnet/Stepup/Identity/Api/Id.php index b60c59097..88588e1ce 100644 --- a/src/Surfnet/Stepup/Identity/Api/Id.php +++ b/src/Surfnet/Stepup/Identity/Api/Id.php @@ -18,11 +18,13 @@ namespace Surfnet\Stepup\Identity\Api; +use InvalidArgumentException; + interface Id { /** * @param mixed $value - * @throws \InvalidArgumentException + * @throws InvalidArgumentException */ public function __construct($value); diff --git a/src/Surfnet/Stepup/Identity/AuditLog/Metadata.php b/src/Surfnet/Stepup/Identity/AuditLog/Metadata.php index 3d3f29f38..2d574164e 100644 --- a/src/Surfnet/Stepup/Identity/AuditLog/Metadata.php +++ b/src/Surfnet/Stepup/Identity/AuditLog/Metadata.php @@ -18,37 +18,44 @@ namespace Surfnet\Stepup\Identity\AuditLog; +use Surfnet\Stepup\Identity\Value\IdentityId; +use Surfnet\Stepup\Identity\Value\Institution; +use Surfnet\Stepup\Identity\Value\RecoveryTokenId; +use Surfnet\Stepup\Identity\Value\RecoveryTokenType; +use Surfnet\Stepup\Identity\Value\SecondFactorId; +use Surfnet\Stepup\Identity\Value\SecondFactorIdentifier; use Surfnet\Stepup\Identity\Value\VettingType; +use Surfnet\StepupBundle\Value\SecondFactorType; final class Metadata { /** - * @var \Surfnet\Stepup\Identity\Value\IdentityId + * @var IdentityId */ public $identityId; /** - * @var \Surfnet\Stepup\Identity\Value\Institution + * @var Institution */ public $identityInstitution; /** - * @var \Surfnet\Stepup\Identity\Value\Institution + * @var Institution */ public $raInstitution; /** - * @var \Surfnet\Stepup\Identity\Value\SecondFactorId|null + * @var SecondFactorId|null */ public $secondFactorId; /** - * @var \Surfnet\StepupBundle\Value\SecondFactorType|null + * @var SecondFactorType|null */ public $secondFactorType; /** - * @var \Surfnet\Stepup\Identity\Value\SecondFactorIdentifier|null + * @var SecondFactorIdentifier|null */ public $secondFactorIdentifier; @@ -56,12 +63,12 @@ final class Metadata public $vettingType; /** - * @var \Surfnet\Stepup\Identity\Value\RecoveryTokenId + * @var RecoveryTokenId */ public $recoveryTokenId; /** - * @var \Surfnet\Stepup\Identity\Value\RecoveryTokenType + * @var RecoveryTokenType */ public $recoveryTokenType; } diff --git a/src/Surfnet/Stepup/Identity/Collection/InstitutionCollection.php b/src/Surfnet/Stepup/Identity/Collection/InstitutionCollection.php index 776419c76..63ec69bb5 100644 --- a/src/Surfnet/Stepup/Identity/Collection/InstitutionCollection.php +++ b/src/Surfnet/Stepup/Identity/Collection/InstitutionCollection.php @@ -27,7 +27,7 @@ final class InstitutionCollection implements IteratorAggregate, JsonSerializable, SerializableInterface { - private $elements = []; + private array $elements = []; public function __construct(array $institutions = []) { @@ -36,7 +36,7 @@ public function __construct(array $institutions = []) } } - public function contains(Institution $institution) + public function contains(Institution $institution): bool { return in_array($institution, $this->elements); } @@ -47,7 +47,7 @@ public function contains(Institution $institution) * @param Institution $institution * @throws RuntimeException when the institution already exists in this collection */ - public function add(Institution $institution) + public function add(Institution $institution): void { if (in_array($institution, $this->elements)) { throw new RuntimeException(sprintf( @@ -64,7 +64,7 @@ public function add(Institution $institution) * * @param InstitutionCollection $institutionCollection */ - public function addAllFrom(InstitutionCollection $institutionCollection) + public function addAllFrom(InstitutionCollection $institutionCollection): void { foreach ($institutionCollection as $institution) { $this->add($institution); @@ -77,7 +77,7 @@ public function addAllFrom(InstitutionCollection $institutionCollection) * @param Institution $institution * @throws RuntimeException when the institution to remove is not in this collection */ - public function remove(Institution $institution) + public function remove(Institution $institution): void { if (!in_array($institution, $this->elements)) { throw new RuntimeException(sprintf( @@ -86,7 +86,7 @@ public function remove(Institution $institution) )); } - $elements = array_filter($this->elements, function ($inst) use ($institution) { + $elements = array_filter($this->elements, function ($inst) use ($institution): bool { return !$institution->equals($inst); }); $this->elements = $elements; @@ -97,7 +97,7 @@ public function remove(Institution $institution) * * @param InstitutionCollection $institutionCollection */ - public function removeAllIn(InstitutionCollection $institutionCollection) + public function removeAllIn(InstitutionCollection $institutionCollection): void { foreach ($institutionCollection as $institution) { $this->remove($institution); @@ -111,7 +111,7 @@ public function jsonSerialize() public static function deserialize(array $data) { - $institutions = array_map(function ($institution) { + $institutions = array_map(function ($institution): Institution { return new Institution($institution); }, $data); @@ -120,7 +120,7 @@ public static function deserialize(array $data) public function serialize(): array { - return array_map(function (Institution $institution) { + return array_map(function (Institution $institution): string { return (string) $institution; }, $this->elements); } diff --git a/src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php b/src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php index b1e909684..71c571948 100644 --- a/src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php +++ b/src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php @@ -26,7 +26,7 @@ final class VettingTypeHintCollection implements JsonSerializable, SerializableInterface { - private $elements = []; + private array $elements = []; public function __construct(array $hints = []) { @@ -35,7 +35,7 @@ public function __construct(array $hints = []) } } - public function add(VettingTypeHint $hint) + public function add(VettingTypeHint $hint): void { if (in_array($hint, $this->elements)) { throw new RuntimeException(sprintf( @@ -47,7 +47,7 @@ public function add(VettingTypeHint $hint) $this->elements[] = $hint; } - public function remove(VettingTypeHint $hint) + public function remove(VettingTypeHint $hint): void { if (!in_array($hint, $this->elements)) { throw new RuntimeException(sprintf( @@ -56,7 +56,7 @@ public function remove(VettingTypeHint $hint) )); } - $elements = array_filter($this->elements, function ($inst) use ($hint) { + $elements = array_filter($this->elements, function ($inst) use ($hint): bool { return !$hint->equals($inst); }); $this->elements = $elements; @@ -69,7 +69,7 @@ public function jsonSerialize() public static function deserialize(array $data) { - $institutions = array_map(function ($hint) { + $institutions = array_map(function (array $hint): VettingTypeHint { return new VettingTypeHint($hint['locale'], $hint['hint']); }, $data); diff --git a/src/Surfnet/Stepup/Identity/Entity/ConfigurableSettings.php b/src/Surfnet/Stepup/Identity/Entity/ConfigurableSettings.php index b202434b2..12ffe813d 100644 --- a/src/Surfnet/Stepup/Identity/Entity/ConfigurableSettings.php +++ b/src/Surfnet/Stepup/Identity/Entity/ConfigurableSettings.php @@ -29,15 +29,12 @@ */ final class ConfigurableSettings { - /** - * @var TimeFrame - */ - private $emailVerificationTimeFrame; + private TimeFrame $emailVerificationTimeFrame; /** * @var Locale[] */ - private $locales; + private array $locales; /** * @param TimeFrame $timeFrame @@ -64,12 +61,12 @@ private function __construct(TimeFrame $timeFrame, array $locales) * @param string[] $locales * @return ConfigurableSettings */ - public static function create($emailVerificationTimeFrame, array $locales) + public static function create($emailVerificationTimeFrame, array $locales): self { return new self( TimeFrame::ofSeconds($emailVerificationTimeFrame), array_map( - function ($locale) { + function ($locale): Locale { return new Locale($locale); }, $locales @@ -92,11 +89,11 @@ public function createNewEmailVerificationWindow() * @param Locale $locale * @return bool */ - public function isSupportedLocale(Locale $locale) + public function isSupportedLocale(Locale $locale): bool { return array_reduce( $this->locales, - function ($supported, Locale $supportedLocale) use ($locale) { + function ($supported, Locale $supportedLocale) use ($locale): bool { return $supported || $supportedLocale->equals($locale); }, false diff --git a/src/Surfnet/Stepup/Identity/Entity/InstitutionCollection.php b/src/Surfnet/Stepup/Identity/Entity/InstitutionCollection.php index 809e0f75e..306cb8d80 100644 --- a/src/Surfnet/Stepup/Identity/Entity/InstitutionCollection.php +++ b/src/Surfnet/Stepup/Identity/Entity/InstitutionCollection.php @@ -20,7 +20,7 @@ use Surfnet\Stepup\Configuration\Value\InstitutionRole; use Surfnet\Stepup\Identity\Value\Institution; -use \Surfnet\Stepup\Identity\Collection\InstitutionCollection as Institutions; +use Surfnet\Stepup\Identity\Collection\InstitutionCollection as Institutions; final class InstitutionCollection { @@ -32,7 +32,7 @@ final class InstitutionCollection /** * @param Institution $institution */ - public function set(Institution $institution) + public function set(Institution $institution): void { $this->institutions[(string)$institution] = $institution; } @@ -40,7 +40,7 @@ public function set(Institution $institution) /** * @param Institutions $institutions */ - public function update(Institutions $institutions) + public function update(Institutions $institutions): void { foreach ($institutions as $institution) { $this->institutions[(string)$institutions] = $institution; @@ -60,7 +60,7 @@ public function get(Institution $institution) * @param Institution $institution * @return Institution */ - public function exists(Institution $institution) + public function exists(Institution $institution): bool { return array_key_exists((string)$institution, $this->institutions); } @@ -68,7 +68,7 @@ public function exists(Institution $institution) /** * @param Institution $institution */ - public function remove(Institution $institution) + public function remove(Institution $institution): void { unset($this->institutions[(string)$institution]); } @@ -76,7 +76,7 @@ public function remove(Institution $institution) /** * @return int */ - public function count() + public function count(): int { return count($this->institutions); } diff --git a/src/Surfnet/Stepup/Identity/Entity/RecoveryToken.php b/src/Surfnet/Stepup/Identity/Entity/RecoveryToken.php index c32469983..be1e47cd2 100644 --- a/src/Surfnet/Stepup/Identity/Entity/RecoveryToken.php +++ b/src/Surfnet/Stepup/Identity/Entity/RecoveryToken.php @@ -28,20 +28,11 @@ final class RecoveryToken extends SimpleEventSourcedEntity { - /** - * @var RecoveryTokenId - */ - private $tokenId; + private ?RecoveryTokenId $tokenId = null; - /** - * @var RecoveryTokenType - */ - private $type; + private ?RecoveryTokenType $type = null; - /** - * @var Identity - */ - private $identity; + private ?Identity $identity = null; public static function create( RecoveryTokenId $id, @@ -70,7 +61,7 @@ public function getType(): RecoveryTokenType return $this->type; } - public function revoke() + public function revoke(): void { $this->apply( new RecoveryTokenRevokedEvent( @@ -82,7 +73,7 @@ public function revoke() ); } - public function complyWithRevocation(IdentityId $authorityId) + public function complyWithRevocation(IdentityId $authorityId): void { $this->apply( new CompliedWithRecoveryCodeRevocationEvent( diff --git a/src/Surfnet/Stepup/Identity/Entity/RecoveryTokenCollection.php b/src/Surfnet/Stepup/Identity/Entity/RecoveryTokenCollection.php index ec5042ef8..638558ced 100644 --- a/src/Surfnet/Stepup/Identity/Entity/RecoveryTokenCollection.php +++ b/src/Surfnet/Stepup/Identity/Entity/RecoveryTokenCollection.php @@ -27,7 +27,7 @@ final class RecoveryTokenCollection /** * @var RecoveryToken[] */ - private $recoveryTokens = []; + private array $recoveryTokens = []; public function set(RecoveryToken $recoveryToken): void { @@ -42,7 +42,7 @@ public function get(RecoveryTokenId $id): RecoveryToken return $this->recoveryTokens[(string)$id]; } - public function hasType(RecoveryTokenType $type) + public function hasType(RecoveryTokenType $type): bool { foreach ($this->recoveryTokens as $token) { if ($type->equals($token->getType())) { @@ -57,7 +57,7 @@ public function count(): int return count($this->recoveryTokens); } - public function remove(RecoveryTokenId $recoveryTokenId) + public function remove(RecoveryTokenId $recoveryTokenId): void { unset($this->recoveryTokens[(string)$recoveryTokenId]); } diff --git a/src/Surfnet/Stepup/Identity/Entity/RegistrationAuthority.php b/src/Surfnet/Stepup/Identity/Entity/RegistrationAuthority.php index 3822be839..6c3139c0a 100644 --- a/src/Surfnet/Stepup/Identity/Entity/RegistrationAuthority.php +++ b/src/Surfnet/Stepup/Identity/Entity/RegistrationAuthority.php @@ -29,25 +29,13 @@ */ final class RegistrationAuthority extends SimpleEventSourcedEntity { - /** - * @var \Surfnet\Stepup\Identity\Value\RegistrationAuthorityRole - */ - private $role; + private ?RegistrationAuthorityRole $role = null; - /** - * @var \Surfnet\Stepup\Identity\Value\Location - */ - private $location; + private ?Location $location = null; - /** - * @var \Surfnet\Stepup\Identity\Value\ContactInformation - */ - private $contactInformation; + private ?ContactInformation $contactInformation = null; - /** - * @var Institution - */ - private $institution; + private ?Institution $institution = null; /** * @param RegistrationAuthorityRole $role @@ -61,7 +49,7 @@ public static function accreditWith( Location $location, ContactInformation $contactInformation, Institution $institution - ) { + ): self { $registrationAuthority = new self(); $registrationAuthority->role = $role; $registrationAuthority->location = $location; @@ -75,7 +63,7 @@ public static function accreditWith( * @param Location $location * @param ContactInformation $contactInformation */ - public function amendInformation(Location $location, ContactInformation $contactInformation) + public function amendInformation(Location $location, ContactInformation $contactInformation): void { $this->location = $location; $this->contactInformation = $contactInformation; @@ -85,7 +73,7 @@ public function amendInformation(Location $location, ContactInformation $contact * @param RegistrationAuthorityRole $role * @return void */ - public function appointAs(RegistrationAuthorityRole $role) + public function appointAs(RegistrationAuthorityRole $role): void { $this->role = $role; } diff --git a/src/Surfnet/Stepup/Identity/Entity/RegistrationAuthorityCollection.php b/src/Surfnet/Stepup/Identity/Entity/RegistrationAuthorityCollection.php index 827cdaab9..f4716c9e2 100644 --- a/src/Surfnet/Stepup/Identity/Entity/RegistrationAuthorityCollection.php +++ b/src/Surfnet/Stepup/Identity/Entity/RegistrationAuthorityCollection.php @@ -25,13 +25,13 @@ final class RegistrationAuthorityCollection /** * @var RegistrationAuthority[] */ - private $registrationAuthorities = []; + private array $registrationAuthorities = []; /** * @param Institution $institution * @param RegistrationAuthority $registrationAuthority */ - public function set(Institution $institution, RegistrationAuthority $registrationAuthority) + public function set(Institution $institution, RegistrationAuthority $registrationAuthority): void { $this->registrationAuthorities[(string)$institution] = $registrationAuthority; } @@ -49,7 +49,7 @@ public function get(Institution $institution) * @param Institution $institution * @return RegistrationAuthority */ - public function exists(Institution $institution) + public function exists(Institution $institution): bool { return array_key_exists((string)$institution, $this->registrationAuthorities); } @@ -57,7 +57,7 @@ public function exists(Institution $institution) /** * @param Institution $institution */ - public function remove(Institution $institution) + public function remove(Institution $institution): void { unset($this->registrationAuthorities[(string)$institution]); } @@ -65,7 +65,7 @@ public function remove(Institution $institution) /** * @return int */ - public function count() + public function count(): int { return count($this->registrationAuthorities); } @@ -73,7 +73,7 @@ public function count() /** * RegistrationAuthority[] */ - public function getValues() + public function getValues(): array { return array_values($this->registrationAuthorities); } diff --git a/src/Surfnet/Stepup/Identity/Entity/SecondFactorCollection.php b/src/Surfnet/Stepup/Identity/Entity/SecondFactorCollection.php index 1a655017d..0b47b51e0 100644 --- a/src/Surfnet/Stepup/Identity/Entity/SecondFactorCollection.php +++ b/src/Surfnet/Stepup/Identity/Entity/SecondFactorCollection.php @@ -31,7 +31,7 @@ public function getSecondFactorWithHighestLoa(SecondFactorTypeService $service) { return array_reduce( $this->toArray(), - function (SecondFactor $carry, SecondFactor $item) use ($service) { + function (SecondFactor $carry, SecondFactor $item) use ($service): SecondFactor { return $service->hasEqualOrHigherLoaComparedTo($carry->getType(), $item->getType()) ? $carry : $item; }, $this->first() ?: null diff --git a/src/Surfnet/Stepup/Identity/Entity/UnverifiedSecondFactor.php b/src/Surfnet/Stepup/Identity/Entity/UnverifiedSecondFactor.php index 94b7dc5e2..2266b80d3 100644 --- a/src/Surfnet/Stepup/Identity/Entity/UnverifiedSecondFactor.php +++ b/src/Surfnet/Stepup/Identity/Entity/UnverifiedSecondFactor.php @@ -40,35 +40,20 @@ */ class UnverifiedSecondFactor extends AbstractSecondFactor { - /** - * @var \Surfnet\Stepup\Identity\Api\Identity - */ - private $identity; + private ?Identity $identity = null; - /** - * @var \Surfnet\Stepup\Identity\Value\SecondFactorId - */ - private $id; + private ?SecondFactorId $id = null; - /** - * @var \Surfnet\StepupBundle\Value\SecondFactorType - */ - private $type; + private ?SecondFactorType $type = null; /** - * @var \Surfnet\Stepup\Identity\Value\SecondFactorIdentifier + * @var SecondFactorIdentifier */ private $secondFactorIdentifier; - /** - * @var \Surfnet\Stepup\Identity\Value\EmailVerificationWindow - */ - private $verificationWindow; + private ?EmailVerificationWindow $verificationWindow = null; - /** - * @var string - */ - private $verificationNonce; + private ?string $verificationNonce = null; /** * @param SecondFactorId $id @@ -86,7 +71,7 @@ public static function create( $secondFactorIdentifier, EmailVerificationWindow $emailVerificationWindow, $verificationNonce - ) { + ): self { if (!is_string($verificationNonce)) { throw InvalidArgumentException::invalidType('string', 'verificationNonce', $verificationNonce); } @@ -122,7 +107,7 @@ public function getId() * @param string $verificationNonce * @return bool */ - public function hasNonce($verificationNonce) + public function hasNonce($verificationNonce): bool { return $this->verificationNonce === $verificationNonce; } @@ -135,7 +120,7 @@ public function canBeVerifiedNow() return $this->verificationWindow->isOpen(); } - public function verifyEmail() + public function verifyEmail(): void { $this->apply( new EmailVerifiedEvent( @@ -153,7 +138,7 @@ public function verifyEmail() ); } - public function revoke() + public function revoke(): void { $this->apply( new UnverifiedSecondFactorRevokedEvent( @@ -166,7 +151,7 @@ public function revoke() ); } - public function complyWithRevocation(IdentityId $authorityId) + public function complyWithRevocation(IdentityId $authorityId): void { $this->apply( new CompliedWithUnverifiedSecondFactorRevocationEvent( @@ -185,7 +170,7 @@ public function complyWithRevocation(IdentityId $authorityId) * @param string $registrationCode * @return VerifiedSecondFactor */ - public function asVerified($registrationRequestedAt, $registrationCode) + public function asVerified(DateTime $registrationRequestedAt, $registrationCode) { return VerifiedSecondFactor::create( $this->id, diff --git a/src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php b/src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php index 138b6c719..e48acd154 100644 --- a/src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php +++ b/src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php @@ -44,35 +44,20 @@ */ class VerifiedSecondFactor extends AbstractSecondFactor { - /** - * @var \Surfnet\Stepup\Identity\Value\SecondFactorId - */ - private $id; + private ?SecondFactorId $id = null; - /** - * @var \Surfnet\Stepup\Identity\Api\Identity - */ - private $identity; + private ?Identity $identity = null; - /** - * @var \Surfnet\StepupBundle\Value\SecondFactorType - */ - private $type; + private ?SecondFactorType $type = null; /** - * @var \Surfnet\Stepup\Identity\Value\SecondFactorIdentifier + * @var SecondFactorIdentifier */ private $secondFactorIdentifier; - /** - * @var \Surfnet\Stepup\DateTime\DateTime - */ - private $registrationRequestedAt; + private ?DateTime $registrationRequestedAt = null; - /** - * @var string - */ - private $registrationCode; + private ?string $registrationCode = null; /** * @param SecondFactorId $id @@ -90,7 +75,7 @@ public static function create( SecondFactorIdentifier $secondFactorIdentifier, DateTime $registrationRequestedAt, $registrationCode - ) { + ): self { if (!is_string($registrationCode)) { throw InvalidArgumentException::invalidType('string', 'registrationCode', $registrationCode); } @@ -123,7 +108,7 @@ public function getId() * @param SecondFactorIdentifier $secondFactorIdentifier * @return bool */ - public function hasRegistrationCodeAndIdentifier($registrationCode, SecondFactorIdentifier $secondFactorIdentifier) + public function hasRegistrationCodeAndIdentifier($registrationCode, SecondFactorIdentifier $secondFactorIdentifier): bool { return strcasecmp($registrationCode, $this->registrationCode) === 0 && $secondFactorIdentifier->equals($this->secondFactorIdentifier); @@ -132,7 +117,7 @@ public function hasRegistrationCodeAndIdentifier($registrationCode, SecondFactor /** * @return bool */ - public function canBeVettedNow() + public function canBeVettedNow(): bool { return !DateTime::now()->comesAfter( $this->registrationRequestedAt @@ -141,7 +126,7 @@ public function canBeVettedNow() ); } - public function vet($provePossessionSkipped, VettingType $type) + public function vet($provePossessionSkipped, VettingType $type): void { if ($provePossessionSkipped) { $this->apply( @@ -177,7 +162,7 @@ public function vet($provePossessionSkipped, VettingType $type) ); } - public function revoke() + public function revoke(): void { $this->apply( new VerifiedSecondFactorRevokedEvent( @@ -190,7 +175,7 @@ public function revoke() ); } - public function complyWithRevocation(IdentityId $authorityId) + public function complyWithRevocation(IdentityId $authorityId): void { $this->apply( new CompliedWithVerifiedSecondFactorRevocationEvent( diff --git a/src/Surfnet/Stepup/Identity/Entity/VettedSecondFactor.php b/src/Surfnet/Stepup/Identity/Entity/VettedSecondFactor.php index a330d0818..d230b53ad 100644 --- a/src/Surfnet/Stepup/Identity/Entity/VettedSecondFactor.php +++ b/src/Surfnet/Stepup/Identity/Entity/VettedSecondFactor.php @@ -35,30 +35,18 @@ */ class VettedSecondFactor extends AbstractSecondFactor { - /** - * @var \Surfnet\Stepup\Identity\Api\Identity - */ - private $identity; + private ?Identity $identity = null; - /** - * @var \Surfnet\Stepup\Identity\Value\SecondFactorId - */ - private $id; + private ?SecondFactorId $id = null; - /** - * @var \Surfnet\StepupBundle\Value\SecondFactorType - */ - private $type; + private ?SecondFactorType $type = null; /** - * @var \Surfnet\Stepup\Identity\Value\SecondFactorIdentifier + * @var SecondFactorIdentifier */ private $secondFactorIdentifier; - /** - * @var VettingType - */ - private $vettingType; + private ?VettingType $vettingType = null; /** * @return VettedSecondFactor @@ -69,7 +57,7 @@ public static function create( SecondFactorType $type, SecondFactorIdentifier $secondFactorIdentifier, VettingType $vettingType - ) { + ): self { $secondFactor = new self(); $secondFactor->id = $id; $secondFactor->identity = $identity; @@ -92,7 +80,7 @@ public function getId() return $this->id; } - public function revoke() + public function revoke(): void { $this->apply( new VettedSecondFactorRevokedEvent( @@ -105,7 +93,7 @@ public function revoke() ); } - public function complyWithRevocation(IdentityId $authorityId) + public function complyWithRevocation(IdentityId $authorityId): void { $this->apply( new CompliedWithVettedSecondFactorRevocationEvent( diff --git a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php index 17cbab8f7..413353219 100644 --- a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php @@ -29,7 +29,7 @@ */ class AppointedAsRaEvent extends IdentityEvent implements RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'institution', 'name_id', @@ -50,7 +50,7 @@ public function __construct( $this->nameId = $nameId; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; diff --git a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php index 31bbd7072..35712286e 100644 --- a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php @@ -26,7 +26,7 @@ class AppointedAsRaForInstitutionEvent extends IdentityEvent implements RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'institution', 'name_id', @@ -55,7 +55,7 @@ public function __construct( $this->raInstitution = $raInstitution; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; diff --git a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php index 7e056b78b..62366938f 100644 --- a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php @@ -29,7 +29,7 @@ */ class AppointedAsRaaEvent extends IdentityEvent implements RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'institution', 'name_id', @@ -50,7 +50,7 @@ public function __construct( $this->nameId = $nameId; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; diff --git a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaForInstitutionEvent.php index 354900d03..cbd52cc26 100644 --- a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaForInstitutionEvent.php @@ -26,7 +26,7 @@ class AppointedAsRaaForInstitutionEvent extends IdentityEvent implements RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'institution', 'name_id', @@ -55,7 +55,7 @@ public function __construct( $this->raInstitution = $raInstitution; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; diff --git a/src/Surfnet/Stepup/Identity/Event/AuditableEvent.php b/src/Surfnet/Stepup/Identity/Event/AuditableEvent.php index 55244e611..5c6937309 100644 --- a/src/Surfnet/Stepup/Identity/Event/AuditableEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/AuditableEvent.php @@ -18,10 +18,12 @@ namespace Surfnet\Stepup\Identity\Event; +use Surfnet\Stepup\Identity\AuditLog\Metadata; + interface AuditableEvent { /** - * @return \Surfnet\Stepup\Identity\AuditLog\Metadata + * @return Metadata */ public function getAuditLogMetadata(); } diff --git a/src/Surfnet/Stepup/Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php b/src/Surfnet/Stepup/Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php index 9ea8022ef..6b8aef11a 100644 --- a/src/Surfnet/Stepup/Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php @@ -39,7 +39,7 @@ class CompliedWithRecoveryCodeRevocationEvent extends IdentityEvent implements R * @var RecoveryTokenType */ public $recoveryTokenType; - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'identity_institution', 'recovery_token_type', @@ -73,7 +73,7 @@ final public static function deserialize(array $data) ); } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; diff --git a/src/Surfnet/Stepup/Identity/Event/CompliedWithRevocationEvent.php b/src/Surfnet/Stepup/Identity/Event/CompliedWithRevocationEvent.php index 28f2c4d9f..299f1238b 100644 --- a/src/Surfnet/Stepup/Identity/Event/CompliedWithRevocationEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/CompliedWithRevocationEvent.php @@ -31,7 +31,7 @@ abstract class CompliedWithRevocationEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'identity_institution', 'second_factor_identifier', @@ -40,22 +40,22 @@ abstract class CompliedWithRevocationEvent extends IdentityEvent implements Forg ]; /** - * @var \Surfnet\Stepup\Identity\Value\IdentityId + * @var IdentityId */ public $authorityId; /** - * @var \Surfnet\Stepup\Identity\Value\SecondFactorId + * @var SecondFactorId */ public $secondFactorId; /** - * @var \Surfnet\StepupBundle\Value\SecondFactorType + * @var SecondFactorType */ public $secondFactorType; /** - * @var \Surfnet\Stepup\Identity\Value\SecondFactorIdentifier + * @var SecondFactorIdentifier */ public $secondFactorIdentifier; @@ -75,7 +75,7 @@ final public function __construct( $this->secondFactorIdentifier = $secondFactorIdentifier; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; @@ -121,7 +121,7 @@ public function getSensitiveData() ->withSecondFactorIdentifier($this->secondFactorIdentifier, $this->secondFactorType); } - public function setSensitiveData(SensitiveData $sensitiveData) + public function setSensitiveData(SensitiveData $sensitiveData): void { $this->secondFactorIdentifier = $sensitiveData->getSecondFactorIdentifier(); } diff --git a/src/Surfnet/Stepup/Identity/Event/EmailVerifiedEvent.php b/src/Surfnet/Stepup/Identity/Event/EmailVerifiedEvent.php index 40f738ef3..9206ce210 100644 --- a/src/Surfnet/Stepup/Identity/Event/EmailVerifiedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/EmailVerifiedEvent.php @@ -35,7 +35,7 @@ class EmailVerifiedEvent extends IdentityEvent implements Forgettable, PossessionProvenAndVerified, RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'identity_institution', 'second_factor_id', @@ -48,22 +48,22 @@ class EmailVerifiedEvent extends IdentityEvent implements Forgettable, Possessio ]; /** - * @var \Surfnet\Stepup\Identity\Value\SecondFactorId + * @var SecondFactorId */ public $secondFactorId; /** - * @var \Surfnet\StepupBundle\Value\SecondFactorType + * @var SecondFactorType */ public $secondFactorType; /** - * @var \Surfnet\Stepup\Identity\Value\SecondFactorIdentifier + * @var SecondFactorIdentifier */ private $secondFactorIdentifier; /** - * @var \Surfnet\Stepup\DateTime\DateTime + * @var DateTime */ public $registrationRequestedAt; @@ -73,17 +73,17 @@ class EmailVerifiedEvent extends IdentityEvent implements Forgettable, Possessio public $registrationCode; /** - * @var \Surfnet\Stepup\Identity\Value\CommonName + * @var CommonName */ public $commonName; /** - * @var \Surfnet\Stepup\Identity\Value\Email + * @var Email */ public $email; /** - * @var \Surfnet\Stepup\Identity\Value\Locale Eg. "en_GB" + * @var Locale Eg. "en_GB" */ public $preferredLocale; @@ -125,7 +125,7 @@ public function __construct( $this->preferredLocale = $preferredLocale; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; @@ -179,7 +179,7 @@ public function getSensitiveData() ->withSecondFactorIdentifier($this->secondFactorIdentifier, $this->secondFactorType); } - public function setSensitiveData(SensitiveData $sensitiveData) + public function setSensitiveData(SensitiveData $sensitiveData): void { $this->email = $sensitiveData->getEmail(); $this->commonName = $sensitiveData->getCommonName(); diff --git a/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenAndVerifiedEvent.php b/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenAndVerifiedEvent.php index 2e1d9dd63..e32a41797 100644 --- a/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenAndVerifiedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenAndVerifiedEvent.php @@ -35,7 +35,7 @@ class GssfPossessionProvenAndVerifiedEvent extends IdentityEvent implements Forgettable, PossessionProvenAndVerified, RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'identity_institution', 'stepup_provider', @@ -48,37 +48,37 @@ class GssfPossessionProvenAndVerifiedEvent extends IdentityEvent implements Forg ]; /** - * @var \Surfnet\Stepup\Identity\Value\SecondFactorId + * @var SecondFactorId */ public $secondFactorId; /** - * @var \Surfnet\Stepup\Identity\Value\StepupProvider + * @var StepupProvider */ public $stepupProvider; /** - * @var \Surfnet\Stepup\Identity\Value\GssfId + * @var GssfId */ public $gssfId; /** - * @var \Surfnet\Stepup\Identity\Value\CommonName + * @var CommonName */ public $commonName; /** - * @var \Surfnet\Stepup\Identity\Value\Email + * @var Email */ public $email; /** - * @var \Surfnet\Stepup\Identity\Value\Locale Eg. "en_GB" + * @var Locale Eg. "en_GB" */ public $preferredLocale; /** - * @var \Surfnet\Stepup\DateTime\DateTime + * @var DateTime */ public $registrationRequestedAt; @@ -125,7 +125,7 @@ public function __construct( $this->registrationCode = $registrationCode; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; @@ -182,7 +182,7 @@ public function getSensitiveData() ->withSecondFactorIdentifier($this->gssfId, new SecondFactorType((string) $this->stepupProvider)); } - public function setSensitiveData(SensitiveData $sensitiveData) + public function setSensitiveData(SensitiveData $sensitiveData): void { $this->gssfId = $sensitiveData->getSecondFactorIdentifier(); $this->email = $sensitiveData->getEmail(); diff --git a/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenEvent.php b/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenEvent.php index 68c0c10ad..87c8381e0 100644 --- a/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenEvent.php @@ -35,7 +35,7 @@ class GssfPossessionProvenEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'identity_institution', 'second_factor_id', @@ -47,17 +47,17 @@ class GssfPossessionProvenEvent extends IdentityEvent implements Forgettable, Ri ]; /** - * @var \Surfnet\Stepup\Identity\Value\SecondFactorId + * @var SecondFactorId */ public $secondFactorId; /** - * @var \Surfnet\Stepup\Identity\Value\StepupProvider + * @var StepupProvider */ public $stepupProvider; /** - * @var \Surfnet\Stepup\Identity\Value\GssfId + * @var GssfId */ public $gssfId; @@ -67,7 +67,7 @@ class GssfPossessionProvenEvent extends IdentityEvent implements Forgettable, Ri public $emailVerificationRequired; /** - * @var \Surfnet\Stepup\Identity\Value\EmailVerificationWindow + * @var EmailVerificationWindow */ public $emailVerificationWindow; @@ -77,17 +77,17 @@ class GssfPossessionProvenEvent extends IdentityEvent implements Forgettable, Ri public $emailVerificationNonce; /** - * @var \Surfnet\Stepup\Identity\Value\CommonName + * @var CommonName */ public $commonName; /** - * @var \Surfnet\Stepup\Identity\Value\Email + * @var Email */ public $email; /** - * @var \Surfnet\Stepup\Identity\Value\Locale Eg. "en_GB" + * @var Locale Eg. "en_GB" */ public $preferredLocale; @@ -132,7 +132,7 @@ public function __construct( $this->preferredLocale = $preferredLocale; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; @@ -190,7 +190,7 @@ public function getSensitiveData() ->withSecondFactorIdentifier($this->gssfId, new SecondFactorType((string) $this->stepupProvider)); } - public function setSensitiveData(SensitiveData $sensitiveData) + public function setSensitiveData(SensitiveData $sensitiveData): void { $this->email = $sensitiveData->getEmail(); $this->commonName = $sensitiveData->getCommonName(); diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php index 44faf26c0..b044e53e8 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php @@ -32,7 +32,7 @@ */ class IdentityAccreditedAsRaEvent extends IdentityEvent implements RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'name_id', 'institution', @@ -85,7 +85,7 @@ public function __construct( $this->contactInformation = $contactInformation; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaForInstitutionEvent.php index 5cbf6e000..682162678 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaForInstitutionEvent.php @@ -29,7 +29,7 @@ class IdentityAccreditedAsRaForInstitutionEvent extends IdentityEvent implements RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'name_id', 'institution', @@ -91,7 +91,7 @@ public function __construct( $this->raInstitution = $raInstitution; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php index d4b871112..9789f2ad8 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php @@ -32,7 +32,7 @@ */ class IdentityAccreditedAsRaaEvent extends IdentityEvent implements RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'name_id', 'institution', @@ -85,7 +85,7 @@ public function __construct( $this->contactInformation = $contactInformation; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaForInstitutionEvent.php index 62b48fa0e..3ba2e3007 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaForInstitutionEvent.php @@ -29,7 +29,7 @@ class IdentityAccreditedAsRaaForInstitutionEvent extends IdentityEvent implements RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'name_id', 'institution', @@ -90,7 +90,7 @@ public function __construct( $this->raInstitution = $raInstitution; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php index 466c5e0e5..b30cd1a75 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php @@ -18,7 +18,6 @@ namespace Surfnet\Stepup\Identity\Event; -use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\RightToObtainDataInterface; use Surfnet\Stepup\Identity\AuditLog\Metadata; use Surfnet\Stepup\Identity\Value\CommonName; use Surfnet\Stepup\Identity\Value\Email; @@ -27,11 +26,12 @@ use Surfnet\Stepup\Identity\Value\Locale; use Surfnet\Stepup\Identity\Value\NameId; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Forgettable; +use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\RightToObtainDataInterface; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\SensitiveData; class IdentityCreatedEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'id', 'institution', 'name_id', @@ -46,17 +46,17 @@ class IdentityCreatedEvent extends IdentityEvent implements Forgettable, RightTo public $nameId; /** - * @var \Surfnet\Stepup\Identity\Value\CommonName + * @var CommonName */ public $commonName; /** - * @var \Surfnet\Stepup\Identity\Value\Email + * @var Email */ public $email; /** - * @var \Surfnet\Stepup\Identity\Value\Locale + * @var Locale */ public $preferredLocale; @@ -76,7 +76,7 @@ public function __construct( $this->preferredLocale = $preferredLocale; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; @@ -117,7 +117,7 @@ public function getSensitiveData() ->withEmail($this->email); } - public function setSensitiveData(SensitiveData $sensitiveData) + public function setSensitiveData(SensitiveData $sensitiveData): void { $this->email = $sensitiveData->getEmail(); $this->commonName = $sensitiveData->getCommonName(); diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityEmailChangedEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityEmailChangedEvent.php index db4fb0461..e5c2dded4 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityEmailChangedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityEmailChangedEvent.php @@ -28,7 +28,7 @@ class IdentityEmailChangedEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'id', 'identity_institution', 'email' @@ -46,7 +46,7 @@ public function __construct(IdentityId $identityId, Institution $institution, Em $this->email = $email; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; @@ -85,7 +85,7 @@ public function getSensitiveData() ->withEmail($this->email); } - public function setSensitiveData(SensitiveData $sensitiveData) + public function setSensitiveData(SensitiveData $sensitiveData): void { $this->email = $sensitiveData->getEmail(); } diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityForgottenEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityForgottenEvent.php index 3679d94ba..a23fc129b 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityForgottenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityForgottenEvent.php @@ -25,7 +25,7 @@ class IdentityForgottenEvent extends IdentityEvent implements RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'institution', ]; @@ -33,7 +33,7 @@ class IdentityForgottenEvent extends IdentityEvent implements RightToObtainDataI /** * @return Metadata */ - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityRenamedEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityRenamedEvent.php index d3cd89570..68ea729e7 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityRenamedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityRenamedEvent.php @@ -28,7 +28,7 @@ class IdentityRenamedEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'id', 'institution', 'common_name', @@ -46,7 +46,7 @@ public function __construct(IdentityId $id, Institution $institution, CommonName $this->commonName = $commonName; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; @@ -85,7 +85,7 @@ public function getSensitiveData() ->withCommonName($this->commonName); } - public function setSensitiveData(SensitiveData $sensitiveData) + public function setSensitiveData(SensitiveData $sensitiveData): void { $this->commonName = $sensitiveData->getCommonName(); } diff --git a/src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php b/src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php index 98949eb88..721518127 100644 --- a/src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php @@ -26,7 +26,7 @@ class LocalePreferenceExpressedEvent extends IdentityEvent implements RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'id', 'institution', 'preferred_locale', @@ -49,7 +49,7 @@ public function __construct(IdentityId $id, Institution $institution, Locale $pr $this->preferredLocale = $preferredLocale; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; diff --git a/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenAndVerifiedEvent.php b/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenAndVerifiedEvent.php index 3b76fe500..c1cd78d45 100644 --- a/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenAndVerifiedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenAndVerifiedEvent.php @@ -34,7 +34,7 @@ class PhonePossessionProvenAndVerifiedEvent extends IdentityEvent implements Forgettable, PossessionProvenAndVerified, RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'identity_institution', 'second_factor_id', @@ -47,32 +47,32 @@ class PhonePossessionProvenAndVerifiedEvent extends IdentityEvent implements For ]; /** - * @var \Surfnet\Stepup\Identity\Value\SecondFactorId + * @var SecondFactorId */ public $secondFactorId; /** - * @var \Surfnet\Stepup\Identity\Value\PhoneNumber + * @var PhoneNumber */ public $phoneNumber; /** - * @var \Surfnet\Stepup\Identity\Value\CommonName + * @var CommonName */ public $commonName; /** - * @var \Surfnet\Stepup\Identity\Value\Email + * @var Email */ public $email; /** - * @var \Surfnet\Stepup\Identity\Value\Locale Eg. "en_GB" + * @var Locale Eg. "en_GB" */ public $preferredLocale; /** - * @var \Surfnet\Stepup\DateTime\DateTime + * @var DateTime */ public $registrationRequestedAt; @@ -114,7 +114,7 @@ public function __construct( $this->registrationCode = $registrationCode; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; @@ -169,7 +169,7 @@ public function getSensitiveData() ->withSecondFactorIdentifier($this->phoneNumber, new SecondFactorType('sms')); } - public function setSensitiveData(SensitiveData $sensitiveData) + public function setSensitiveData(SensitiveData $sensitiveData): void { $this->phoneNumber = $sensitiveData->getSecondFactorIdentifier(); $this->email = $sensitiveData->getEmail(); diff --git a/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenEvent.php b/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenEvent.php index 661f470ca..6317f6aa5 100644 --- a/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenEvent.php @@ -18,7 +18,6 @@ namespace Surfnet\Stepup\Identity\Event; -use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\RightToObtainDataInterface; use Surfnet\Stepup\Identity\AuditLog\Metadata; use Surfnet\Stepup\Identity\Value\CommonName; use Surfnet\Stepup\Identity\Value\Email; @@ -30,11 +29,12 @@ use Surfnet\Stepup\Identity\Value\SecondFactorId; use Surfnet\StepupBundle\Value\SecondFactorType; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Forgettable; +use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\RightToObtainDataInterface; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\SensitiveData; class PhonePossessionProvenEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'identity_institution', 'second_factor_id', @@ -46,12 +46,12 @@ class PhonePossessionProvenEvent extends IdentityEvent implements Forgettable, R ]; /** - * @var \Surfnet\Stepup\Identity\Value\SecondFactorId + * @var SecondFactorId */ public $secondFactorId; /** - * @var \Surfnet\Stepup\Identity\Value\PhoneNumber + * @var PhoneNumber */ public $phoneNumber; @@ -61,7 +61,7 @@ class PhonePossessionProvenEvent extends IdentityEvent implements Forgettable, R public $emailVerificationRequired; /** - * @var \Surfnet\Stepup\Identity\Value\EmailVerificationWindow + * @var EmailVerificationWindow */ public $emailVerificationWindow; @@ -71,17 +71,17 @@ class PhonePossessionProvenEvent extends IdentityEvent implements Forgettable, R public $emailVerificationNonce; /** - * @var \Surfnet\Stepup\Identity\Value\CommonName + * @var CommonName */ public $commonName; /** - * @var \Surfnet\Stepup\Identity\Value\Email + * @var Email */ public $email; /** - * @var \Surfnet\Stepup\Identity\Value\Locale Eg. "en_GB" + * @var Locale Eg. "en_GB" */ public $preferredLocale; @@ -123,7 +123,7 @@ public function __construct( $this->preferredLocale = $preferredLocale; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; @@ -179,7 +179,7 @@ public function getSensitiveData() ->withSecondFactorIdentifier($this->phoneNumber, new SecondFactorType('sms')); } - public function setSensitiveData(SensitiveData $sensitiveData) + public function setSensitiveData(SensitiveData $sensitiveData): void { $this->email = $sensitiveData->getEmail(); $this->commonName = $sensitiveData->getCommonName(); diff --git a/src/Surfnet/Stepup/Identity/Event/PhoneRecoveryTokenPossessionProvenEvent.php b/src/Surfnet/Stepup/Identity/Event/PhoneRecoveryTokenPossessionProvenEvent.php index 2982ec450..4951f2be0 100644 --- a/src/Surfnet/Stepup/Identity/Event/PhoneRecoveryTokenPossessionProvenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/PhoneRecoveryTokenPossessionProvenEvent.php @@ -18,9 +18,6 @@ namespace Surfnet\Stepup\Identity\Event; -use Surfnet\Stepup\Identity\Value\RecoveryTokenId; -use Surfnet\Stepup\Identity\Value\RecoveryTokenType; -use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\RightToObtainDataInterface; use Surfnet\Stepup\Identity\AuditLog\Metadata; use Surfnet\Stepup\Identity\Value\CommonName; use Surfnet\Stepup\Identity\Value\Email; @@ -28,7 +25,10 @@ use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\Stepup\Identity\Value\Locale; use Surfnet\Stepup\Identity\Value\PhoneNumber; +use Surfnet\Stepup\Identity\Value\RecoveryTokenId; +use Surfnet\Stepup\Identity\Value\RecoveryTokenType; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Forgettable; +use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\RightToObtainDataInterface; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\SensitiveData; /** @@ -39,7 +39,7 @@ */ class PhoneRecoveryTokenPossessionProvenEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'identity_institution', 'recovery_token_id', @@ -49,27 +49,27 @@ class PhoneRecoveryTokenPossessionProvenEvent extends IdentityEvent implements F ]; /** - * @var \Surfnet\Stepup\Identity\Value\RecoveryTokenId + * @var RecoveryTokenId */ public $recoveryTokenId; /** - * @var \Surfnet\Stepup\Identity\Value\PhoneNumber + * @var PhoneNumber */ public $phoneNumber; /** - * @var \Surfnet\Stepup\Identity\Value\CommonName + * @var CommonName */ public $commonName; /** - * @var \Surfnet\Stepup\Identity\Value\Email + * @var Email */ public $email; /** - * @var \Surfnet\Stepup\Identity\Value\Locale Eg. "en_GB" + * @var Locale Eg. "en_GB" */ public $preferredLocale; @@ -91,7 +91,7 @@ public function __construct( $this->preferredLocale = $preferredLocale; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; @@ -128,7 +128,7 @@ public function serialize(): array ]; } - public function getSensitiveData() + public function getSensitiveData(): SensitiveData { return (new SensitiveData) ->withCommonName($this->commonName) @@ -136,7 +136,7 @@ public function getSensitiveData() ->withRecoveryTokenSecret($this->phoneNumber, RecoveryTokenType::sms()); } - public function setSensitiveData(SensitiveData $sensitiveData) + public function setSensitiveData(SensitiveData $sensitiveData): void { $this->email = $sensitiveData->getEmail(); $this->commonName = $sensitiveData->getCommonName(); diff --git a/src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php b/src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php index c8f8363ba..9c6120926 100644 --- a/src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php @@ -36,7 +36,7 @@ class RecoveryTokenRevokedEvent extends IdentityEvent implements RightToObtainDa */ public $recoveryTokenType; - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'identity_institution', 'recovery_token_id', @@ -66,7 +66,7 @@ final public static function deserialize(array $data) ); } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; diff --git a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedEvent.php b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedEvent.php index b34308238..b139368a0 100644 --- a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedEvent.php @@ -31,7 +31,7 @@ */ class RegistrationAuthorityInformationAmendedEvent extends IdentityEvent implements RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'name_id', 'institution', @@ -75,7 +75,7 @@ public function __construct( $this->contactInformation = $contactInformation; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; diff --git a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedForInstitutionEvent.php index 6a53fcbf2..f1ce11f47 100644 --- a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedForInstitutionEvent.php @@ -28,7 +28,7 @@ class RegistrationAuthorityInformationAmendedForInstitutionEvent extends IdentityEvent implements RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'institution', 'name_id', @@ -81,7 +81,7 @@ public function __construct( $this->raInstitution = $raInstitution; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; diff --git a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedEvent.php b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedEvent.php index f7616decd..deed3bbcb 100644 --- a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedEvent.php @@ -33,7 +33,7 @@ */ class RegistrationAuthorityRetractedEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'identity_institution', 'name_id', @@ -70,7 +70,7 @@ public function __construct( $this->email = $email; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; @@ -106,7 +106,7 @@ public function getSensitiveData() ->withEmail($this->email); } - public function setSensitiveData(SensitiveData $sensitiveData) + public function setSensitiveData(SensitiveData $sensitiveData): void { $this->email = $sensitiveData->getEmail(); $this->commonName = $sensitiveData->getCommonName(); diff --git a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedForInstitutionEvent.php index 500fa8355..beb58b8b4 100644 --- a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedForInstitutionEvent.php @@ -30,7 +30,7 @@ class RegistrationAuthorityRetractedForInstitutionEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'identity_institution', 'name_id', @@ -75,7 +75,7 @@ public function __construct( $this->raInstitution = $raInstitution; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; @@ -116,7 +116,7 @@ public function getSensitiveData() ->withEmail($this->email); } - public function setSensitiveData(SensitiveData $sensitiveData) + public function setSensitiveData(SensitiveData $sensitiveData): void { $this->email = $sensitiveData->getEmail(); $this->commonName = $sensitiveData->getCommonName(); diff --git a/src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php b/src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php index a2a4d618c..ab89dfa73 100644 --- a/src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php @@ -41,7 +41,7 @@ */ class SafeStoreSecretRecoveryTokenPossessionPromisedEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'identity_institution', 'recovery_token_id', @@ -51,27 +51,27 @@ class SafeStoreSecretRecoveryTokenPossessionPromisedEvent extends IdentityEvent ]; /** - * @var \Surfnet\Stepup\Identity\Value\RecoveryTokenId + * @var RecoveryTokenId */ public $recoveryTokenId; /** - * @var \Surfnet\Stepup\Identity\Value\HashableSecret + * @var HashableSecret */ public $secret; /** - * @var \Surfnet\Stepup\Identity\Value\CommonName + * @var CommonName */ public $commonName; /** - * @var \Surfnet\Stepup\Identity\Value\Email + * @var Email */ public $email; /** - * @var \Surfnet\Stepup\Identity\Value\Locale Eg. "en_GB" + * @var Locale Eg. "en_GB" */ public $preferredLocale; @@ -93,7 +93,7 @@ public function __construct( $this->preferredLocale = $preferredLocale; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; @@ -131,7 +131,7 @@ public function serialize(): array ]; } - public function getSensitiveData() + public function getSensitiveData(): SensitiveData { return (new SensitiveData) ->withCommonName($this->commonName) @@ -139,7 +139,7 @@ public function getSensitiveData() ->withRecoveryTokenSecret($this->secret, RecoveryTokenType::safeStore()); } - public function setSensitiveData(SensitiveData $sensitiveData) + public function setSensitiveData(SensitiveData $sensitiveData): void { $this->email = $sensitiveData->getEmail(); $this->commonName = $sensitiveData->getCommonName(); diff --git a/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php b/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php index 28369e8b1..267fed113 100644 --- a/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php @@ -42,7 +42,7 @@ */ class SecondFactorMigratedEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'source_institution', 'target_name_id', @@ -56,47 +56,44 @@ class SecondFactorMigratedEvent extends IdentityEvent implements Forgettable, Ri 'email', ]; - /** - * @var Institution - */ - private $sourceInstitution; + private Institution $sourceInstitution; /** - * @var \Surfnet\Stepup\Identity\Value\NameId + * @var NameId */ public $targetNameId; /** - * @var \Surfnet\Stepup\Identity\Value\SecondFactorId + * @var SecondFactorId */ public $secondFactorId; /** - * @var \Surfnet\Stepup\Identity\Value\SecondFactorId + * @var SecondFactorId */ public $newSecondFactorId; /** - * @var \Surfnet\StepupBundle\Value\SecondFactorType + * @var SecondFactorType */ public $secondFactorType; /** - * @var \Surfnet\Stepup\Identity\Value\SecondFactorIdentifier + * @var SecondFactorIdentifier */ public $secondFactorIdentifier; /** - * @var \Surfnet\Stepup\Identity\Value\CommonName + * @var CommonName */ public $commonName; /** - * @var \Surfnet\Stepup\Identity\Value\Email + * @var Email */ public $email; /** - * @var \Surfnet\Stepup\Identity\Value\Locale + * @var Locale */ public $preferredLocale; /** @@ -135,7 +132,7 @@ public function __construct( $this->preferredLocale = $preferredLocale; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; @@ -200,7 +197,7 @@ public function getSensitiveData() ->withSecondFactorIdentifier($this->secondFactorIdentifier, $this->secondFactorType); } - public function setSensitiveData(SensitiveData $sensitiveData) + public function setSensitiveData(SensitiveData $sensitiveData): void { $this->secondFactorIdentifier = $sensitiveData->getSecondFactorIdentifier(); $this->commonName = $sensitiveData->getCommonName(); diff --git a/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedToEvent.php b/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedToEvent.php index 78300d06d..7f241e3f9 100644 --- a/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedToEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedToEvent.php @@ -34,7 +34,7 @@ */ class SecondFactorMigratedToEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'identity_institution', 'second_factor_id', @@ -45,27 +45,27 @@ class SecondFactorMigratedToEvent extends IdentityEvent implements Forgettable, ]; /** - * @var \Surfnet\Stepup\Identity\Value\Institution + * @var Institution */ public $targetInstitution; /** - * @var \Surfnet\Stepup\Identity\Value\SecondFactorId + * @var SecondFactorId */ public $secondFactorId; /** - * @var \Surfnet\Stepup\Identity\Value\SecondFactorId + * @var SecondFactorId */ public $targetSecondFactorId; /** - * @var \Surfnet\StepupBundle\Value\SecondFactorType + * @var SecondFactorType */ public $secondFactorType; /** - * @var \Surfnet\Stepup\Identity\Value\SecondFactorIdentifier + * @var SecondFactorIdentifier */ public $secondFactorIdentifier; @@ -90,7 +90,7 @@ public function __construct( $this->targetInstitution = $targetInstitution; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; @@ -137,7 +137,7 @@ public function getSensitiveData() ->withSecondFactorIdentifier($this->secondFactorIdentifier, $this->secondFactorType); } - public function setSensitiveData(SensitiveData $sensitiveData) + public function setSensitiveData(SensitiveData $sensitiveData): void { $this->secondFactorIdentifier = $sensitiveData->getSecondFactorIdentifier(); } diff --git a/src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php b/src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php index de976cc94..b8de346b1 100644 --- a/src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php @@ -31,7 +31,7 @@ abstract class SecondFactorRevokedEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'identity_institution', 'second_factor_id', @@ -40,17 +40,17 @@ abstract class SecondFactorRevokedEvent extends IdentityEvent implements Forgett ]; /** - * @var \Surfnet\Stepup\Identity\Value\SecondFactorId + * @var SecondFactorId */ public $secondFactorId; /** - * @var \Surfnet\StepupBundle\Value\SecondFactorType + * @var SecondFactorType */ public $secondFactorType; /** - * @var \Surfnet\Stepup\Identity\Value\SecondFactorIdentifier + * @var SecondFactorIdentifier */ public $secondFactorIdentifier; @@ -68,7 +68,7 @@ final public function __construct( $this->secondFactorIdentifier = $secondFactorIdentifier; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; @@ -112,7 +112,7 @@ public function getSensitiveData() ->withSecondFactorIdentifier($this->secondFactorIdentifier, $this->secondFactorType); } - public function setSensitiveData(SensitiveData $sensitiveData) + public function setSensitiveData(SensitiveData $sensitiveData): void { $this->secondFactorIdentifier = $sensitiveData->getSecondFactorIdentifier(); } diff --git a/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php b/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php index 530c35306..8bcd8368f 100644 --- a/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php @@ -40,7 +40,7 @@ */ class SecondFactorVettedEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'name_id', 'identity_institution', @@ -54,37 +54,37 @@ class SecondFactorVettedEvent extends IdentityEvent implements Forgettable, Righ ]; /** - * @var \Surfnet\Stepup\Identity\Value\NameId + * @var NameId */ public $nameId; /** - * @var \Surfnet\Stepup\Identity\Value\SecondFactorId + * @var SecondFactorId */ public $secondFactorId; /** - * @var \Surfnet\StepupBundle\Value\SecondFactorType + * @var SecondFactorType */ public $secondFactorType; /** - * @var \Surfnet\Stepup\Identity\Value\SecondFactorIdentifier + * @var SecondFactorIdentifier */ public $secondFactorIdentifier; /** - * @var \Surfnet\Stepup\Identity\Value\CommonName + * @var CommonName */ public $commonName; /** - * @var \Surfnet\Stepup\Identity\Value\Email + * @var Email */ public $email; /** - * @var \Surfnet\Stepup\Identity\Value\Locale Eg. "en_GB" + * @var Locale Eg. "en_GB" */ public $preferredLocale; @@ -118,7 +118,7 @@ public function __construct( $this->vettingType = $vettingType; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; @@ -163,7 +163,7 @@ public function serialize(): array ]; } - public function getSensitiveData() + public function getSensitiveData(): SensitiveData { return (new SensitiveData) ->withCommonName($this->commonName) @@ -172,7 +172,7 @@ public function getSensitiveData() ->withVettingType($this->vettingType); } - public function setSensitiveData(SensitiveData $sensitiveData) + public function setSensitiveData(SensitiveData $sensitiveData): void { $this->email = $sensitiveData->getEmail(); $this->commonName = $sensitiveData->getCommonName(); diff --git a/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php b/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php index 4d5be12ed..1f4308b77 100644 --- a/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php +++ b/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php @@ -20,6 +20,7 @@ use Surfnet\Stepup\Identity\AuditLog\Metadata; use Surfnet\Stepup\Identity\Value\CommonName; +use Surfnet\Stepup\Identity\Value\DocumentNumber; use Surfnet\Stepup\Identity\Value\Email; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\Institution; @@ -40,7 +41,7 @@ */ class SecondFactorVettedWithoutTokenProofOfPossession extends IdentityEvent implements Forgettable, RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'name_id', 'identity_institution', @@ -54,42 +55,42 @@ class SecondFactorVettedWithoutTokenProofOfPossession extends IdentityEvent impl ]; /** - * @var \Surfnet\Stepup\Identity\Value\NameId + * @var NameId */ public $nameId; /** - * @var \Surfnet\Stepup\Identity\Value\SecondFactorId + * @var SecondFactorId */ public $secondFactorId; /** - * @var \Surfnet\StepupBundle\Value\SecondFactorType + * @var SecondFactorType */ public $secondFactorType; /** - * @var \Surfnet\Stepup\Identity\Value\SecondFactorIdentifier + * @var SecondFactorIdentifier */ public $secondFactorIdentifier; /** - * @var \Surfnet\Stepup\Identity\Value\DocumentNumber + * @var DocumentNumber */ public $documentNumber; /** - * @var \Surfnet\Stepup\Identity\Value\CommonName + * @var CommonName */ public $commonName; /** - * @var \Surfnet\Stepup\Identity\Value\Email + * @var Email */ public $email; /** - * @var \Surfnet\Stepup\Identity\Value\Locale Eg. "en_GB" + * @var Locale Eg. "en_GB" */ public $preferredLocale; @@ -123,7 +124,7 @@ public function __construct( $this->vettingType = $vettingType; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; @@ -168,7 +169,7 @@ public function serialize(): array ]; } - public function getSensitiveData() + public function getSensitiveData(): SensitiveData { return (new SensitiveData) ->withCommonName($this->commonName) @@ -177,7 +178,7 @@ public function getSensitiveData() ->withVettingType($this->vettingType); } - public function setSensitiveData(SensitiveData $sensitiveData) + public function setSensitiveData(SensitiveData $sensitiveData): void { $this->email = $sensitiveData->getEmail(); $this->commonName = $sensitiveData->getCommonName(); diff --git a/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenAndVerifiedEvent.php b/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenAndVerifiedEvent.php index 3242f396b..8c08b2fe7 100644 --- a/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenAndVerifiedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenAndVerifiedEvent.php @@ -25,8 +25,8 @@ use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\Stepup\Identity\Value\Locale; -use Surfnet\Stepup\Identity\Value\U2fKeyHandle; use Surfnet\Stepup\Identity\Value\SecondFactorId; +use Surfnet\Stepup\Identity\Value\U2fKeyHandle; use Surfnet\StepupBundle\Value\SecondFactorType; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Forgettable; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\RightToObtainDataInterface; @@ -37,7 +37,7 @@ */ class U2fDevicePossessionProvenAndVerifiedEvent extends IdentityEvent implements Forgettable, PossessionProvenAndVerified, RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'identity_institution', 'second_factor_id', @@ -50,32 +50,32 @@ class U2fDevicePossessionProvenAndVerifiedEvent extends IdentityEvent implements ]; /** - * @var \Surfnet\Stepup\Identity\Value\SecondFactorId + * @var SecondFactorId */ public $secondFactorId; /** - * @var \Surfnet\Stepup\Identity\Value\U2fKeyHandle + * @var U2fKeyHandle */ public $keyHandle; /** - * @var \Surfnet\Stepup\Identity\Value\CommonName + * @var CommonName */ public $commonName; /** - * @var \Surfnet\Stepup\Identity\Value\Email + * @var Email */ public $email; /** - * @var \Surfnet\Stepup\Identity\Value\Locale Eg. "en_GB" + * @var Locale Eg. "en_GB" */ public $preferredLocale; /** - * @var \Surfnet\Stepup\DateTime\DateTime + * @var DateTime */ public $registrationRequestedAt; @@ -117,7 +117,7 @@ public function __construct( $this->registrationCode = $registrationCode; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; @@ -172,7 +172,7 @@ public function getSensitiveData() ->withSecondFactorIdentifier($this->keyHandle, new SecondFactorType('u2f')); } - public function setSensitiveData(SensitiveData $sensitiveData) + public function setSensitiveData(SensitiveData $sensitiveData): void { $this->keyHandle = $sensitiveData->getSecondFactorIdentifier(); $this->email = $sensitiveData->getEmail(); diff --git a/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php b/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php index 8ec89dba4..c3b87133c 100644 --- a/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php @@ -25,8 +25,8 @@ use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\Stepup\Identity\Value\Locale; -use Surfnet\Stepup\Identity\Value\U2fKeyHandle; use Surfnet\Stepup\Identity\Value\SecondFactorId; +use Surfnet\Stepup\Identity\Value\U2fKeyHandle; use Surfnet\StepupBundle\Value\SecondFactorType; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Forgettable; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\RightToObtainDataInterface; @@ -37,7 +37,7 @@ */ class U2fDevicePossessionProvenEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'identity_institution', 'second_factor_id', @@ -49,12 +49,12 @@ class U2fDevicePossessionProvenEvent extends IdentityEvent implements Forgettabl ]; /** - * @var \Surfnet\Stepup\Identity\Value\SecondFactorId + * @var SecondFactorId */ public $secondFactorId; /** - * @var \Surfnet\Stepup\Identity\Value\U2fKeyHandle + * @var U2fKeyHandle */ public $keyHandle; @@ -64,7 +64,7 @@ class U2fDevicePossessionProvenEvent extends IdentityEvent implements Forgettabl public $emailVerificationRequired; /** - * @var \Surfnet\Stepup\Identity\Value\EmailVerificationWindow + * @var EmailVerificationWindow */ public $emailVerificationWindow; @@ -74,17 +74,17 @@ class U2fDevicePossessionProvenEvent extends IdentityEvent implements Forgettabl public $emailVerificationNonce; /** - * @var \Surfnet\Stepup\Identity\Value\CommonName + * @var CommonName */ public $commonName; /** - * @var \Surfnet\Stepup\Identity\Value\Email + * @var Email */ public $email; /** - * @var \Surfnet\Stepup\Identity\Value\Locale Eg. "en_GB" + * @var Locale Eg. "en_GB" */ public $preferredLocale; @@ -126,7 +126,7 @@ public function __construct( $this->preferredLocale = $preferredLocale; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; @@ -182,7 +182,7 @@ public function getSensitiveData() ->withSecondFactorIdentifier($this->keyHandle, new SecondFactorType('u2f')); } - public function setSensitiveData(SensitiveData $sensitiveData) + public function setSensitiveData(SensitiveData $sensitiveData): void { $this->email = $sensitiveData->getEmail(); $this->commonName = $sensitiveData->getCommonName(); diff --git a/src/Surfnet/Stepup/Identity/Event/VettedSecondFactorsAllRevokedEvent.php b/src/Surfnet/Stepup/Identity/Event/VettedSecondFactorsAllRevokedEvent.php index 4a3d2c88c..bd0538c6e 100644 --- a/src/Surfnet/Stepup/Identity/Event/VettedSecondFactorsAllRevokedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/VettedSecondFactorsAllRevokedEvent.php @@ -25,7 +25,7 @@ class VettedSecondFactorsAllRevokedEvent extends IdentityEvent implements RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'identity_institution', ]; @@ -37,7 +37,7 @@ final public function __construct( parent::__construct($identityId, $identityInstitution); } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; diff --git a/src/Surfnet/Stepup/Identity/Event/VettingTypeHintsSavedEvent.php b/src/Surfnet/Stepup/Identity/Event/VettingTypeHintsSavedEvent.php index 1c03f7a49..7bf94ac8f 100644 --- a/src/Surfnet/Stepup/Identity/Event/VettingTypeHintsSavedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/VettingTypeHintsSavedEvent.php @@ -26,7 +26,7 @@ class VettingTypeHintsSavedEvent extends IdentityEvent implements RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'identity_institution', 'hints', @@ -54,7 +54,7 @@ public function __construct( $this->institution = $institution; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; diff --git a/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenAndVerifiedEvent.php b/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenAndVerifiedEvent.php index 1b064bd08..aaf28be54 100644 --- a/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenAndVerifiedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenAndVerifiedEvent.php @@ -34,7 +34,7 @@ class YubikeyPossessionProvenAndVerifiedEvent extends IdentityEvent implements Forgettable, PossessionProvenAndVerified, RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'identity_institution', 'second_factor_id', @@ -47,34 +47,34 @@ class YubikeyPossessionProvenAndVerifiedEvent extends IdentityEvent implements F ]; /** - * @var \Surfnet\Stepup\Identity\Value\SecondFactorId + * @var SecondFactorId */ public $secondFactorId; /** * The Yubikey's public ID. * - * @var \Surfnet\Stepup\Identity\Value\YubikeyPublicId + * @var YubikeyPublicId */ public $yubikeyPublicId; /** - * @var \Surfnet\Stepup\Identity\Value\CommonName + * @var CommonName */ public $commonName; /** - * @var \Surfnet\Stepup\Identity\Value\Email + * @var Email */ public $email; /** - * @var \Surfnet\Stepup\Identity\Value\Locale Eg. "en_GB" + * @var Locale Eg. "en_GB" */ public $preferredLocale; /** - * @var \Surfnet\Stepup\DateTime\DateTime + * @var DateTime */ public $registrationRequestedAt; @@ -116,7 +116,7 @@ public function __construct( $this->registrationCode = $registrationCode; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; @@ -171,7 +171,7 @@ public function getSensitiveData() ->withSecondFactorIdentifier($this->yubikeyPublicId, new SecondFactorType('yubikey')); } - public function setSensitiveData(SensitiveData $sensitiveData) + public function setSensitiveData(SensitiveData $sensitiveData): void { $this->yubikeyPublicId = $sensitiveData->getSecondFactorIdentifier(); $this->email = $sensitiveData->getEmail(); diff --git a/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenEvent.php b/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenEvent.php index a640aafb2..bc4fb4bed 100644 --- a/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenEvent.php @@ -18,6 +18,7 @@ namespace Surfnet\Stepup\Identity\Event; +use Surfnet\Stepup\DateTime\DateTime; use Surfnet\Stepup\Identity\AuditLog\Metadata; use Surfnet\Stepup\Identity\Value\CommonName; use Surfnet\Stepup\Identity\Value\Email; @@ -34,7 +35,7 @@ class YubikeyPossessionProvenEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'identity_institution', 'second_factor_id', @@ -46,14 +47,14 @@ class YubikeyPossessionProvenEvent extends IdentityEvent implements Forgettable, ]; /** - * @var \Surfnet\Stepup\Identity\Value\SecondFactorId + * @var SecondFactorId */ public $secondFactorId; /** * The Yubikey's public ID. * - * @var \Surfnet\Stepup\Identity\Value\YubikeyPublicId + * @var YubikeyPublicId */ public $yubikeyPublicId; @@ -63,12 +64,12 @@ class YubikeyPossessionProvenEvent extends IdentityEvent implements Forgettable, public $emailVerificationRequired; /** - * @var \Surfnet\Stepup\DateTime\DateTime + * @var DateTime */ public $emailVerificationRequestedAt; /** - * @var \Surfnet\Stepup\Identity\Value\EmailVerificationWindow + * @var EmailVerificationWindow */ public $emailVerificationWindow; @@ -78,17 +79,17 @@ class YubikeyPossessionProvenEvent extends IdentityEvent implements Forgettable, public $emailVerificationNonce; /** - * @var \Surfnet\Stepup\Identity\Value\CommonName + * @var CommonName */ public $commonName; /** - * @var \Surfnet\Stepup\Identity\Value\Email + * @var Email */ public $email; /** - * @var \Surfnet\Stepup\Identity\Value\Locale Eg. "en_GB" + * @var Locale Eg. "en_GB" */ public $preferredLocale; @@ -130,7 +131,7 @@ public function __construct( $this->preferredLocale = $preferredLocale; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; @@ -186,7 +187,7 @@ public function getSensitiveData() ->withSecondFactorIdentifier($this->yubikeyPublicId, new SecondFactorType('yubikey')); } - public function setSensitiveData(SensitiveData $sensitiveData) + public function setSensitiveData(SensitiveData $sensitiveData): void { $this->email = $sensitiveData->getEmail(); $this->commonName = $sensitiveData->getCommonName(); diff --git a/src/Surfnet/Stepup/Identity/Event/YubikeySecondFactorBootstrappedEvent.php b/src/Surfnet/Stepup/Identity/Event/YubikeySecondFactorBootstrappedEvent.php index c98a61771..8cd15ec15 100644 --- a/src/Surfnet/Stepup/Identity/Event/YubikeySecondFactorBootstrappedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/YubikeySecondFactorBootstrappedEvent.php @@ -34,7 +34,7 @@ final class YubikeySecondFactorBootstrappedEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { - private $allowlist = [ + private array $allowlist = [ 'identity_id', 'name_id', 'identity_institution', @@ -47,37 +47,37 @@ final class YubikeySecondFactorBootstrappedEvent extends IdentityEvent implement ]; /** - * @var \Surfnet\Stepup\Identity\Value\NameId + * @var NameId */ public $nameId; /** - * @var \Surfnet\Stepup\Identity\Value\Institution + * @var Institution */ public $institution; /** - * @var \Surfnet\Stepup\Identity\Value\CommonName + * @var CommonName */ public $commonName; /** - * @var \Surfnet\Stepup\Identity\Value\Email + * @var Email */ public $email; /** - * @var \Surfnet\Stepup\Identity\Value\Locale + * @var Locale */ public $preferredLocale; /** - * @var \Surfnet\Stepup\Identity\Value\SecondFactorId + * @var SecondFactorId */ public $secondFactorId; /** - * @var \Surfnet\Stepup\Identity\Value\YubikeyPublicId + * @var YubikeyPublicId */ public $yubikeyPublicId; @@ -102,7 +102,7 @@ public function __construct( $this->yubikeyPublicId = $yubikeyPublicId; } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { $metadata = new Metadata(); $metadata->identityId = $this->identityId; @@ -150,7 +150,7 @@ public function getSensitiveData() ->withSecondFactorIdentifier($this->yubikeyPublicId, new SecondFactorType('yubikey')); } - public function setSensitiveData(SensitiveData $sensitiveData) + public function setSensitiveData(SensitiveData $sensitiveData): void { $this->email = $sensitiveData->getEmail(); $this->commonName = $sensitiveData->getCommonName(); diff --git a/src/Surfnet/Stepup/Identity/EventSourcing/IdentityRepository.php b/src/Surfnet/Stepup/Identity/EventSourcing/IdentityRepository.php index 35e8d1d2c..453f198fb 100644 --- a/src/Surfnet/Stepup/Identity/EventSourcing/IdentityRepository.php +++ b/src/Surfnet/Stepup/Identity/EventSourcing/IdentityRepository.php @@ -34,11 +34,11 @@ class IdentityRepository extends EventSourcingRepository { - protected $events; + protected EventStoreInterface $events; - protected $logger; + protected LoggerInterface $logger; - private $userDataFilter; + private UserDataFilterInterface $userDataFilter; /** * @param EventStreamDecorator[] $eventStreamDecorators diff --git a/src/Surfnet/Stepup/Identity/EventSourcing/WhitelistRepository.php b/src/Surfnet/Stepup/Identity/EventSourcing/WhitelistRepository.php index dcbae515d..49f84c03d 100644 --- a/src/Surfnet/Stepup/Identity/EventSourcing/WhitelistRepository.php +++ b/src/Surfnet/Stepup/Identity/EventSourcing/WhitelistRepository.php @@ -23,6 +23,7 @@ use Broadway\EventSourcing\EventSourcingRepository; use Broadway\EventSourcing\EventStreamDecorator; use Broadway\EventStore\EventStore as EventStoreInterface; +use Surfnet\Stepup\Identity\Whitelist; class WhitelistRepository extends EventSourcingRepository { @@ -41,7 +42,7 @@ public function __construct( parent::__construct( $eventStore, $eventBus, - \Surfnet\Stepup\Identity\Whitelist::class, + Whitelist::class, $aggregateFactory, $eventStreamDecorators ); diff --git a/src/Surfnet/Stepup/Identity/Identity.php b/src/Surfnet/Stepup/Identity/Identity.php index 0e8806ff4..e0a7c4a10 100644 --- a/src/Surfnet/Stepup/Identity/Identity.php +++ b/src/Surfnet/Stepup/Identity/Identity.php @@ -136,49 +136,40 @@ class Identity extends EventSourcedAggregateRoot implements IdentityApi private $nameId; /** - * @var \Surfnet\Stepup\Identity\Value\CommonName + * @var CommonName */ private $commonName; /** - * @var \Surfnet\Stepup\Identity\Value\Email + * @var Email */ private $email; /** * @var SecondFactorCollection|UnverifiedSecondFactor[] */ - private $unverifiedSecondFactors; + private ?SecondFactorCollection $unverifiedSecondFactors = null; /** * @var SecondFactorCollection|VerifiedSecondFactor[] */ - private $verifiedSecondFactors; + private ?SecondFactorCollection $verifiedSecondFactors = null; /** * @var SecondFactorCollection|VettedSecondFactor[] */ - private $vettedSecondFactors; + private ?SecondFactorCollection $vettedSecondFactors = null; - /** - * @var RegistrationAuthorityCollection - */ - private $registrationAuthorities; + private ?RegistrationAuthorityCollection $registrationAuthorities = null; /** * @var Locale */ private $preferredLocale; - /** - * @var boolean - */ - private $forgotten; + private ?bool $forgotten = null; - /** - * @var RecoveryTokenCollection - */ - private $recoveryTokens; + private ?RecoveryTokenCollection $recoveryTokens = null; public static function create( IdentityId $id, @@ -187,7 +178,7 @@ public static function create( CommonName $commonName, Email $email, Locale $preferredLocale - ) { + ): self { $identity = new self(); $identity->apply(new IdentityCreatedEvent($id, $institution, $nameId, $commonName, $email, $preferredLocale)); @@ -198,7 +189,7 @@ final public function __construct() { } - public function rename(CommonName $commonName) + public function rename(CommonName $commonName): void { $this->assertNotForgotten(); @@ -210,7 +201,7 @@ public function rename(CommonName $commonName) $this->apply(new IdentityRenamedEvent($this->id, $this->institution, $commonName)); } - public function changeEmail(Email $email) + public function changeEmail(Email $email): void { $this->assertNotForgotten(); @@ -222,7 +213,7 @@ public function changeEmail(Email $email) $this->apply(new IdentityEmailChangedEvent($this->id, $this->institution, $email)); } - public function bootstrapYubikeySecondFactor(SecondFactorId $secondFactorId, YubikeyPublicId $yubikeyPublicId, $maxNumberOfTokens) + public function bootstrapYubikeySecondFactor(SecondFactorId $secondFactorId, YubikeyPublicId $yubikeyPublicId, $maxNumberOfTokens): void { $this->assertNotForgotten(); $this->assertUserMayAddSecondFactor($maxNumberOfTokens); @@ -247,7 +238,7 @@ public function provePossessionOfYubikey( $emailVerificationRequired, EmailVerificationWindow $emailVerificationWindow, $maxNumberOfTokens - ) { + ): void { $this->assertNotForgotten(); $this->assertUserMayAddSecondFactor($maxNumberOfTokens); @@ -291,7 +282,7 @@ public function provePossessionOfPhone( $emailVerificationRequired, EmailVerificationWindow $emailVerificationWindow, $maxNumberOfTokens - ) { + ): void { $this->assertNotForgotten(); $this->assertUserMayAddSecondFactor($maxNumberOfTokens); @@ -364,7 +355,7 @@ public function promisePossessionOfSafeStoreSecretRecoveryToken(RecoveryTokenId ); } - public function saveVettingTypeHints(Institution $institution, VettingTypeHintCollection $hints) + public function saveVettingTypeHints(Institution $institution, VettingTypeHintCollection $hints): void { $this->assertNotForgotten(); $this->apply( @@ -384,7 +375,7 @@ public function provePossessionOfGssf( $emailVerificationRequired, EmailVerificationWindow $emailVerificationWindow, $maxNumberOfTokens - ) { + ): void { $this->assertNotForgotten(); $this->assertUserMayAddSecondFactor($maxNumberOfTokens); @@ -433,7 +424,7 @@ public function provePossessionOfU2fDevice( $emailVerificationRequired, EmailVerificationWindow $emailVerificationWindow, $maxNumberOfTokens - ) { + ): void { $this->assertNotForgotten(); $this->assertUserMayAddSecondFactor($maxNumberOfTokens); @@ -471,7 +462,7 @@ public function provePossessionOfU2fDevice( } } - public function verifyEmail($verificationNonce) + public function verifyEmail($verificationNonce): void { $this->assertNotForgotten(); @@ -511,7 +502,7 @@ public function vetSecondFactor( SecondFactorTypeService $secondFactorTypeService, SecondFactorProvePossessionHelper $secondFactorProvePossessionHelper, $provePossessionSkipped - ) { + ): void { $this->assertNotForgotten(); /** @var VettedSecondFactor|null $secondFactorWithHighestLoa */ @@ -729,7 +720,7 @@ public function complyWithVettingOfSecondFactor( $registrationCode, DocumentNumber $documentNumber, $provePossessionSkipped - ) { + ): void { $this->assertNotForgotten(); $secondFactorToVet = null; @@ -754,7 +745,7 @@ public function complyWithVettingOfSecondFactor( $secondFactorToVet->vet($provePossessionSkipped, new OnPremiseVettingType($documentNumber)); } - public function revokeSecondFactor(SecondFactorId $secondFactorId) + public function revokeSecondFactor(SecondFactorId $secondFactorId): void { $this->assertNotForgotten(); @@ -788,7 +779,7 @@ public function revokeSecondFactor(SecondFactorId $secondFactorId) } } - public function complyWithSecondFactorRevocation(SecondFactorId $secondFactorId, IdentityId $authorityId) + public function complyWithSecondFactorRevocation(SecondFactorId $secondFactorId, IdentityId $authorityId): void { $this->assertNotForgotten(); @@ -856,7 +847,7 @@ public function accreditWith( Location $location, ContactInformation $contactInformation, InstitutionConfiguration $institutionConfiguration - ) { + ): void { $this->assertNotForgotten(); if (!$institutionConfiguration->isInstitutionAllowedToAccreditRoles(new ConfigurationInstitution($this->institution->getInstitution()))) { @@ -898,7 +889,7 @@ public function accreditWith( } } - public function amendRegistrationAuthorityInformation(Institution $institution, Location $location, ContactInformation $contactInformation) + public function amendRegistrationAuthorityInformation(Institution $institution, Location $location, ContactInformation $contactInformation): void { $this->assertNotForgotten(); @@ -931,7 +922,7 @@ public function appointAs( Institution $institution, RegistrationAuthorityRole $role, InstitutionConfiguration $institutionConfiguration - ) { + ): void { $this->assertNotForgotten(); if (!$institutionConfiguration->isInstitutionAllowedToAccreditRoles(new ConfigurationInstitution($this->institution->getInstitution()))) { @@ -955,7 +946,7 @@ public function appointAs( } } - public function retractRegistrationAuthority(Institution $institution) + public function retractRegistrationAuthority(Institution $institution): void { $this->assertNotForgotten(); @@ -975,7 +966,7 @@ public function retractRegistrationAuthority(Institution $institution) )); } - public function expressPreferredLocale(Locale $preferredLocale) + public function expressPreferredLocale(Locale $preferredLocale): void { $this->assertNotForgotten(); @@ -986,7 +977,7 @@ public function expressPreferredLocale(Locale $preferredLocale) $this->apply(new LocalePreferenceExpressedEvent($this->id, $this->institution, $preferredLocale)); } - public function forget() + public function forget(): void { $this->assertNotForgotten(); @@ -997,7 +988,7 @@ public function forget() $this->apply(new IdentityForgottenEvent($this->id, $this->institution)); } - public function allVettedSecondFactorsRemoved() + public function allVettedSecondFactorsRemoved(): void { $this->apply( new VettedSecondFactorsAllRevokedEvent( @@ -1024,12 +1015,12 @@ protected function applyIdentityCreatedEvent(IdentityCreatedEvent $event) $this->recoveryTokens = new RecoveryTokenCollection(); } - public function applyIdentityRenamedEvent(IdentityRenamedEvent $event) + public function applyIdentityRenamedEvent(IdentityRenamedEvent $event): void { $this->commonName = $event->commonName; } - public function applyIdentityEmailChangedEvent(IdentityEmailChangedEvent $event) + public function applyIdentityEmailChangedEvent(IdentityEmailChangedEvent $event): void { $this->email = $event->email; } @@ -1190,7 +1181,7 @@ protected function applyEmailVerifiedEvent(EmailVerifiedEvent $event) * vetted second factor on the target identity. The source * second factor is not yet forgotten. */ - public function applySecondFactorMigratedEvent(SecondFactorMigratedEvent $event) + public function applySecondFactorMigratedEvent(SecondFactorMigratedEvent $event): void { $secondFactorId = (string)$event->newSecondFactorId; $vetted = VettedSecondFactor::create( @@ -1418,7 +1409,7 @@ protected function getChildEntities(): array /** * @throws DomainException */ - private function assertNotForgotten() + private function assertNotForgotten(): void { if ($this->forgotten) { throw new DomainException('Operation on this Identity is not allowed: it has been forgotten'); @@ -1428,7 +1419,7 @@ private function assertNotForgotten() /** * @throws DomainException */ - private function assertUserMayAddSecondFactor($maxNumberOfTokens) + private function assertUserMayAddSecondFactor($maxNumberOfTokens): void { if (count($this->unverifiedSecondFactors) + count($this->verifiedSecondFactors) + @@ -1440,7 +1431,7 @@ private function assertUserMayAddSecondFactor($maxNumberOfTokens) } } - private function assertUserMayAddRecoveryToken(RecoveryTokenType $recoveryTokenType) + private function assertUserMayAddRecoveryToken(RecoveryTokenType $recoveryTokenType): void { // Assert this token type is not yet registered if ($this->recoveryTokens->hasType($recoveryTokenType)) { @@ -1494,7 +1485,7 @@ public function getVettedSecondFactorById(SecondFactorId $secondFactorId): ?Vett return $this->vettedSecondFactors->get((string)$secondFactorId); } - private function assertTokenNotAlreadyRegistered(SecondFactorType $type, SecondFactorIdentifier $identifier) + private function assertTokenNotAlreadyRegistered(SecondFactorType $type, SecondFactorIdentifier $identifier): void { foreach ($this->unverifiedSecondFactors as $unverified) { if ($unverified->typeAndIdentifierAreEqual($type, $identifier)) { @@ -1513,7 +1504,7 @@ private function assertTokenNotAlreadyRegistered(SecondFactorType $type, SecondF } } - private function assertSelfAssertedTokenRegistrationAllowed() + private function assertSelfAssertedTokenRegistrationAllowed(): void { if ($this->vettedSecondFactors->count() !== 0) { throw new DomainException("Self-asserted second factor registration is only allowed when no tokens are vetted yet"); @@ -1526,7 +1517,7 @@ private function assertSelfAssertedTokenRegistrationAllowed() /** * Verify that every vetted second factor is self-asserted */ - private function assertAllVettedTokensAreSelfAsserted() + private function assertAllVettedTokensAreSelfAsserted(): bool { /** @var VettedSecondFactor $vettedToken */ foreach ($this->vettedSecondFactors as $vettedSecondFactor) { diff --git a/src/Surfnet/Stepup/Identity/Value/CommonName.php b/src/Surfnet/Stepup/Identity/Value/CommonName.php index 590280412..4f33da2c3 100644 --- a/src/Surfnet/Stepup/Identity/Value/CommonName.php +++ b/src/Surfnet/Stepup/Identity/Value/CommonName.php @@ -23,15 +23,12 @@ final class CommonName implements JsonSerializable { - /** - * @var string - */ - private $commonName; + private string $commonName; /** * @return self */ - public static function unknown() + public static function unknown(): self { return new self('—'); } @@ -56,12 +53,12 @@ public function getCommonName() return $this->commonName; } - public function __toString() + public function __toString(): string { return $this->commonName; } - public function equals(CommonName $other) + public function equals(CommonName $other): bool { return $this->commonName === $other->commonName; } diff --git a/src/Surfnet/Stepup/Identity/Value/ContactInformation.php b/src/Surfnet/Stepup/Identity/Value/ContactInformation.php index 3435393d9..dc3eb473a 100644 --- a/src/Surfnet/Stepup/Identity/Value/ContactInformation.php +++ b/src/Surfnet/Stepup/Identity/Value/ContactInformation.php @@ -23,10 +23,7 @@ final class ContactInformation implements JsonSerializable { - /** - * @var string - */ - private $contactInformation; + private string $contactInformation; /** * @param string $contactInformation @@ -44,7 +41,7 @@ public function __construct($contactInformation) * @param ContactInformation $otherContactInformation * @return bool */ - public function equals(ContactInformation $otherContactInformation) + public function equals(ContactInformation $otherContactInformation): bool { return $this->contactInformation === $otherContactInformation->contactInformation; } @@ -62,7 +59,7 @@ public function jsonSerialize() return $this->contactInformation; } - public function __toString() + public function __toString(): string { return $this->contactInformation; } diff --git a/src/Surfnet/Stepup/Identity/Value/DocumentNumber.php b/src/Surfnet/Stepup/Identity/Value/DocumentNumber.php index 90d558143..c574373da 100644 --- a/src/Surfnet/Stepup/Identity/Value/DocumentNumber.php +++ b/src/Surfnet/Stepup/Identity/Value/DocumentNumber.php @@ -23,15 +23,12 @@ final class DocumentNumber implements JsonSerializable { - /** - * @var string - */ - private $documentNumber; + private string $documentNumber; /** * @return self */ - public static function unknown() + public static function unknown(): self { return new self('—'); } @@ -56,12 +53,12 @@ public function getDocumentNumber() return $this->documentNumber; } - public function __toString() + public function __toString(): string { return $this->documentNumber; } - public function equals(DocumentNumber $other) + public function equals(DocumentNumber $other): bool { return $this->documentNumber === $other->documentNumber; } diff --git a/src/Surfnet/Stepup/Identity/Value/Email.php b/src/Surfnet/Stepup/Identity/Value/Email.php index 5f9736431..da5a34abc 100644 --- a/src/Surfnet/Stepup/Identity/Value/Email.php +++ b/src/Surfnet/Stepup/Identity/Value/Email.php @@ -23,15 +23,12 @@ final class Email implements JsonSerializable { - /** - * @var string - */ - private $email; + private string $email; /** * @return self */ - public static function unknown() + public static function unknown(): self { return new self('unknown@domain.invalid'); } @@ -63,12 +60,12 @@ public function getEmail() return $this->email; } - public function __toString() + public function __toString(): string { return $this->email; } - public function equals(Email $other) + public function equals(Email $other): bool { return $this->email === $other->email; } diff --git a/src/Surfnet/Stepup/Identity/Value/EmailVerificationWindow.php b/src/Surfnet/Stepup/Identity/Value/EmailVerificationWindow.php index 1192a7ae3..109f8362a 100644 --- a/src/Surfnet/Stepup/Identity/Value/EmailVerificationWindow.php +++ b/src/Surfnet/Stepup/Identity/Value/EmailVerificationWindow.php @@ -24,15 +24,9 @@ final class EmailVerificationWindow implements SerializableInterface { - /** - * @var DateTime - */ - private $start; + private DateTime $start; - /** - * @var DateTime - */ - private $end; + private DateTime $end; private function __construct(DateTime $start, DateTime $end) { @@ -45,7 +39,7 @@ private function __construct(DateTime $start, DateTime $end) * @param DateTime $start * @return EmailVerificationWindow */ - public static function createFromTimeFrameStartingAt(TimeFrame $timeFrame, DateTime $start) + public static function createFromTimeFrameStartingAt(TimeFrame $timeFrame, DateTime $start): EmailVerificationWindow { return new EmailVerificationWindow($start, $timeFrame->getEndWhenStartingAt($start)); } @@ -55,7 +49,7 @@ public static function createFromTimeFrameStartingAt(TimeFrame $timeFrame, DateT * @param DateTime $end * @return EmailVerificationWindow */ - public static function createWindowFromTill(DateTime $start, DateTime $end) + public static function createWindowFromTill(DateTime $start, DateTime $end): EmailVerificationWindow { if (!$end->comesAfter($start)) { throw new InvalidArgumentException(sprintf( @@ -72,7 +66,7 @@ public static function createWindowFromTill(DateTime $start, DateTime $end) /** * @return bool */ - public function isOpen() + public function isOpen(): bool { $now = DateTime::now(); @@ -91,7 +85,7 @@ public function openUntil() * @param EmailVerificationWindow $other * @return bool */ - public function equals(EmailVerificationWindow $other) + public function equals(EmailVerificationWindow $other): bool { return $this->start == $other->start && $this->end == $other->end; } @@ -109,7 +103,7 @@ public function serialize(): array return ['start' => (string) $this->start, 'end' => (string) $this->end]; } - public function __toString() + public function __toString(): string { return $this->start . '-' . $this->end; } diff --git a/src/Surfnet/Stepup/Identity/Value/GssfId.php b/src/Surfnet/Stepup/Identity/Value/GssfId.php index 041cead61..fe83f573a 100644 --- a/src/Surfnet/Stepup/Identity/Value/GssfId.php +++ b/src/Surfnet/Stepup/Identity/Value/GssfId.php @@ -22,12 +22,9 @@ final class GssfId implements SecondFactorIdentifier { - /** - * @var string - */ - private $gssfId; + private string $gssfId; - public static function unknown() + public static function unknown(): self { return new self('—'); } @@ -46,7 +43,7 @@ public function getValue() return $this->gssfId; } - public function __toString() + public function __toString(): string { return $this->gssfId; } diff --git a/src/Surfnet/Stepup/Identity/Value/HashedSecret.php b/src/Surfnet/Stepup/Identity/Value/HashedSecret.php index 80117c07f..d8765fac0 100644 --- a/src/Surfnet/Stepup/Identity/Value/HashedSecret.php +++ b/src/Surfnet/Stepup/Identity/Value/HashedSecret.php @@ -23,7 +23,7 @@ */ class HashedSecret implements Secret { - private $secret; + private string $secret; public function __construct(string $secret) { diff --git a/src/Surfnet/Stepup/Identity/Value/IdentityId.php b/src/Surfnet/Stepup/Identity/Value/IdentityId.php index dc6b0a81a..705f8eba6 100644 --- a/src/Surfnet/Stepup/Identity/Value/IdentityId.php +++ b/src/Surfnet/Stepup/Identity/Value/IdentityId.php @@ -24,10 +24,7 @@ final class IdentityId implements Id, JsonSerializable { - /** - * @var string - */ - private $value; + private string $value; public function __construct($value) { @@ -46,12 +43,12 @@ public function getIdentityId() return $this->value; } - public function equals(Id $other) + public function equals(Id $other): bool { return $this == $other; } - public function __toString() + public function __toString(): string { return $this->value; } diff --git a/src/Surfnet/Stepup/Identity/Value/Institution.php b/src/Surfnet/Stepup/Identity/Value/Institution.php index f7550f7a5..ce255f3ae 100644 --- a/src/Surfnet/Stepup/Identity/Value/Institution.php +++ b/src/Surfnet/Stepup/Identity/Value/Institution.php @@ -23,10 +23,7 @@ final class Institution implements JsonSerializable { - /** - * @var string - */ - private $institution; + private string $institution; /** * @param string $institution may not be an empty string @@ -52,7 +49,7 @@ public function getInstitution() * @param Institution $otherInstitution * @return bool */ - public function equals(Institution $otherInstitution) + public function equals(Institution $otherInstitution): bool { return $this->institution === $otherInstitution->institution; } @@ -62,7 +59,7 @@ public function jsonSerialize() return $this->institution; } - public function __toString() + public function __toString(): string { return $this->institution; } diff --git a/src/Surfnet/Stepup/Identity/Value/Locale.php b/src/Surfnet/Stepup/Identity/Value/Locale.php index 0af09cfb9..6ed88b3e7 100644 --- a/src/Surfnet/Stepup/Identity/Value/Locale.php +++ b/src/Surfnet/Stepup/Identity/Value/Locale.php @@ -23,10 +23,7 @@ final class Locale implements JsonSerializable { - /** - * @var string - */ - private $locale; + private string $locale; /** * @param string $locale @@ -44,7 +41,7 @@ public function __construct($locale) * @param self $other * @return bool */ - public function equals(Locale $other) + public function equals(Locale $other): bool { return $this == $other; } @@ -65,7 +62,7 @@ public function jsonSerialize() /** * @return string */ - public function __toString() + public function __toString(): string { return $this->locale; } diff --git a/src/Surfnet/Stepup/Identity/Value/Location.php b/src/Surfnet/Stepup/Identity/Value/Location.php index 048c03804..057f02d72 100644 --- a/src/Surfnet/Stepup/Identity/Value/Location.php +++ b/src/Surfnet/Stepup/Identity/Value/Location.php @@ -23,10 +23,7 @@ final class Location implements JsonSerializable { - /** - * @var string - */ - private $location; + private string $location; /** * @param string $location @@ -44,7 +41,7 @@ public function __construct($location) * @param Location $otherLocation * @return bool */ - public function equals(Location $otherLocation) + public function equals(Location $otherLocation): bool { return $this->location === $otherLocation->location; } @@ -62,7 +59,7 @@ public function jsonSerialize() return $this->location; } - public function __toString() + public function __toString(): string { return $this->location; } diff --git a/src/Surfnet/Stepup/Identity/Value/NameId.php b/src/Surfnet/Stepup/Identity/Value/NameId.php index 505ef0372..6fec2f840 100644 --- a/src/Surfnet/Stepup/Identity/Value/NameId.php +++ b/src/Surfnet/Stepup/Identity/Value/NameId.php @@ -34,10 +34,7 @@ final class NameId implements JsonSerializable */ private const MAX_LENGTH = 255; - /** - * @var string - */ - private $value; + private string $value; public function __construct($value) { @@ -62,12 +59,12 @@ public function getNameId() return $this->value; } - public function equals($other) + public function equals($other): bool { return $this == $other; } - public function __toString() + public function __toString(): string { return $this->value; } diff --git a/src/Surfnet/Stepup/Identity/Value/OnPremiseVettingType.php b/src/Surfnet/Stepup/Identity/Value/OnPremiseVettingType.php index 23efe0d6e..822b2479b 100644 --- a/src/Surfnet/Stepup/Identity/Value/OnPremiseVettingType.php +++ b/src/Surfnet/Stepup/Identity/Value/OnPremiseVettingType.php @@ -25,17 +25,14 @@ class OnPremiseVettingType implements VettingType */ protected $type = VettingType::TYPE_ON_PREMISE; - /** - * @var DocumentNumber - */ - private $documentNumber; + private DocumentNumber $documentNumber; public function __construct(DocumentNumber $documentNumber) { $this->documentNumber = $documentNumber; } - public static function deserialize($data) + public static function deserialize(array $data): self { $documentNumber = new DocumentNumber($data['document_number']); return new self($documentNumber); diff --git a/src/Surfnet/Stepup/Identity/Value/PhoneNumber.php b/src/Surfnet/Stepup/Identity/Value/PhoneNumber.php index 7fb6326f5..9f79ed336 100644 --- a/src/Surfnet/Stepup/Identity/Value/PhoneNumber.php +++ b/src/Surfnet/Stepup/Identity/Value/PhoneNumber.php @@ -22,10 +22,7 @@ final class PhoneNumber implements SecondFactorIdentifier, RecoveryTokenIdentifier { - /** - * @var string - */ - private $phoneNumber; + private string $phoneNumber; public static function unknown(): self { @@ -59,7 +56,7 @@ public function equals($other): bool return $other instanceof self && $this->phoneNumber === $other->phoneNumber; } - public function __toString() + public function __toString(): string { return $this->phoneNumber; } diff --git a/src/Surfnet/Stepup/Identity/Value/RecoveryTokenId.php b/src/Surfnet/Stepup/Identity/Value/RecoveryTokenId.php index 638825e30..1d6d881a0 100644 --- a/src/Surfnet/Stepup/Identity/Value/RecoveryTokenId.php +++ b/src/Surfnet/Stepup/Identity/Value/RecoveryTokenId.php @@ -23,10 +23,7 @@ final class RecoveryTokenId implements Id { - /** - * @var string - */ - private $value; + private string $value; public function __construct($value) { @@ -45,12 +42,12 @@ public function getRecoveryTokenId() return $this->value; } - public function equals(Id $other) + public function equals(Id $other): bool { return $this == $other; } - public function __toString() + public function __toString(): string { return $this->value; } diff --git a/src/Surfnet/Stepup/Identity/Value/RecoveryTokenType.php b/src/Surfnet/Stepup/Identity/Value/RecoveryTokenType.php index 4fb51a74d..40d836eeb 100644 --- a/src/Surfnet/Stepup/Identity/Value/RecoveryTokenType.php +++ b/src/Surfnet/Stepup/Identity/Value/RecoveryTokenType.php @@ -25,10 +25,7 @@ final class RecoveryTokenType const TYPE_SMS = 'sms'; const TYPE_SAFE_STORE = 'safe-store'; - /** - * @var string - */ - private $type; + private string $type; public function __construct($type) { @@ -43,12 +40,12 @@ public function __construct($type) $this->type = $type; } - public static function sms() + public static function sms(): RecoveryTokenType { return new RecoveryTokenType(self::TYPE_SMS); } - public static function safeStore() + public static function safeStore(): RecoveryTokenType { return new RecoveryTokenType(self::TYPE_SAFE_STORE); } @@ -71,7 +68,7 @@ public function getType() return $this->type; } - public function __toString() + public function __toString(): string { return $this->type; } diff --git a/src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php b/src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php index 74c7d2f84..0beca2c07 100644 --- a/src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php +++ b/src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php @@ -27,10 +27,7 @@ final class RegistrationAuthorityRole implements SerializableInterface const ROLE_RAA = 2; const ROLE_SRAA = 3; - /** - * @var int - */ - private $role; + private int $role; /** * @param string $role may not be an empty string @@ -49,12 +46,12 @@ public function __construct($role) /** * @SuppressWarnings(PHPMD.ShortMethodName) no use in lengthening a domain term for the sake of shutting up PHPMD */ - public static function ra() + public static function ra(): self { return new self(self::ROLE_RA); } - public static function raa() + public static function raa(): self { return new self(self::ROLE_RAA); } @@ -63,7 +60,7 @@ public static function raa() * @param RegistrationAuthorityRole $role * @return bool */ - public function equals(RegistrationAuthorityRole $role) + public function equals(RegistrationAuthorityRole $role): bool { return $this->role === $role->role; } @@ -71,7 +68,7 @@ public function equals(RegistrationAuthorityRole $role) /** * @return bool */ - public function isRa() + public function isRa(): bool { return $this->role === self::ROLE_RA; } @@ -79,7 +76,7 @@ public function isRa() /** * @return bool */ - public function isRaa() + public function isRaa(): bool { return $this->role === self::ROLE_RAA; } @@ -89,7 +86,7 @@ public function jsonSerialize() return $this->role; } - public function __toString() + public function __toString(): string { return (string) $this->role; } diff --git a/src/Surfnet/Stepup/Identity/Value/SafeStore.php b/src/Surfnet/Stepup/Identity/Value/SafeStore.php index f0bb07584..a5ee86e9d 100644 --- a/src/Surfnet/Stepup/Identity/Value/SafeStore.php +++ b/src/Surfnet/Stepup/Identity/Value/SafeStore.php @@ -23,8 +23,7 @@ */ class SafeStore implements RecoveryTokenIdentifier { - /** @var Secret */ - private $secret; + private Secret $secret; public function __construct(Secret $hashedSecret) { @@ -36,12 +35,12 @@ public static function unknown(): self return new self(new ForgottenSecret()); } - public static function hidden() + public static function hidden(): self { return new self(new HiddenSecret()); } - public function getValue() + public function getValue(): string { return $this->secret->getSecret(); } diff --git a/src/Surfnet/Stepup/Identity/Value/SecondFactorId.php b/src/Surfnet/Stepup/Identity/Value/SecondFactorId.php index 4e6930511..fb49e605e 100644 --- a/src/Surfnet/Stepup/Identity/Value/SecondFactorId.php +++ b/src/Surfnet/Stepup/Identity/Value/SecondFactorId.php @@ -23,10 +23,7 @@ final class SecondFactorId implements Id { - /** - * @var string - */ - private $value; + private string $value; public function __construct($value) { @@ -45,12 +42,12 @@ public function getSecondFactorId() return $this->value; } - public function equals(Id $other) + public function equals(Id $other): bool { return $this == $other; } - public function __toString() + public function __toString(): string { return $this->value; } diff --git a/src/Surfnet/Stepup/Identity/Value/SelfAssertedRegistrationVettingType.php b/src/Surfnet/Stepup/Identity/Value/SelfAssertedRegistrationVettingType.php index df243e9e9..e91412f3a 100644 --- a/src/Surfnet/Stepup/Identity/Value/SelfAssertedRegistrationVettingType.php +++ b/src/Surfnet/Stepup/Identity/Value/SelfAssertedRegistrationVettingType.php @@ -25,14 +25,14 @@ class SelfAssertedRegistrationVettingType implements VettingType */ protected $type = VettingType::TYPE_SELF_ASSERTED_REGISTRATION; - protected $authoringRecoveryToken; + protected RecoveryTokenId $authoringRecoveryToken; public function __construct(RecoveryTokenId $recoveryTokenId) { $this->authoringRecoveryToken = $recoveryTokenId; } - public static function deserialize($data) + public static function deserialize(array $data): self { $recoveryTokenId = new RecoveryTokenId($data['recovery_token_id']); return new self($recoveryTokenId); diff --git a/src/Surfnet/Stepup/Identity/Value/SelfVetVettingType.php b/src/Surfnet/Stepup/Identity/Value/SelfVetVettingType.php index 87e00e6c7..470d41aa5 100644 --- a/src/Surfnet/Stepup/Identity/Value/SelfVetVettingType.php +++ b/src/Surfnet/Stepup/Identity/Value/SelfVetVettingType.php @@ -27,17 +27,14 @@ class SelfVetVettingType implements VettingType */ protected $type = VettingType::TYPE_SELF_VET; - /** - * @var Loa - */ - private $authoringLoa; + private Loa $authoringLoa; public function __construct(Loa $loa) { $this->authoringLoa = $loa; } - public static function deserialize($data) + public static function deserialize(array $data): self { $loa = new Loa($data['loa']['level'], $data['loa']['identifier']); return new self($loa); diff --git a/src/Surfnet/Stepup/Identity/Value/StepupProvider.php b/src/Surfnet/Stepup/Identity/Value/StepupProvider.php index 12da6613e..915c12fb6 100644 --- a/src/Surfnet/Stepup/Identity/Value/StepupProvider.php +++ b/src/Surfnet/Stepup/Identity/Value/StepupProvider.php @@ -22,10 +22,7 @@ final class StepupProvider { - /** - * @var string - */ - private $provider; + private string $provider; public function __construct($provider) { @@ -44,12 +41,12 @@ public function getStepupProvider() return $this->provider; } - public function equals(StepupProvider $other) + public function equals(StepupProvider $other): bool { return $this->provider === $other->provider; } - public function __toString() + public function __toString(): string { return $this->provider; } diff --git a/src/Surfnet/Stepup/Identity/Value/TimeFrame.php b/src/Surfnet/Stepup/Identity/Value/TimeFrame.php index 03a49ce89..9e1ba91d5 100644 --- a/src/Surfnet/Stepup/Identity/Value/TimeFrame.php +++ b/src/Surfnet/Stepup/Identity/Value/TimeFrame.php @@ -25,10 +25,7 @@ final class TimeFrame { - /** - * @var DateInterval - */ - private $timeFrame; + private DateInterval $timeFrame; /** * @param DateInterval $timeFrame @@ -42,7 +39,7 @@ final private function __construct(DateInterval $timeFrame) * @param int $seconds * @return TimeFrame */ - public static function ofSeconds($seconds) + public static function ofSeconds($seconds): TimeFrame { if (!is_int($seconds) || $seconds < 1) { throw InvalidArgumentException::invalidType('positive integer', 'seconds', $seconds); @@ -55,7 +52,7 @@ public static function ofSeconds($seconds) * @param DateTime $dateTime * @return DateTime */ - public function getEndWhenStartingAt(DateTime $dateTime) + public function getEndWhenStartingAt(DateTime $dateTime): DateTime { return $dateTime->add($this->timeFrame); } @@ -64,12 +61,12 @@ public function getEndWhenStartingAt(DateTime $dateTime) * @param TimeFrame $other * @return bool */ - public function equals(TimeFrame $other) + public function equals(TimeFrame $other): bool { return $this->timeFrame->s === $other->timeFrame->s; } - public function __toString() + public function __toString(): string { return $this->timeFrame->format('%S'); } diff --git a/src/Surfnet/Stepup/Identity/Value/U2fKeyHandle.php b/src/Surfnet/Stepup/Identity/Value/U2fKeyHandle.php index b6c4f05ce..37c1085f2 100644 --- a/src/Surfnet/Stepup/Identity/Value/U2fKeyHandle.php +++ b/src/Surfnet/Stepup/Identity/Value/U2fKeyHandle.php @@ -27,15 +27,12 @@ final class U2fKeyHandle implements SecondFactorIdentifier { const UNKNOWN = '—'; - /** - * @var string - */ - private $value; + private string $value; /** * @return static */ - public static function unknown() + public static function unknown(): self { return new self(self::UNKNOWN); } @@ -63,7 +60,7 @@ public function getValue() return $this->value; } - public function __toString() + public function __toString(): string { return $this->value; } diff --git a/src/Surfnet/Stepup/Identity/Value/UnhashedSecret.php b/src/Surfnet/Stepup/Identity/Value/UnhashedSecret.php index 644aa12ba..950e54a1a 100644 --- a/src/Surfnet/Stepup/Identity/Value/UnhashedSecret.php +++ b/src/Surfnet/Stepup/Identity/Value/UnhashedSecret.php @@ -41,7 +41,7 @@ class UnhashedSecret implements HashableSecret */ private const ALGORITHM = PASSWORD_BCRYPT; - private $secret; + private string $secret; public function hashSecret(): Secret { diff --git a/src/Surfnet/Stepup/Identity/Value/VettingTypeHint.php b/src/Surfnet/Stepup/Identity/Value/VettingTypeHint.php index c66ed9ff4..5a6263345 100644 --- a/src/Surfnet/Stepup/Identity/Value/VettingTypeHint.php +++ b/src/Surfnet/Stepup/Identity/Value/VettingTypeHint.php @@ -22,16 +22,12 @@ class VettingTypeHint implements JsonSerializable { - /** - * @var string - */ - private $locale; + private string $locale; /** * The hint text is nullable - * @var string */ - private $hint; + private ?string $hint; public function __construct(string $locale, ?string $hint) { diff --git a/src/Surfnet/Stepup/Identity/Value/YubikeyPublicId.php b/src/Surfnet/Stepup/Identity/Value/YubikeyPublicId.php index d97278b5f..74bd2070f 100644 --- a/src/Surfnet/Stepup/Identity/Value/YubikeyPublicId.php +++ b/src/Surfnet/Stepup/Identity/Value/YubikeyPublicId.php @@ -24,12 +24,9 @@ final class YubikeyPublicId implements SecondFactorIdentifier { const UNKNOWN = '—'; - /** - * @var string - */ - private $value; + private string $value; - public static function unknown() + public static function unknown(): self { return new self(self::UNKNOWN); } @@ -70,7 +67,7 @@ public function getValue() return $this->value; } - public function __toString() + public function __toString(): string { return $this->value; } diff --git a/src/Surfnet/Stepup/Identity/Whitelist.php b/src/Surfnet/Stepup/Identity/Whitelist.php index b0df6aa82..440cb6a54 100644 --- a/src/Surfnet/Stepup/Identity/Whitelist.php +++ b/src/Surfnet/Stepup/Identity/Whitelist.php @@ -37,7 +37,7 @@ final class Whitelist extends EventSourcedAggregateRoot implements WhitelistApi /** * @var InstitutionCollection The collection of institutions currently on the whitelist */ - private $whitelist; + private ?InstitutionCollection $whitelist = null; public function __construct() { @@ -48,7 +48,7 @@ public function getAggregateRootId(): string return self::WHITELIST_AGGREGATE_ID; } - public static function create(InstitutionCollection $institutionCollection) + public static function create(InstitutionCollection $institutionCollection): self { $whitelist = new self(); $whitelist->apply(new WhitelistCreatedEvent($institutionCollection)); @@ -56,12 +56,12 @@ public static function create(InstitutionCollection $institutionCollection) return $whitelist; } - public function replaceAll(InstitutionCollection $institutionCollection) + public function replaceAll(InstitutionCollection $institutionCollection): void { $this->apply(new WhitelistReplacedEvent($institutionCollection)); } - public function add(InstitutionCollection $institutionCollection) + public function add(InstitutionCollection $institutionCollection): void { foreach ($institutionCollection as $institution) { if ($this->whitelist->contains($institution)) { @@ -75,7 +75,7 @@ public function add(InstitutionCollection $institutionCollection) $this->apply(new InstitutionsAddedToWhitelistEvent($institutionCollection)); } - public function remove(InstitutionCollection $institutionCollection) + public function remove(InstitutionCollection $institutionCollection): void { foreach ($institutionCollection as $institution) { if (!$this->whitelist->contains($institution)) { @@ -89,24 +89,24 @@ public function remove(InstitutionCollection $institutionCollection) $this->apply(new InstitutionsRemovedFromWhitelistEvent($institutionCollection)); } - protected function applyWhitelistCreatedEvent(WhitelistCreatedEvent $event) + protected function applyWhitelistCreatedEvent(WhitelistCreatedEvent $event): void { $this->whitelist = new InstitutionCollection(); $this->whitelist->addAllFrom($event->whitelistedInstitutions); } - protected function applyWhitelistReplacedEvent(WhitelistReplacedEvent $event) + protected function applyWhitelistReplacedEvent(WhitelistReplacedEvent $event): void { $this->whitelist = new InstitutionCollection(); $this->whitelist->addAllFrom($event->whitelistedInstitutions); } - protected function applyInstitutionsAddedToWhitelistEvent(InstitutionsAddedToWhitelistEvent $event) + protected function applyInstitutionsAddedToWhitelistEvent(InstitutionsAddedToWhitelistEvent $event): void { $this->whitelist->addAllFrom($event->addedInstitutions); } - protected function applyInstitutionsRemovedFromWhitelistEvent(InstitutionsRemovedFromWhitelistEvent $event) + protected function applyInstitutionsRemovedFromWhitelistEvent(InstitutionsRemovedFromWhitelistEvent $event): void { $this->whitelist->removeAllIn($event->removedInstitutions); } diff --git a/src/Surfnet/Stepup/Tests/Configuration/Event/EventSerializationAndDeserializationTest.php b/src/Surfnet/Stepup/Tests/Configuration/Event/EventSerializationAndDeserializationTest.php index a94ec9782..f8b3c4a0c 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Event/EventSerializationAndDeserializationTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Event/EventSerializationAndDeserializationTest.php @@ -65,7 +65,7 @@ class EventSerializationAndDeserializationTest extends TestCase * * @dataProvider institutionConfigurationEventsProvider */ - public function an_event_should_be_the_same_after_serialization_and_deserialization(SerializableInterface $unserializedEvent) + public function an_event_should_be_the_same_after_serialization_and_deserialization(SerializableInterface $unserializedEvent): void { $serializedEvent = $unserializedEvent->serialize(); @@ -77,7 +77,7 @@ public function an_event_should_be_the_same_after_serialization_and_deserializat /** * @return SerializableInterface[] */ - public function institutionConfigurationEventsProvider() + public function institutionConfigurationEventsProvider(): array { $institution = new Institution('A test institution'); $institutionConfigurationId = InstitutionConfigurationId::from($institution); diff --git a/src/Surfnet/Stepup/Tests/Configuration/InstitutionConfigurationTest.php b/src/Surfnet/Stepup/Tests/Configuration/InstitutionConfigurationTest.php index ec5cbd2a1..2a2a56e03 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/InstitutionConfigurationTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/InstitutionConfigurationTest.php @@ -30,6 +30,7 @@ use Surfnet\Stepup\Configuration\InstitutionConfiguration; use Surfnet\Stepup\Configuration\Value\AllowedSecondFactorList; use Surfnet\Stepup\Configuration\Value\Institution; +use Surfnet\Stepup\Configuration\Value\InstitutionAuthorizationOption; use Surfnet\Stepup\Configuration\Value\InstitutionConfigurationId; use Surfnet\Stepup\Configuration\Value\InstitutionRole; use Surfnet\Stepup\Configuration\Value\NumberOfTokensPerIdentityOption; @@ -38,7 +39,6 @@ use Surfnet\Stepup\Configuration\Value\ShowRaaContactInformationOption; use Surfnet\Stepup\Configuration\Value\SsoOn2faOption; use Surfnet\Stepup\Configuration\Value\UseRaLocationsOption; -use Surfnet\Stepup\Configuration\Value\InstitutionAuthorizationOption; use Surfnet\Stepup\Configuration\Value\VerifyEmailOption; class InstitutionConfigurationTest extends AggregateRootScenarioTestCase @@ -47,7 +47,7 @@ class InstitutionConfigurationTest extends AggregateRootScenarioTestCase * @test * @group aggregate */ - public function use_ra_locations_option_is_set_to_false_by_default_upon_creation_of_an_institution_configuration() + public function use_ra_locations_option_is_set_to_false_by_default_upon_creation_of_an_institution_configuration(): void { $institution = new Institution('Institution'); $institutionConfigurationId = InstitutionConfigurationId::from($institution); @@ -107,7 +107,7 @@ public function use_ra_locations_option_is_set_to_false_by_default_upon_creation * @test * @group aggregate */ - public function show_raa_contact_information_option_is_set_to_true_by_default_upon_creation_of_an_institution_configuration() + public function show_raa_contact_information_option_is_set_to_true_by_default_upon_creation_of_an_institution_configuration(): void { $institution = new Institution('Institution'); $institutionConfigurationId = InstitutionConfigurationId::from($institution); @@ -167,7 +167,7 @@ public function show_raa_contact_information_option_is_set_to_true_by_default_up * @test * @group aggregate */ - public function use_ra_locations_option_is_not_changed_if_its_given_value_is_not_different_from_the_current_value() + public function use_ra_locations_option_is_not_changed_if_its_given_value_is_not_different_from_the_current_value(): void { $institution = new Institution('Institution'); $institutionConfigurationId = InstitutionConfigurationId::from($institution); @@ -195,7 +195,7 @@ public function use_ra_locations_option_is_not_changed_if_its_given_value_is_not $selfAssertedTokensOption ) ]) - ->when(function (InstitutionConfiguration $institutionConfiguration) use ($theSameUseRaLocationsOption) { + ->when(function (InstitutionConfiguration $institutionConfiguration) use ($theSameUseRaLocationsOption): void { $institutionConfiguration->configureUseRaLocationsOption($theSameUseRaLocationsOption); }) ->then([]); @@ -205,7 +205,7 @@ public function use_ra_locations_option_is_not_changed_if_its_given_value_is_not * @test * @group aggregate */ - public function show_raa_contact_information_option_is_not_changed_if_its_given_value_is_not_different_from_the_current_value() + public function show_raa_contact_information_option_is_not_changed_if_its_given_value_is_not_different_from_the_current_value(): void { $institution = new Institution('Institution'); $institutionConfigurationId = InstitutionConfigurationId::from($institution); @@ -233,7 +233,7 @@ public function show_raa_contact_information_option_is_not_changed_if_its_given_ $selfAssertedTokensOption ) ]) - ->when(function (InstitutionConfiguration $institutionConfiguration) use ($sameShowRaaContactInformationOption) { + ->when(function (InstitutionConfiguration $institutionConfiguration) use ($sameShowRaaContactInformationOption): void { $institutionConfiguration->configureShowRaaContactInformationOption($sameShowRaaContactInformationOption); }) ->then([]); @@ -243,7 +243,7 @@ public function show_raa_contact_information_option_is_not_changed_if_its_given_ * @test * @group aggregate */ - public function use_ra_locations_option_is_changed_if_its_given_value_is_different_from_the_current_value() + public function use_ra_locations_option_is_changed_if_its_given_value_is_different_from_the_current_value(): void { $institution = new Institution('Institution'); $institutionConfigurationId = InstitutionConfigurationId::from($institution); @@ -271,7 +271,7 @@ public function use_ra_locations_option_is_changed_if_its_given_value_is_differe $selfAssertedTokensOption ) ]) - ->when(function (InstitutionConfiguration $institutionConfiguration) use ($expectedUseRaLocationsOption) { + ->when(function (InstitutionConfiguration $institutionConfiguration) use ($expectedUseRaLocationsOption): void { $institutionConfiguration->configureUseRaLocationsOption($expectedUseRaLocationsOption); }) ->then([ @@ -287,7 +287,7 @@ public function use_ra_locations_option_is_changed_if_its_given_value_is_differe * @test * @group aggregate */ - public function show_raa_contact_information_option_is_changed_if_its_given_value_is_different_from_the_current_value() + public function show_raa_contact_information_option_is_changed_if_its_given_value_is_different_from_the_current_value(): void { $institution = new Institution('Institution'); $institutionConfigurationId = InstitutionConfigurationId::from($institution); @@ -315,7 +315,7 @@ public function show_raa_contact_information_option_is_changed_if_its_given_valu $selfAssertedTokensOption ) ]) - ->when(function (InstitutionConfiguration $institutionConfiguration) use ($expectedShowRaaContactInformationOption) { + ->when(function (InstitutionConfiguration $institutionConfiguration) use ($expectedShowRaaContactInformationOption): void { $institutionConfiguration->configureShowRaaContactInformationOption($expectedShowRaaContactInformationOption); }) ->then([ @@ -331,7 +331,7 @@ public function show_raa_contact_information_option_is_changed_if_its_given_valu * @test * @group aggregate */ - public function test_the_setting_of_fga_options_on_an_institution_configuration() + public function test_the_setting_of_fga_options_on_an_institution_configuration(): void { $institution = new Institution('Institution'); $institutionConfigurationId = InstitutionConfigurationId::from($institution); diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/ContactInformationTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/ContactInformationTest.php index f18e4cab0..b025ff536 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/ContactInformationTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/ContactInformationTest.php @@ -19,7 +19,9 @@ namespace Surfnet\Stepup\Tests\Configuration\Value; use PHPUnit\Framework\TestCase as UnitTest; +use StdClass; use Surfnet\Stepup\Configuration\Value\ContactInformation; +use Surfnet\Stepup\Exception\InvalidArgumentException; class ContactInformationTest extends UnitTest { @@ -30,9 +32,9 @@ class ContactInformationTest extends UnitTest * * @param mixed $invalidValue */ - public function it_cannot_be_created_with_anything_but_a_nonempty_string($invalidValue) + public function it_cannot_be_created_with_anything_but_a_nonempty_string(int|float|StdClass|array $invalidValue): void { - $this->expectException(\Surfnet\Stepup\Exception\InvalidArgumentException::class); + $this->expectException(InvalidArgumentException::class); new ContactInformation($invalidValue); } @@ -40,7 +42,7 @@ public function it_cannot_be_created_with_anything_but_a_nonempty_string($invali * @test * @group domain */ - public function two_instances_with_the_same_value_are_equal() + public function two_instances_with_the_same_value_are_equal(): void { $contactInformation = new ContactInformation('a'); $theSame = new ContactInformation('a'); @@ -55,13 +57,13 @@ public function two_instances_with_the_same_value_are_equal() /** * dataprovider */ - public function invalidValueProvider() + public function invalidValueProvider(): array { return [ 'array' => [[]], 'integer' => [1], 'float' => [1.2], - 'object' => [new \StdClass()], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php index 4c338c262..acf23d1e8 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php @@ -20,20 +20,21 @@ use PHPUnit\Framework\TestCase as TestCase; use Surfnet\Stepup\Configuration\Value\Institution; -use Surfnet\Stepup\Configuration\Value\InstitutionRole; use Surfnet\Stepup\Configuration\Value\InstitutionAuthorizationOption; +use Surfnet\Stepup\Configuration\Value\InstitutionRole; +use Surfnet\Stepup\Exception\InvalidArgumentException; class InstitutionAuthorizationOptionTest extends TestCase { /** * @var Institution */ - private $institution; + private Institution $institution; /** * @var InstitutionRole */ - private $institutionRole; + private InstitutionRole $institutionRole; public function setUp(): void { @@ -45,7 +46,7 @@ public function setUp(): void * @test * @group domain */ - public function institution_entries_are_sorted() + public function institution_entries_are_sorted(): void { $useRaOption = InstitutionAuthorizationOption::fromInstitutionConfig($this->institutionRole, ['z', 'y', 'x']); $this->assertEquals(['x', 'y', 'z'], $useRaOption->getInstitutions($this->institution)); @@ -55,7 +56,7 @@ public function institution_entries_are_sorted() * @test * @group domain */ - public function institution_entries_default_is_own_institution() + public function institution_entries_default_is_own_institution(): void { $useRaOption1 = InstitutionAuthorizationOption::fromInstitutionConfig($this->institutionRole, null); $useRaOption2 = InstitutionAuthorizationOption::fromInstitutionConfig($this->institutionRole, [$this->institution->getInstitution()]); @@ -68,7 +69,7 @@ public function institution_entries_default_is_own_institution() * @group domain * @dataProvider institutionSetComparisonProvider */ - public function institution_option_instances_can_be_compared($expectation, $configurationA, $configurationB) + public function institution_option_instances_can_be_compared(bool $expectation, ?array $configurationA, ?array $configurationB): void { $useRaOption = InstitutionAuthorizationOption::fromInstitutionConfig($this->institutionRole, $configurationA); $secondInstitutionOption = InstitutionAuthorizationOption::fromInstitutionConfig($this->institutionRole, $configurationB); @@ -79,7 +80,7 @@ public function institution_option_instances_can_be_compared($expectation, $conf * @test * @group domain */ - public function can_be_retrieved_json_serializable() + public function can_be_retrieved_json_serializable(): void { $institutionOption = InstitutionAuthorizationOption::fromInstitutionConfig($this->institutionRole, ['z', 'y', 'x']); $this->assertEquals(['x', 'y', 'z'], $institutionOption->jsonSerialize()); @@ -89,7 +90,7 @@ public function can_be_retrieved_json_serializable() * @test * @group domain */ - public function can_be_retrieved_json_serializable_on_empty_set() + public function can_be_retrieved_json_serializable_on_empty_set(): void { $institutionOption = InstitutionAuthorizationOption::fromInstitutionConfig($this->institutionRole); $this->assertEquals(null, $institutionOption->jsonSerialize()); @@ -100,9 +101,9 @@ public function can_be_retrieved_json_serializable_on_empty_set() * @group domain * @dataProvider invalidConstructorArgumentsProvider */ - public function invalid_types_are_rejected_during_construction($arguments) + public function invalid_types_are_rejected_during_construction(bool|int|array $arguments): void { - $this->expectException(\Surfnet\Stepup\Exception\InvalidArgumentException::class); + $this->expectException(InvalidArgumentException::class); InstitutionAuthorizationOption::fromInstitutionConfig($this->institutionRole, $arguments); } @@ -110,7 +111,7 @@ public function invalid_types_are_rejected_during_construction($arguments) * @test * @group domain */ - public function should_be_set_to_default_if_created_with_own_institution_as_institutions() + public function should_be_set_to_default_if_created_with_own_institution_as_institutions(): void { $institutions = [ $this->institution, @@ -126,7 +127,7 @@ public function should_be_set_to_default_if_created_with_own_institution_as_inst * @test * @group domain */ - public function the_default_value_is_given_institution() + public function the_default_value_is_given_institution(): void { $this->assertEquals([$this->institution], InstitutionAuthorizationOption::getDefault($this->institutionRole)->getInstitutions($this->institution)); } @@ -135,7 +136,7 @@ public function the_default_value_is_given_institution() * @test * @group domain */ - public function the_empty_value_is_no_value() + public function the_empty_value_is_no_value(): void { $this->assertEquals([], InstitutionAuthorizationOption::getEmpty($this->institutionRole)->getInstitutions($this->institution)); } @@ -144,7 +145,7 @@ public function the_empty_value_is_no_value() * @test * @group domain */ - public function the_blank_method_should_return_null() + public function the_blank_method_should_return_null(): void { $this->assertEquals(null, InstitutionAuthorizationOption::blank()); } @@ -154,7 +155,7 @@ public function the_blank_method_should_return_null() * @group domain * @dataProvider institutionHasInstitutionProvider */ - public function the_has_institution_method_should_check_for_institutions($expectation, $institutionList, $institution) + public function the_has_institution_method_should_check_for_institutions(bool $expectation, array $institutionList, string $institution): void { $institution = new Institution($institution); $list = []; @@ -167,7 +168,7 @@ public function the_has_institution_method_should_check_for_institutions($expect } - public function institutionHasInstitutionProvider() + public function institutionHasInstitutionProvider(): array { return [ 'array-with-institution' => [true, ['a', 'b'], 'a'], @@ -176,7 +177,7 @@ public function institutionHasInstitutionProvider() ]; } - public function institutionSetComparisonProvider() + public function institutionSetComparisonProvider(): array { return [ 'both-same-set-of-institutions' => [true, ['a', 'b'], ['a', 'b']], @@ -188,7 +189,7 @@ public function institutionSetComparisonProvider() ]; } - public function invalidConstructorArgumentsProvider() + public function invalidConstructorArgumentsProvider(): array { return [ 'cant-be-boolean' => [false], diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionConfigurationIdTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionConfigurationIdTest.php index f81d339b0..90a0c2bb5 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionConfigurationIdTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionConfigurationIdTest.php @@ -19,8 +19,10 @@ namespace Surfnet\Stepup\Tests\Configuration\Value; use PHPUnit\Framework\TestCase as TestCase; +use StdClass; use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\Stepup\Configuration\Value\InstitutionConfigurationId; +use Surfnet\Stepup\Exception\InvalidArgumentException; class InstitutionConfigurationIdTest extends TestCase { @@ -28,7 +30,7 @@ class InstitutionConfigurationIdTest extends TestCase * @test * @group domain */ - public function two_institution_configuration_ids_created_for_the_different_institution_are_not_equal() + public function two_institution_configuration_ids_created_for_the_different_institution_are_not_equal(): void { $institutionConfigurationId = InstitutionConfigurationId::from(new Institution('An institution')); $different = InstitutionConfigurationId::from(new Institution('A different institution')); @@ -43,9 +45,9 @@ public function two_institution_configuration_ids_created_for_the_different_inst * @dataProvider nonStringOrEmptyStringProvider * @param $nonStringOrEmptyString */ - public function an_institution_configuration_id_cannot_be_created_from_something_other_than_a_string($nonStringOrEmptyString) + public function an_institution_configuration_id_cannot_be_created_from_something_other_than_a_string(string|int|float|StdClass|array $nonStringOrEmptyString): void { - $this->expectException(\Surfnet\Stepup\Exception\InvalidArgumentException::class); + $this->expectException(InvalidArgumentException::class); new InstitutionConfigurationId($nonStringOrEmptyString); } @@ -54,9 +56,9 @@ public function an_institution_configuration_id_cannot_be_created_from_something * @test * @group domain */ - public function an_institution_configuration_id_cannot_be_created_from_something_other_than_a_uuid() + public function an_institution_configuration_id_cannot_be_created_from_something_other_than_a_uuid(): void { - $this->expectException(\Surfnet\Stepup\Exception\InvalidArgumentException::class); + $this->expectException(InvalidArgumentException::class); $nonUuid = 'this-is-not-a-uuid'; @@ -67,7 +69,7 @@ public function an_institution_configuration_id_cannot_be_created_from_something * @test * @group domain */ - public function two_institution_configuration_ids_created_for_the_same_institution_are_equal() + public function two_institution_configuration_ids_created_for_the_same_institution_are_equal(): void { $institutionConfigurationId = InstitutionConfigurationId::from(new Institution('An institution')); $same = InstitutionConfigurationId::from(new Institution('An institution')); @@ -79,7 +81,7 @@ public function two_institution_configuration_ids_created_for_the_same_instituti * @test * @group domain */ - public function institution_configuration_ids_are_created_case_insensitively_from_institutions() + public function institution_configuration_ids_are_created_case_insensitively_from_institutions(): void { $mixedCaseInstitution = new Institution('An InStItUtIoN'); $lowerCaseInstitution = new Institution('an institution'); @@ -100,7 +102,7 @@ public function institution_configuration_ids_are_created_case_insensitively_fro * @test * @group domain */ - public function normalized_institution_configuration_ids_and_unnormalized_institution_configuration_ids_are_the_same() + public function normalized_institution_configuration_ids_and_unnormalized_institution_configuration_ids_are_the_same(): void { $mixedCaseInstitution = new Institution('An InStItUtIoN'); @@ -115,7 +117,7 @@ public function normalized_institution_configuration_ids_and_unnormalized_instit /** * dataprovider */ - public function nonStringOrEmptyStringProvider() + public function nonStringOrEmptyStringProvider(): array { return [ 'empty string' => [''], @@ -123,7 +125,7 @@ public function nonStringOrEmptyStringProvider() 'array' => [[]], 'integer' => [1], 'float' => [1.2], - 'object' => [new \StdClass()], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionRoleTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionRoleTest.php index a7493ab24..60f9efb25 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionRoleTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionRoleTest.php @@ -19,11 +19,9 @@ namespace Surfnet\Stepup\Tests\Configuration\Value; use PHPUnit\Framework\TestCase as TestCase; -use Surfnet\Stepup\Configuration\Value\Institution; -use Surfnet\Stepup\Configuration\Value\InstitutionAuthorizationOption; use Surfnet\Stepup\Configuration\Value\InstitutionRole; -use Surfnet\Stepup\Configuration\Value\InstitutionSet; use Surfnet\Stepup\Configuration\Value\SelectRaaOption; +use Surfnet\Stepup\Exception\InvalidArgumentException; class InstitutionRoleTest extends TestCase { @@ -32,9 +30,9 @@ class InstitutionRoleTest extends TestCase * @group domain * @dataProvider invalidConstructorArgumentsProvider */ - public function invalid_types_are_rejected_during_construction($arguments) + public function invalid_types_are_rejected_during_construction(bool|string|int $arguments): void { - $this->expectException(\Surfnet\Stepup\Exception\InvalidArgumentException::class); + $this->expectException(InvalidArgumentException::class); new InstitutionRole($arguments); } @@ -43,7 +41,7 @@ public function invalid_types_are_rejected_during_construction($arguments) * @group domain * @dataProvider institutionTypeProvider */ - public function institution_roles_can_be_created_by_type($type) + public function institution_roles_can_be_created_by_type(string $type): void { $role1 = new InstitutionRole($type); $role2 = new InstitutionRole($type); @@ -52,7 +50,7 @@ public function institution_roles_can_be_created_by_type($type) $this->assertTrue($role1->equals($role2)); } - public function institutionTypeProvider() + public function institutionTypeProvider(): array { return [ 'use_ra' => ['use_ra'], @@ -61,7 +59,7 @@ public function institutionTypeProvider() ]; } - public function invalidConstructorArgumentsProvider() + public function invalidConstructorArgumentsProvider(): array { return [ 'cant-be-boolean' => [false], diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionSetTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionSetTest.php index bab79904a..20b4e0136 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionSetTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionSetTest.php @@ -18,11 +18,11 @@ namespace Surfnet\Stepup\Tests\Configuration\Value; -use IteratorAggregate; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\Stepup\Configuration\Value\InstitutionSet; use Surfnet\Stepup\Configuration\Value\Location; +use Surfnet\Stepup\Exception\InvalidArgumentException; class InstitutionSetTest extends UnitTest { @@ -30,7 +30,7 @@ class InstitutionSetTest extends UnitTest * @test * @group domain */ - public function the_set_is_built_out_of_institution_vos() + public function the_set_is_built_out_of_institution_vos(): void { $institutionA = new Institution('a'); $institutionB = new Institution('b'); @@ -44,10 +44,10 @@ public function the_set_is_built_out_of_institution_vos() * @test * @group domain */ - public function duplicate_entries_are_not_allowed() + public function duplicate_entries_are_not_allowed(): void { $this->expectExceptionMessage("Duplicate entries are not allowed in the InstitutionSet"); - $this->expectException(\Surfnet\Stepup\Exception\InvalidArgumentException::class); + $this->expectException(InvalidArgumentException::class); $institutionB = new Institution('b'); $institutionBDupe = new Institution('b'); @@ -59,10 +59,10 @@ public function duplicate_entries_are_not_allowed() * @test * @group domain */ - public function duplicate_entries_are_not_allowed_case_insensitive() + public function duplicate_entries_are_not_allowed_case_insensitive(): void { $this->expectExceptionMessage("Duplicate entries are not allowed in the InstitutionSet"); - $this->expectException(\Surfnet\Stepup\Exception\InvalidArgumentException::class); + $this->expectException(InvalidArgumentException::class); $institutionB = new Institution('b'); $institutionBDupe = new Institution('B'); @@ -74,10 +74,10 @@ public function duplicate_entries_are_not_allowed_case_insensitive() * @test * @group domain */ - public function only_institutions_can_be_present_in_set() + public function only_institutions_can_be_present_in_set(): void { $this->expectExceptionMessage("Invalid argument type: \"Surfnet\Stepup\Configuration\Value\Institution\" expected, \"Surfnet\Stepup\Configuration\Value\Location\" given for \"institutions\""); - $this->expectException(\Surfnet\Stepup\Exception\InvalidArgumentException::class); + $this->expectException(InvalidArgumentException::class); $institution = new Institution('b'); $location = new Location('Foobar'); @@ -89,7 +89,7 @@ public function only_institutions_can_be_present_in_set() * @test * @group domain */ - public function factory_method_can_build_from_empty_array() + public function factory_method_can_build_from_empty_array(): void { $input = []; $set = InstitutionSet::create($input); @@ -100,7 +100,7 @@ public function factory_method_can_build_from_empty_array() * @test * @group domain */ - public function factory_method_can_build_from_array_of_string() + public function factory_method_can_build_from_array_of_string(): void { $input = [ new Institution('a'), @@ -125,9 +125,9 @@ public function factory_method_can_build_from_array_of_string() * * @param array $invalid */ - public function factory_method_can_build_from_array_of_string_and_rejects_invalid_types(array $invalid) + public function factory_method_can_build_from_array_of_string_and_rejects_invalid_types(array $invalid): void { - $this->expectException(\Surfnet\Stepup\Exception\InvalidArgumentException::class); + $this->expectException(InvalidArgumentException::class); InstitutionSet::create($invalid); } @@ -136,7 +136,7 @@ public function factory_method_can_build_from_array_of_string_and_rejects_invali * @test * @group domain */ - public function sets_can_be_compared() + public function sets_can_be_compared(): void { $input = [ new Institution('a'), @@ -149,7 +149,7 @@ public function sets_can_be_compared() $this->assertTrue($set->equals($secondSet)); } - public function dirtyInstitutionListProvider() + public function dirtyInstitutionListProvider(): array { return [ 'numeric_entry' => [['a', 1, 'b']], diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionTest.php index 246c405c6..4a9a23f87 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionTest.php @@ -19,7 +19,9 @@ namespace Surfnet\Stepup\Tests\Configuration\Value; use PHPUnit\Framework\TestCase as UnitTest; +use StdClass; use Surfnet\Stepup\Configuration\Value\Institution; +use Surfnet\Stepup\Exception\InvalidArgumentException; class InstitutionTest extends UnitTest { @@ -30,9 +32,9 @@ class InstitutionTest extends UnitTest * * @param mixed $invalidValue */ - public function an_institution_cannot_be_created_with_anything_but_a_nonempty_string($invalidValue) + public function an_institution_cannot_be_created_with_anything_but_a_nonempty_string(string|int|float|StdClass|array $invalidValue): void { - $this->expectException(\Surfnet\Stepup\Exception\InvalidArgumentException::class); + $this->expectException(InvalidArgumentException::class); new Institution($invalidValue); } @@ -40,7 +42,7 @@ public function an_institution_cannot_be_created_with_anything_but_a_nonempty_st * @test * @group domain */ - public function two_institutions_with_the_same_value_are_equal() + public function two_institutions_with_the_same_value_are_equal(): void { $institution = new Institution('a'); $theSame = new Institution('a'); @@ -52,7 +54,7 @@ public function two_institutions_with_the_same_value_are_equal() $this->assertTrue($institution->equals($different)); } - public function nonStringOrNonEmptyStringProvider() + public function nonStringOrNonEmptyStringProvider(): array { return [ 'empty string' => [''], @@ -60,7 +62,7 @@ public function nonStringOrNonEmptyStringProvider() 'array' => [[]], 'integer' => [1], 'float' => [1.2], - 'object' => [new \StdClass()], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/LocationTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/LocationTest.php index 6d813febf..f6768de67 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/LocationTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/LocationTest.php @@ -19,7 +19,9 @@ namespace Surfnet\Stepup\Tests\Configuration\Value; use PHPUnit\Framework\TestCase as UnitTest; +use stdClass; use Surfnet\Stepup\Configuration\Value\Location; +use Surfnet\Stepup\Exception\InvalidArgumentException; class LocationTest extends UnitTest { @@ -30,9 +32,9 @@ class LocationTest extends UnitTest * * @param mixed $nonString */ - public function it_cannot_be_created_with_anything_but_a_string($nonString) + public function it_cannot_be_created_with_anything_but_a_string(bool|int|float|stdClass|array|null $nonString): void { - $this->expectException(\Surfnet\Stepup\Exception\InvalidArgumentException::class); + $this->expectException(InvalidArgumentException::class); new Location($nonString); } @@ -41,7 +43,7 @@ public function it_cannot_be_created_with_anything_but_a_string($nonString) * @test * @group domain */ - public function two_locations_with_the_same_value_are_equal() + public function two_locations_with_the_same_value_are_equal(): void { $location = new Location('a'); $theSame = new Location('a'); @@ -56,7 +58,7 @@ public function two_locations_with_the_same_value_are_equal() /** * dataprovider */ - public function nonStringProvider() + public function nonStringProvider(): array { return [ 'null' => [null], @@ -64,7 +66,7 @@ public function nonStringProvider() 'array' => [[]], 'integer' => [1], 'float' => [1.2], - 'object' => [new \stdClass()], + 'object' => [new stdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php index 8e46633ed..76b8da46a 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php @@ -20,7 +20,9 @@ use PHPUnit\Framework\TestCase as TestCase; use Ramsey\Uuid\Uuid; +use StdClass; use Surfnet\Stepup\Configuration\Value\RaLocationId; +use Surfnet\Stepup\Exception\InvalidArgumentException; class RaLocationIdTest extends TestCase { @@ -31,9 +33,9 @@ class RaLocationIdTest extends TestCase * * @param mixed $nonStringOrEmptyString */ - public function an_ra_location_id_cannot_be_created_with_anything_but_a_nonempty_string($nonStringOrEmptyString) + public function an_ra_location_id_cannot_be_created_with_anything_but_a_nonempty_string(string|int|float|StdClass|array $nonStringOrEmptyString): void { - $this->expectException(\Surfnet\Stepup\Exception\InvalidArgumentException::class); + $this->expectException(InvalidArgumentException::class); new RaLocationId($nonStringOrEmptyString); } @@ -41,9 +43,9 @@ public function an_ra_location_id_cannot_be_created_with_anything_but_a_nonempty * @test * @group domain */ - public function an_ra_location_id_cannot_be_created_with_anything_but_a_uuid() + public function an_ra_location_id_cannot_be_created_with_anything_but_a_uuid(): void { - $this->expectException(\Surfnet\Stepup\Exception\InvalidArgumentException::class); + $this->expectException(InvalidArgumentException::class); $nonUuid = 'this-is-not-a-uuid'; @@ -54,7 +56,7 @@ public function an_ra_location_id_cannot_be_created_with_anything_but_a_uuid() * @test * @group domain */ - public function two_ra_location_ids_with_the_same_values_are_equal() + public function two_ra_location_ids_with_the_same_values_are_equal(): void { $uuid = self::uuid(); @@ -68,7 +70,7 @@ public function two_ra_location_ids_with_the_same_values_are_equal() * @test * @group domain */ - public function two_ra_location_ids_with_different_values_are_not_equal() + public function two_ra_location_ids_with_different_values_are_not_equal(): void { $raLocationId = new RaLocationId(self::uuid()); $different = new RaLocationId(self::uuid()); @@ -76,7 +78,7 @@ public function two_ra_location_ids_with_different_values_are_not_equal() $this->assertFalse($raLocationId->equals($different)); } - public function nonStringOrEmptyStringProvider() + public function nonStringOrEmptyStringProvider(): array { return [ 'empty string' => [''], @@ -84,11 +86,11 @@ public function nonStringOrEmptyStringProvider() 'array' => [[]], 'integer' => [1], 'float' => [1.2], - 'object' => [new \StdClass()], + 'object' => [new StdClass()], ]; } - private static function uuid() { + private static function uuid(): string { return (string) Uuid::uuid4(); } } diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationListTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationListTest.php index 658e8432b..955c49b1c 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationListTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationListTest.php @@ -20,12 +20,13 @@ use PHPUnit\Framework\TestCase as TestCase; use Ramsey\Uuid\Uuid; -use Surfnet\Stepup\Configuration\Value\ContactInformation; use Surfnet\Stepup\Configuration\Entity\RaLocation; +use Surfnet\Stepup\Configuration\Value\ContactInformation; use Surfnet\Stepup\Configuration\Value\Location; use Surfnet\Stepup\Configuration\Value\RaLocationId; -use Surfnet\Stepup\Configuration\Value\RaLocationName; use Surfnet\Stepup\Configuration\Value\RaLocationList; +use Surfnet\Stepup\Configuration\Value\RaLocationName; +use Surfnet\Stepup\Exception\LogicException; class RaLocationListTest extends TestCase { @@ -33,9 +34,9 @@ class RaLocationListTest extends TestCase * @test * @group domain */ - public function an_ra_location_list_does_not_allow_ra_locations_with_the_same_ra_location_id_upon_creation() + public function an_ra_location_list_does_not_allow_ra_locations_with_the_same_ra_location_id_upon_creation(): void { - $this->expectException(\Surfnet\Stepup\Exception\LogicException::class); + $this->expectException(LogicException::class); $this->expectExceptionMessage('Cannot add'); $raLocations = $this->getRaLocationsArray(); @@ -49,9 +50,9 @@ public function an_ra_location_list_does_not_allow_ra_locations_with_the_same_ra * @test * @group domain */ - public function an_ra_location_list_does_not_allow_adding_ra_locations_with_an_ra_location_id_that_is_already_present() + public function an_ra_location_list_does_not_allow_adding_ra_locations_with_an_ra_location_id_that_is_already_present(): void { - $this->expectException(\Surfnet\Stepup\Exception\LogicException::class); + $this->expectException(LogicException::class); $this->expectExceptionMessage('Cannot add'); $raLocations = $this->getRaLocationsArray(); @@ -65,7 +66,7 @@ public function an_ra_location_list_does_not_allow_adding_ra_locations_with_an_r * @test * @group domain */ - public function an_ra_location_list_is_created_from_ra_locations() + public function an_ra_location_list_is_created_from_ra_locations(): void { $raLocations = $this->getRaLocationsArray(); @@ -79,7 +80,7 @@ public function an_ra_location_list_is_created_from_ra_locations() * @test * @group domain */ - public function an_ra_location_list_has_an_ra_location_with_a_given_ra_location_id() + public function an_ra_location_list_has_an_ra_location_with_a_given_ra_location_id(): void { $raLocations = $this->getRaLocationsArray(); $expectedRaLocationIdToBePresent = $raLocations[0]->getId(); @@ -93,7 +94,7 @@ public function an_ra_location_list_has_an_ra_location_with_a_given_ra_location_ * @test * @group domain */ - public function an_ra_location_list_does_not_have_ra_locations_with_a_non_present_ra_location_id() + public function an_ra_location_list_does_not_have_ra_locations_with_a_non_present_ra_location_id(): void { $raLocations = $this->getRaLocationsArray(); $expectedRaLocationIdNotToBePresent = new RaLocationId((string) Uuid::uuid4()); @@ -107,7 +108,7 @@ public function an_ra_location_list_does_not_have_ra_locations_with_a_non_presen * @test * @group domain */ - public function an_ra_location_is_added_to_an_ra_location_list() + public function an_ra_location_is_added_to_an_ra_location_list(): void { $raLocations = $this->getRaLocationsArray(); @@ -123,7 +124,7 @@ public function an_ra_location_is_added_to_an_ra_location_list() * @test * @group domain */ - public function an_ra_location_is_removed_from_an_ra_location_list_by_its_ra_location_id() + public function an_ra_location_is_removed_from_an_ra_location_list_by_its_ra_location_id(): void { $raLocations = $this->getRaLocationsArray(); $raLocationToRemove = $raLocations[0]; @@ -137,7 +138,7 @@ public function an_ra_location_is_removed_from_an_ra_location_list_by_its_ra_loc $this->assertEquals($expectOnlyTheSecondRaLocation, $raLocationListAsArray); } - protected function getRaLocationsArray() + protected function getRaLocationsArray(): array { return [ RaLocation::create( diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationNameTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationNameTest.php index 27b608e22..0a9a5050f 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationNameTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationNameTest.php @@ -19,7 +19,9 @@ namespace Surfnet\Stepup\Tests\Configuration\Value; use PHPUnit\Framework\TestCase as TestCase; +use StdClass; use Surfnet\Stepup\Configuration\Value\RaLocationName; +use Surfnet\Stepup\Exception\InvalidArgumentException; class RaLocationNameTest extends TestCase { @@ -30,9 +32,9 @@ class RaLocationNameTest extends TestCase * * @param mixed $nonStringOrEmptyString */ - public function an_ra_location_name_cannot_be_created_with_anything_but_a_nonempty_string($nonStringOrEmptyString) + public function an_ra_location_name_cannot_be_created_with_anything_but_a_nonempty_string(string|int|float|StdClass|array $nonStringOrEmptyString): void { - $this->expectException(\Surfnet\Stepup\Exception\InvalidArgumentException::class); + $this->expectException(InvalidArgumentException::class); new RaLocationName($nonStringOrEmptyString); } @@ -41,7 +43,7 @@ public function an_ra_location_name_cannot_be_created_with_anything_but_a_nonemp * @test * @group domain */ - public function two_ra_location_names_with_the_same_values_are_equal() + public function two_ra_location_names_with_the_same_values_are_equal(): void { $raLocationName = new RaLocationName('a'); $theSame = new RaLocationName('a'); @@ -53,7 +55,7 @@ public function two_ra_location_names_with_the_same_values_are_equal() * @test * @group domain */ - public function two_ra_location_names_with_different_values_are_not_equal() + public function two_ra_location_names_with_different_values_are_not_equal(): void { $raLocationName = new RaLocationName('a'); $different = new RaLocationName('A'); @@ -61,7 +63,7 @@ public function two_ra_location_names_with_different_values_are_not_equal() $this->assertFalse($raLocationName->equals($different)); } - public function nonStringOrEmptyStringProvider() + public function nonStringOrEmptyStringProvider(): array { return [ 'empty string' => [''], @@ -69,7 +71,7 @@ public function nonStringOrEmptyStringProvider() 'array' => [[]], 'integer' => [1], 'float' => [1.2], - 'object' => [new \StdClass()], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/ShowRaaContactInformationOptionTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/ShowRaaContactInformationOptionTest.php index 7fedba303..7337380da 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/ShowRaaContactInformationOptionTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/ShowRaaContactInformationOptionTest.php @@ -19,7 +19,9 @@ namespace Surfnet\Stepup\Tests\Configuration\Value; use PHPUnit\Framework\TestCase as TestCase; +use StdClass; use Surfnet\Stepup\Configuration\Value\ShowRaaContactInformationOption; +use Surfnet\Stepup\Exception\InvalidArgumentException; class ShowRaaContactInformationOptionTest extends TestCase { @@ -31,9 +33,9 @@ class ShowRaaContactInformationOptionTest extends TestCase * * @param mixed $nonBooleanProvider */ - public function show_raa_contact_information_option_can_only_be_boolean($nonBooleanProvider) + public function show_raa_contact_information_option_can_only_be_boolean(string|int|float|StdClass|array $nonBooleanProvider): void { - $this->expectException(\Surfnet\Stepup\Exception\InvalidArgumentException::class); + $this->expectException(InvalidArgumentException::class); new ShowRaaContactInformationOption($nonBooleanProvider); } @@ -43,7 +45,7 @@ public function show_raa_contact_information_option_can_only_be_boolean($nonBool * @group domain * @group institution-configuration-option */ - public function two_show_raa_contact_information_options_with_the_same_values_are_equal() + public function two_show_raa_contact_information_options_with_the_same_values_are_equal(): void { $option = true; @@ -58,7 +60,7 @@ public function two_show_raa_contact_information_options_with_the_same_values_ar * @group domain * @group institution-configuration-option */ - public function two_show_raa_contact_information_options_with_different_values_are_not_equal() + public function two_show_raa_contact_information_options_with_different_values_are_not_equal(): void { $showRaaContactInformationOption = new ShowRaaContactInformationOption(true); $different = new ShowRaaContactInformationOption(false); @@ -71,7 +73,7 @@ public function two_show_raa_contact_information_options_with_different_values_a * @group domain * @group institution-configuration-option */ - public function default_value_is_true() + public function default_value_is_true(): void { $default = ShowRaaContactInformationOption::getDefault(); $true = new ShowRaaContactInformationOption(true); @@ -79,14 +81,14 @@ public function default_value_is_true() $this->assertTrue($default->equals($true)); } - public function nonBooleanProvider() + public function nonBooleanProvider(): array { return [ 'string' => [''], 'array' => [[]], 'integer' => [1], 'float' => [1.2], - 'object' => [new \StdClass()], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/UseRaLocationsOptionTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/UseRaLocationsOptionTest.php index 2261bfbe9..09db74cef 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/UseRaLocationsOptionTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/UseRaLocationsOptionTest.php @@ -19,7 +19,9 @@ namespace Surfnet\Stepup\Tests\Configuration\Value; use PHPUnit\Framework\TestCase as TestCase; +use StdClass; use Surfnet\Stepup\Configuration\Value\UseRaLocationsOption; +use Surfnet\Stepup\Exception\InvalidArgumentException; class UseRaLocationsOptionTest extends TestCase { @@ -31,9 +33,9 @@ class UseRaLocationsOptionTest extends TestCase * * @param mixed $nonBooleanProvider */ - public function use_ra_locations_option_can_only_be_boolean($nonBooleanProvider) + public function use_ra_locations_option_can_only_be_boolean(string|int|float|StdClass|array $nonBooleanProvider): void { - $this->expectException(\Surfnet\Stepup\Exception\InvalidArgumentException::class); + $this->expectException(InvalidArgumentException::class); new UseRaLocationsOption($nonBooleanProvider); } @@ -43,7 +45,7 @@ public function use_ra_locations_option_can_only_be_boolean($nonBooleanProvider) * @group domain * @group institution-configuration-option */ - public function two_use_ra_location_options_with_the_same_values_are_equal() + public function two_use_ra_location_options_with_the_same_values_are_equal(): void { $option = true; @@ -58,7 +60,7 @@ public function two_use_ra_location_options_with_the_same_values_are_equal() * @group domain * @group institution-configuration-option */ - public function two_use_ra_location_options_with_different_values_are_not_equal() + public function two_use_ra_location_options_with_different_values_are_not_equal(): void { $useRaLocationsOption = new UseRaLocationsOption(true); $different = new UseRaLocationsOption(false); @@ -71,7 +73,7 @@ public function two_use_ra_location_options_with_different_values_are_not_equal( * @group domain * @group institution-configuration-option */ - public function default_value_is_false() + public function default_value_is_false(): void { $default = UseRaLocationsOption::getDefault(); $false = new UseRaLocationsOption(false); @@ -79,14 +81,14 @@ public function default_value_is_false() $this->assertTrue($default->equals($false)); } - public function nonBooleanProvider() + public function nonBooleanProvider(): array { return [ 'string' => [''], 'array' => [[]], 'integer' => [1], 'float' => [1.2], - 'object' => [new \StdClass()], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/DateTime/DateTimeTest.php b/src/Surfnet/Stepup/Tests/DateTime/DateTimeTest.php index e7d8f2afb..c439bc76d 100644 --- a/src/Surfnet/Stepup/Tests/DateTime/DateTimeTest.php +++ b/src/Surfnet/Stepup/Tests/DateTime/DateTimeTest.php @@ -34,7 +34,7 @@ class DateTimeTest extends UnitTest * @test * @group domain */ - public function the_configured_format_is_what_is_needed_for_correct_application_behavior() + public function the_configured_format_is_what_is_needed_for_correct_application_behavior(): void { $this->assertEquals('Y-m-d\\TH:i:sP', DateTime::FORMAT); } @@ -46,7 +46,7 @@ public function the_configured_format_is_what_is_needed_for_correct_application_ * @test * @group domain */ - public function to_string_returns_the_time_in_the_correct_format() + public function to_string_returns_the_time_in_the_correct_format(): void { $coreDateTimeObject = new CoreDateTime('@1000'); $ourDateTimeObject = new DateTime(new CoreDateTime('@1000')); @@ -58,7 +58,7 @@ public function to_string_returns_the_time_in_the_correct_format() * @test * @group domain */ - public function add_returns_a_different_object_that_has_the_interval_added() + public function add_returns_a_different_object_that_has_the_interval_added(): void { $base = new DateTime(new CoreDateTime('@1000')); $interval = new DateInterval('PT1S'); @@ -73,7 +73,7 @@ public function add_returns_a_different_object_that_has_the_interval_added() * @test * @group domain */ - public function sub_returns_a_different_object_that_has_the_interval_substracted() + public function sub_returns_a_different_object_that_has_the_interval_substracted(): void { $base = new DateTime(new CoreDateTime('@1000')); $interval = new DateInterval('PT1S'); @@ -88,7 +88,7 @@ public function sub_returns_a_different_object_that_has_the_interval_substracted * @test * @group domain */ - public function comes_before_works_with_exclusive_comparison() + public function comes_before_works_with_exclusive_comparison(): void { $base = new DateTime(new CoreDateTime('@1000')); $before = new DateTime(new CoreDateTime('@999')); @@ -104,7 +104,7 @@ public function comes_before_works_with_exclusive_comparison() * @test * @group domain */ - public function comes_before_or_is_equal_works_with_inclusive_comparison() + public function comes_before_or_is_equal_works_with_inclusive_comparison(): void { $base = new DateTime(new CoreDateTime('@1000')); $before = new DateTime(new CoreDateTime('@999')); @@ -120,7 +120,7 @@ public function comes_before_or_is_equal_works_with_inclusive_comparison() * @test * @group domain */ - public function comes_after_works_with_exclusive_comparison() + public function comes_after_works_with_exclusive_comparison(): void { $base = new DateTime(new CoreDateTime('@1000')); $before = new DateTime(new CoreDateTime('@999')); @@ -136,7 +136,7 @@ public function comes_after_works_with_exclusive_comparison() * @test * @group domain */ - public function comes_after_or_is_equal_works_with_inclusive_comparison() + public function comes_after_or_is_equal_works_with_inclusive_comparison(): void { $base = new DateTime(new CoreDateTime('@1000')); $before = new DateTime(new CoreDateTime('@999')); diff --git a/src/Surfnet/Stepup/Tests/Helper/JsonHelperTest.php b/src/Surfnet/Stepup/Tests/Helper/JsonHelperTest.php index 59917fa82..35ef174dd 100644 --- a/src/Surfnet/Stepup/Tests/Helper/JsonHelperTest.php +++ b/src/Surfnet/Stepup/Tests/Helper/JsonHelperTest.php @@ -19,6 +19,7 @@ namespace Surfnet\Stepup\Tests\Helper; use PHPUnit\Framework\TestCase as TestCase; +use StdClass; use Surfnet\Stepup\Exception\InvalidArgumentException; use Surfnet\Stepup\Exception\JsonException; use Surfnet\Stepup\Helper\JsonHelper; @@ -32,7 +33,7 @@ class JsonHelperTest extends TestCase * @dataProvider nonStringProvider * @param $nonString */ - public function json_helper_can_only_decode_strings($nonString) + public function json_helper_can_only_decode_strings(bool|int|float|StdClass|array $nonString): void { $this->expectException(InvalidArgumentException::class); @@ -43,7 +44,7 @@ public function json_helper_can_only_decode_strings($nonString) * @test * @group json */ - public function json_helper_decodes_strings_to_arrays() + public function json_helper_decodes_strings_to_arrays(): void { $expectedDecodedResult = ['hello' => 'world']; $json = '{ "hello" : "world" }'; @@ -57,7 +58,7 @@ public function json_helper_decodes_strings_to_arrays() * @test * @group json */ - public function json_helper_throws_an_exception_when_there_is_a_syntax_error() + public function json_helper_throws_an_exception_when_there_is_a_syntax_error(): void { $this->expectException(JsonException::class); $this->expectExceptionMessage('Syntax error'); @@ -67,14 +68,14 @@ public function json_helper_throws_an_exception_when_there_is_a_syntax_error() JsonHelper::decode($jsonWithMissingDoubleQuotes); } - public function nonStringProvider() + public function nonStringProvider(): array { return [ 'boolean' => [true], 'array' => [[]], 'integer' => [1], 'float' => [1.2], - 'object' => [new \StdClass()], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Helper/UserDataFilterTest.php b/src/Surfnet/Stepup/Tests/Helper/UserDataFilterTest.php index 749b1f591..0c5d6e633 100644 --- a/src/Surfnet/Stepup/Tests/Helper/UserDataFilterTest.php +++ b/src/Surfnet/Stepup/Tests/Helper/UserDataFilterTest.php @@ -18,6 +18,7 @@ namespace Surfnet\Stepup\Tests\Helper; +use Generator; use PHPUnit\Framework\TestCase; use Surfnet\Stepup\DateTime\DateTime; use Surfnet\Stepup\Helper\UserDataFilter; @@ -40,14 +41,14 @@ class UserDataFilterTest extends TestCase /** * @dataProvider provideEvents */ - public function test_filtering_is_applied_with_expected_result($event, $expectation) + public function test_filtering_is_applied_with_expected_result(IdentityCreatedEvent|PhonePossessionProvenAndVerifiedEvent|AppointedAsRaaForInstitutionEvent|PhonePossessionProvenEvent $event, array $expectation): void { $helper = new UserDataFilter(); $data = $helper->filter($event); $this->assertSame($expectation, array_keys($data)); } - public function provideEvents() + public function provideEvents(): Generator { $event = new IdentityCreatedEvent( new IdentityId("id"), diff --git a/src/Surfnet/Stepup/Tests/Helper/UserDataFormatterTest.php b/src/Surfnet/Stepup/Tests/Helper/UserDataFormatterTest.php index 8f3a33fd6..a998e8274 100644 --- a/src/Surfnet/Stepup/Tests/Helper/UserDataFormatterTest.php +++ b/src/Surfnet/Stepup/Tests/Helper/UserDataFormatterTest.php @@ -23,7 +23,7 @@ class UserDataFormatterTest extends TestCase { - public function test_data_is_formatted() + public function test_data_is_formatted(): void { $formatter = new UserDataFormatter('Stepup-Middleware'); $expected = [ @@ -45,7 +45,7 @@ public function test_data_is_formatted() $this->assertEquals($expected, $formatter->format($inputData, [])); } - public function test_errors_are_included_in_output() + public function test_errors_are_included_in_output(): void { $formatter = new UserDataFormatter('Stepup-Middleware'); $expected = [ diff --git a/src/Surfnet/Stepup/Tests/Identity/Collection/InstitutionCollectionTest.php b/src/Surfnet/Stepup/Tests/Identity/Collection/InstitutionCollectionTest.php index 958b20ae5..d8cb65e3c 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Collection/InstitutionCollectionTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Collection/InstitutionCollectionTest.php @@ -19,6 +19,7 @@ namespace Surfnet\Stepup\Tests\Identity\Collection; use PHPUnit\Framework\TestCase as UnitTest; +use Surfnet\Stepup\Exception\RuntimeException; use Surfnet\Stepup\Identity\Collection\InstitutionCollection; use Surfnet\Stepup\Identity\Value\Institution; @@ -29,7 +30,7 @@ class InstitutionCollectionTest extends UnitTest * @group domain * @group whitelist */ - public function it_can_be_constructed_with_or_without_institutions() + public function it_can_be_constructed_with_or_without_institutions(): void { $collection1 = new InstitutionCollection($this->getInstitutions()); $collection2 = new InstitutionCollection(); @@ -43,7 +44,7 @@ public function it_can_be_constructed_with_or_without_institutions() * @group domain * @group whitelist */ - public function it_correctly_asserts_whether_or_not_it_contains_an_institution() + public function it_correctly_asserts_whether_or_not_it_contains_an_institution(): void { $institutions = $this->getInstitutions(); @@ -61,7 +62,7 @@ public function it_correctly_asserts_whether_or_not_it_contains_an_institution() * @group domain * @group whitelist */ - public function it_allows_to_add_an_institution_that_it_does_not_already_contain() + public function it_allows_to_add_an_institution_that_it_does_not_already_contain(): void { $toAdd = new Institution('to be added'); @@ -76,9 +77,9 @@ public function it_allows_to_add_an_institution_that_it_does_not_already_contain * @group domain * @group whitelist */ - public function an_institution_already_in_the_collection_cannot_be_added() + public function an_institution_already_in_the_collection_cannot_be_added(): void { - $this->expectException(\Surfnet\Stepup\Exception\RuntimeException::class); + $this->expectException(RuntimeException::class); $institutions = $this->getInstitutions(); $alreadyExists = $institutions[0]; @@ -93,7 +94,7 @@ public function an_institution_already_in_the_collection_cannot_be_added() * @group domain * @group whitelist */ - public function an_institution_in_the_collection_can_be_removed() + public function an_institution_in_the_collection_can_be_removed(): void { $institutions = $this->getInstitutions(); $inCollection = $institutions[0]; @@ -111,9 +112,9 @@ public function an_institution_in_the_collection_can_be_removed() * @group whitelist * */ - public function an_institution_not_in_the_collection_cannot_be_removed() + public function an_institution_not_in_the_collection_cannot_be_removed(): void { - $this->expectException(\Surfnet\Stepup\Exception\RuntimeException::class); + $this->expectException(RuntimeException::class); $institutions = $this->getInstitutions(); $notInCollection = new Institution('not in the collection'); @@ -129,7 +130,7 @@ public function an_institution_not_in_the_collection_cannot_be_removed() * @group domain * @group whitelist */ - public function multiple_institutions_can_be_added_from_another_collection() + public function multiple_institutions_can_be_added_from_another_collection(): void { $institutions = $this->getInstitutions(); $collectionOneElements = [$institutions[0], $institutions[1]]; @@ -150,7 +151,7 @@ public function multiple_institutions_can_be_added_from_another_collection() * @group domain * @group whitelist */ - public function multiple_institutions_can_be_removed() + public function multiple_institutions_can_be_removed(): void { $collectionOneElements = $this->getInstitutions(); $collectionTwoElements = [$collectionOneElements[0], $collectionOneElements[2]]; diff --git a/src/Surfnet/Stepup/Tests/Identity/Entity/ConfigurableSettingsTest.php b/src/Surfnet/Stepup/Tests/Identity/Entity/ConfigurableSettingsTest.php index 853bcbffe..07442405a 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Entity/ConfigurableSettingsTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Entity/ConfigurableSettingsTest.php @@ -31,7 +31,7 @@ class ConfigurableSettingsTest extends UnitTest * @test * @group domain */ - public function a_new_email_verification_window_always_starts_now() + public function a_new_email_verification_window_always_starts_now(): void { $settings = ConfigurableSettings::create(3, []); @@ -53,7 +53,7 @@ public function a_new_email_verification_window_always_starts_now() $this->assertTrue($secondWindow->isOpen()); } - public function localeVerifications() + public function localeVerifications(): array { return [ 'No app locales, false' => [false, 'nl_NL', []], @@ -71,7 +71,7 @@ public function localeVerifications() * @param string $localeString * @param string[] $validLocaleStrings */ - public function a_locale_can_be_verified_to_be_a_valid_locale($isValid, $localeString, array $validLocaleStrings) + public function a_locale_can_be_verified_to_be_a_valid_locale(bool $isValid, string $localeString, array $validLocaleStrings): void { $configuration = ConfigurableSettings::create(3, $validLocaleStrings); diff --git a/src/Surfnet/Stepup/Tests/Identity/Entity/SecondFactorCollectionTest.php b/src/Surfnet/Stepup/Tests/Identity/Entity/SecondFactorCollectionTest.php index 142f748fb..e4f4a5220 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Entity/SecondFactorCollectionTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Entity/SecondFactorCollectionTest.php @@ -20,8 +20,8 @@ use Mockery as m; use PHPUnit\Framework\TestCase as UnitTest; -use Surfnet\Stepup\Identity\Entity\SecondFactorCollection; use Surfnet\Stepup\Identity\Entity\SecondFactor; +use Surfnet\Stepup\Identity\Entity\SecondFactorCollection; use Surfnet\StepupBundle\Service\SecondFactorTypeService; use Surfnet\StepupBundle\Value\SecondFactorType; @@ -31,7 +31,7 @@ class SecondFactorCollectionTest extends UnitTest * @test * @group domain */ - public function collection_can_return_second_factor_with_highest_loa() + public function collection_can_return_second_factor_with_highest_loa(): void { $collection = new SecondFactorCollection([ $this->mockVettedSecondFactor('sms'), @@ -50,7 +50,7 @@ public function collection_can_return_second_factor_with_highest_loa() * @param string $type * @return SecondFactor */ - private function mockVettedSecondFactor($type) + private function mockVettedSecondFactor(string $type) { $mock = m::mock('\Surfnet\Stepup\Identity\Entity\SecondFactor'); $mock->shouldReceive('getType') diff --git a/src/Surfnet/Stepup/Tests/Identity/Event/EventSerializationAndDeserializationTest.php b/src/Surfnet/Stepup/Tests/Identity/Event/EventSerializationAndDeserializationTest.php index 9a918ce90..43176fdbe 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Event/EventSerializationAndDeserializationTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Event/EventSerializationAndDeserializationTest.php @@ -81,7 +81,7 @@ class EventSerializationAndDeserializationTest extends UnitTest * @dataProvider eventProvider * @param SerializableInterface $event */ - public function an_event_should_be_the_same_after_serialization_and_deserialization(SerializableInterface $event) + public function an_event_should_be_the_same_after_serialization_and_deserialization(SerializableInterface $event): void { $isForgettableEvent = $event instanceof Forgettable; $providesSensitiveData = method_exists($event, 'getSensitiveData') || method_exists($event, 'setSensitiveData'); @@ -115,7 +115,7 @@ public function an_event_should_be_the_same_after_serialization_and_deserializat * @param string $serializedSensitiveData * @param SerializableInterface $event */ - public function an_serialized_event_should_be_the_same(string $serializedData, string $serializedSensitiveData, SerializableInterface $event) + public function an_serialized_event_should_be_the_same(string $serializedData, string $serializedSensitiveData, SerializableInterface $event): void { $isForgettableEvent = $event instanceof Forgettable; @@ -134,7 +134,7 @@ public function an_serialized_event_should_be_the_same(string $serializedData, s * @test * @group domain */ - public function an_email_verification_window_should_be_the_same_after_serialization_and_deserialization() + public function an_email_verification_window_should_be_the_same_after_serialization_and_deserialization(): void { // use a fixed datetime instance, to prevent microsecond precision issues in PHP 7.1+ $startDateTime = new DateTime(new CoreDateTime('@1000')); @@ -143,7 +143,7 @@ public function an_email_verification_window_should_be_the_same_after_serializat $this->assertTrue($window == EmailVerificationWindow::deserialize($window->serialize())); } - public function eventProvider() + public function eventProvider(): array { return [ 'CompliedWithUnverifiedSecondFactorRevocationEvent:sms' => [ @@ -546,7 +546,7 @@ public function eventProvider() ]; } - public function serializedDataProvider(){ + public function serializedDataProvider(): array{ return [ // Tests for changes in BC support for adding the VettingType in the SecondFactorVettedEvents in favour of the 'DocumentNumber' 'SecondFactorVettedEvent:support-new-event-with-vetting-type' => [ @@ -616,7 +616,7 @@ public function serializedDataProvider(){ ]; } - private static function UUID() + private static function UUID(): string { return (string) Uuid::uuid4(); } diff --git a/src/Surfnet/Stepup/Tests/Identity/Event/ForgettableEventsTest.php b/src/Surfnet/Stepup/Tests/Identity/Event/ForgettableEventsTest.php index a186b4950..6f1acce9e 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Event/ForgettableEventsTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Event/ForgettableEventsTest.php @@ -19,6 +19,7 @@ namespace Surfnet\Stepup\Tests\Identity\Event; use PHPUnit\Framework\TestCase; +use ReflectionClass; final class ForgettableEventsTest extends TestCase { @@ -26,7 +27,7 @@ final class ForgettableEventsTest extends TestCase * @test * @group domain */ - public function certain_events_are_forgettable_events_and_others_are_not() + public function certain_events_are_forgettable_events_and_others_are_not(): void { $forgettableEventFqcns = [ 'Surfnet\Stepup\Identity\Event\CompliedWithRevocationEvent', @@ -80,16 +81,16 @@ public function certain_events_are_forgettable_events_and_others_are_not() /** * @return string[] */ - private function getConcreteIdentityEventFqcns() + private function getConcreteIdentityEventFqcns(): array { return array_filter( array_map( - function ($file) { + function ($file): ?string { $fqcn = sprintf( 'Surfnet\Stepup\Identity\Event\%s', preg_replace('/\\..+?$/', '', basename($file)) ); - $reflection = new \ReflectionClass($fqcn); + $reflection = new ReflectionClass($fqcn); return $reflection->isInstantiable() ? $fqcn : null; }, glob(__DIR__ . '/../../../Identity/Event/*Event.php') diff --git a/src/Surfnet/Stepup/Tests/Identity/Event/WhitelistEventSerializationAndDeserializationTest.php b/src/Surfnet/Stepup/Tests/Identity/Event/WhitelistEventSerializationAndDeserializationTest.php index 744ad89ce..81769197f 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Event/WhitelistEventSerializationAndDeserializationTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Event/WhitelistEventSerializationAndDeserializationTest.php @@ -36,13 +36,13 @@ class WhitelistEventSerializationAndDeserializationTest extends UnitTest * @dataProvider eventProvider * @param SerializableInterface $event */ - public function an_event_should_be_the_same_after_serialization_and_deserialization(SerializableInterface $event) + public function an_event_should_be_the_same_after_serialization_and_deserialization(SerializableInterface $event): void { $class = get_class($event); $this->assertTrue($event == call_user_func([$class, 'deserialize'], $event->serialize())); } - public function eventProvider() + public function eventProvider(): array { return [ 'WhitelistCreatedEvent' => [ diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/CommonNameTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/CommonNameTest.php index 5d5e9b89d..41e4f8296 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/CommonNameTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/CommonNameTest.php @@ -19,6 +19,8 @@ namespace Surfnet\Stepup\Tests\Identity\Value; use PHPUnit\Framework\TestCase as UnitTest; +use StdClass; +use Surfnet\Stepup\Exception\InvalidArgumentException; use Surfnet\Stepup\Identity\Value\CommonName; class CommonNameTest extends UnitTest @@ -30,9 +32,9 @@ class CommonNameTest extends UnitTest * * @param mixed $invalidValue */ - public function the_common_name_address_must_be_a_non_empty_string($invalidValue) + public function the_common_name_address_must_be_a_non_empty_string(string|int|float|StdClass|array $invalidValue): void { - $this->expectException(\Surfnet\Stepup\Exception\InvalidArgumentException::class); + $this->expectException(InvalidArgumentException::class); new CommonName($invalidValue); } @@ -41,7 +43,7 @@ public function the_common_name_address_must_be_a_non_empty_string($invalidValue * @test * @group domain */ - public function two_common_names_with_the_same_value_are_equal() + public function two_common_names_with_the_same_value_are_equal(): void { $commonName = new CommonName('John Doe'); $theSame = new CommonName('John Doe'); @@ -56,7 +58,7 @@ public function two_common_names_with_the_same_value_are_equal() /** * provider for {@see the_common_name_address_must_be_a_non_empty_string()} */ - public function invalidArgumentProvider() + public function invalidArgumentProvider(): array { return [ 'empty string' => [''], @@ -64,7 +66,7 @@ public function invalidArgumentProvider() 'array' => [[]], 'integer' => [1], 'float' => [1.2], - 'object' => [new \StdClass()], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/ContactInformationTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/ContactInformationTest.php index e832ed502..f4a49e11e 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/ContactInformationTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/ContactInformationTest.php @@ -19,6 +19,8 @@ namespace Surfnet\Stepup\Tests\Identity\Value; use PHPUnit\Framework\TestCase as UnitTest; +use StdClass; +use Surfnet\Stepup\Exception\InvalidArgumentException; use Surfnet\Stepup\Identity\Value\ContactInformation; class ContactInformationTest extends UnitTest @@ -30,9 +32,9 @@ class ContactInformationTest extends UnitTest * * @param mixed $invalidValue */ - public function it_cannot_be_created_with_anything_but_a_nonempty_string($invalidValue) + public function it_cannot_be_created_with_anything_but_a_nonempty_string(int|float|StdClass|array $invalidValue): void { - $this->expectException(\Surfnet\Stepup\Exception\InvalidArgumentException::class); + $this->expectException(InvalidArgumentException::class); new ContactInformation($invalidValue); } @@ -41,7 +43,7 @@ public function it_cannot_be_created_with_anything_but_a_nonempty_string($invali * @test * @group domain */ - public function two_instances_with_the_same_value_are_equal() + public function two_instances_with_the_same_value_are_equal(): void { $contactInformation = new ContactInformation('a'); $theSame = new ContactInformation('a'); @@ -56,13 +58,13 @@ public function two_instances_with_the_same_value_are_equal() /** * dataprovider */ - public function invalidValueProvider() + public function invalidValueProvider(): array { return [ 'array' => [[]], 'integer' => [1], 'float' => [1.2], - 'object' => [new \StdClass()], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/DocumentNumberTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/DocumentNumberTest.php index 71d79a299..5663026ea 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/DocumentNumberTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/DocumentNumberTest.php @@ -19,6 +19,8 @@ namespace Surfnet\Stepup\Tests\Identity\Value; use PHPUnit\Framework\TestCase as UnitTest; +use StdClass; +use Surfnet\Stepup\Exception\InvalidArgumentException; use Surfnet\Stepup\Identity\Value\DocumentNumber; class DocumentNumberTest extends UnitTest @@ -30,9 +32,9 @@ class DocumentNumberTest extends UnitTest * * @param mixed $invalidValue */ - public function the_document_number_must_be_a_non_empty_string($invalidValue) + public function the_document_number_must_be_a_non_empty_string(string|int|float|StdClass|array $invalidValue): void { - $this->expectException(\Surfnet\Stepup\Exception\InvalidArgumentException::class); + $this->expectException(InvalidArgumentException::class); new DocumentNumber($invalidValue); } @@ -40,7 +42,7 @@ public function the_document_number_must_be_a_non_empty_string($invalidValue) * @test * @group domain */ - public function two_document_numbers_with_the_same_value_are_equal() + public function two_document_numbers_with_the_same_value_are_equal(): void { $commonName = new DocumentNumber('John Doe'); $theSame = new DocumentNumber('John Doe'); @@ -55,14 +57,14 @@ public function two_document_numbers_with_the_same_value_are_equal() /** * provider for {@see the_document_number_address_must_be_a_non_empty_string()} */ - public function invalidArgumentProvider() + public function invalidArgumentProvider(): array { return [ 'empty string' => [''], 'array' => [[]], 'integer' => [1], 'float' => [1.2], - 'object' => [new \StdClass()], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/EmailTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/EmailTest.php index 54ae3f7ea..cb39d7991 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/EmailTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/EmailTest.php @@ -19,6 +19,8 @@ namespace Surfnet\Stepup\Tests\Identity\Value; use PHPUnit\Framework\TestCase as UnitTest; +use StdClass; +use Surfnet\Stepup\Exception\InvalidArgumentException; use Surfnet\Stepup\Identity\Value\Email; class EmailTest extends UnitTest @@ -30,9 +32,9 @@ class EmailTest extends UnitTest * * @param mixed $invalidValue */ - public function the_email_address_must_be_a_non_empty_string($invalidValue) + public function the_email_address_must_be_a_non_empty_string(string|int|float|StdClass|array $invalidValue): void { - $this->expectException(\Surfnet\Stepup\Exception\InvalidArgumentException::class); + $this->expectException(InvalidArgumentException::class); new Email($invalidValue); } @@ -42,9 +44,9 @@ public function the_email_address_must_be_a_non_empty_string($invalidValue) * @dataProvider invalidEmailProvider * @param $invalidValue */ - public function the_email_address_given_must_be_rfc_822_compliant($invalidValue) + public function the_email_address_given_must_be_rfc_822_compliant(string $invalidValue): void { - $this->expectException(\Surfnet\Stepup\Exception\InvalidArgumentException::class); + $this->expectException(InvalidArgumentException::class); new Email($invalidValue); } @@ -53,7 +55,7 @@ public function the_email_address_given_must_be_rfc_822_compliant($invalidValue) * @test * @group domain */ - public function two_emails_with_the_same_value_are_equal() + public function two_emails_with_the_same_value_are_equal(): void { $email = new Email('email@example.invalid'); $theSame = new Email('email@example.invalid'); @@ -68,7 +70,7 @@ public function two_emails_with_the_same_value_are_equal() /** * provider for {@see the_email_address_must_be_a_non_empty_string()} */ - public function invalidArgumentProvider() + public function invalidArgumentProvider(): array { return [ 'empty string' => [''], @@ -76,7 +78,7 @@ public function invalidArgumentProvider() 'array' => [[]], 'integer' => [1], 'float' => [1.2], - 'object' => [new \StdClass()], + 'object' => [new StdClass()], ]; } @@ -87,7 +89,7 @@ public function invalidArgumentProvider() * * @return array */ - public function invalidEmailProvider() + public function invalidEmailProvider(): array { return [ 'no @-sign' => ['mailboxexample.invalid'], diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/EmailVerificationWindowTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/EmailVerificationWindowTest.php index 171e6cf7c..cdc1b6796 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/EmailVerificationWindowTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/EmailVerificationWindowTest.php @@ -34,7 +34,7 @@ class EmailVerificationWindowTest extends TestCase * * @runInSeparateProcess */ - public function window_is_open_for_instructed_timeframe_after_given_time() + public function window_is_open_for_instructed_timeframe_after_given_time(): void { $startTime = new DateTime(new CoreDateTime('@1')); $timeFrame = TimeFrame::ofSeconds(3); @@ -64,7 +64,7 @@ public function window_is_open_for_instructed_timeframe_after_given_time() * * @runInSeparateProcess */ - public function a_window_is_considered_equal_when_the_start_and_end_are_the_same() + public function a_window_is_considered_equal_when_the_start_and_end_are_the_same(): void { // since we work with second precision, we might run issues trusting normal time, so we fixate the time DateTimeHelper::setCurrentTime(new DateTime(new CoreDateTime('@10000'))); @@ -93,7 +93,7 @@ public function a_window_is_considered_equal_when_the_start_and_end_are_the_same * * @runInSeparateProcess */ - public function the_window_correctly_calculates_the_end_datetime() + public function the_window_correctly_calculates_the_end_datetime(): void { // since we work with second precision, we might run issues trusting normal time, so we fixate the time DateTimeHelper::setCurrentTime(new DateTime(new CoreDateTime('@10'))); @@ -118,7 +118,7 @@ public function the_window_correctly_calculates_the_end_datetime() * @param string|null $startTimeOffset * @return EmailVerificationWindow */ - private function newEmailVerificationWindow($timeFrameSeconds, $startTimeOffset = null) + private function newEmailVerificationWindow(int $timeFrameSeconds, $startTimeOffset = null) { $start = DateTime::now(); if ($startTimeOffset) { diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/GssfIdTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/GssfIdTest.php index 8287d246d..b030ec138 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/GssfIdTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/GssfIdTest.php @@ -19,6 +19,8 @@ namespace Surfnet\Stepup\Tests\Identity\Value; use PHPUnit\Framework\TestCase as UnitTest; +use StdClass; +use Surfnet\Stepup\Exception\InvalidArgumentException; use Surfnet\Stepup\Identity\Value\GssfId; class GssfIdTest extends UnitTest @@ -30,9 +32,9 @@ class GssfIdTest extends UnitTest * * @param mixed $invalidValue */ - public function a_gssf_id_cannot_be_created_with_anything_but_a_nonempty_string($invalidValue) + public function a_gssf_id_cannot_be_created_with_anything_but_a_nonempty_string(string|int|float|StdClass|array $invalidValue): void { - $this->expectException(\Surfnet\Stepup\Exception\InvalidArgumentException::class); + $this->expectException(InvalidArgumentException::class); new GssfId($invalidValue); } @@ -41,7 +43,7 @@ public function a_gssf_id_cannot_be_created_with_anything_but_a_nonempty_string( * @test * @group domain */ - public function two_gssf_ids_with_the_same_value_are_equal() + public function two_gssf_ids_with_the_same_value_are_equal(): void { $gssf = new GssfId('a'); $theSame = new GssfId(' a'); @@ -56,7 +58,7 @@ public function two_gssf_ids_with_the_same_value_are_equal() /** * DataProvider for {@see a_gssf_od_cannot_be_created_with_anything_but_a_nonempty_string()} */ - public function invalidValueProvider() + public function invalidValueProvider(): array { return [ 'empty string' => [''], @@ -64,7 +66,7 @@ public function invalidValueProvider() 'array' => [[]], 'integer' => [1], 'float' => [1.2], - 'object' => [new \StdClass()], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/InstitutionTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/InstitutionTest.php index f058901dd..496881bd6 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/InstitutionTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/InstitutionTest.php @@ -19,6 +19,8 @@ namespace Surfnet\Stepup\Tests\Identity\Value; use PHPUnit\Framework\TestCase as UnitTest; +use StdClass; +use Surfnet\Stepup\Exception\InvalidArgumentException; use Surfnet\Stepup\Identity\Value\Institution; class InstitutionTest extends UnitTest @@ -30,9 +32,9 @@ class InstitutionTest extends UnitTest * * @param mixed $invalidValue */ - public function an_institution_cannot_be_created_with_anything_but_a_nonempty_string($invalidValue) + public function an_institution_cannot_be_created_with_anything_but_a_nonempty_string(string|int|float|StdClass|array $invalidValue): void { - $this->expectException(\Surfnet\Stepup\Exception\InvalidArgumentException::class); + $this->expectException(InvalidArgumentException::class); new Institution($invalidValue); } @@ -41,7 +43,7 @@ public function an_institution_cannot_be_created_with_anything_but_a_nonempty_st * @test * @group domain */ - public function two_institutions_with_the_same_value_are_equal() + public function two_institutions_with_the_same_value_are_equal(): void { $institution = new Institution('a'); $theSame = new Institution('a'); @@ -56,7 +58,7 @@ public function two_institutions_with_the_same_value_are_equal() /** * dataprovider */ - public function invalidValueProvider() + public function invalidValueProvider(): array { return [ 'empty string' => [''], @@ -64,7 +66,7 @@ public function invalidValueProvider() 'array' => [[]], 'integer' => [1], 'float' => [1.2], - 'object' => [new \StdClass()], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/LocationTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/LocationTest.php index a3138c044..cc4104dcc 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/LocationTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/LocationTest.php @@ -19,6 +19,8 @@ namespace Surfnet\Stepup\Tests\Identity\Value; use PHPUnit\Framework\TestCase as UnitTest; +use StdClass; +use Surfnet\Stepup\Exception\InvalidArgumentException; use Surfnet\Stepup\Identity\Value\Location; class LocationTest extends UnitTest @@ -30,9 +32,9 @@ class LocationTest extends UnitTest * * @param mixed $invalidValue */ - public function it_cannot_be_created_with_anything_but_a_nonempty_string($invalidValue) + public function it_cannot_be_created_with_anything_but_a_nonempty_string(int|float|StdClass|array $invalidValue): void { - $this->expectException(\Surfnet\Stepup\Exception\InvalidArgumentException::class); + $this->expectException(InvalidArgumentException::class); new Location($invalidValue); } @@ -41,7 +43,7 @@ public function it_cannot_be_created_with_anything_but_a_nonempty_string($invali * @test * @group domain */ - public function two_locations_with_the_same_value_are_equal() + public function two_locations_with_the_same_value_are_equal(): void { $location = new Location('a'); $theSame = new Location('a'); @@ -56,13 +58,13 @@ public function two_locations_with_the_same_value_are_equal() /** * dataprovider */ - public function invalidValueProvider() + public function invalidValueProvider(): array { return [ 'array' => [[]], 'integer' => [1], 'float' => [1.2], - 'object' => [new \StdClass()], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/PhoneNumberTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/PhoneNumberTest.php index 47ce75305..47450faa7 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/PhoneNumberTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/PhoneNumberTest.php @@ -19,6 +19,8 @@ namespace Surfnet\Stepup\Tests\Identity\Value; use PHPUnit\Framework\TestCase as UnitTest; +use StdClass; +use Surfnet\Stepup\Exception\InvalidArgumentException; use Surfnet\Stepup\Identity\Value\PhoneNumber; class PhoneNumberTest extends UnitTest @@ -30,9 +32,9 @@ class PhoneNumberTest extends UnitTest * * @param mixed $invalidValue */ - public function a_phone_number_cannot_be_created_with_anything_but_a_nonempty_string($invalidValue) + public function a_phone_number_cannot_be_created_with_anything_but_a_nonempty_string(string|int|float|StdClass|array $invalidValue): void { - $this->expectException(\Surfnet\Stepup\Exception\InvalidArgumentException::class); + $this->expectException(InvalidArgumentException::class); new PhoneNumber($invalidValue); } @@ -41,7 +43,7 @@ public function a_phone_number_cannot_be_created_with_anything_but_a_nonempty_st * @test * @group domain */ - public function two_phone_numbers_with_the_same_value_are_equal() + public function two_phone_numbers_with_the_same_value_are_equal(): void { $one = new PhoneNumber('+31 (0) 12345678'); $theSame = new PhoneNumber('+31 (0) 12345678'); @@ -56,7 +58,7 @@ public function two_phone_numbers_with_the_same_value_are_equal() /** * DataProvider for {@see a_phonenumber_cannot_be_created_with_anything_but_a_nonempty_string()} */ - public function invalidValueProvider() + public function invalidValueProvider(): array { return [ 'empty string' => [''], @@ -64,7 +66,7 @@ public function invalidValueProvider() 'array' => [[]], 'integer' => [1], 'float' => [1.2], - 'object' => [new \StdClass()], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/RecoveryTokenIdentifierFactoryTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/RecoveryTokenIdentifierFactoryTest.php index 58bd671f5..3748d1533 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/RecoveryTokenIdentifierFactoryTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/RecoveryTokenIdentifierFactoryTest.php @@ -30,7 +30,7 @@ final class RecoveryTokenIdentifierFactoryTest extends TestCase /** * @group domain */ - public function test_generates_identifiers_of_all_types() + public function test_generates_identifiers_of_all_types(): void { $this->assertEquals( new PhoneNumber('+31 (0) 12345678'), diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/RegistrationAuthorityRoleTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/RegistrationAuthorityRoleTest.php index c942ad277..48234281d 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/RegistrationAuthorityRoleTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/RegistrationAuthorityRoleTest.php @@ -19,6 +19,8 @@ namespace Surfnet\Stepup\Tests\Identity\Value; use PHPUnit\Framework\TestCase as UnitTest; +use StdClass; +use Surfnet\Stepup\Exception\InvalidArgumentException; use Surfnet\Stepup\Identity\Value\RegistrationAuthorityRole; class RegistrationAuthorityRoleTest extends UnitTest @@ -30,9 +32,9 @@ class RegistrationAuthorityRoleTest extends UnitTest * * @param mixed $invalidValue */ - public function it_cannot_be_created_with_anything_but_a_valid_role($invalidValue) + public function it_cannot_be_created_with_anything_but_a_valid_role(float|StdClass|array $invalidValue): void { - $this->expectException(\Surfnet\Stepup\Exception\InvalidArgumentException::class); + $this->expectException(InvalidArgumentException::class); new RegistrationAuthorityRole($invalidValue); } @@ -41,7 +43,7 @@ public function it_cannot_be_created_with_anything_but_a_valid_role($invalidValu * @test * @group domain */ - public function two_roles_with_the_same_value_are_equal() + public function two_roles_with_the_same_value_are_equal(): void { $role = new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RAA); $theSame = new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RAA); @@ -54,12 +56,12 @@ public function two_roles_with_the_same_value_are_equal() /** * dataprovider */ - public function invalidValueProvider() + public function invalidValueProvider(): array { return [ 'array' => [[]], 'float' => [1.2], - 'object' => [new \StdClass()], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/SafeStoreTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/SafeStoreTest.php index 46154bbbd..cb4b09c8b 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/SafeStoreTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/SafeStoreTest.php @@ -31,7 +31,7 @@ class SafeStoreTest extends UnitTest /** * @group domain */ - public function test_creation_of_safe_store() + public function test_creation_of_safe_store(): void { $unhashed = new UnhashedSecret('super-secret'); $instance = new SafeStore($unhashed->hashSecret()); @@ -42,7 +42,7 @@ public function test_creation_of_safe_store() /** * @group domain */ - public function test_equals() + public function test_equals(): void { $safeStore = new SafeStore(new UnhashedSecret('a')); $safeStore2 = new SafeStore(new UnhashedSecret('a')); diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/SecondFactorIdentifierFactoryTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/SecondFactorIdentifierFactoryTest.php index 05b8d4a5a..485b98a55 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/SecondFactorIdentifierFactoryTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/SecondFactorIdentifierFactoryTest.php @@ -31,7 +31,7 @@ final class SecondFactorIdentifierFactoryTest extends TestCase * @test * @group domain */ - public function generates_identifiers_of_all_types() + public function generates_identifiers_of_all_types(): void { $this->assertEquals( new PhoneNumber('+31 (0) 12345678'), diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/StepupProviderTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/StepupProviderTest.php index 81a199cf5..eb1a38c18 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/StepupProviderTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/StepupProviderTest.php @@ -19,6 +19,8 @@ namespace Surfnet\Stepup\Tests\Identity\Value; use PHPUnit\Framework\TestCase as UnitTest; +use StdClass; +use Surfnet\Stepup\Exception\InvalidArgumentException; use Surfnet\Stepup\Identity\Value\StepupProvider; class StepupProviderTest extends UnitTest @@ -30,9 +32,9 @@ class StepupProviderTest extends UnitTest * * @param mixed $invalidValue */ - public function a_stepup_provider_cannot_be_created_with_anything_but_a_nonempty_string($invalidValue) + public function a_stepup_provider_cannot_be_created_with_anything_but_a_nonempty_string(string|int|float|StdClass|array $invalidValue): void { - $this->expectException(\Surfnet\Stepup\Exception\InvalidArgumentException::class); + $this->expectException(InvalidArgumentException::class); new StepupProvider($invalidValue); } @@ -41,7 +43,7 @@ public function a_stepup_provider_cannot_be_created_with_anything_but_a_nonempty * @test * @group domain */ - public function two_stepup_providers_with_the_same_value_are_equal() + public function two_stepup_providers_with_the_same_value_are_equal(): void { $institution = new StepupProvider('a'); $theSame = new StepupProvider('a'); @@ -54,7 +56,7 @@ public function two_stepup_providers_with_the_same_value_are_equal() /** * DataProvider for {@see a_stepup_provider_cannot_be_created_with_anything_but_a_nonempty_string()} */ - public function invalidValueProvider() + public function invalidValueProvider(): array { return [ 'empty string' => [''], @@ -62,7 +64,7 @@ public function invalidValueProvider() 'array' => [[]], 'integer' => [1], 'float' => [1.2], - 'object' => [new \StdClass()], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/TimeFrameTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/TimeFrameTest.php index 98bb4ebbd..9b5015752 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/TimeFrameTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/TimeFrameTest.php @@ -19,6 +19,8 @@ namespace Surfnet\Stepup\Tests\Identity\Value; use PHPUnit\Framework\TestCase as UnitTest; +use StdClass; +use Surfnet\Stepup\Exception\InvalidArgumentException; use Surfnet\Stepup\Identity\Value\TimeFrame; class TimeFrameTest extends UnitTest @@ -28,9 +30,9 @@ class TimeFrameTest extends UnitTest * @group domain * @dataProvider invalidValueProvider */ - public function it_cannot_be_given_an_non_positive_amount_of_seconds($invalidValue) + public function it_cannot_be_given_an_non_positive_amount_of_seconds(string|float|int|StdClass|array $invalidValue): void { - $this->expectException(\Surfnet\Stepup\Exception\InvalidArgumentException::class); + $this->expectException(InvalidArgumentException::class); TimeFrame::ofSeconds($invalidValue); } @@ -39,7 +41,7 @@ public function it_cannot_be_given_an_non_positive_amount_of_seconds($invalidVal * @test * @group domain */ - public function to_string_output_matches_amount_of_seconds_as_string() + public function to_string_output_matches_amount_of_seconds_as_string(): void { $seconds = 1000; @@ -55,7 +57,7 @@ public function to_string_output_matches_amount_of_seconds_as_string() /** * dataprovider */ - public function invalidValueProvider() + public function invalidValueProvider(): array { return [ 'empty string' => [''], @@ -64,7 +66,7 @@ public function invalidValueProvider() 'float' => [2.718], 'zero' => [0], 'negative int' => [-1], - 'object' => [new \StdClass()], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/YubikeyPublicIdTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/YubikeyPublicIdTest.php index 81840b8ee..3a6f2a7d9 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/YubikeyPublicIdTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/YubikeyPublicIdTest.php @@ -19,6 +19,7 @@ namespace Surfnet\Stepup\Tests\Identity\Value; use PHPUnit\Framework\TestCase as UnitTest; +use Surfnet\Stepup\Exception\InvalidArgumentException; use Surfnet\Stepup\Identity\Value\YubikeyPublicId; class YubikeyPublicIdTest extends UnitTest @@ -27,7 +28,7 @@ class YubikeyPublicIdTest extends UnitTest * @test * @group domain */ - public function two_yubikey_public_ids_with_the_same_value_are_equal() + public function two_yubikey_public_ids_with_the_same_value_are_equal(): void { $id = new YubikeyPublicId('00001234'); $theSame = new YubikeyPublicId('00001234'); @@ -39,7 +40,7 @@ public function two_yubikey_public_ids_with_the_same_value_are_equal() $this->assertFalse($id->equals($unknown)); } - public function invalidFormatProvider() + public function invalidFormatProvider(): array { return [ '7-character unpadded ID' => ['1906381'], @@ -60,14 +61,14 @@ public function invalidFormatProvider() * * @param mixed $invalidFormat */ - public function it_cannot_be_constructed_with_an_invalid_format($invalidFormat) + public function it_cannot_be_constructed_with_an_invalid_format(string $invalidFormat): void { - $this->expectException(\Surfnet\Stepup\Exception\InvalidArgumentException::class); + $this->expectException(InvalidArgumentException::class); new YubikeyPublicId($invalidFormat); } - public function validFormatProvider() + public function validFormatProvider(): array { return [ '8-character ID' => ['01906381'], @@ -85,7 +86,7 @@ public function validFormatProvider() * * @param string $validFormat */ - public function its_value_matches_its_input_value($validFormat) + public function its_value_matches_its_input_value(string $validFormat): void { $id = new YubikeyPublicId($validFormat); diff --git a/src/Surfnet/Stepup/Token/TokenGenerator.php b/src/Surfnet/Stepup/Token/TokenGenerator.php index 1c0143ae1..0005110e9 100644 --- a/src/Surfnet/Stepup/Token/TokenGenerator.php +++ b/src/Surfnet/Stepup/Token/TokenGenerator.php @@ -25,7 +25,7 @@ class TokenGenerator * * @return string */ - public static function generateNonce() + public static function generateNonce(): string { return md5(openssl_random_pseudo_bytes(50)); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Filter/InstitutionAuthorizationRepositoryFilter.php b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Filter/InstitutionAuthorizationRepositoryFilter.php index 811e49dd3..1b742040f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Filter/InstitutionAuthorizationRepositoryFilter.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Filter/InstitutionAuthorizationRepositoryFilter.php @@ -34,7 +34,7 @@ public function filter( InstitutionAuthorizationContextInterface $authorizationContext, $institutionField, $authorizationAlias - ) { + ): void { // If actor is SRAA we don't need filtering if ($authorizationContext->isActorSraa()) { return; @@ -63,7 +63,7 @@ public function filter( * @param $name * @return string */ - private function getParameterName($authorizationAlias, $name) + private function getParameterName($authorizationAlias, string $name): string { return "{$authorizationAlias}_{$name}"; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/AuthorizationContextService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/AuthorizationContextService.php index 01c1773a6..3577b4c5e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/AuthorizationContextService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/AuthorizationContextService.php @@ -37,25 +37,13 @@ */ class AuthorizationContextService { - /** - * @var SraaService - */ - private $sraaService; + private SraaService $sraaService; - /** - * @var IdentityService - */ - private $identityService; + private IdentityService $identityService; - /** - * @var ConfiguredInstitutionRepository - */ - private $institutionRepository; + private ConfiguredInstitutionRepository $institutionRepository; - /** - * @var AuthorizationRepository - */ - private $authorizationRepository; + private AuthorizationRepository $authorizationRepository; public function __construct( SraaService $sraaService, @@ -102,7 +90,7 @@ public function buildInstitutionAuthorizationContext( return new InstitutionAuthorizationContext($institutions, $isSraa); } - private function isSraa(IdentityId $actorId) + private function isSraa(IdentityId $actorId): bool { $identity = $this->identityService->find((string)$actorId); if (!$identity) { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/AuthorizationService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/AuthorizationService.php index 697dc8512..c26e648ed 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/AuthorizationService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/AuthorizationService.php @@ -38,25 +38,13 @@ */ class AuthorizationService { - /** - * @var IdentityService - */ - private $identityService; + private IdentityService $identityService; - /** - * @var InstitutionConfigurationOptionsService - */ - private $institutionConfigurationService; + private InstitutionConfigurationOptionsService $institutionConfigurationService; - /** - * @var SecondFactorService - */ - private $secondFactorService; + private SecondFactorService $secondFactorService; - /** - * @var RecoveryTokenService - */ - private $recoveryTokenService; + private RecoveryTokenService $recoveryTokenService; public function __construct( IdentityService $identityService, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/CommandAuthorizationService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/CommandAuthorizationService.php index 10779b05a..6b2b584f3 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/CommandAuthorizationService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/CommandAuthorizationService.php @@ -56,22 +56,10 @@ */ class CommandAuthorizationService { - /** - * @var WhitelistService - */ - private $whitelistService; - /** - * @var IdentityService - */ - private $identityService; - /** - * @var AuthorizationContextService - */ - private $authorizationContextService; - /** - * @var LoggerInterface - */ - private $logger; + private WhitelistService $whitelistService; + private IdentityService $identityService; + private AuthorizationContextService $authorizationContextService; + private LoggerInterface $logger; public function __construct( WhitelistService $whitelistService, @@ -90,7 +78,7 @@ public function __construct( * @param IdentityId|null $actorId * @return bool */ - public function isInstitutionWhitelisted(Institution $institution, IdentityId $actorId = null) + public function isInstitutionWhitelisted(Institution $institution, IdentityId $actorId = null): bool { // If the actor is SRAA all actions should be allowed if (!is_null($actorId) && $this->isSraa($actorId)) { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/AuthorizationDecision.php b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/AuthorizationDecision.php index 3cfca7ea6..0e78bd2d3 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/AuthorizationDecision.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/AuthorizationDecision.php @@ -22,16 +22,16 @@ final class AuthorizationDecision { - private $code; + private int $code; - private $errorMessages; + private array $errorMessages; - public static function allowed() + public static function allowed(): self { return new self(200); } - public static function denied(array $messages = []) + public static function denied(array $messages = []): self { Assertion::allString($messages, 'The error messages should all be strings'); return new self(403, $messages); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionAuthorizationContext.php b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionAuthorizationContext.php index 598921dc8..906b10ce4 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionAuthorizationContext.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionAuthorizationContext.php @@ -34,15 +34,9 @@ */ class InstitutionAuthorizationContext implements InstitutionAuthorizationContextInterface { - /** - * @var InstitutionCollection|null - */ - private $institutions; + private ?InstitutionCollection $institutions; - /** - * @var bool - */ - private $isSraa; + private bool $isSraa; public function __construct( InstitutionCollection $institutions = null, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionRoleSet.php b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionRoleSet.php index 3ea0bf6a0..9af40c8f6 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionRoleSet.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionRoleSet.php @@ -26,7 +26,7 @@ final class InstitutionRoleSet implements InstitutionRoleSetInterface /** * @var InstitutionRole[] */ - private $institutionRoles; + private array $institutionRoles; public function __construct(array $institutionRoles) { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/AllowedSecondFactor.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/AllowedSecondFactor.php index 8be3d62b6..305a94116 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/AllowedSecondFactor.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/AllowedSecondFactor.php @@ -51,7 +51,7 @@ private function __construct() * @param SecondFactorType $secondFactorType * @return AllowedSecondFactor */ - public static function createFrom(Institution $institution, SecondFactorType $secondFactorType) + public static function createFrom(Institution $institution, SecondFactorType $secondFactorType): self { $allowedSecondFactor = new self; $allowedSecondFactor->institution = $institution; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/ConfiguredInstitution.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/ConfiguredInstitution.php index 405c554c7..3e95abde7 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/ConfiguredInstitution.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/ConfiguredInstitution.php @@ -37,7 +37,7 @@ class ConfiguredInstitution * @param Institution $institution * @return ConfiguredInstitution */ - public static function createFrom(Institution $institution) + public static function createFrom(Institution $institution): self { $configuredInstitution = new self; $configuredInstitution->institution = $institution; @@ -45,7 +45,7 @@ public static function createFrom(Institution $institution) return $configuredInstitution; } - public function jsonSerialize() + public function jsonSerialize(): array { return ['institution' => $this->institution]; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/InstitutionAuthorization.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/InstitutionAuthorization.php index 0808c2adc..1b4dd860a 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/InstitutionAuthorization.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/InstitutionAuthorization.php @@ -62,7 +62,7 @@ public static function create( Institution $institution, Institution $institutionRelation, InstitutionRole $institutionRole - ) { + ): self { $options = new self; $options->institution = $institution; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/InstitutionConfigurationOptions.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/InstitutionConfigurationOptions.php index 0f5827a5f..dbfecfdba 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/InstitutionConfigurationOptions.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/InstitutionConfigurationOptions.php @@ -91,7 +91,7 @@ public static function create( SsoOn2faOption $ssoOn2faOption, SelfVetOption $selfVetOption, SelfAssertedTokensOption $selfAssertedTokensOption - ) { + ): self { $options = new self; $options->institution = $institution; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/RaLocation.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/RaLocation.php index 1f0e63203..3b1f0f33c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/RaLocation.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/RaLocation.php @@ -70,7 +70,7 @@ public static function create( RaLocationName $name, Location $location, ContactInformation $contactInformation - ) { + ): self { if (!is_string($id)) { throw InvalidArgumentException::invalidType('string', 'id', $id); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/AllowedSecondFactorListProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/AllowedSecondFactorListProjector.php index b12eb7982..2ed3432bb 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/AllowedSecondFactorListProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/AllowedSecondFactorListProjector.php @@ -25,10 +25,7 @@ final class AllowedSecondFactorListProjector extends Projector { - /** - * @var AllowedSecondFactorRepository - */ - private $allowedSecondFactorRepository; + private AllowedSecondFactorRepository $allowedSecondFactorRepository; public function __construct(AllowedSecondFactorRepository $allowedSecondFactorRepository) { @@ -38,7 +35,7 @@ public function __construct(AllowedSecondFactorRepository $allowedSecondFactorRe /** * @param AllowedSecondFactorListUpdatedEvent $event */ - public function applyAllowedSecondFactorListUpdatedEvent(AllowedSecondFactorListUpdatedEvent $event) + public function applyAllowedSecondFactorListUpdatedEvent(AllowedSecondFactorListUpdatedEvent $event): void { // Start with a clean slate $this->allowedSecondFactorRepository->clearAllowedSecondFactorListFor($event->institution); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/ConfiguredInstitutionProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/ConfiguredInstitutionProjector.php index 76baf7084..70de45aa4 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/ConfiguredInstitutionProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/ConfiguredInstitutionProjector.php @@ -26,22 +26,19 @@ final class ConfiguredInstitutionProjector extends Projector { - /** - * @var ConfiguredInstitutionRepository - */ - private $configuredInstitutionRepository; + private ConfiguredInstitutionRepository $configuredInstitutionRepository; public function __construct(ConfiguredInstitutionRepository $configuredInstitutionRepository) { $this->configuredInstitutionRepository = $configuredInstitutionRepository; } - public function applyNewInstitutionConfigurationCreatedEvent(NewInstitutionConfigurationCreatedEvent $event) + public function applyNewInstitutionConfigurationCreatedEvent(NewInstitutionConfigurationCreatedEvent $event): void { $this->configuredInstitutionRepository->save(ConfiguredInstitution::createFrom($event->institution)); } - public function applyInstitutionConfigurationRemovedEvent(InstitutionConfigurationRemovedEvent $event) + public function applyInstitutionConfigurationRemovedEvent(InstitutionConfigurationRemovedEvent $event): void { $this->configuredInstitutionRepository->removeConfigurationFor($event->institution); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/InstitutionAuthorizationProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/InstitutionAuthorizationProjector.php index 65133cecc..08501e3fb 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/InstitutionAuthorizationProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/InstitutionAuthorizationProjector.php @@ -32,14 +32,8 @@ */ final class InstitutionAuthorizationProjector extends Projector { - /** - * @var InstitutionAuthorizationRepository - */ - private $institutionAuthorizationRepository; - /** - * @var InstitutionConfigurationOptionsRepository - */ - private $institutionConfigurationOptionsRepository; + private InstitutionAuthorizationRepository $institutionAuthorizationRepository; + private InstitutionConfigurationOptionsRepository $institutionConfigurationOptionsRepository; public function __construct( InstitutionAuthorizationRepository $institutionAuthorizationRepository, @@ -49,12 +43,12 @@ public function __construct( $this->institutionConfigurationOptionsRepository = $institutionConfigurationOptionsRepository; } - public function applyNewInstitutionConfigurationCreatedEvent(NewInstitutionConfigurationCreatedEvent $event) + public function applyNewInstitutionConfigurationCreatedEvent(NewInstitutionConfigurationCreatedEvent $event): void { $this->institutionAuthorizationRepository->setDefaultInstitutionOption($event->institution); } - public function applyUseRaOptionChangedEvent(UseRaOptionChangedEvent $event) + public function applyUseRaOptionChangedEvent(UseRaOptionChangedEvent $event): void { $this->institutionAuthorizationRepository->saveInstitutionOption( $event->institution, @@ -62,7 +56,7 @@ public function applyUseRaOptionChangedEvent(UseRaOptionChangedEvent $event) ); } - public function applyUseRaaOptionChangedEvent(UseRaaOptionChangedEvent $event) + public function applyUseRaaOptionChangedEvent(UseRaaOptionChangedEvent $event): void { $this->institutionAuthorizationRepository->saveInstitutionOption( $event->institution, @@ -70,7 +64,7 @@ public function applyUseRaaOptionChangedEvent(UseRaaOptionChangedEvent $event) ); } - public function applySelectRaaOptionChangedEvent(SelectRaaOptionChangedEvent $event) + public function applySelectRaaOptionChangedEvent(SelectRaaOptionChangedEvent $event): void { $this->institutionAuthorizationRepository->saveInstitutionOption( $event->institution, @@ -78,7 +72,7 @@ public function applySelectRaaOptionChangedEvent(SelectRaaOptionChangedEvent $ev ); } - public function applyInstitutionConfigurationRemovedEvent(InstitutionConfigurationRemovedEvent $event) + public function applyInstitutionConfigurationRemovedEvent(InstitutionConfigurationRemovedEvent $event): void { $this->institutionAuthorizationRepository->clearInstitutionOption( $event->institution diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/InstitutionConfigurationOptionsProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/InstitutionConfigurationOptionsProjector.php index 675b247da..5b38dcdab 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/InstitutionConfigurationOptionsProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/InstitutionConfigurationOptionsProjector.php @@ -34,15 +34,9 @@ final class InstitutionConfigurationOptionsProjector extends Projector { - /** - * @var InstitutionConfigurationOptionsRepository - */ - private $institutionConfigurationOptionsRepository; + private InstitutionConfigurationOptionsRepository $institutionConfigurationOptionsRepository; - /** - * @var AllowedSecondFactorRepository - */ - private $allowedSecondFactorRepository; + private AllowedSecondFactorRepository $allowedSecondFactorRepository; public function __construct( InstitutionConfigurationOptionsRepository $institutionConfigurationOptionsRepository, @@ -52,7 +46,7 @@ public function __construct( $this->allowedSecondFactorRepository = $allowedSecondFactorRepository; } - public function applyNewInstitutionConfigurationCreatedEvent(NewInstitutionConfigurationCreatedEvent $event) + public function applyNewInstitutionConfigurationCreatedEvent(NewInstitutionConfigurationCreatedEvent $event): void { $institutionConfigurationOptions = InstitutionConfigurationOptions::create( $event->institution, @@ -68,7 +62,7 @@ public function applyNewInstitutionConfigurationCreatedEvent(NewInstitutionConfi $this->institutionConfigurationOptionsRepository->save($institutionConfigurationOptions); } - public function applyUseRaLocationsOptionChangedEvent(UseRaLocationsOptionChangedEvent $event) + public function applyUseRaLocationsOptionChangedEvent(UseRaLocationsOptionChangedEvent $event): void { $institutionConfigurationOptions = $this->institutionConfigurationOptionsRepository->findConfigurationOptionsFor($event->institution); $institutionConfigurationOptions->useRaLocationsOption = $event->useRaLocationsOption; @@ -76,7 +70,7 @@ public function applyUseRaLocationsOptionChangedEvent(UseRaLocationsOptionChange $this->institutionConfigurationOptionsRepository->save($institutionConfigurationOptions); } - public function applyShowRaaContactInformationOptionChangedEvent(ShowRaaContactInformationOptionChangedEvent $event) + public function applyShowRaaContactInformationOptionChangedEvent(ShowRaaContactInformationOptionChangedEvent $event): void { $institutionConfigurationOptions = $this->institutionConfigurationOptionsRepository->findConfigurationOptionsFor($event->institution); $institutionConfigurationOptions->showRaaContactInformationOption = $event->showRaaContactInformationOption; @@ -84,7 +78,7 @@ public function applyShowRaaContactInformationOptionChangedEvent(ShowRaaContactI $this->institutionConfigurationOptionsRepository->save($institutionConfigurationOptions); } - public function applyVerifyEmailOptionChangedEvent(VerifyEmailOptionChangedEvent $event) + public function applyVerifyEmailOptionChangedEvent(VerifyEmailOptionChangedEvent $event): void { $institutionConfigurationOptions = $this->institutionConfigurationOptionsRepository->findConfigurationOptionsFor($event->institution); $institutionConfigurationOptions->verifyEmailOption = $event->verifyEmailOption; @@ -92,7 +86,7 @@ public function applyVerifyEmailOptionChangedEvent(VerifyEmailOptionChangedEvent $this->institutionConfigurationOptionsRepository->save($institutionConfigurationOptions); } - public function applyNumberOfTokensPerIdentityOptionChangedEvent(NumberOfTokensPerIdentityOptionChangedEvent $event) + public function applyNumberOfTokensPerIdentityOptionChangedEvent(NumberOfTokensPerIdentityOptionChangedEvent $event): void { $institutionConfigurationOptions = $this->institutionConfigurationOptionsRepository->findConfigurationOptionsFor($event->institution); $institutionConfigurationOptions->numberOfTokensPerIdentityOption = $event->numberOfTokensPerIdentityOption; @@ -100,7 +94,7 @@ public function applyNumberOfTokensPerIdentityOptionChangedEvent(NumberOfTokensP $this->institutionConfigurationOptionsRepository->save($institutionConfigurationOptions); } - public function applySelfVetOptionChangedEvent(SelfVetOptionChangedEvent $event) + public function applySelfVetOptionChangedEvent(SelfVetOptionChangedEvent $event): void { $institutionConfigurationOptions = $this->institutionConfigurationOptionsRepository->findConfigurationOptionsFor($event->institution); $institutionConfigurationOptions->selfVetOption = $event->selfVetOption; @@ -108,7 +102,7 @@ public function applySelfVetOptionChangedEvent(SelfVetOptionChangedEvent $event) $this->institutionConfigurationOptionsRepository->save($institutionConfigurationOptions); } - public function applySsoOn2faOptionChangedEvent(SsoOn2faOptionChangedEvent $event) + public function applySsoOn2faOptionChangedEvent(SsoOn2faOptionChangedEvent $event): void { $institutionConfigurationOptions = $this->institutionConfigurationOptionsRepository->findConfigurationOptionsFor($event->institution); $institutionConfigurationOptions->ssoOn2faOption = $event->ssoOn2faOption; @@ -116,7 +110,7 @@ public function applySsoOn2faOptionChangedEvent(SsoOn2faOptionChangedEvent $even $this->institutionConfigurationOptionsRepository->save($institutionConfigurationOptions); } - public function applySelfAssertedTokensOptionChangedEvent(SelfAssertedTokensOptionChangedEvent $event) + public function applySelfAssertedTokensOptionChangedEvent(SelfAssertedTokensOptionChangedEvent $event): void { $institutionConfigurationOptions = $this->institutionConfigurationOptionsRepository->findConfigurationOptionsFor($event->institution); $institutionConfigurationOptions->selfAssertedTokensOption = $event->selfAssertedTokensOption; @@ -124,7 +118,7 @@ public function applySelfAssertedTokensOptionChangedEvent(SelfAssertedTokensOpti $this->institutionConfigurationOptionsRepository->save($institutionConfigurationOptions); } - public function applyInstitutionConfigurationRemovedEvent(InstitutionConfigurationRemovedEvent $event) + public function applyInstitutionConfigurationRemovedEvent(InstitutionConfigurationRemovedEvent $event): void { $this->institutionConfigurationOptionsRepository->removeConfigurationOptionsFor($event->institution); $this->allowedSecondFactorRepository->clearAllowedSecondFactorListFor($event->institution); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/RaLocationProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/RaLocationProjector.php index fd1c95fd2..864178401 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/RaLocationProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/RaLocationProjector.php @@ -32,17 +32,14 @@ class RaLocationProjector extends Projector { - /** - * @var RaLocationRepository - */ - private $repository; + private RaLocationRepository $repository; public function __construct(RaLocationRepository $repository) { $this->repository = $repository; } - public function applyRaLocationAddedEvent(RaLocationAddedEvent $event) + public function applyRaLocationAddedEvent(RaLocationAddedEvent $event): void { $raLocation = RaLocation::create( $event->raLocationId->getRaLocationId(), @@ -55,7 +52,7 @@ public function applyRaLocationAddedEvent(RaLocationAddedEvent $event) $this->repository->save($raLocation); } - public function applyRaLocationRenamedEvent(RaLocationRenamedEvent $event) + public function applyRaLocationRenamedEvent(RaLocationRenamedEvent $event): void { $raLocation = $this->fetchRaLocationById($event->raLocationId); @@ -64,7 +61,7 @@ public function applyRaLocationRenamedEvent(RaLocationRenamedEvent $event) $this->repository->save($raLocation); } - public function applyRaLocationRelocatedEvent(RaLocationRelocatedEvent $event) + public function applyRaLocationRelocatedEvent(RaLocationRelocatedEvent $event): void { $raLocation = $this->fetchRaLocationById($event->raLocationId); @@ -73,7 +70,7 @@ public function applyRaLocationRelocatedEvent(RaLocationRelocatedEvent $event) $this->repository->save($raLocation); } - public function applyRaLocationContactInformationChangedEvent(RaLocationContactInformationChangedEvent $event) + public function applyRaLocationContactInformationChangedEvent(RaLocationContactInformationChangedEvent $event): void { $raLocation = $this->fetchRaLocationById($event->raLocationId); @@ -82,14 +79,14 @@ public function applyRaLocationContactInformationChangedEvent(RaLocationContactI $this->repository->save($raLocation); } - public function applyRaLocationRemovedEvent(RaLocationRemovedEvent $event) + public function applyRaLocationRemovedEvent(RaLocationRemovedEvent $event): void { $raLocation = $this->fetchRaLocationById($event->raLocationId); $this->repository->remove($raLocation); } - public function applyInstitutionConfigurationRemovedEvent(InstitutionConfigurationRemovedEvent $event) + public function applyInstitutionConfigurationRemovedEvent(InstitutionConfigurationRemovedEvent $event): void { $this->repository->removeRaLocationsFor($event->institution); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/AllowedSecondFactorRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/AllowedSecondFactorRepository.php index 37d7d2142..63f4f6861 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/AllowedSecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/AllowedSecondFactorRepository.php @@ -30,7 +30,7 @@ public function __construct(ManagerRegistry $registry) parent::__construct($registry, AllowedSecondFactor::class); } - public function save(AllowedSecondFactor $allowedSecondFactor) + public function save(AllowedSecondFactor $allowedSecondFactor): void { $entityManager = $this->getEntityManager(); $entityManager->persist($allowedSecondFactor); @@ -51,7 +51,7 @@ public function getAllowedSecondFactorsFor(Institution $institution) ->execute(); } - public function clearAllowedSecondFactorListFor(Institution $institution) + public function clearAllowedSecondFactorListFor(Institution $institution): void { $this->createQueryBuilder('asf') ->delete() diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/ConfiguredInstitutionRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/ConfiguredInstitutionRepository.php index b66851bb3..9758216f6 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/ConfiguredInstitutionRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/ConfiguredInstitutionRepository.php @@ -33,7 +33,7 @@ public function __construct(ManagerRegistry $registry) /** * @param ConfiguredInstitution $configuredInstitution */ - public function save(ConfiguredInstitution $configuredInstitution) + public function save(ConfiguredInstitution $configuredInstitution): void { $entityManager = $this->getEntityManager(); $entityManager->persist($configuredInstitution); @@ -44,7 +44,7 @@ public function save(ConfiguredInstitution $configuredInstitution) * @param Institution $institution * @return bool */ - public function hasConfigurationFor(Institution $institution) + public function hasConfigurationFor(Institution $institution): bool { $result = $this->createQueryBuilder('ci') ->select('ci.institution') @@ -59,7 +59,7 @@ public function hasConfigurationFor(Institution $institution) /** * @param Institution $institution */ - public function removeConfigurationFor(Institution $institution) + public function removeConfigurationFor(Institution $institution): void { $this->createQueryBuilder('ci') ->delete() diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionAuthorizationRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionAuthorizationRepository.php index b22d903ac..59e0eeb75 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionAuthorizationRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionAuthorizationRepository.php @@ -21,6 +21,7 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Common\Persistence\ManagerRegistry; use Doctrine\ORM\EntityManager; +use Doctrine\ORM\OptimisticLockException; use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\Stepup\Configuration\Value\InstitutionAuthorizationOption; use Surfnet\Stepup\Configuration\Value\InstitutionRole; @@ -80,9 +81,9 @@ public function findSelectRaasForInstitution(Institution $institution) /** * @param Institution $institution * @param InstitutionAuthorizationOption $institutionOption - * @throws \Doctrine\ORM\OptimisticLockException + * @throws OptimisticLockException */ - public function saveInstitutionOption(Institution $institution, InstitutionAuthorizationOption $institutionOption) + public function saveInstitutionOption(Institution $institution, InstitutionAuthorizationOption $institutionOption): void { $institutionAuthorizations = []; @@ -100,9 +101,9 @@ public function saveInstitutionOption(Institution $institution, InstitutionAutho /** * @param Institution $institution * @param InstitutionAuthorizationOption $institutionOption - * @throws \Doctrine\ORM\OptimisticLockException + * @throws OptimisticLockException */ - public function clearInstitutionOption(Institution $institution) + public function clearInstitutionOption(Institution $institution): void { $entityManager = $this->getEntityManager(); @@ -119,9 +120,9 @@ public function clearInstitutionOption(Institution $institution) /** * @param Institution $institution - * @throws \Doctrine\ORM\OptimisticLockException + * @throws OptimisticLockException */ - public function setDefaultInstitutionOption(Institution $institution) + public function setDefaultInstitutionOption(Institution $institution): void { $this->saveInstitutionOption( $institution, @@ -141,9 +142,9 @@ public function setDefaultInstitutionOption(Institution $institution) * @param Institution $institution * @param InstitutionRole $role * @param InstitutionAuthorization[] $institutionAuthorizations - * @throws \Doctrine\ORM\OptimisticLockException + * @throws OptimisticLockException */ - private function save(Institution $institution, InstitutionRole $role, array $institutionAuthorizations) + private function save(Institution $institution, InstitutionRole $role, array $institutionAuthorizations): void { $entityManager = $this->getEntityManager(); @@ -158,7 +159,7 @@ private function save(Institution $institution, InstitutionRole $role, array $in * @param Institution $institution * @param InstitutionRole $role */ - private function clearOldAuthorizations(EntityManager $entityManager, Institution $institution, InstitutionRole $role) + private function clearOldAuthorizations(EntityManager $entityManager, Institution $institution, InstitutionRole $role): void { $entityManager->createQuery( 'DELETE '.InstitutionAuthorization::class.' ia @@ -174,7 +175,7 @@ private function clearOldAuthorizations(EntityManager $entityManager, Institutio * @param InstitutionRole $role * @param InstitutionAuthorization[] $institutionAuthorizations */ - private function addNewAuthorizations(EntityManager $entityManager, InstitutionRole $role, array $institutionAuthorizations) + private function addNewAuthorizations(EntityManager $entityManager, InstitutionRole $role, array $institutionAuthorizations): void { foreach ($institutionAuthorizations as $institutionAuthorization) { if ($institutionAuthorization->institutionRole === $role) { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionConfigurationOptionsRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionConfigurationOptionsRepository.php index ad882684a..d2fc52ad6 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionConfigurationOptionsRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionConfigurationOptionsRepository.php @@ -48,7 +48,7 @@ public function findConfigurationOptionsFor(Institution $institution) /** * @param InstitutionConfigurationOptions $institutionConfigurationOptions */ - public function save(InstitutionConfigurationOptions $institutionConfigurationOptions) + public function save(InstitutionConfigurationOptions $institutionConfigurationOptions): void { $entityManager = $this->getEntityManager(); $entityManager->persist($institutionConfigurationOptions); @@ -58,7 +58,7 @@ public function save(InstitutionConfigurationOptions $institutionConfigurationOp /** * @param Institution $institution */ - public function removeConfigurationOptionsFor(Institution $institution) + public function removeConfigurationOptionsFor(Institution $institution): void { $this->createQueryBuilder('ico') ->delete() diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/RaLocationRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/RaLocationRepository.php index edbc76e92..08aba2ef0 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/RaLocationRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/RaLocationRepository.php @@ -72,7 +72,7 @@ public function findByRaLocationId(RaLocationId $raLocationId) /** * @param RaLocation $raLocation */ - public function save(RaLocation $raLocation) + public function save(RaLocation $raLocation): void { $entityManager = $this->getEntityManager(); $entityManager->persist($raLocation); @@ -82,7 +82,7 @@ public function save(RaLocation $raLocation) /** * @param RaLocation $raLocation */ - public function remove(RaLocation $raLocation) + public function remove(RaLocation $raLocation): void { $entityManager = $this->getEntityManager(); $entityManager->remove($raLocation); @@ -105,7 +105,7 @@ public function findByInstitution(Institution $institution) /** * @param Institution $institution */ - public function removeRaLocationsFor(Institution $institution) + public function removeRaLocationsFor(Institution $institution): void { $this->createQueryBuilder('rl') ->delete() diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/AllowedSecondFactorListService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/AllowedSecondFactorListService.php index 38a7b6b04..af3210e09 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/AllowedSecondFactorListService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/AllowedSecondFactorListService.php @@ -26,15 +26,9 @@ class AllowedSecondFactorListService { - /** - * @var AllowedSecondFactorRepository - */ - private $allowedSecondFactorRepository; + private AllowedSecondFactorRepository $allowedSecondFactorRepository; - /** - * @var ConfiguredInstitutionRepository - */ - private $configuredInstitutionRepository; + private ConfiguredInstitutionRepository $configuredInstitutionRepository; public function __construct( AllowedSecondFactorRepository $allowedSecondFactoryRepository, @@ -44,7 +38,7 @@ public function __construct( $this->configuredInstitutionRepository = $configuredInstitutionRepository; } - public function getAllowedSecondFactorListFor(Institution $institution) + public function getAllowedSecondFactorListFor(Institution $institution): AllowedSecondFactorList { $allowedSecondFactors = array_map(function (AllowedSecondFactor $allowedSecondFactor) { return $allowedSecondFactor->secondFactorType; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/AllowedSecondFactorMap.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/AllowedSecondFactorMap.php index 6b0eefd04..73bdc412c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/AllowedSecondFactorMap.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/AllowedSecondFactorMap.php @@ -27,7 +27,7 @@ final class AllowedSecondFactorMap /** * @var AllowedSecondFactor[] */ - private $mappedAllowedSecondFactors = []; + private array $mappedAllowedSecondFactors = []; private function __construct() { @@ -37,7 +37,7 @@ private function __construct() * @param AllowedSecondFactor[] $allowedSecondFactors * @return AllowedSecondFactorMap */ - public static function from($allowedSecondFactors) + public static function from($allowedSecondFactors): self { $allowedSecondFactorMap = new self(); foreach ($allowedSecondFactors as $allowedSecondFactor) { @@ -51,7 +51,7 @@ public static function from($allowedSecondFactors) * @param Institution $institution * @return AllowedSecondFactorList */ - public function getAllowedSecondFactorListFor(Institution $institution) + public function getAllowedSecondFactorListFor(Institution $institution): AllowedSecondFactorList { $institution = strtolower($institution->getInstitution()); if (!array_key_exists($institution, $this->mappedAllowedSecondFactors)) { @@ -65,7 +65,7 @@ public function getAllowedSecondFactorListFor(Institution $institution) * @param AllowedSecondFactor $allowedSecondFactor * @SuppressWarnings(PHPMD.UnusedPrivateMethod) */ - private function add(AllowedSecondFactor $allowedSecondFactor) + private function add(AllowedSecondFactor $allowedSecondFactor): void { $institution = strtolower($allowedSecondFactor->institution->getInstitution()); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/ConfiguredInstitutionService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/ConfiguredInstitutionService.php index c55f1cc74..45446c8cd 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/ConfiguredInstitutionService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/ConfiguredInstitutionService.php @@ -25,10 +25,7 @@ class ConfiguredInstitutionService { - /** - * @var ConfiguredInstitutionRepository - */ - private $repository; + private ConfiguredInstitutionRepository $repository; public function __construct(ConfiguredInstitutionRepository $repository) { @@ -38,7 +35,7 @@ public function __construct(ConfiguredInstitutionRepository $repository) /** * @return ConfiguredInstitution[] */ - public function getAll() + public function getAll(): array { return $this->repository->findAll(); } @@ -47,7 +44,7 @@ public function getAll() /** * @return InstitutionListing[] */ - public function getAllAsInstitution() + public function getAllAsInstitution(): array { $configuredInstitutions = $this->repository->findAll(); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionAuthorizationOptionMap.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionAuthorizationOptionMap.php index e65a01b01..d06b2849d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionAuthorizationOptionMap.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionAuthorizationOptionMap.php @@ -27,7 +27,7 @@ final class InstitutionAuthorizationOptionMap /** * @var InstitutionAuthorizationOption[] */ - private $institutionOptions = []; + private array $institutionOptions = []; /** * InstitutionAuthorizationOptionMap constructor. @@ -62,7 +62,7 @@ private function __construct(Institution $institution, array $institutionAuthori * @param InstitutionAuthorization[]|null * @return InstitutionAuthorizationOptionMap */ - public static function fromInstitutionAuthorizations(Institution $institution, array $institutionAuthorizations) + public static function fromInstitutionAuthorizations(Institution $institution, array $institutionAuthorizations): self { return new self($institution, $institutionAuthorizations); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionAuthorizationService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionAuthorizationService.php index 9aa3d5fbc..d00d7f9f6 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionAuthorizationService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionAuthorizationService.php @@ -25,10 +25,7 @@ class InstitutionAuthorizationService { - /** - * @var InstitutionAuthorizationRepository - */ - private $repository; + private InstitutionAuthorizationRepository $repository; /** * @param InstitutionAuthorizationRepository $repository @@ -44,7 +41,7 @@ public function __construct( * @param InstitutionRole $role * @return InstitutionAuthorizationOption */ - public function findAuthorizationsByRoleFor(Institution $institution, InstitutionRole $role) + public function findAuthorizationsByRoleFor(Institution $institution, InstitutionRole $role): InstitutionAuthorizationOption { $authorizations = $this->repository->findAuthorizationOptionsForInstitutionByRole($institution, $role); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionConfigurationOptionsService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionConfigurationOptionsService.php index 6dca4da00..0cee156b5 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionConfigurationOptionsService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionConfigurationOptionsService.php @@ -24,10 +24,7 @@ class InstitutionConfigurationOptionsService { - /** - * @var InstitutionConfigurationOptionsRepository - */ - private $repository; + private InstitutionConfigurationOptionsRepository $repository; /** * @var int @@ -49,7 +46,7 @@ public function __construct( /** * @return InstitutionConfigurationOptions[] */ - public function findAllInstitutionConfigurationOptions() + public function findAllInstitutionConfigurationOptions(): array { return $this->repository->findAll(); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/RaLocationService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/RaLocationService.php index 8c9fb8c80..65d67ff16 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/RaLocationService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/RaLocationService.php @@ -26,10 +26,7 @@ class RaLocationService { - /** - * @var RaLocationRepository - */ - private $repository; + private RaLocationRepository $repository; public function __construct(RaLocationRepository $repository) { @@ -67,7 +64,7 @@ public function listRaLocationsFor(Institution $institution) /** * @return RaLocation[] */ - public function getAllRaLocations() + public function getAllRaLocations(): array { return $this->repository->findAll(); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuditLogController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuditLogController.php index d034e6758..7f60a86ec 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuditLogController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuditLogController.php @@ -29,10 +29,7 @@ final class AuditLogController extends AbstractController { - /** - * @var AuditLogService - */ - private $auditLogService; + private AuditLogService $auditLogService; public function __construct(AuditLogService $service) { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuthorizationController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuthorizationController.php index 14b13ce49..eb4ff0ae2 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuthorizationController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuthorizationController.php @@ -25,14 +25,8 @@ class AuthorizationController extends AbstractController { - /** - * @var AuthorizationService - */ - private $authorizationService; - - /** - * @param AuthorizationService $authorizationService - */ + private AuthorizationService $authorizationService; + public function __construct(AuthorizationService $authorizationService) { $this->authorizationService = $authorizationService; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php index 2879ff84e..bd61e7867 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php @@ -42,35 +42,20 @@ */ class CommandController extends AbstractController { - /** - * @var WhitelistService - */ - private $whitelistService; + private WhitelistService $whitelistService; - /** - * @var TransactionAwarePipeline - */ - private $pipeline; + private TransactionAwarePipeline $pipeline; - /** - * @var MetadataEnricher - */ - private $metadataEnricher; + private MetadataEnricher $metadataEnricher; /** * @var AuthorizationChecker */ - private $authorizationChecker; + private AuthorizationCheckerInterface $authorizationChecker; - /** - * @var LoggerInterface - */ - private $logger; + private LoggerInterface $logger; - /** - * @var CommandAuthorizationService - */ - private $commandAuthorizationService; + private CommandAuthorizationService $commandAuthorizationService; public function __construct( @@ -89,7 +74,7 @@ public function __construct( $this->commandAuthorizationService = $commandAuthorizationService; } - public function handleAction(Command $command, Metadata $metadata, Request $request) + public function handleAction(Command $command, Metadata $metadata, Request $request): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS']); $this->logger->notice(sprintf('Received request to process Command "%s"', $command)); @@ -126,7 +111,7 @@ public function handleAction(Command $command, Metadata $metadata, Request $requ * @param Metadata $metadata * @return Institution */ - private function resolveInstitution(Command $command, Metadata $metadata) + private function resolveInstitution(Command $command, Metadata $metadata): Institution { if ($metadata->actorInstitution) { return new Institution($metadata->actorInstitution); @@ -150,7 +135,7 @@ private function resolveInstitution(Command $command, Metadata $metadata) * @param Command $command * @param Metadata $metadata */ - private function handleAuthorization(Command $command, Metadata $metadata) + private function handleAuthorization(Command $command, Metadata $metadata): void { // Get the actorId and actorInstitution from the metadata // Be aware that these values could be null when executing commands where we shouldn't log in for diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ConfiguredInstitutionController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ConfiguredInstitutionController.php index 72d8376f3..ae5f3a0d5 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ConfiguredInstitutionController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ConfiguredInstitutionController.php @@ -24,17 +24,14 @@ class ConfiguredInstitutionController extends AbstractController { - /** - * @var ConfiguredInstitutionService - */ - private $configuredInstitutionService; + private ConfiguredInstitutionService $configuredInstitutionService; public function __construct(ConfiguredInstitutionService $allListings) { $this->configuredInstitutionService = $allListings; } - public function collectionAction() + public function collectionAction(): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/DeprovisionController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/DeprovisionController.php index 8ef735f0c..37ad5034c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/DeprovisionController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/DeprovisionController.php @@ -27,9 +27,9 @@ class DeprovisionController extends AbstractController { - private $deprovisionService; + private DeprovisionServiceInterface $deprovisionService; - private $formatHelper; + private UserDataFormatterInterface $formatHelper; public function __construct( DeprovisionServiceInterface $deprovisionService, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php index 5efc24860..e3a99c18b 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php @@ -28,19 +28,14 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; class IdentityController extends AbstractController { - /** - * @var IdentityService - */ - private $identityService; + private IdentityService $identityService; - /** - * @var InstitutionRoleSet - */ - private $roleRequirements; + private InstitutionRoleSet $roleRequirements; public function __construct( IdentityService $identityService @@ -52,7 +47,7 @@ public function __construct( ); } - public function getAction($id) + public function getAction($id): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); @@ -83,9 +78,9 @@ public function collectionAction(Request $request, Institution $institution) /** * @param string $identityId - * @return \Symfony\Component\HttpFoundation\Response + * @return Response */ - public function getRegistrationAuthorityCredentialsAction($identityId) + public function getRegistrationAuthorityCredentialsAction($identityId): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/InstitutionConfigurationOptionsController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/InstitutionConfigurationOptionsController.php index d52fb55f5..a77e36dbb 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/InstitutionConfigurationOptionsController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/InstitutionConfigurationOptionsController.php @@ -29,20 +29,14 @@ final class InstitutionConfigurationOptionsController extends AbstractController { - /** - * @var InstitutionConfigurationOptionsService - */ - private $institutionConfigurationOptionsService; + private InstitutionConfigurationOptionsService $institutionConfigurationOptionsService; /** * @return InstitutionAuthorizationService */ - private $institutionAuthorizationService; + private InstitutionAuthorizationService $institutionAuthorizationService; - /** - * @var AllowedSecondFactorListService - */ - private $allowedSecondFactorListService; + private AllowedSecondFactorListService $allowedSecondFactorListService; public function __construct( InstitutionConfigurationOptionsService $institutionConfigurationOptionsService, @@ -54,7 +48,7 @@ public function __construct( $this->allowedSecondFactorListService = $allowedSecondFactorListService; } - public function getForInstitutionAction($institutionName) + public function getForInstitutionAction($institutionName): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_SS', 'ROLE_RA', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ProfileController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ProfileController.php index f165eab5f..b154d8270 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ProfileController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ProfileController.php @@ -27,10 +27,7 @@ class ProfileController extends AbstractController { - /** - * @var ProfileService - */ - private $profileService; + private ProfileService $profileService; public function __construct( ProfileService $profileService @@ -38,7 +35,7 @@ public function __construct( $this->profileService = $profileService; } - public function getAction(Request $request, $identityId) + public function getAction(Request $request, $identityId): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php index 99f7518e0..6dfcba021 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php @@ -33,15 +33,9 @@ class RaCandidateController extends AbstractController { - /** - * @var RaCandidateService - */ - private $raCandidateService; + private RaCandidateService $raCandidateService; - /** - * @var AuthorizationContextService - */ - private $authorizationService; + private AuthorizationContextService $authorizationService; public function __construct( RaCandidateService $raCandidateService, @@ -84,7 +78,7 @@ public function searchAction(Request $request) * @param Request $request * @return JsonResponse */ - public function getAction(Request $request) + public function getAction(Request $request): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaController.php index 338a5e06e..dc4bc4e8f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaController.php @@ -25,17 +25,14 @@ class RaController extends AbstractController { - /** - * @var RaListingService - */ - private $raListingService; + private RaListingService $raListingService; public function __construct(RaListingService $raListingService) { $this->raListingService = $raListingService; } - public function listAction(Institution $institution) + public function listAction(Institution $institution): JsonCollectionResponse { $this->denyAccessUnlessGranted(['ROLE_SS', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php index fa1657f9b..0497297ac 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php @@ -32,15 +32,9 @@ class RaListingController extends AbstractController { - /** - * @var RaListingService - */ - private $raListingService; + private RaListingService $raListingService; - /** - * @var AuthorizationContextService - */ - private $authorizationService; + private AuthorizationContextService $authorizationService; public function __construct( RaListingService $raListingService, @@ -50,7 +44,7 @@ public function __construct( $this->authorizationService = $authorizationService; } - public function getAction(Request $request, $identityId) + public function getAction(Request $request, $identityId): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaLocationController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaLocationController.php index 78004a388..ddea42de1 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaLocationController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaLocationController.php @@ -32,14 +32,14 @@ final class RaLocationController extends AbstractController /** * @return RaLocationService */ - private $raLocationService; + private RaLocationService $raLocationService; public function __construct(RaLocationService $raLocationService) { $this->raLocationService = $raLocationService; } - public function searchAction(Request $request, Institution $institution) + public function searchAction(Request $request, Institution $institution): JsonCollectionResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); @@ -54,7 +54,7 @@ public function searchAction(Request $request, Institution $institution) return new JsonCollectionResponse($count, 1, $count, $raLocations); } - public function getAction(Request $request) + public function getAction(Request $request): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php index 647b6b73c..cd6de7fd0 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php @@ -30,15 +30,9 @@ final class RaSecondFactorController extends AbstractController { - /** - * @var RaSecondFactorService - */ - private $raSecondFactorService; + private RaSecondFactorService $raSecondFactorService; - /** - * @var AuthorizationContextService - */ - private $authorizationService; + private AuthorizationContextService $authorizationService; public function __construct( RaSecondFactorService $raSecondFactorService, @@ -61,7 +55,7 @@ public function collectionAction(Request $request) return JsonCollectionResponse::fromPaginator($paginator, $filters); } - public function exportAction(Request $request) + public function exportAction(Request $request): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); @@ -76,7 +70,7 @@ public function exportAction(Request $request) * @param Request $request * @return RaSecondFactorQuery */ - private function buildRaSecondFactorQuery(Request $request) + private function buildRaSecondFactorQuery(Request $request): RaSecondFactorQuery { $actorId = new IdentityId($request->get('actorId')); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php index 8b75ab38d..65edfcaca 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php @@ -38,20 +38,11 @@ */ class RecoveryTokenController extends AbstractController { - /** - * @var RecoveryTokenService - */ - private $service; + private RecoveryTokenService $service; - /** - * @var AuthorizationContextService - */ - private $authorizationService; + private AuthorizationContextService $authorizationService; - /** - * @var LoggerInterface - */ - private $logger; + private LoggerInterface $logger; public function __construct( RecoveryTokenService $recoveryTokenServiceService, @@ -63,7 +54,7 @@ public function __construct( $this->logger = $logger; } - public function getAction($id) + public function getAction($id): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); $this->logger->info(sprintf('Received request to get recovery token: %s', $id)); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/SraaController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/SraaController.php index 23ff854bb..028f611de 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/SraaController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/SraaController.php @@ -27,10 +27,7 @@ class SraaController extends AbstractController { - /** - * @var SraaService - */ - private $sraaService; + private SraaService $sraaService; public function __construct(SraaService $sraaService) { @@ -41,7 +38,7 @@ public function __construct(SraaService $sraaService) * @param string $nameId injected by symfony from the request * @return JsonNotFoundResponse|JsonResponse */ - public function getAction($nameId) + public function getAction($nameId): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php index 6bca2ba22..ca0432c34 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php @@ -29,17 +29,14 @@ class UnverifiedSecondFactorController extends AbstractController { - /** - * @var SecondFactorService - */ - private $secondFactorService; + private SecondFactorService $secondFactorService; public function __construct(SecondFactorService $secondFactorService) { $this->secondFactorService = $secondFactorService; } - public function getAction($id) + public function getAction($id): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VerifiedSecondFactorController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VerifiedSecondFactorController.php index be19c4625..168956735 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VerifiedSecondFactorController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VerifiedSecondFactorController.php @@ -39,20 +39,11 @@ */ class VerifiedSecondFactorController extends AbstractController { - /** - * @var SecondFactorService - */ - private $secondFactorService; + private SecondFactorService $secondFactorService; - /** - * @var AuthorizationContextService - */ - private $institutionAuthorizationService; + private AuthorizationContextService $institutionAuthorizationService; - /** - * @var SecondFactorProvePossessionHelper - */ - private $secondFactorProvePossessionHelper; + private SecondFactorProvePossessionHelper $secondFactorProvePossessionHelper; public function __construct( @@ -65,7 +56,7 @@ public function __construct( $this->secondFactorProvePossessionHelper = $secondFactorProvePossessionHelper; } - public function getAction($id) + public function getAction($id): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); @@ -119,7 +110,7 @@ public function collectionOfIdentityAction(Request $request) return JsonCollectionResponse::fromPaginator($paginator); } - public function getCanSkipProvePossessionAction($id) + public function getCanSkipProvePossessionAction($id): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php index 338da3e11..c200a80ed 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php @@ -29,17 +29,14 @@ class VettedSecondFactorController extends AbstractController { - /** - * @var SecondFactorService - */ - private $secondFactorService; + private SecondFactorService $secondFactorService; public function __construct(SecondFactorService $secondFactorService) { $this->secondFactorService = $secondFactorService; } - public function getAction($id) + public function getAction($id): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettingTypeHintController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettingTypeHintController.php index dfe2891fd..7c81ebe5e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettingTypeHintController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettingTypeHintController.php @@ -38,15 +38,9 @@ class VettingTypeHintController extends AbstractController { - /** - * @var VettingTypeHintService - */ - private $service; + private VettingTypeHintService $service; - /** - * @var LoggerInterface - */ - private $logger; + private LoggerInterface $logger; public function __construct( VettingTypeHintService $vettingTypeHintService, @@ -56,7 +50,7 @@ public function __construct( $this->logger = $logger; } - public function getAction($institution) + public function getAction($institution): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); $this->logger->info(sprintf('Received request to get a vetting type hint for institution: %s', $institution)); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/DependencyInjection/Configuration.php b/src/Surfnet/StepupMiddleware/ApiBundle/DependencyInjection/Configuration.php index 349697fd6..92f432acf 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/DependencyInjection/Configuration.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/DependencyInjection/Configuration.php @@ -33,7 +33,7 @@ public function getConfigTreeBuilder(): TreeBuilder ->scalarNode('http_basic_realm') ->defaultValue('Secure Gateway API') ->validate() - ->ifTrue(function ($realm) { + ->ifTrue(function ($realm): bool { return !is_string($realm) || empty($realm); }) ->thenInvalid("Invalid HTTP Basic realm '%s'. Must be string and non-empty.") diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/DependencyInjection/SurfnetStepupMiddlewareApiExtension.php b/src/Surfnet/StepupMiddleware/ApiBundle/DependencyInjection/SurfnetStepupMiddlewareApiExtension.php index 845bd3e09..7c1fc678b 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/DependencyInjection/SurfnetStepupMiddlewareApiExtension.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/DependencyInjection/SurfnetStepupMiddlewareApiExtension.php @@ -26,7 +26,7 @@ class SurfnetStepupMiddlewareApiExtension extends Extension { - public function load(array $config, ContainerBuilder $container) + public function load(array $config, ContainerBuilder $container): void { $processor = new Processor(); $config = $processor->processConfiguration(new Configuration(), $config); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DateTimeType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DateTimeType.php index 8c5678a2e..dcece31fc 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DateTimeType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DateTimeType.php @@ -20,6 +20,7 @@ use DateTime as CoreDateTime; use DateTimeZone; +use Doctrine\DBAL\DBALException; use Doctrine\DBAL\Platforms\AbstractPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; @@ -36,7 +37,7 @@ class DateTimeType extends Type * @param array $fieldDeclaration * @param AbstractPlatform $platform * @return string - * @throws \Doctrine\DBAL\DBALException + * @throws DBALException */ public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DocumentNumberType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DocumentNumberType.php index 52c534514..e2fbe33ae 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DocumentNumberType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DocumentNumberType.php @@ -18,6 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type; +use Doctrine\DBAL\DBALException; use Doctrine\DBAL\Platforms\AbstractPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; @@ -34,7 +35,7 @@ class DocumentNumberType extends Type * @param array $fieldDeclaration * @param AbstractPlatform $platform * @return string - * @throws \Doctrine\DBAL\DBALException + * @throws DBALException */ public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/EventListener/ExceptionListener.php b/src/Surfnet/StepupMiddleware/ApiBundle/EventListener/ExceptionListener.php index 15cd2d273..9eca963dc 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/EventListener/ExceptionListener.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/EventListener/ExceptionListener.php @@ -34,17 +34,14 @@ */ class ExceptionListener { - /** - * @var LoggerInterface - */ - private $logger; + private LoggerInterface $logger; public function __construct(LoggerInterface $logger) { $this->logger = $logger; } - public function onKernelException(ExceptionEvent $event) + public function onKernelException(ExceptionEvent $event): void { $throwable = $event->getThrowable(); @@ -67,7 +64,7 @@ public function onKernelException(ExceptionEvent $event) $event->setResponse($this->createJsonErrorResponse($throwable, $statusCode, $headers)); } - private function logException(Throwable $throwable) + private function logException(Throwable $throwable): void { # As per \Symfony\Component\HttpKernel\EventListener\ExceptionListener#logException(). $isCritical = !$throwable instanceof HttpExceptionInterface || $throwable->getStatusCode() >= 500; @@ -85,7 +82,7 @@ private function logException(Throwable $throwable) * @param array $headers OPTIONAL * @return JsonResponse */ - private function createJsonErrorResponse(Throwable $throwable, $statusCode, $headers = []) + private function createJsonErrorResponse(Throwable $throwable, int $statusCode, array $headers = []): JsonResponse { if ($throwable instanceof BadApiRequestException || $throwable instanceof BadCommandRequestException diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadApiRequestException.php b/src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadApiRequestException.php index bd8517ac3..88cdff575 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadApiRequestException.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadApiRequestException.php @@ -26,7 +26,7 @@ class BadApiRequestException extends RuntimeException /** * @var string[] */ - private $errors; + private array $errors; /** * @param string[] $errors diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadCommandRequestException.php b/src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadCommandRequestException.php index a58549ed3..ab75c22a0 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadCommandRequestException.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadCommandRequestException.php @@ -29,14 +29,13 @@ class BadCommandRequestException extends RuntimeException /** * @var string[] */ - private $errors; + private array $errors; /** * @param string $message - * @param ConstraintViolationListInterface $violations * @return self */ - public static function withViolations($message, ConstraintViolationListInterface $violations) + public static function withViolations($message, ConstraintViolationListInterface $violations): self { $violationStrings = self::convertViolationsToStrings($violations); $message = sprintf('%s (%s)', $message, join('; ', $violationStrings)); @@ -45,10 +44,9 @@ public static function withViolations($message, ConstraintViolationListInterface } /** - * @param ConstraintViolationListInterface $violations * @return string[] */ - private static function convertViolationsToStrings(ConstraintViolationListInterface $violations) + private static function convertViolationsToStrings(ConstraintViolationListInterface $violations): array { $violationStrings = []; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Exception/InvalidArgumentException.php b/src/Surfnet/StepupMiddleware/ApiBundle/Exception/InvalidArgumentException.php index 1bd89c277..01f1da28e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Exception/InvalidArgumentException.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Exception/InvalidArgumentException.php @@ -29,7 +29,7 @@ class InvalidArgumentException extends CoreInvalidArgumentException implements E * * @return self */ - public static function invalidType($expected, $parameterName, $parameter) + public static function invalidType($expected, $parameterName, $parameter): self { $message = sprintf( 'Invalid argument type: "%s" expected, "%s" given for "%s"', diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/AuditLogEntry.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/AuditLogEntry.php index a6a14dd7a..052b74783 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/AuditLogEntry.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/AuditLogEntry.php @@ -20,6 +20,9 @@ use Doctrine\ORM\Mapping as ORM; use JsonSerializable; +use Surfnet\Stepup\DateTime\DateTime; +use Surfnet\Stepup\Identity\Value\CommonName; +use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Exception\LogicException; use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\AuditLogRepository; @@ -40,7 +43,7 @@ class AuditLogEntry implements JsonSerializable * * @var string[] */ - private $eventActionMap = [ + private array $eventActionMap = [ 'Surfnet\Stepup\Identity\Event\CompliedWithUnverifiedSecondFactorRevocationEvent' => 'revoked_by_ra', 'Surfnet\Stepup\Identity\Event\CompliedWithVerifiedSecondFactorRevocationEvent' => 'revoked_by_ra', 'Surfnet\Stepup\Identity\Event\CompliedWithVettedSecondFactorRevocationEvent' => 'revoked_by_ra', @@ -93,13 +96,13 @@ class AuditLogEntry implements JsonSerializable public $actorId; /** - * @var \Surfnet\Stepup\Identity\Value\CommonName + * @var CommonName */ #[ORM\Column(type: 'stepup_common_name', nullable: true)] public $actorCommonName; /** - * @var \Surfnet\Stepup\Identity\Value\Institution|null + * @var Institution|null */ #[ORM\Column(type: 'institution', nullable: true)] public $actorInstitution; @@ -122,7 +125,7 @@ class AuditLogEntry implements JsonSerializable public $identityId; /** - * @var \Surfnet\Stepup\Identity\Value\Institution + * @var Institution */ #[ORM\Column(type: 'institution')] public $identityInstitution; @@ -164,7 +167,7 @@ class AuditLogEntry implements JsonSerializable public $event; /** - * @var \Surfnet\Stepup\DateTime\DateTime + * @var DateTime */ #[ORM\Column(type: 'stepup_datetime')] public $recordedOn; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Identity.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Identity.php index dcd6e2366..5c2482244 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Identity.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Identity.php @@ -43,31 +43,31 @@ class Identity implements JsonSerializable public $id; /** - * @var \Surfnet\Stepup\Identity\Value\NameId + * @var NameId */ #[ORM\Column(type: 'stepup_name_id')] public $nameId; /** - * @var \Surfnet\Stepup\Identity\Value\CommonName + * @var CommonName */ #[ORM\Column(type: 'stepup_common_name')] public $commonName; /** - * @var \Surfnet\Stepup\Identity\Value\Institution + * @var Institution */ #[ORM\Column(type: 'institution')] public $institution; /** - * @var \Surfnet\Stepup\Identity\Value\Email + * @var Email */ #[ORM\Column(type: 'stepup_email')] public $email; /** - * @var \Surfnet\Stepup\Identity\Value\Locale + * @var Locale */ #[ORM\Column(type: 'stepup_locale')] public $preferredLocale; @@ -79,7 +79,7 @@ public static function create( Email $email, CommonName $commonName, Locale $preferredLocale - ) { + ): self { $identity = new self(); $identity->id = $id; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/IdentitySelfAssertedTokenOptions.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/IdentitySelfAssertedTokenOptions.php index a7e0bb3bb..3a579b8d0 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/IdentitySelfAssertedTokenOptions.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/IdentitySelfAssertedTokenOptions.php @@ -60,7 +60,7 @@ public static function create( IdentityId $identityId, bool $possessedToken, bool $possessedSelfAssertedToken - ) { + ): self { $identitySelfAssertedTokenOptions = new self(); $identitySelfAssertedTokenOptions->identityId = $identityId; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/InstitutionListing.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/InstitutionListing.php index b4c97855b..29d6df365 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/InstitutionListing.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/InstitutionListing.php @@ -28,13 +28,13 @@ class InstitutionListing implements JsonSerializable { /** * - * @var \Surfnet\Stepup\Identity\Value\Institution + * @var Institution */ #[ORM\Id] #[ORM\Column(type: 'institution')] public $institution; - public static function createFrom(Institution $institution) + public static function createFrom(Institution $institution): self { $instance = new self(); $instance->institution = $institution; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaCandidate.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaCandidate.php index faf3d7666..91f47e54e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaCandidate.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaCandidate.php @@ -50,25 +50,25 @@ class RaCandidate implements JsonSerializable public $raInstitution; /** - * @var \Surfnet\Stepup\Identity\Value\Institution + * @var Institution */ #[ORM\Column(type: 'institution')] public $institution; /** - * @var \Surfnet\Stepup\Identity\Value\NameId + * @var NameId */ #[ORM\Column(type: 'stepup_name_id')] public $nameId; /** - * @var \Surfnet\Stepup\Identity\Value\CommonName + * @var CommonName */ #[ORM\Column(type: 'stepup_common_name')] public $commonName; /** - * @var \Surfnet\Stepup\Identity\Value\Email + * @var Email */ #[ORM\Column(type: 'stepup_email')] public $email; @@ -84,7 +84,7 @@ public static function nominate( CommonName $commonName, Email $email, Institution $raInstitution - ) { + ): self { $candidate = new self(); $candidate->identityId = (string) $identityId; $candidate->institution = $institution; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaListing.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaListing.php index f6dcf92ec..6211ad3fb 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaListing.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaListing.php @@ -103,7 +103,7 @@ public static function create( Location $location, ContactInformation $contactInformation, Institution $raInstitution - ) { + ): self { if (!is_string($identityId)) { throw InvalidArgumentException::invalidType('string', 'id', $identityId); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaSecondFactor.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaSecondFactor.php index 663742655..466208e73 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaSecondFactor.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaSecondFactor.php @@ -67,7 +67,7 @@ class RaSecondFactor implements JsonSerializable public $identityId; /** - * @var \Surfnet\Stepup\Identity\Value\Institution + * @var Institution */ #[ORM\Column(type: 'institution')] public $institution; @@ -76,7 +76,7 @@ class RaSecondFactor implements JsonSerializable * The name of the registrant. * * - * @var \Surfnet\Stepup\Identity\Value\CommonName + * @var CommonName */ #[ORM\Column(type: 'stepup_common_name')] public $name; @@ -85,7 +85,7 @@ class RaSecondFactor implements JsonSerializable * The e-mail of the registrant. * * - * @var \Surfnet\Stepup\Identity\Value\Email + * @var Email */ #[ORM\Column(type: 'stepup_email')] public $email; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RecoveryToken.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RecoveryToken.php index cb92c54d2..249968ab9 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RecoveryToken.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RecoveryToken.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Entity; use Doctrine\ORM\Mapping as ORM; +use JsonSerializable; use Surfnet\Stepup\Identity\Value\CommonName; use Surfnet\Stepup\Identity\Value\Email; use Surfnet\Stepup\Identity\Value\Institution; @@ -28,7 +29,7 @@ #[ORM\Table] #[ORM\Index(name: 'idx_recovery_method_type', columns: ['type'])] #[ORM\Entity(repositoryClass: RecoveryTokenRepository::class)] -class RecoveryToken implements \JsonSerializable +class RecoveryToken implements JsonSerializable { /** * @var string diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/SecondFactorRevocation.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/SecondFactorRevocation.php index df790c7af..b4bd1d9ab 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/SecondFactorRevocation.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/SecondFactorRevocation.php @@ -19,6 +19,8 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Entity; use Doctrine\ORM\Mapping as ORM; +use Surfnet\Stepup\DateTime\DateTime; +use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\SecondFactorRevocationRepository; #[ORM\Table(name: 'second_factor_revocation')] @@ -34,7 +36,7 @@ class SecondFactorRevocation public $id; /** - * @var \Surfnet\Stepup\Identity\Value\Institution + * @var Institution */ #[ORM\Column(type: 'institution')] public $institution; @@ -52,7 +54,7 @@ class SecondFactorRevocation public $revokedBy; /** - * @var \Surfnet\Stepup\DateTime\DateTime + * @var DateTime */ #[ORM\Column(type: 'stepup_datetime')] public $recordedOn; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/UnverifiedSecondFactor.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/UnverifiedSecondFactor.php index f02af1e29..6fdcad6c2 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/UnverifiedSecondFactor.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/UnverifiedSecondFactor.php @@ -19,10 +19,11 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Entity; use Doctrine\ORM\Mapping as ORM; +use JsonSerializable; use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\UnverifiedSecondFactorRepository; #[ORM\Entity(repositoryClass: UnverifiedSecondFactorRepository::class)] -class UnverifiedSecondFactor implements \JsonSerializable +class UnverifiedSecondFactor implements JsonSerializable { /** * diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VerifiedSecondFactor.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VerifiedSecondFactor.php index 03df388b1..69e174749 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VerifiedSecondFactor.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VerifiedSecondFactor.php @@ -18,13 +18,15 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Entity; +use DateTime; use Doctrine\ORM\Mapping as ORM; +use JsonSerializable; use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\VerifiedSecondFactorRepository; #[ORM\Table] #[ORM\Index(name: 'idx_institution', columns: ['institution'])] #[ORM\Entity(repositoryClass: VerifiedSecondFactorRepository::class)] -class VerifiedSecondFactor implements \JsonSerializable +class VerifiedSecondFactor implements JsonSerializable { /** * @var string @@ -71,7 +73,7 @@ class VerifiedSecondFactor implements \JsonSerializable public $registrationCode; /** - * @var \DateTime + * @var DateTime */ #[ORM\Column(type: 'stepup_datetime')] public $registrationRequestedAt; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettedSecondFactor.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettedSecondFactor.php index 4f19379cc..a6a5354f1 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettedSecondFactor.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettedSecondFactor.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Entity; use Doctrine\ORM\Mapping as ORM; +use JsonSerializable; use Surfnet\Stepup\Identity\Value\VettingType; use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\VettedSecondFactorRepository; @@ -26,7 +27,7 @@ #[ORM\Index(name: 'idx_vetted_second_factor_type', columns: ['type'])] #[ORM\Index(name: 'idx_vetted_second_factor_vetting_type', columns: ['vetting_type'])] #[ORM\Entity(repositoryClass: VettedSecondFactorRepository::class)] -class VettedSecondFactor implements \JsonSerializable +class VettedSecondFactor implements JsonSerializable { /** * @var string diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettingTypeHint.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettingTypeHint.php index 7babf3024..4e355186c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettingTypeHint.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettingTypeHint.php @@ -19,11 +19,12 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Entity; use Doctrine\ORM\Mapping as ORM; +use JsonSerializable; use Surfnet\Stepup\Identity\Collection\VettingTypeHintCollection; use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\VettingTypeHintRepository; #[ORM\Entity(repositoryClass: VettingTypeHintRepository::class)] -class VettingTypeHint implements \JsonSerializable +class VettingTypeHint implements JsonSerializable { #[ORM\Id] #[ORM\Column(length: 36)] diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/WhitelistEntry.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/WhitelistEntry.php index 9a78c4e90..6449b0b8d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/WhitelistEntry.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/WhitelistEntry.php @@ -30,7 +30,7 @@ class WhitelistEntry implements JsonSerializable #[ORM\Column(type: 'institution')] public Institution $institution; - public static function createFrom(Institution $institution) + public static function createFrom(Institution $institution): self { $instance = new self(); $instance->institution = $institution; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/AuditLogProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/AuditLogProjector.php index a441c7a89..e7e20e7ae 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/AuditLogProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/AuditLogProjector.php @@ -49,15 +49,9 @@ */ class AuditLogProjector implements EventListener { - /** - * @var \Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\AuditLogRepository - */ - private $auditLogRepository; + private AuditLogRepository $auditLogRepository; - /** - * @var \Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\IdentityRepository - */ - private $identityRepository; + private IdentityRepository $identityRepository; public function __construct( AuditLogRepository $auditLogRepository, @@ -92,7 +86,7 @@ public function handle(DomainMessage $domainMessage): void * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.NPathComplexity) */ - private function applyAuditableEvent(AuditableEvent $event, DomainMessage $domainMessage) + private function applyAuditableEvent(AuditableEvent $event, DomainMessage $domainMessage): void { $auditLogMetadata = $event->getAuditLogMetadata(); @@ -155,7 +149,7 @@ private function applyAuditableEvent(AuditableEvent $event, DomainMessage $domai $this->auditLogRepository->save($entry); } - private function applyIdentityForgottenEvent(IdentityForgottenEvent $event) + private function applyIdentityForgottenEvent(IdentityForgottenEvent $event): void { $entries = $this->auditLogRepository->findByIdentityId($event->identityId); foreach ($entries as $auditLogEntry) { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/IdentityProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/IdentityProjector.php index 291147b78..3d768605f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/IdentityProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/IdentityProjector.php @@ -32,17 +32,14 @@ class IdentityProjector extends Projector { - /** - * @var IdentityRepository - */ - private $identityRepository; + private IdentityRepository $identityRepository; public function __construct(IdentityRepository $identityRepository) { $this->identityRepository = $identityRepository; } - public function applyIdentityCreatedEvent(IdentityCreatedEvent $event) + public function applyIdentityCreatedEvent(IdentityCreatedEvent $event): void { $this->identityRepository->save(Identity::create( (string) $event->identityId, @@ -55,7 +52,7 @@ public function applyIdentityCreatedEvent(IdentityCreatedEvent $event) )); } - public function applyIdentityRenamedEvent(IdentityRenamedEvent $event) + public function applyIdentityRenamedEvent(IdentityRenamedEvent $event): void { $identity = $this->identityRepository->find((string) $event->identityId); $identity->commonName = $event->commonName; @@ -63,7 +60,7 @@ public function applyIdentityRenamedEvent(IdentityRenamedEvent $event) $this->identityRepository->save($identity); } - public function applyIdentityEmailChangedEvent(IdentityEmailChangedEvent $event) + public function applyIdentityEmailChangedEvent(IdentityEmailChangedEvent $event): void { $identity = $this->identityRepository->find((string) $event->identityId); $identity->email = $event->email; @@ -71,7 +68,7 @@ public function applyIdentityEmailChangedEvent(IdentityEmailChangedEvent $event) $this->identityRepository->save($identity); } - public function applyLocalePreferenceExpressedEvent(LocalePreferenceExpressedEvent $event) + public function applyLocalePreferenceExpressedEvent(LocalePreferenceExpressedEvent $event): void { $identity = $this->identityRepository->find((string) $event->identityId); $identity->preferredLocale = $event->preferredLocale; @@ -79,12 +76,12 @@ public function applyLocalePreferenceExpressedEvent(LocalePreferenceExpressedEve $this->identityRepository->save($identity); } - public function applySecondFactorVettedEvent(SecondFactorVettedEvent $event) + public function applySecondFactorVettedEvent(SecondFactorVettedEvent $event): void { $this->determinePossessionOfSelfAssertedToken($event->vettingType, (string) $event->identityId); } - public function applySecondFactorVettedWithoutTokenProofOfPossession(SecondFactorVettedWithoutTokenProofOfPossession $event) + public function applySecondFactorVettedWithoutTokenProofOfPossession(SecondFactorVettedWithoutTokenProofOfPossession $event): void { $this->determinePossessionOfSelfAssertedToken($event->vettingType, (string) $event->identityId); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/IdentitySelfAssertedTokenOptionsProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/IdentitySelfAssertedTokenOptionsProjector.php index d5636d4b8..968816476 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/IdentitySelfAssertedTokenOptionsProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/IdentitySelfAssertedTokenOptionsProjector.php @@ -29,10 +29,7 @@ class IdentitySelfAssertedTokenOptionsProjector extends Projector { - /** - * @var IdentitySelfAssertedTokenOptionsRepository - */ - private $repository; + private IdentitySelfAssertedTokenOptionsRepository $repository; public function __construct(IdentitySelfAssertedTokenOptionsRepository $identitySelfAssertedTokenOptionsRepository) { @@ -43,7 +40,7 @@ public function __construct(IdentitySelfAssertedTokenOptionsRepository $identity * Identity is created, we also create a set of * IdentitySelfAssertedTokenOptions. */ - public function applyIdentityCreatedEvent(IdentityCreatedEvent $event) + public function applyIdentityCreatedEvent(IdentityCreatedEvent $event): void { $identitySelfAssertedTokenOptions = IdentitySelfAssertedTokenOptions::create( $event->identityId, @@ -53,12 +50,12 @@ public function applyIdentityCreatedEvent(IdentityCreatedEvent $event) $this->repository->save($identitySelfAssertedTokenOptions); } - public function applySecondFactorVettedEvent(SecondFactorVettedEvent $event) + public function applySecondFactorVettedEvent(SecondFactorVettedEvent $event): void { $this->determinePossessionOfToken($event->vettingType, $event->identityId); } - public function applySecondFactorVettedWithoutTokenProofOfPossession(SecondFactorVettedWithoutTokenProofOfPossession $event) + public function applySecondFactorVettedWithoutTokenProofOfPossession(SecondFactorVettedWithoutTokenProofOfPossession $event): void { $this->determinePossessionOfToken($event->vettingType, $event->identityId); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/InstitutionListingProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/InstitutionListingProjector.php index 5764b4761..367f95281 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/InstitutionListingProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/InstitutionListingProjector.php @@ -28,14 +28,14 @@ */ class InstitutionListingProjector extends Projector { - private $institutionListingRepository; + private InstitutionListingRepository $institutionListingRepository; public function __construct(InstitutionListingRepository $institutionListingRepository) { $this->institutionListingRepository = $institutionListingRepository; } - public function applyIdentityCreatedEvent(IdentityCreatedEvent $event) + public function applyIdentityCreatedEvent(IdentityCreatedEvent $event): void { $this->institutionListingRepository->addIfNotExists($event->identityInstitution); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaListingProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaListingProjector.php index 7c2ad6c6a..0af361290 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaListingProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaListingProjector.php @@ -44,15 +44,9 @@ */ class RaListingProjector extends Projector { - /** - * @var RaListingRepository - */ - private $raListingRepository; + private RaListingRepository $raListingRepository; - /** - * @var IdentityRepository - */ - private $identityRepository; + private IdentityRepository $identityRepository; public function __construct(RaListingRepository $raListingRepository, IdentityRepository $identityRepository) { @@ -64,7 +58,7 @@ public function __construct(RaListingRepository $raListingRepository, IdentityRe * @param IdentityAccreditedAsRaForInstitutionEvent $event * @return void */ - public function applyIdentityAccreditedAsRaForInstitutionEvent(IdentityAccreditedAsRaForInstitutionEvent $event) + public function applyIdentityAccreditedAsRaForInstitutionEvent(IdentityAccreditedAsRaForInstitutionEvent $event): void { $identity = $this->identityRepository->find((string) $event->identityId); @@ -86,7 +80,7 @@ public function applyIdentityAccreditedAsRaForInstitutionEvent(IdentityAccredite * @param IdentityAccreditedAsRaaForInstitutionEvent $event * @return void */ - public function applyIdentityAccreditedAsRaaForInstitutionEvent(IdentityAccreditedAsRaaForInstitutionEvent $event) + public function applyIdentityAccreditedAsRaaForInstitutionEvent(IdentityAccreditedAsRaaForInstitutionEvent $event): void { $identity = $this->identityRepository->find((string) $event->identityId); @@ -106,7 +100,7 @@ public function applyIdentityAccreditedAsRaaForInstitutionEvent(IdentityAccredit public function applyRegistrationAuthorityInformationAmendedForInstitutionEvent( RegistrationAuthorityInformationAmendedForInstitutionEvent $event - ) { + ): void { /** @var RaListing $raListing */ $raListing = $this->raListingRepository->findByIdentityIdAndRaInstitution($event->identityId, $event->raInstitution); @@ -123,7 +117,7 @@ public function applyRegistrationAuthorityInformationAmendedForInstitutionEvent( $this->raListingRepository->save($raListing); } - public function applyAppointedAsRaForInstitutionEvent(AppointedAsRaForInstitutionEvent $event) + public function applyAppointedAsRaForInstitutionEvent(AppointedAsRaForInstitutionEvent $event): void { /** @var RaListing $raListing */ $raListing = $this->raListingRepository->findByIdentityIdAndRaInstitution($event->identityId, $event->raInstitution); @@ -133,7 +127,7 @@ public function applyAppointedAsRaForInstitutionEvent(AppointedAsRaForInstitutio $this->raListingRepository->save($raListing); } - public function applyAppointedAsRaaForInstitutionEvent(AppointedAsRaaForInstitutionEvent $event) + public function applyAppointedAsRaaForInstitutionEvent(AppointedAsRaaForInstitutionEvent $event): void { /** @var RaListing $raListing */ $raListing = $this->raListingRepository->findByIdentityIdAndRaInstitution($event->identityId, $event->raInstitution); @@ -143,7 +137,7 @@ public function applyAppointedAsRaaForInstitutionEvent(AppointedAsRaaForInstitut $this->raListingRepository->save($raListing); } - public function applyRegistrationAuthorityRetractedForInstitutionEvent(RegistrationAuthorityRetractedForInstitutionEvent $event) + public function applyRegistrationAuthorityRetractedForInstitutionEvent(RegistrationAuthorityRetractedForInstitutionEvent $event): void { $this->raListingRepository->removeByIdentityIdAndRaInstitution($event->identityId, $event->raInstitution); } @@ -160,7 +154,7 @@ protected function applyIdentityForgottenEvent(IdentityForgottenEvent $event) * @param IdentityAccreditedAsRaEvent $event * @return void */ - public function applyIdentityAccreditedAsRaEvent(IdentityAccreditedAsRaEvent $event) + public function applyIdentityAccreditedAsRaEvent(IdentityAccreditedAsRaEvent $event): void { $identity = $this->identityRepository->find((string) $event->identityId); @@ -184,7 +178,7 @@ public function applyIdentityAccreditedAsRaEvent(IdentityAccreditedAsRaEvent $ev * @param IdentityAccreditedAsRaaEvent $event * @return void */ - public function applyIdentityAccreditedAsRaaEvent(IdentityAccreditedAsRaaEvent $event) + public function applyIdentityAccreditedAsRaaEvent(IdentityAccreditedAsRaaEvent $event): void { $identity = $this->identityRepository->find((string) $event->identityId); @@ -209,7 +203,7 @@ public function applyIdentityAccreditedAsRaaEvent(IdentityAccreditedAsRaaEvent $ */ public function applyRegistrationAuthorityInformationAmendedEvent( RegistrationAuthorityInformationAmendedEvent $event - ) { + ): void { /** @var RaListing $raListing */ $raListing = $this->raListingRepository->findByIdentityIdAndRaInstitution($event->identityId, $event->identityInstitution); @@ -231,7 +225,7 @@ public function applyRegistrationAuthorityInformationAmendedEvent( * * @param AppointedAsRaEvent $event */ - public function applyAppointedAsRaEvent(AppointedAsRaEvent $event) + public function applyAppointedAsRaEvent(AppointedAsRaEvent $event): void { /** @var RaListing $raListing */ $raListing = $this->raListingRepository->findByIdentityIdAndInstitution($event->identityId, $event->identityInstitution); @@ -246,7 +240,7 @@ public function applyAppointedAsRaEvent(AppointedAsRaEvent $event) * * @param AppointedAsRaaEvent $event */ - public function applyAppointedAsRaaEvent(AppointedAsRaaEvent $event) + public function applyAppointedAsRaaEvent(AppointedAsRaaEvent $event): void { /** @var RaListing $raListing */ $raListing = $this->raListingRepository->findByIdentityIdAndInstitution($event->identityId, $event->identityInstitution); @@ -261,7 +255,7 @@ public function applyAppointedAsRaaEvent(AppointedAsRaaEvent $event) * * @param RegistrationAuthorityRetractedEvent $event */ - public function applyRegistrationAuthorityRetractedEvent(RegistrationAuthorityRetractedEvent $event) + public function applyRegistrationAuthorityRetractedEvent(RegistrationAuthorityRetractedEvent $event): void { $this->raListingRepository->removeByIdentityIdAndInstitution($event->identityId, $event->identityInstitution); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaSecondFactorProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaSecondFactorProjector.php index 27ad4eb34..8ed7041e0 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaSecondFactorProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaSecondFactorProjector.php @@ -58,15 +58,9 @@ */ class RaSecondFactorProjector extends Projector { - /** - * @var RaSecondFactorRepository - */ - private $raSecondFactorRepository; + private RaSecondFactorRepository $raSecondFactorRepository; - /** - * @var IdentityRepository - */ - private $identityRepository; + private IdentityRepository $identityRepository; public function __construct( RaSecondFactorRepository $raSecondFactorRepository, @@ -76,7 +70,7 @@ public function __construct( $this->identityRepository = $identityRepository; } - public function applyIdentityRenamedEvent(IdentityRenamedEvent $event) + public function applyIdentityRenamedEvent(IdentityRenamedEvent $event): void { $secondFactors = $this->raSecondFactorRepository->findByIdentityId((string) $event->identityId); @@ -93,7 +87,7 @@ public function applyIdentityRenamedEvent(IdentityRenamedEvent $event) $this->raSecondFactorRepository->saveAll($secondFactors); } - public function applyIdentityEmailChangedEvent(IdentityEmailChangedEvent $event) + public function applyIdentityEmailChangedEvent(IdentityEmailChangedEvent $event): void { $secondFactors = $this->raSecondFactorRepository->findByIdentityId((string) $event->identityId); @@ -110,7 +104,7 @@ public function applyIdentityEmailChangedEvent(IdentityEmailChangedEvent $event) $this->raSecondFactorRepository->saveAll($secondFactors); } - public function applyYubikeySecondFactorBootstrappedEvent(YubikeySecondFactorBootstrappedEvent $event) + public function applyYubikeySecondFactorBootstrappedEvent(YubikeySecondFactorBootstrappedEvent $event): void { $identity = $this->identityRepository->find((string) $event->identityId); @@ -128,7 +122,7 @@ public function applyYubikeySecondFactorBootstrappedEvent(YubikeySecondFactorBoo $this->raSecondFactorRepository->save($secondFactor); } - public function applyYubikeyPossessionProvenEvent(YubikeyPossessionProvenEvent $event) + public function applyYubikeyPossessionProvenEvent(YubikeyPossessionProvenEvent $event): void { $this->saveRaSecondFactor( (string) $event->identityId, @@ -140,7 +134,7 @@ public function applyYubikeyPossessionProvenEvent(YubikeyPossessionProvenEvent $ ); } - public function applyYubikeyPossessionProvenAndVerifiedEvent(YubikeyPossessionProvenAndVerifiedEvent $event) + public function applyYubikeyPossessionProvenAndVerifiedEvent(YubikeyPossessionProvenAndVerifiedEvent $event): void { $this->saveRaSecondFactor( (string) $event->identityId, @@ -152,7 +146,7 @@ public function applyYubikeyPossessionProvenAndVerifiedEvent(YubikeyPossessionPr ); } - public function applyPhonePossessionProvenEvent(PhonePossessionProvenEvent $event) + public function applyPhonePossessionProvenEvent(PhonePossessionProvenEvent $event): void { $this->saveRaSecondFactor( (string) $event->identityId, @@ -164,7 +158,7 @@ public function applyPhonePossessionProvenEvent(PhonePossessionProvenEvent $even ); } - public function applyPhonePossessionProvenAndVerifiedEvent(PhonePossessionProvenAndVerifiedEvent $event) + public function applyPhonePossessionProvenAndVerifiedEvent(PhonePossessionProvenAndVerifiedEvent $event): void { $this->saveRaSecondFactor( (string) $event->identityId, @@ -176,7 +170,7 @@ public function applyPhonePossessionProvenAndVerifiedEvent(PhonePossessionProven ); } - public function applyGssfPossessionProvenEvent(GssfPossessionProvenEvent $event) + public function applyGssfPossessionProvenEvent(GssfPossessionProvenEvent $event): void { $this->saveRaSecondFactor( (string) $event->identityId, @@ -188,7 +182,7 @@ public function applyGssfPossessionProvenEvent(GssfPossessionProvenEvent $event) ); } - public function applyGssfPossessionProvenAndVerifiedEvent(GssfPossessionProvenAndVerifiedEvent $event) + public function applyGssfPossessionProvenAndVerifiedEvent(GssfPossessionProvenAndVerifiedEvent $event): void { $this->saveRaSecondFactor( (string) $event->identityId, @@ -203,7 +197,7 @@ public function applyGssfPossessionProvenAndVerifiedEvent(GssfPossessionProvenAn /** * @deprecated Built in U2F support is dropped from StepUp, this was not removed to support event replay */ - public function applyU2fDevicePossessionProvenEvent(U2fDevicePossessionProvenEvent $event) + public function applyU2fDevicePossessionProvenEvent(U2fDevicePossessionProvenEvent $event): void { $this->saveRaSecondFactor( (string) $event->identityId, @@ -218,7 +212,7 @@ public function applyU2fDevicePossessionProvenEvent(U2fDevicePossessionProvenEve /** * @deprecated Built in U2F support is dropped from StepUp, this was not removed to support event replay */ - public function applyU2fDevicePossessionProvenAndVerifiedEvent(U2fDevicePossessionProvenAndVerifiedEvent $event) + public function applyU2fDevicePossessionProvenAndVerifiedEvent(U2fDevicePossessionProvenAndVerifiedEvent $event): void { $this->saveRaSecondFactor( (string) $event->identityId, @@ -241,15 +235,15 @@ public function applyU2fDevicePossessionProvenAndVerifiedEvent(U2fDevicePossessi * @param DocumentNumber|null $documentNumber */ private function saveRaSecondFactor( - $identityId, - $secondFactorId, - $secondFactorType, + string $identityId, + string $secondFactorId, + string $secondFactorType, $secondFactorIdentifier, CommonName $commonName, Email $email, SecondFactorStatus $status = null, DocumentNumber $documentNumber = null - ) { + ): void { $identity = $this->identityRepository->find($identityId); $secondFactor = new RaSecondFactor( @@ -270,7 +264,7 @@ private function saveRaSecondFactor( $this->raSecondFactorRepository->save($secondFactor); } - public function applyEmailVerifiedEvent(EmailVerifiedEvent $event) + public function applyEmailVerifiedEvent(EmailVerifiedEvent $event): void { $this->updateStatus($event->secondFactorId, SecondFactorStatus::verified()); } @@ -279,7 +273,7 @@ public function applyEmailVerifiedEvent(EmailVerifiedEvent $event) * The RA second factor projection is updated with a new Second factor based on the 'source' second factor * from the original identity. */ - public function applySecondFactorMigratedEvent(SecondFactorMigratedEvent $event) + public function applySecondFactorMigratedEvent(SecondFactorMigratedEvent $event): void { $oldSecondFactor = $this->raSecondFactorRepository->find((string) $event->secondFactorId); @@ -295,7 +289,7 @@ public function applySecondFactorMigratedEvent(SecondFactorMigratedEvent $event) ); } - public function applySecondFactorVettedEvent(SecondFactorVettedEvent $event) + public function applySecondFactorVettedEvent(SecondFactorVettedEvent $event): void { $secondFactor = $this->raSecondFactorRepository->find((string) $event->secondFactorId); $secondFactor->documentNumber = $event->vettingType->getDocumentNumber(); @@ -304,7 +298,7 @@ public function applySecondFactorVettedEvent(SecondFactorVettedEvent $event) $this->raSecondFactorRepository->save($secondFactor); } - public function applySecondFactorVettedWithoutTokenProofOfPossession(SecondFactorVettedWithoutTokenProofOfPossession $event) + public function applySecondFactorVettedWithoutTokenProofOfPossession(SecondFactorVettedWithoutTokenProofOfPossession $event): void { $secondFactor = $this->raSecondFactorRepository->find((string) $event->secondFactorId); @@ -360,7 +354,7 @@ protected function applyIdentityForgottenEvent(IdentityForgottenEvent $event) * @param SecondFactorId $secondFactorId * @param SecondFactorStatus $status */ - private function updateStatus(SecondFactorId $secondFactorId, SecondFactorStatus $status) + private function updateStatus(SecondFactorId $secondFactorId, SecondFactorStatus $status): void { $secondFactor = $this->raSecondFactorRepository->find((string) $secondFactorId); $secondFactor->status = $status; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RecoveryTokenProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RecoveryTokenProjector.php index 1f83b6eff..463aab3ab 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RecoveryTokenProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RecoveryTokenProjector.php @@ -34,10 +34,7 @@ */ class RecoveryTokenProjector extends Projector { - /** - * @var RecoveryTokenRepository - */ - private $recoveryTokenRepository; + private RecoveryTokenRepository $recoveryTokenRepository; public function __construct( RecoveryTokenRepository $recoveryMethodRepository @@ -45,7 +42,7 @@ public function __construct( $this->recoveryTokenRepository = $recoveryMethodRepository; } - public function applyPhoneRecoveryTokenPossessionProvenEvent(PhoneRecoveryTokenPossessionProvenEvent $event) + public function applyPhoneRecoveryTokenPossessionProvenEvent(PhoneRecoveryTokenPossessionProvenEvent $event): void { $recoveryToken = new RecoveryToken(); $recoveryToken->id = $event->recoveryTokenId->getRecoveryTokenId(); @@ -60,7 +57,7 @@ public function applyPhoneRecoveryTokenPossessionProvenEvent(PhoneRecoveryTokenP $this->recoveryTokenRepository->save($recoveryToken); } - public function applySafeStoreSecretRecoveryTokenPossessionPromisedEvent(SafeStoreSecretRecoveryTokenPossessionPromisedEvent $event) + public function applySafeStoreSecretRecoveryTokenPossessionPromisedEvent(SafeStoreSecretRecoveryTokenPossessionPromisedEvent $event): void { $recoveryToken = new RecoveryToken(); $recoveryToken->id = $event->recoveryTokenId->getRecoveryTokenId(); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php index f0186a5ca..67e3176ec 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php @@ -53,20 +53,11 @@ */ class SecondFactorProjector extends Projector { - /** - * @var \Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\UnverifiedSecondFactorRepository - */ - private $unverifiedRepository; + private UnverifiedSecondFactorRepository $unverifiedRepository; - /** - * @var \Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\VerifiedSecondFactorRepository - */ - private $verifiedRepository; + private VerifiedSecondFactorRepository $verifiedRepository; - /** - * @var \Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\VettedSecondFactorRepository - */ - private $vettedRepository; + private VettedSecondFactorRepository $vettedRepository; public function __construct( UnverifiedSecondFactorRepository $unverifiedRepository, @@ -78,7 +69,7 @@ public function __construct( $this->vettedRepository = $vettedRepository; } - public function applyYubikeySecondFactorBootstrappedEvent(YubikeySecondFactorBootstrappedEvent $event) + public function applyYubikeySecondFactorBootstrappedEvent(YubikeySecondFactorBootstrappedEvent $event): void { $secondFactor = new VettedSecondFactor(); $secondFactor->id = $event->secondFactorId->getSecondFactorId(); @@ -89,7 +80,7 @@ public function applyYubikeySecondFactorBootstrappedEvent(YubikeySecondFactorBoo $this->vettedRepository->save($secondFactor); } - public function applyYubikeyPossessionProvenEvent(YubikeyPossessionProvenEvent $event) + public function applyYubikeyPossessionProvenEvent(YubikeyPossessionProvenEvent $event): void { $secondFactor = new UnverifiedSecondFactor(); $secondFactor->id = $event->secondFactorId->getSecondFactorId(); @@ -101,7 +92,7 @@ public function applyYubikeyPossessionProvenEvent(YubikeyPossessionProvenEvent $ $this->unverifiedRepository->save($secondFactor); } - public function applyYubikeyPossessionProvenAndVerifiedEvent(YubikeyPossessionProvenAndVerifiedEvent $event) + public function applyYubikeyPossessionProvenAndVerifiedEvent(YubikeyPossessionProvenAndVerifiedEvent $event): void { $secondFactor = new VerifiedSecondFactor(); $secondFactor->id = $event->secondFactorId->getSecondFactorId(); @@ -116,7 +107,7 @@ public function applyYubikeyPossessionProvenAndVerifiedEvent(YubikeyPossessionPr $this->verifiedRepository->save($secondFactor); } - public function applyPhonePossessionProvenEvent(PhonePossessionProvenEvent $event) + public function applyPhonePossessionProvenEvent(PhonePossessionProvenEvent $event): void { $secondFactor = new UnverifiedSecondFactor(); $secondFactor->id = $event->secondFactorId->getSecondFactorId(); @@ -128,7 +119,7 @@ public function applyPhonePossessionProvenEvent(PhonePossessionProvenEvent $even $this->unverifiedRepository->save($secondFactor); } - public function applyPhonePossessionProvenAndVerifiedEvent(PhonePossessionProvenAndVerifiedEvent $event) + public function applyPhonePossessionProvenAndVerifiedEvent(PhonePossessionProvenAndVerifiedEvent $event): void { $secondFactor = new VerifiedSecondFactor(); $secondFactor->id = $event->secondFactorId->getSecondFactorId(); @@ -143,7 +134,7 @@ public function applyPhonePossessionProvenAndVerifiedEvent(PhonePossessionProven $this->verifiedRepository->save($secondFactor); } - public function applyGssfPossessionProvenEvent(GssfPossessionProvenEvent $event) + public function applyGssfPossessionProvenEvent(GssfPossessionProvenEvent $event): void { $secondFactor = new UnverifiedSecondFactor(); $secondFactor->id = $event->secondFactorId->getSecondFactorId(); @@ -155,7 +146,7 @@ public function applyGssfPossessionProvenEvent(GssfPossessionProvenEvent $event) $this->unverifiedRepository->save($secondFactor); } - public function applyGssfPossessionProvenAndVerifiedEvent(GssfPossessionProvenAndVerifiedEvent $event) + public function applyGssfPossessionProvenAndVerifiedEvent(GssfPossessionProvenAndVerifiedEvent $event): void { $secondFactor = new VerifiedSecondFactor(); $secondFactor->id = $event->secondFactorId->getSecondFactorId(); @@ -170,7 +161,7 @@ public function applyGssfPossessionProvenAndVerifiedEvent(GssfPossessionProvenAn $this->verifiedRepository->save($secondFactor); } - public function applyEmailVerifiedEvent(EmailVerifiedEvent $event) + public function applyEmailVerifiedEvent(EmailVerifiedEvent $event): void { $unverified = $this->unverifiedRepository->find($event->secondFactorId->getSecondFactorId()); @@ -188,7 +179,7 @@ public function applyEmailVerifiedEvent(EmailVerifiedEvent $event) $this->unverifiedRepository->remove($unverified); } - public function applySecondFactorVettedEvent(SecondFactorVettedEvent $event) + public function applySecondFactorVettedEvent(SecondFactorVettedEvent $event): void { $verified = $this->verifiedRepository->find($event->secondFactorId->getSecondFactorId()); @@ -214,7 +205,7 @@ public function applySecondFactorVettedEvent(SecondFactorVettedEvent $event) * The original 'source' second factor is not yet removed. This is handled when the * old identity is cleaned up. */ - public function applySecondFactorMigratedEvent(SecondFactorMigratedEvent $event) + public function applySecondFactorMigratedEvent(SecondFactorMigratedEvent $event): void { $vetted = new VettedSecondFactor(); $vetted->id = $event->newSecondFactorId->getSecondFactorId(); @@ -226,7 +217,7 @@ public function applySecondFactorMigratedEvent(SecondFactorMigratedEvent $event) $this->vettedRepository->save($vetted); } - public function applySecondFactorVettedWithoutTokenProofOfPossession(SecondFactorVettedWithoutTokenProofOfPossession $event) + public function applySecondFactorVettedWithoutTokenProofOfPossession(SecondFactorVettedWithoutTokenProofOfPossession $event): void { $verified = $this->verifiedRepository->find($event->secondFactorId->getSecondFactorId()); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorRevocationProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorRevocationProjector.php index 34432445d..6c03969d4 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorRevocationProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorRevocationProjector.php @@ -30,10 +30,7 @@ class SecondFactorRevocationProjector extends Projector { - /** - * @var \Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\SecondFactorRevocationRepository - */ - private $repository; + private SecondFactorRevocationRepository $repository; public function __construct(SecondFactorRevocationRepository $repository) { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SraaProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SraaProjector.php index 59c1ed8b8..7faa69105 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SraaProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SraaProjector.php @@ -26,10 +26,7 @@ class SraaProjector extends Projector { - /** - * @var \Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\SraaRepository - */ - private $sraaRepository; + private SraaRepository $sraaRepository; public function __construct(SraaRepository $raaRepository) { @@ -39,7 +36,7 @@ public function __construct(SraaRepository $raaRepository) /** * @param SraaUpdatedEvent $event */ - public function applySraaUpdatedEvent(SraaUpdatedEvent $event) + public function applySraaUpdatedEvent(SraaUpdatedEvent $event): void { $this->sraaRepository->removeAll(); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/VettingTypeHintProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/VettingTypeHintProjector.php index 14f05bdad..2c1fd5727 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/VettingTypeHintProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/VettingTypeHintProjector.php @@ -32,17 +32,14 @@ */ class VettingTypeHintProjector extends Projector { - /** - * @var VettingTypeHintRepository - */ - private $vettingTypeHintRepository; + private VettingTypeHintRepository $vettingTypeHintRepository; public function __construct(VettingTypeHintRepository $vettingTypeHintRepository) { $this->vettingTypeHintRepository = $vettingTypeHintRepository; } - public function applyVettingTypeHintsSavedEvent(VettingTypeHintsSavedEvent $event) + public function applyVettingTypeHintsSavedEvent(VettingTypeHintsSavedEvent $event): void { $entity = $this->vettingTypeHintRepository->find($event->institution); if (!$entity) { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/WhitelistProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/WhitelistProjector.php index 959ece9b7..4ee82448e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/WhitelistProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/WhitelistProjector.php @@ -28,10 +28,7 @@ class WhitelistProjector extends Projector { - /** - * @var WhitelistEntryRepository - */ - private $whitelistEntryRepository; + private WhitelistEntryRepository $whitelistEntryRepository; /** * @param WhitelistEntryRepository $whitelistRepository diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/IdentityQuery.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/IdentityQuery.php index 2ca424a40..49eceac11 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/IdentityQuery.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/IdentityQuery.php @@ -18,6 +18,8 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Query; +use Surfnet\Stepup\Identity\Value\Institution; + class IdentityQuery extends AbstractQuery { /** @@ -31,7 +33,7 @@ class IdentityQuery extends AbstractQuery public $commonName; /** - * @var string|\Surfnet\Stepup\Identity\Value\Institution + * @var string|Institution */ public $institution; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaCandidateQuery.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaCandidateQuery.php index 4c80dc64e..5251af564 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaCandidateQuery.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaCandidateQuery.php @@ -18,12 +18,13 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Query; +use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Authorization\Value\InstitutionAuthorizationContextInterface; class RaCandidateQuery extends AbstractQuery { /** - * @var string|\Surfnet\Stepup\Identity\Value\Institution + * @var string|Institution */ public $institution; @@ -43,7 +44,7 @@ class RaCandidateQuery extends AbstractQuery public $secondFactorTypes; /** - * @var string|\Surfnet\Stepup\Identity\Value\Institution + * @var string|Institution */ public $raInstitution; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaListingQuery.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaListingQuery.php index 4b92455cd..044a2bac1 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaListingQuery.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaListingQuery.php @@ -19,12 +19,13 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Query; use Surfnet\Stepup\Identity\Value\IdentityId; +use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Authorization\Value\InstitutionAuthorizationContextInterface; class RaListingQuery extends AbstractQuery { /** - * @var string|\Surfnet\Stepup\Identity\Value\Institution + * @var string|Institution */ public $institution; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaaQuery.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaaQuery.php index d1ec1fc95..add5d7c7a 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaaQuery.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaaQuery.php @@ -18,10 +18,12 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Query; +use Surfnet\Stepup\Identity\Value\Institution; + class RaaQuery extends AbstractQuery { /** - * @var string|\Surfnet\Stepup\Identity\Value\Institution + * @var string|Institution */ public $institution; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuditLogRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuditLogRepository.php index 9c2d6ed48..4f748d8c4 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuditLogRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuditLogRepository.php @@ -38,7 +38,7 @@ public function __construct(ManagerRegistry $registry) * * @var string[] */ - private static $secondFactorEvents = [ + private static array $secondFactorEvents = [ 'Surfnet\Stepup\Identity\Event\YubikeySecondFactorBootstrappedEvent', 'Surfnet\Stepup\Identity\Event\GssfPossessionProvenEvent', 'Surfnet\Stepup\Identity\Event\PhonePossessionProvenEvent', @@ -78,7 +78,7 @@ public function __construct(ManagerRegistry $registry) * @param SecondFactorAuditLogQuery $query * @return Query */ - public function createSecondFactorSearchQuery(SecondFactorAuditLogQuery $query) + public function createSecondFactorSearchQuery(SecondFactorAuditLogQuery $query): Query { $queryBuilder = $this ->createQueryBuilder('al') @@ -139,14 +139,14 @@ public function findByIdentityId(IdentityId $identityId) /** * @param AuditLogEntry $entry */ - public function save(AuditLogEntry $entry) + public function save(AuditLogEntry $entry): void { $entityManager = $this->getEntityManager(); $entityManager->persist($entry); $entityManager->flush(); } - public function saveAll(array $entries) + public function saveAll(array $entries): void { $entityManager = $this->getEntityManager(); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php index a84ad1a2b..3fc9f0863 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php @@ -39,10 +39,7 @@ */ class AuthorizationRepository extends ServiceEntityRepository { - /** - * @var LoggerInterface - */ - private $logger; + private LoggerInterface $logger; public function __construct(ManagerRegistry $registry, LoggerInterface $logger) { @@ -127,7 +124,7 @@ public function getInstitutionsForRole(RegistrationAuthorityRole $role, Identity * Finds the institutions that have the Select RAA authorization based on * the institution of the specified identity. */ - public function getInstitutionsForSelectRaaRole(IdentityId $actorId) + public function getInstitutionsForSelectRaaRole(IdentityId $actorId): InstitutionCollection { $qb = $this->_em->createQueryBuilder() ->select("ci.institution") @@ -167,14 +164,11 @@ public function getInstitutionsForSelectRaaRole(IdentityId $actorId) */ private function getAllowedInstitutionRoles(RegistrationAuthorityRole $role): array { - switch (true) { - case $role->equals(RegistrationAuthorityRole::ra()): - return [InstitutionRole::ROLE_USE_RA]; - case $role->equals(RegistrationAuthorityRole::raa()): - return [InstitutionRole::ROLE_USE_RAA]; - default: - return []; - } + return match (true) { + $role->equals(RegistrationAuthorityRole::ra()) => [InstitutionRole::ROLE_USE_RA], + $role->equals(RegistrationAuthorityRole::raa()) => [InstitutionRole::ROLE_USE_RAA], + default => [], + }; } /** @@ -185,14 +179,11 @@ private function getAllowedInstitutionRoles(RegistrationAuthorityRole $role): ar */ private function getAllowedIdentityRoles(RegistrationAuthorityRole $role): array { - switch (true) { - case $role->equals(RegistrationAuthorityRole::ra()): - return [AuthorityRole::ROLE_RA, AuthorityRole::ROLE_RAA]; - case $role->equals(RegistrationAuthorityRole::raa()): - return [AuthorityRole::ROLE_RAA]; - default: - return []; - } + return match (true) { + $role->equals(RegistrationAuthorityRole::ra()) => [AuthorityRole::ROLE_RA, AuthorityRole::ROLE_RAA], + $role->equals(RegistrationAuthorityRole::raa()) => [AuthorityRole::ROLE_RAA], + default => [], + }; } private function getInstitutionRoleByRaRole(RegistrationAuthorityRole $role): string diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php index 0c703bebf..542eb2600 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php @@ -20,6 +20,7 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\ORM\Query; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\Stepup\Identity\Value\NameId; @@ -30,10 +31,7 @@ class IdentityRepository extends ServiceEntityRepository { - /** - * @var InstitutionAuthorizationRepositoryFilter - */ - private $authorizationRepositoryFilter; + private InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter; public function __construct(ManagerRegistry $registry, InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter) { @@ -41,7 +39,7 @@ public function __construct(ManagerRegistry $registry, InstitutionAuthorizationR $this->authorizationRepositoryFilter = $authorizationRepositoryFilter; } - public function find($id, $lockMode = null, $lockVersion = null): ?Identity + public function find(mixed $id, $lockMode = null, $lockVersion = null): ?Identity { /** @var Identity|null $identity */ $identity = parent::find($id); @@ -52,7 +50,7 @@ public function find($id, $lockMode = null, $lockVersion = null): ?Identity /** * @param Identity $identity */ - public function save(Identity $identity) + public function save(Identity $identity): void { $entityManager = $this->getEntityManager(); $entityManager->persist($identity); @@ -61,11 +59,11 @@ public function save(Identity $identity) /** * @param IdentityQuery $query - * @return \Doctrine\ORM\Query + * @return Query */ public function createSearchQuery( IdentityQuery $query - ) { + ): Query { $queryBuilder = $this->createQueryBuilder('i'); if ($query->institution) { @@ -116,7 +114,7 @@ public function findByNameIdsIndexed(array $nameIds) * * @return bool */ - public function hasIdentityWithNameIdAndInstitution(NameId $nameId, Institution $institution) + public function hasIdentityWithNameIdAndInstitution(NameId $nameId, Institution $institution): bool { $identityCount = $this->createQueryBuilder('i') ->select('COUNT(i.id)') @@ -151,7 +149,7 @@ public function findOneByNameId(string $nameId) :? Identity return $this->findOneBy(['nameId' => $nameId]); } - public function removeByIdentityId(IdentityId $identityId) + public function removeByIdentityId(IdentityId $identityId): void { $this->getEntityManager()->createQueryBuilder() ->delete($this->_entityName, 'i') diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentitySelfAssertedTokenOptionsRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentitySelfAssertedTokenOptionsRepository.php index 920995c16..45dad4209 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentitySelfAssertedTokenOptionsRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentitySelfAssertedTokenOptionsRepository.php @@ -33,12 +33,12 @@ public function __construct(ManagerRegistry $registry, InstitutionAuthorizationR $this->authorizationRepositoryFilter = $authorizationRepositoryFilter; } - public function find($id, $lockMode = null, $lockVersion = null): ?IdentitySelfAssertedTokenOptions + public function find(mixed $id, $lockMode = null, $lockVersion = null): ?IdentitySelfAssertedTokenOptions { return parent::find($id); } - public function save(IdentitySelfAssertedTokenOptions $options) + public function save(IdentitySelfAssertedTokenOptions $options): void { $entityManager = $this->getEntityManager(); $entityManager->persist($options); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/InstitutionListingRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/InstitutionListingRepository.php index 126510d5c..a86d0ba67 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/InstitutionListingRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/InstitutionListingRepository.php @@ -34,13 +34,13 @@ public function __construct(ManagerRegistry $registry) parent::__construct($registry, InstitutionListing::class); } - public function save(InstitutionListing $institution) + public function save(InstitutionListing $institution): void { $this->getEntityManager()->persist($institution); $this->getEntityManager()->flush(); } - public function addIfNotExists(Institution $institution) + public function addIfNotExists(Institution $institution): void { $existsQuery = $this->createQueryBuilder('i') ->where('i.institution = :institution') diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaCandidateRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaCandidateRepository.php index 2116af23a..f96019750 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaCandidateRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaCandidateRepository.php @@ -19,7 +19,9 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Repository; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; +use Doctrine\ORM\Query; use Doctrine\ORM\Query\Expr\Join; +use Doctrine\ORM\QueryBuilder; use Surfnet\Stepup\Identity\Value\VettingType; use Surfnet\StepupMiddleware\ApiBundle\Authorization\Filter\InstitutionAuthorizationRepositoryFilter; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity\InstitutionAuthorization; @@ -36,10 +38,7 @@ */ class RaCandidateRepository extends ServiceEntityRepository { - /** - * @var InstitutionAuthorizationRepositoryFilter - */ - private $authorizationRepositoryFilter; + private InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter; public function __construct(ManagerRegistry $registry, InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter) { @@ -49,9 +48,9 @@ public function __construct(ManagerRegistry $registry, InstitutionAuthorizationR /** * @param RaCandidateQuery $query - * @return \Doctrine\ORM\Query + * @return Query */ - public function createSearchQuery(RaCandidateQuery $query) + public function createSearchQuery(RaCandidateQuery $query): Query { $queryBuilder = $this->getBaseQuery(); @@ -109,9 +108,9 @@ public function createSearchQuery(RaCandidateQuery $query) /** * @param RaCandidateQuery $query - * @return \Doctrine\ORM\Query + * @return Query */ - public function createOptionsQuery(RaCandidateQuery $query) + public function createOptionsQuery(RaCandidateQuery $query): Query { $queryBuilder = $this->getEntityManager()->createQueryBuilder() ->select('a.institution') @@ -148,7 +147,7 @@ public function findOneByIdentityId(string $identityId) } /** - * @return \Doctrine\ORM\QueryBuilder + * @return QueryBuilder */ private function getBaseQuery() { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php index c4459b7d9..e73270ada 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php @@ -20,6 +20,7 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\ORM\Query; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Authorization\Filter\InstitutionAuthorizationRepositoryFilter; @@ -34,10 +35,7 @@ */ class RaListingRepository extends ServiceEntityRepository { - /** - * @var InstitutionAuthorizationRepositoryFilter - */ - private $authorizationRepositoryFilter; + private InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter; public function __construct(ManagerRegistry $registry, InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter) { @@ -49,7 +47,7 @@ public function __construct(ManagerRegistry $registry, InstitutionAuthorizationR * @param IdentityId $identityId The RA's identity id. * @return null|RaListing[] */ - public function findByIdentityId(IdentityId $identityId) + public function findByIdentityId(IdentityId $identityId): array { return parent::findBy(['identityId' => (string) $identityId]); } @@ -59,7 +57,7 @@ public function findByIdentityId(IdentityId $identityId) * @param Institution $raInstitution * @return null|RaListing */ - public function findByIdentityIdAndRaInstitution(IdentityId $identityId, Institution $raInstitution) + public function findByIdentityIdAndRaInstitution(IdentityId $identityId, Institution $raInstitution): ?object { return parent::findOneBy([ 'identityId' => (string) $identityId, @@ -105,7 +103,7 @@ public function findByIdentityIdAndRaInstitutionWithContext( * @param Institution $institution * @return RaListing[] */ - public function findByIdentityIdAndInstitution(IdentityId $identityId, Institution $institution) + public function findByIdentityIdAndInstitution(IdentityId $identityId, Institution $institution): array { return parent::findBy([ 'identityId' => (string) $identityId, @@ -113,7 +111,7 @@ public function findByIdentityIdAndInstitution(IdentityId $identityId, Instituti ]); } - public function save(RaListing $raListingEntry) + public function save(RaListing $raListingEntry): void { $this->getEntityManager()->persist($raListingEntry); $this->getEntityManager()->flush(); @@ -124,9 +122,9 @@ public function save(RaListing $raListingEntry) * @SuppressWarnings(PHPMD.NPathComplexity) below complex or hard to maintain. * * @param RaListingQuery $query - * @return \Doctrine\ORM\Query + * @return Query */ - public function createSearchQuery(RaListingQuery $query) + public function createSearchQuery(RaListingQuery $query): Query { $queryBuilder = $this->createQueryBuilder('r'); @@ -196,9 +194,9 @@ public function createSearchQuery(RaListingQuery $query) /** * @param RaListingQuery $query - * @return \Doctrine\ORM\Query + * @return Query */ - public function createOptionsQuery(RaListingQuery $query) + public function createOptionsQuery(RaListingQuery $query): Query { $queryBuilder = $this->createQueryBuilder('r') ->select('r.institution, r.raInstitution') @@ -222,7 +220,7 @@ public function createOptionsQuery(RaListingQuery $query) * @param Institution $raInstitution * @return ArrayCollection */ - public function listRasFor(Institution $raInstitution) + public function listRasFor(Institution $raInstitution): ArrayCollection { $listings = $this->createQueryBuilder('rl') ->where('rl.raInstitution = :institution') @@ -237,7 +235,7 @@ public function listRasFor(Institution $raInstitution) * @param IdentityId $identityId * @return void */ - public function removeByIdentityId(IdentityId $identityId, Institution $institution) + public function removeByIdentityId(IdentityId $identityId, Institution $institution): void { $this->getEntityManager()->createQueryBuilder() ->delete($this->_entityName, 'ral') @@ -254,7 +252,7 @@ public function removeByIdentityId(IdentityId $identityId, Institution $institut * @param Institution $raInstitution * @return void */ - public function removeByIdentityIdAndRaInstitution(IdentityId $identityId, Institution $raInstitution) + public function removeByIdentityIdAndRaInstitution(IdentityId $identityId, Institution $raInstitution): void { $this->getEntityManager()->createQueryBuilder() ->delete($this->_entityName, 'ral') @@ -271,7 +269,7 @@ public function removeByIdentityIdAndRaInstitution(IdentityId $identityId, Insti * @param Institution $institution * @return void */ - public function removeByIdentityIdAndInstitution(IdentityId $identityId, Institution $institution) + public function removeByIdentityIdAndInstitution(IdentityId $identityId, Institution $institution): void { $this->getEntityManager()->createQueryBuilder() ->delete($this->_entityName, 'ral') diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php index d3d1f2cf5..81202067e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Repository; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; +use Doctrine\DBAL\DBALException; use Doctrine\DBAL\Types\Type; use Doctrine\ORM\Query; use Surfnet\Stepup\Exception\RuntimeException; @@ -32,10 +33,7 @@ class RaSecondFactorRepository extends ServiceEntityRepository { - /** - * @var InstitutionAuthorizationRepositoryFilter - */ - private $authorizationRepositoryFilter; + private InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter; public function __construct(ManagerRegistry $registry, InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter) { @@ -43,7 +41,7 @@ public function __construct(ManagerRegistry $registry, InstitutionAuthorizationR $this->authorizationRepositoryFilter = $authorizationRepositoryFilter; } - public function find($id, $lockMode = null, $lockVersion = null): ?RaSecondFactor + public function find(mixed $id, $lockMode = null, $lockVersion = null): ?RaSecondFactor { /** @var RaSecondFactor|null $secondFactor */ $secondFactor = parent::find($id); @@ -55,7 +53,7 @@ public function find($id, $lockMode = null, $lockVersion = null): ?RaSecondFacto * @param string $identityId * @return RaSecondFactor[] */ - public function findByIdentityId($identityId) + public function findByIdentityId($identityId): array { return parent::findBy(['identityId' => $identityId]); } @@ -65,7 +63,7 @@ public function findByIdentityId($identityId) * @param string $institution * @return RaSecondFactor[] */ - public function findByInstitution($institution) + public function findByInstitution($institution): array { return parent::findBy(['institution' => $institution]); } @@ -77,9 +75,9 @@ public function findByInstitution($institution) * * @param RaSecondFactorQuery $query * @return Query - * @throws \Doctrine\DBAL\DBALException + * @throws DBALException */ - public function createSearchQuery(RaSecondFactorQuery $query) + public function createSearchQuery(RaSecondFactorQuery $query): Query { $queryBuilder = $this ->createQueryBuilder('sf'); @@ -157,9 +155,9 @@ public function createSearchQuery(RaSecondFactorQuery $query) /** * @param RaSecondFactorQuery $query - * @return \Doctrine\ORM\Query + * @return Query */ - public function createOptionsQuery(RaSecondFactorQuery $query) + public function createOptionsQuery(RaSecondFactorQuery $query): Query { $queryBuilder = $this->createQueryBuilder('sf') ->select('sf.institution') @@ -181,7 +179,7 @@ public function createOptionsQuery(RaSecondFactorQuery $query) * @param IdentityId $identityId * @return void */ - public function removeByIdentityId(IdentityId $identityId) + public function removeByIdentityId(IdentityId $identityId): void { $this->getEntityManager()->createQueryBuilder() ->delete($this->_entityName, 'rasf') @@ -191,7 +189,7 @@ public function removeByIdentityId(IdentityId $identityId) ->execute(); } - public function save(RaSecondFactor $secondFactor) + public function save(RaSecondFactor $secondFactor): void { $this->getEntityManager()->persist($secondFactor); $this->getEntityManager()->flush(); @@ -200,7 +198,7 @@ public function save(RaSecondFactor $secondFactor) /** * @param RaSecondFactor[] $secondFactors */ - public function saveAll(array $secondFactors) + public function saveAll(array $secondFactors): void { $entityManager = $this->getEntityManager(); @@ -211,7 +209,7 @@ public function saveAll(array $secondFactors) $entityManager->flush(); } - public function updateStatusByIdentityIdToForgotten(IdentityId $identityId) + public function updateStatusByIdentityIdToForgotten(IdentityId $identityId): void { $this->getEntityManager()->createQueryBuilder() ->update($this->_entityName, 'rasf') diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RecoveryTokenRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RecoveryTokenRepository.php index 6927b6977..343c5ac4f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RecoveryTokenRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RecoveryTokenRepository.php @@ -32,10 +32,7 @@ class RecoveryTokenRepository extends ServiceEntityRepository { - /** - * @var InstitutionAuthorizationRepositoryFilter - */ - private $authorizationRepositoryFilter; + private InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter; public function __construct( ManagerRegistry $registry, @@ -62,7 +59,7 @@ public function remove(RecoveryToken $recoveryToken): void * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.NPathComplexity) */ - public function createSearchQuery(RecoveryTokenQuery $query) + public function createSearchQuery(RecoveryTokenQuery $query): Query { $queryBuilder = $this->createQueryBuilder('rt'); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SecondFactorRevocationRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SecondFactorRevocationRepository.php index 46425284e..69d99fb12 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SecondFactorRevocationRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SecondFactorRevocationRepository.php @@ -32,7 +32,7 @@ public function __construct(ManagerRegistry $registry) /** * @param SecondFactorRevocation $revocation */ - public function save(SecondFactorRevocation $revocation) + public function save(SecondFactorRevocation $revocation): void { $entityManager = $this->getEntityManager(); $entityManager->persist($revocation); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php index 1f8a62d40..23405e0bb 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php @@ -34,7 +34,7 @@ public function __construct(ManagerRegistry $registry) /** * Removes all SRAA's from the database */ - public function removeAll() + public function removeAll(): void { $this ->getEntityManager() @@ -49,7 +49,7 @@ public function removeAll() * * @param array $sraaList */ - public function saveAll(array $sraaList) + public function saveAll(array $sraaList): void { $invalid = []; foreach ($sraaList as $index => $sraa) { @@ -86,9 +86,9 @@ public function saveAll(array $sraaList) /** * @param NameId $nameId - * @return null|\Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Sraa + * @return null|Sraa */ - public function findByNameId(NameId $nameId) + public function findByNameId(NameId $nameId): ?object { return $this->findOneBy(['nameId' => (string) $nameId]); } @@ -97,7 +97,7 @@ public function findByNameId(NameId $nameId) * @param NameId $nameId * @return boolean */ - public function contains(NameId $nameId) + public function contains(NameId $nameId): bool { return $this->findByNameId($nameId) !== null; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/UnverifiedSecondFactorRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/UnverifiedSecondFactorRepository.php index 8d75bf40c..3e2408949 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/UnverifiedSecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/UnverifiedSecondFactorRepository.php @@ -32,7 +32,7 @@ public function __construct(ManagerRegistry $registry) parent::__construct($registry, UnverifiedSecondFactor::class); } - public function find($id, $lockMode = null, $lockVersion = null): ?UnverifiedSecondFactor + public function find(mixed $id, $lockMode = null, $lockVersion = null): ?UnverifiedSecondFactor { /** @var UnverifiedSecondFactor|null $secondFactor */ $secondFactor = parent::find($id); @@ -44,7 +44,7 @@ public function find($id, $lockMode = null, $lockVersion = null): ?UnverifiedSec * @param UnverifiedSecondFactorQuery $query * @return Query */ - public function createSearchQuery(UnverifiedSecondFactorQuery $query) + public function createSearchQuery(UnverifiedSecondFactorQuery $query): Query { $queryBuilder = $this->createQueryBuilder('sf'); @@ -62,7 +62,7 @@ public function createSearchQuery(UnverifiedSecondFactorQuery $query) return $queryBuilder->getQuery(); } - public function removeByIdentityId(IdentityId $identityId) + public function removeByIdentityId(IdentityId $identityId): void { $this->getEntityManager()->createQueryBuilder() ->delete($this->_entityName, 'sf') @@ -75,13 +75,13 @@ public function removeByIdentityId(IdentityId $identityId) /** * @param UnverifiedSecondFactor $secondFactor */ - public function save(UnverifiedSecondFactor $secondFactor) + public function save(UnverifiedSecondFactor $secondFactor): void { $this->getEntityManager()->persist($secondFactor); $this->getEntityManager()->flush(); } - public function remove(UnverifiedSecondFactor $secondFactor) + public function remove(UnverifiedSecondFactor $secondFactor): void { $this->getEntityManager()->remove($secondFactor); $this->getEntityManager()->flush(); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VerifiedSecondFactorRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VerifiedSecondFactorRepository.php index 2020803bf..5ffd64235 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VerifiedSecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VerifiedSecondFactorRepository.php @@ -30,10 +30,7 @@ class VerifiedSecondFactorRepository extends ServiceEntityRepository { - /** - * @var InstitutionAuthorizationRepositoryFilter - */ - private $authorizationRepositoryFilter; + private InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter; public function __construct(ManagerRegistry $registry, InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter) { @@ -41,7 +38,7 @@ public function __construct(ManagerRegistry $registry, InstitutionAuthorizationR $this->authorizationRepositoryFilter = $authorizationRepositoryFilter; } - public function find($id, $lockMode = null, $lockVersion = null): ?VerifiedSecondFactor + public function find(mixed $id, $lockMode = null, $lockVersion = null): ?VerifiedSecondFactor { /** @var VerifiedSecondFactor|null $secondFactor */ $secondFactor = parent::find($id); @@ -74,7 +71,7 @@ public function findByDate(DateTime $requestedAt) * @param VerifiedSecondFactorQuery $query * @return Query */ - public function createSearchQuery(VerifiedSecondFactorQuery $query) + public function createSearchQuery(VerifiedSecondFactorQuery $query): Query { $queryBuilder = $this->createQueryBuilder('sf'); @@ -112,7 +109,7 @@ public function createSearchQuery(VerifiedSecondFactorQuery $query) * @param VerifiedSecondFactorOfIdentityQuery $query * @return Query */ - public function createSearchForIdentityQuery(VerifiedSecondFactorOfIdentityQuery $query) + public function createSearchForIdentityQuery(VerifiedSecondFactorOfIdentityQuery $query): Query { $queryBuilder = $this->createQueryBuilder('sf'); @@ -123,7 +120,7 @@ public function createSearchForIdentityQuery(VerifiedSecondFactorOfIdentityQuery return $queryBuilder->getQuery(); } - public function removeByIdentityId(IdentityId $identityId) + public function removeByIdentityId(IdentityId $identityId): void { $this->getEntityManager()->createQueryBuilder() ->delete($this->_entityName, 'sf') @@ -136,13 +133,13 @@ public function removeByIdentityId(IdentityId $identityId) /** * @param VerifiedSecondFactor $secondFactor */ - public function save(VerifiedSecondFactor $secondFactor) + public function save(VerifiedSecondFactor $secondFactor): void { $this->getEntityManager()->persist($secondFactor); $this->getEntityManager()->flush(); } - public function remove(VerifiedSecondFactor $secondFactor) + public function remove(VerifiedSecondFactor $secondFactor): void { $this->getEntityManager()->remove($secondFactor); $this->getEntityManager()->flush(); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettedSecondFactorRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettedSecondFactorRepository.php index a1d052742..1c679287c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettedSecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettedSecondFactorRepository.php @@ -32,7 +32,7 @@ public function __construct(ManagerRegistry $registry) parent::__construct($registry, VettedSecondFactor::class); } - public function find($id, $lockMode = null, $lockVersion = null): ?VettedSecondFactor + public function find(mixed $id, $lockMode = null, $lockVersion = null): ?VettedSecondFactor { /** @var VettedSecondFactor|null $secondFactor */ $secondFactor = parent::find($id); @@ -44,7 +44,7 @@ public function find($id, $lockMode = null, $lockVersion = null): ?VettedSecondF * @param VettedSecondFactorQuery $query * @return Query */ - public function createSearchQuery(VettedSecondFactorQuery $query) + public function createSearchQuery(VettedSecondFactorQuery $query): Query { $queryBuilder = $this->createQueryBuilder('sf'); @@ -57,7 +57,7 @@ public function createSearchQuery(VettedSecondFactorQuery $query) return $queryBuilder->getQuery(); } - public function removeByIdentityId(IdentityId $identityId) + public function removeByIdentityId(IdentityId $identityId): void { $this->getEntityManager()->createQueryBuilder() ->delete($this->_entityName, 'sf') @@ -70,13 +70,13 @@ public function removeByIdentityId(IdentityId $identityId) /** * @param VettedSecondFactor $secondFactor */ - public function save(VettedSecondFactor $secondFactor) + public function save(VettedSecondFactor $secondFactor): void { $this->getEntityManager()->persist($secondFactor); $this->getEntityManager()->flush(); } - public function remove(VettedSecondFactor $secondFactor) + public function remove(VettedSecondFactor $secondFactor): void { $this->getEntityManager()->remove($secondFactor); $this->getEntityManager()->flush(); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php index 4534cbb7c..d329a9779 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php @@ -48,7 +48,7 @@ public function findEntriesByInstitutions(array $institutions) /** * @param WhitelistEntry[] $whitelistEntries */ - public function saveEntries(array $whitelistEntries) + public function saveEntries(array $whitelistEntries): void { $entityManager = $this->getEntityManager(); @@ -62,7 +62,7 @@ public function saveEntries(array $whitelistEntries) /** * Removes all WhitelistEntries */ - public function removeAll() + public function removeAll(): void { $this->createQueryBuilder('w') ->delete() @@ -74,7 +74,7 @@ public function removeAll() /** * @param WhitelistEntry[] $whitelistEntries */ - public function remove(array $whitelistEntries) + public function remove(array $whitelistEntries): void { $entityManager = $this->getEntityManager(); @@ -85,7 +85,7 @@ public function remove(array $whitelistEntries) $entityManager->flush(); } - public function hasEntryFor($institution) + public function hasEntryFor(mixed $institution): bool { $count = $this->createQueryBuilder('w') ->select('COUNT(w.institution)') @@ -100,7 +100,7 @@ public function hasEntryFor($institution) /** * @return ArrayCollection */ - public function getAll() + public function getAll(): ArrayCollection { $results = $this->findAll(); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AbstractSearchService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AbstractSearchService.php index 91bc0abbd..c526aea67 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AbstractSearchService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AbstractSearchService.php @@ -28,12 +28,12 @@ class AbstractSearchService { /** - * @param \Doctrine\ORM\QueryBuilder|\Doctrine\ORM\Query $doctrineQuery + * @param QueryBuilder|Query $doctrineQuery * @param AbstractQuery $query * @param bool $fetchCollection * @return Pagerfanta */ - protected function createPaginatorFrom($doctrineQuery, AbstractQuery $query, $fetchCollection = true) + protected function createPaginatorFrom($doctrineQuery, AbstractQuery $query, $fetchCollection = true): Pagerfanta { $queryObject = $doctrineQuery; if ($doctrineQuery instanceof QueryBuilder) { @@ -61,7 +61,7 @@ protected function createPaginatorFrom($doctrineQuery, AbstractQuery $query, $fe * @param Query $doctrineQuery * @return array */ - protected function getFilteredQueryOptions(Query $doctrineQuery) + protected function getFilteredQueryOptions(Query $doctrineQuery): array { $filters = []; $results = $doctrineQuery->getArrayResult(); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AuditLogService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AuditLogService.php index fe372b503..5979a974f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AuditLogService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AuditLogService.php @@ -24,10 +24,7 @@ class AuditLogService extends AbstractSearchService { - /** - * @var \Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\AuditLogRepository - */ - private $repository; + private AuditLogRepository $repository; public function __construct(AuditLogRepository $repository) { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/IdentityService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/IdentityService.php index 4df023f32..d8a9346e1 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/IdentityService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/IdentityService.php @@ -18,6 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Service; +use Pagerfanta\Pagerfanta; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\Stepup\Identity\Value\NameId; @@ -37,25 +38,13 @@ */ class IdentityService extends AbstractSearchService { - /** - * @var IdentityRepository - */ - private $repository; + private IdentityRepository $repository; - /** - * @var IdentitySelfAssertedTokenOptionsRepository - */ - private $identitySelfAssertedTokensOptionsRepository; + private IdentitySelfAssertedTokenOptionsRepository $identitySelfAssertedTokensOptionsRepository; - /** - * @var RaListingRepository - */ - private $raListingRepository; + private RaListingRepository $raListingRepository; - /** - * @var SraaRepository - */ - private $sraaRepository; + private SraaRepository $sraaRepository; public function __construct( IdentityRepository $repository, @@ -71,9 +60,9 @@ public function __construct( /** * @param string $id - * @return \Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Identity|null + * @return Identity|null */ - public function find($id) + public function find(mixed $id): ?Identity { return $this->repository->find($id); } @@ -81,7 +70,7 @@ public function find($id) /** * @param IdentityQuery $query * @param InstitutionRoleSet $institutionRoles - * @return \Pagerfanta\Pagerfanta + * @return Pagerfanta */ public function search(IdentityQuery $query) { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/ProfileService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/ProfileService.php index e23a3f3d2..c855eba1d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/ProfileService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/ProfileService.php @@ -27,20 +27,11 @@ class ProfileService extends AbstractSearchService { - /** - * @var RaListingRepository - */ - private $raListingRepository; + private RaListingRepository $raListingRepository; - /** - * @var IdentityService - */ - private $identityService; + private IdentityService $identityService; - /** - * @var AuthorizationContextService - */ - private $authorizationService; + private AuthorizationContextService $authorizationService; public function __construct( RaListingRepository $raListingRepository, @@ -68,7 +59,7 @@ public function __construct( * @param string $identityId * @return Profile|null */ - public function createProfile($identityId) + public function createProfile($identityId): ?Profile { $identity = $this->identityService->find($identityId); if ($identity === null) { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaCandidateService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaCandidateService.php index 7f9bb0b9f..9c82107c5 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaCandidateService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaCandidateService.php @@ -18,6 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Service; +use Pagerfanta\Pagerfanta; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Authorization\Value\InstitutionAuthorizationContext; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\RaCandidateQuery; @@ -25,10 +26,7 @@ class RaCandidateService extends AbstractSearchService { - /** - * @var RaCandidateRepository - */ - private $raCandidateRepository; + private RaCandidateRepository $raCandidateRepository; /** * @param RaCandidateRepository $raCandidateRepository @@ -40,7 +38,7 @@ public function __construct(RaCandidateRepository $raCandidateRepository) /** * @param RaCandidateQuery $query - * @return \Pagerfanta\Pagerfanta + * @return Pagerfanta */ public function search(RaCandidateQuery $query) { @@ -64,15 +62,16 @@ public function getFilterOptions(RaCandidateQuery $query) * @param string $identityId * @return null|array */ - public function findOneByIdentityId($identityId) + public function findOneByIdentityId(string $identityId) { return $this->raCandidateRepository->findOneByIdentityId($identityId); } /** * Set the RA candidates USE RA(A) institutions on the Identity he is going to promote. + * @return non-empty-array[] */ - public function setUseRaInstitutionsOnRaCandidate(InstitutionAuthorizationContext $actor, array $raCandidate) + public function setUseRaInstitutionsOnRaCandidate(InstitutionAuthorizationContext $actor, array $raCandidate): array { $result = []; foreach ($actor->getInstitutions() as $raInstitution) { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaListingService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaListingService.php index b174e0693..d5f4e0b3d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaListingService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaListingService.php @@ -18,6 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Service; +use Pagerfanta\Pagerfanta; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Authorization\Value\InstitutionAuthorizationContextInterface; @@ -28,10 +29,7 @@ class RaListingService extends AbstractSearchService { - /** - * @var RaListingRepository - */ - private $raListingRepository; + private RaListingRepository $raListingRepository; public function __construct(RaListingRepository $raListingRepository) { @@ -42,7 +40,7 @@ public function __construct(RaListingRepository $raListingRepository) * @param IdentityId $identityId * @param Institution $raInstitution * @param InstitutionAuthorizationContextInterface $authorizationContext - * @return null|\Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\RaListing + * @return null|RaListing */ public function findByIdentityIdAndRaInstitutionWithContext( IdentityId $identityId, @@ -54,7 +52,7 @@ public function findByIdentityIdAndRaInstitutionWithContext( /** * @param RaListingQuery $query - * @return \Pagerfanta\Pagerfanta + * @return Pagerfanta */ public function search(RaListingQuery $query) { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaSecondFactorService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaSecondFactorService.php index 9bd5961ea..6681680d9 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaSecondFactorService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaSecondFactorService.php @@ -18,15 +18,13 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Service; +use Pagerfanta\Pagerfanta; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\RaSecondFactorQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RaSecondFactorRepository; class RaSecondFactorService extends AbstractSearchService { - /** - * @var \Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RaSecondFactorRepository - */ - private $repository; + private RaSecondFactorRepository $repository; /** * @param RaSecondFactorRepository $repository @@ -38,7 +36,7 @@ public function __construct(RaSecondFactorRepository $repository) /** * @param RaSecondFactorQuery $query - * @return \Pagerfanta\Pagerfanta + * @return Pagerfanta */ public function search(RaSecondFactorQuery $query) { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RecoveryTokenService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RecoveryTokenService.php index 202aeadb5..ef74c0d40 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RecoveryTokenService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RecoveryTokenService.php @@ -29,10 +29,7 @@ class RecoveryTokenService extends AbstractSearchService { - /** - * @var RecoveryTokenRepository - */ - private $recoveryTokenRepository; + private RecoveryTokenRepository $recoveryTokenRepository; public function __construct(RecoveryTokenRepository $recoveryTokenRepository) { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SecondFactorService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SecondFactorService.php index 602937a12..c4fc3122d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SecondFactorService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SecondFactorService.php @@ -18,6 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Service; +use Pagerfanta\Pagerfanta; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\SecondFactorId; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\UnverifiedSecondFactor; @@ -37,20 +38,11 @@ */ class SecondFactorService extends AbstractSearchService { - /** - * @var UnverifiedSecondFactorRepository - */ - private $unverifiedRepository; + private UnverifiedSecondFactorRepository $unverifiedRepository; - /** - * @var VerifiedSecondFactorRepository - */ - private $verifiedRepository; + private VerifiedSecondFactorRepository $verifiedRepository; - /** - * @var VettedSecondFactorRepository - */ - private $vettedRepository; + private VettedSecondFactorRepository $vettedRepository; /** * @param UnverifiedSecondFactorRepository $unverifiedRepository @@ -69,7 +61,7 @@ public function __construct( /** * @param UnverifiedSecondFactorQuery $query - * @return \Pagerfanta\Pagerfanta + * @return Pagerfanta */ public function searchUnverifiedSecondFactors(UnverifiedSecondFactorQuery $query) { @@ -82,7 +74,7 @@ public function searchUnverifiedSecondFactors(UnverifiedSecondFactorQuery $query /** * @param VerifiedSecondFactorQuery $query - * @return \Pagerfanta\Pagerfanta + * @return Pagerfanta */ public function searchVerifiedSecondFactors(VerifiedSecondFactorQuery $query) { @@ -96,7 +88,7 @@ public function searchVerifiedSecondFactors(VerifiedSecondFactorQuery $query) /** * @param VerifiedSecondFactorOfIdentityQuery $query - * @return \Pagerfanta\Pagerfanta + * @return Pagerfanta */ public function searchVerifiedSecondFactorsOfIdentity(VerifiedSecondFactorOfIdentityQuery $query) { @@ -109,7 +101,7 @@ public function searchVerifiedSecondFactorsOfIdentity(VerifiedSecondFactorOfIden /** * @param VettedSecondFactorQuery $query - * @return \Pagerfanta\Pagerfanta + * @return Pagerfanta */ public function searchVettedSecondFactors(VettedSecondFactorQuery $query) { @@ -124,7 +116,7 @@ public function searchVettedSecondFactors(VettedSecondFactorQuery $query) * @param SecondFactorId $id * @return null|UnverifiedSecondFactor */ - public function findUnverified(SecondFactorId $id) + public function findUnverified(SecondFactorId $id): ?UnverifiedSecondFactor { return $this->unverifiedRepository->find($id); } @@ -134,7 +126,7 @@ public function findUnverified(SecondFactorId $id) * @param SecondFactorId $id * @return null|VerifiedSecondFactor */ - public function findVerified(SecondFactorId $id) + public function findVerified(SecondFactorId $id): ?VerifiedSecondFactor { return $this->verifiedRepository->find($id); } @@ -144,7 +136,7 @@ public function findVerified(SecondFactorId $id) * @param SecondFactorId $id * @return null|VettedSecondFactor */ - public function findVetted(SecondFactorId $id) + public function findVetted(SecondFactorId $id): ?VettedSecondFactor { return $this->vettedRepository->find($id); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SraaService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SraaService.php index cc4f3e50f..774662d71 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SraaService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SraaService.php @@ -24,10 +24,7 @@ class SraaService { - /** - * @var \Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\SraaRepository - */ - private $sraaRepository; + private SraaRepository $sraaRepository; public function __construct(SraaRepository $sraaRepository) { @@ -46,7 +43,7 @@ public function findByNameId(NameId $nameId) /** * @return Sraa[] */ - public function findAll() + public function findAll(): array { return $this->sraaRepository->findAll(); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/WhitelistService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/WhitelistService.php index 0a90cbd59..d3dbcace9 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/WhitelistService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/WhitelistService.php @@ -22,10 +22,7 @@ class WhitelistService { - /** - * @var WhitelistEntryRepository - */ - private $whitelistEntryRepository; + private WhitelistEntryRepository $whitelistEntryRepository; public function __construct(WhitelistEntryRepository $whitelistEntryRepository) { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorityRole.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorityRole.php index 47eb9880f..ad6039d1a 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorityRole.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorityRole.php @@ -52,7 +52,7 @@ public function __construct($role) * * @return AuthorityRole */ - public static function ra() + public static function ra(): self { return new self(self::ROLE_RA); } @@ -62,7 +62,7 @@ public static function ra() * * @return AuthorityRole */ - public static function raa() + public static function raa(): self { return new self(self::ROLE_RAA); } @@ -89,7 +89,7 @@ public static function fromRegistrationAuthorityRole(RegistrationAuthorityRole $ * @param AuthorityRole $other * @return bool */ - public function equals(AuthorityRole $other) + public function equals(AuthorityRole $other): bool { return $this->role === $other->role; } @@ -102,7 +102,7 @@ public function getRole() return $this->role; } - public function __toString() + public function __toString(): string { return $this->role; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorizedInstitutionCollection.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorizedInstitutionCollection.php index a47d24e8d..61dcf3fb6 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorizedInstitutionCollection.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorizedInstitutionCollection.php @@ -34,14 +34,9 @@ class AuthorizedInstitutionCollection * * @var string[] */ - private $authorizations = []; + private array $authorizations = []; - /** - * @param InstitutionCollection $raInstitutions - * @param InstitutionCollection|null $raaInstitutions - * @return AuthorizedInstitutionCollection - */ - public static function from(InstitutionCollection $raInstitutions, InstitutionCollection $raaInstitutions = null) + public static function from(InstitutionCollection $raInstitutions, ?InstitutionCollection $raaInstitutions = null): self { $collection = new self(); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/Profile.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/Profile.php index 5f3ec9517..1716a9971 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/Profile.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/Profile.php @@ -24,15 +24,9 @@ class Profile implements JsonSerializable { - /** - * @var Identity - */ - private $identity; + private Identity $identity; - /** - * @var AuthorizedInstitutionCollection - */ - private $authorizedInstitutionCollection; + private AuthorizedInstitutionCollection $authorizedInstitutionCollection; /** * @var bool diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RecoveryTokenStatus.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RecoveryTokenStatus.php index 650f638e9..e68cee705 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RecoveryTokenStatus.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RecoveryTokenStatus.php @@ -20,10 +20,7 @@ final class RecoveryTokenStatus { - /** - * @var string - */ - private $status; + private string $status; public static function active(): self { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RegistrationAuthorityCredentials.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RegistrationAuthorityCredentials.php index 6a05e0d12..0d95a54cb 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RegistrationAuthorityCredentials.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RegistrationAuthorityCredentials.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Value; use Assert\Assertion; +use JsonSerializable; use Surfnet\Stepup\Identity\Value\CommonName; use Surfnet\Stepup\Identity\Value\ContactInformation; use Surfnet\Stepup\Identity\Value\Institution; @@ -27,7 +28,7 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\RaListing; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Sraa; -class RegistrationAuthorityCredentials implements \JsonSerializable +class RegistrationAuthorityCredentials implements JsonSerializable { /** * @var string @@ -92,7 +93,7 @@ private function __construct( * @param Identity $identity * @return RegistrationAuthorityCredentials */ - public static function fromSraa(Sraa $sraa, Identity $identity) + public static function fromSraa(Sraa $sraa, Identity $identity): self { static::assertEquals($sraa->nameId, $identity->nameId); @@ -106,7 +107,7 @@ public static function fromSraa(Sraa $sraa, Identity $identity) * @param RaListing[] $raListings * @return RegistrationAuthorityCredentials */ - public static function fromRaListings(array $raListings) + public static function fromRaListings(array $raListings): self { $raListingCredentials = current($raListings); $isRa = false; @@ -142,7 +143,7 @@ public static function fromRaListings(array $raListings) * @param RaListing $raListing * @return RegistrationAuthorityCredentials */ - public static function fromRaListing(RaListing $raListing) + public static function fromRaListing(RaListing $raListing): self { $credentials = new self( $raListing->identityId, @@ -164,7 +165,7 @@ public static function fromRaListing(RaListing $raListing) * @param string $identityNameId * @return void */ - private static function assertEquals($nameId, $identityNameId) + private static function assertEquals($nameId, $identityNameId): void { Assertion::eq($nameId, $identityNameId); } @@ -172,7 +173,7 @@ private static function assertEquals($nameId, $identityNameId) /** * @return RegistrationAuthorityCredentials */ - public function grantSraa() + public function grantSraa(): static { $copy = clone $this; $copy->isSraa = true; @@ -184,7 +185,7 @@ public function grantSraa() * @param RegistrationAuthorityCredentials $other * @return bool */ - public function equals(RegistrationAuthorityCredentials $other) + public function equals(RegistrationAuthorityCredentials $other): bool { return $other->jsonSerialize() === $this->jsonSerialize(); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/SecondFactorStatus.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/SecondFactorStatus.php index b87b13195..fffe26004 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/SecondFactorStatus.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/SecondFactorStatus.php @@ -25,27 +25,27 @@ final class SecondFactorStatus */ private $status; - public static function unverified() + public static function unverified(): self { return new self('unverified'); } - public static function verified() + public static function verified(): self { return new self('verified'); } - public static function vetted() + public static function vetted(): self { return new self('vetted'); } - public static function revoked() + public static function revoked(): self { return new self('revoked'); } - public static function forgotten() + public static function forgotten(): self { return new self('forgotten'); } @@ -54,7 +54,7 @@ public static function forgotten() * @param string $status * @return bool */ - public static function isValidStatus($status) + public static function isValidStatus($status): bool { return in_array($status, ['unverified', 'verified', 'vetted', 'revoked', 'forgotten', true]); } @@ -71,7 +71,7 @@ private function __construct($status) * @param SecondFactorStatus $other * @return bool */ - public function equals(SecondFactorStatus $other) + public function equals(SecondFactorStatus $other): bool { return $this->status === $other->status; } @@ -79,7 +79,7 @@ public function equals(SecondFactorStatus $other) /** * @return string */ - public function __toString() + public function __toString(): string { return $this->status; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/VerifiedTokenInformation.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/VerifiedTokenInformation.php index 85d1646f7..3e63d6456 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/VerifiedTokenInformation.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/VerifiedTokenInformation.php @@ -69,7 +69,7 @@ public function __construct( $this->registrationCode = $registrationCode; } - public static function fromEntity(VerifiedSecondFactor $token, Identity $identity) + public static function fromEntity(VerifiedSecondFactor $token, Identity $identity): self { $tokenInformation = new self( (string) $identity->email, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php b/src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php index 73242fc0a..c47dc2837 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php @@ -30,7 +30,7 @@ class CommandParamConverter implements ParamConverterInterface * The line above could be removed in newer releases were dynamic imports are allowed * @see https://github.com/phpmd/phpmd/issues/673 */ - public function apply(Request $request, ParamConverter $configuration) + public function apply(Request $request, ParamConverter $configuration): void { $data = json_decode($request->getContent(), true); @@ -55,7 +55,7 @@ public function apply(Request $request, ParamConverter $configuration) $request->attributes->set('command', $command); } - public function supports(ParamConverter $configuration) + public function supports(ParamConverter $configuration): bool { return $configuration->getName() === 'command' && $configuration->getClass() === 'Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command'; @@ -65,7 +65,7 @@ public function supports(ParamConverter $configuration) * @param mixed $data * @throws BadCommandRequestException */ - private function assertIsValidCommandStructure($data) + private function assertIsValidCommandStructure($data): void { if (!is_array($data)) { $type = gettype($data); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionParamConverter.php b/src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionParamConverter.php index 15e6895f9..acde5057e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionParamConverter.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionParamConverter.php @@ -28,12 +28,12 @@ class ConfigurationInstitutionParamConverter implements ParamConverterInterface { const INSTITUTION = 'institution'; - public function apply(Request $request, ParamConverter $configuration) + public function apply(Request $request, ParamConverter $configuration): void { $request->attributes->set(self::INSTITUTION, new Institution($this->getInstitutionFromRequest($request))); } - public function supports(ParamConverter $configuration) + public function supports(ParamConverter $configuration): bool { return $configuration->getName() === self::INSTITUTION && $configuration->getClass() === 'Surfnet\Stepup\Configuration\Value\Institution'; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Request/InstitutionParamConverter.php b/src/Surfnet/StepupMiddleware/ApiBundle/Request/InstitutionParamConverter.php index aeefc884f..b4c651d26 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Request/InstitutionParamConverter.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Request/InstitutionParamConverter.php @@ -26,7 +26,7 @@ class InstitutionParamConverter implements ParamConverterInterface { - public function apply(Request $request, ParamConverter $configuration) + public function apply(Request $request, ParamConverter $configuration): void { $query = $request->query; $institution = $query->get('institution', false); @@ -40,7 +40,7 @@ public function apply(Request $request, ParamConverter $configuration) $request->attributes->set('institution', new Institution($institution)); } - public function supports(ParamConverter $configuration) + public function supports(ParamConverter $configuration): bool { return $configuration->getName() === 'institution' && $configuration->getClass() === 'Surfnet\Stepup\Identity\Value\Institution'; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Request/MetadataParamConverter.php b/src/Surfnet/StepupMiddleware/ApiBundle/Request/MetadataParamConverter.php index 79bf81227..990b4abf9 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Request/MetadataParamConverter.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Request/MetadataParamConverter.php @@ -27,17 +27,14 @@ class MetadataParamConverter implements ParamConverterInterface { - /** - * @var \Symfony\Component\Validator\Validator\ValidatorInterface - */ - private $validator; + private ValidatorInterface $validator; public function __construct(ValidatorInterface $validator) { $this->validator = $validator; } - public function apply(Request $request, ParamConverter $configuration) + public function apply(Request $request, ParamConverter $configuration): void { $data = json_decode($request->getContent()); @@ -58,7 +55,7 @@ public function apply(Request $request, ParamConverter $configuration) $request->attributes->set('metadata', $metadata); } - public function supports(ParamConverter $configuration) + public function supports(ParamConverter $configuration): bool { return $configuration->getName() === 'metadata' && $configuration->getClass() === 'Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Metadata'; @@ -68,7 +65,7 @@ public function supports(ParamConverter $configuration) * @param mixed $data * @throws BadCommandRequestException */ - private function assertIsValidMetadataStructure($data) + private function assertIsValidMetadataStructure($data): void { if (!is_object($data)) { $type = gettype($data); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonAuthorizationResponse.php b/src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonAuthorizationResponse.php index 2d12134f1..19c906290 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonAuthorizationResponse.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonAuthorizationResponse.php @@ -39,7 +39,7 @@ public function __construct(int $code, array $errors = []) parent::__construct($data, 200); } - public static function from(AuthorizationDecision $decision) + public static function from(AuthorizationDecision $decision): self { return new self($decision->getCode(), $decision->getErrorMessages()); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonCollectionResponse.php b/src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonCollectionResponse.php index 37928647d..c7c3c4574 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonCollectionResponse.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonCollectionResponse.php @@ -23,7 +23,7 @@ class JsonCollectionResponse extends JsonResponse { - public static function fromPaginator(Pagerfanta $paginator, $filters = array()) + public static function fromPaginator(Pagerfanta $paginator, $filters = array()): self { return new self( $paginator->getNbResults(), @@ -43,7 +43,7 @@ public static function fromPaginator(Pagerfanta $paginator, $filters = array()) * @param array $headers * @param array $filters */ - public function __construct($totalItems, $page, $pageSize, array $collection, $headers = array(), $filters = array()) + public function __construct($totalItems, $page, $pageSize, array $collection, array $headers = array(), $filters = array()) { $data = array( 'collection' => array( diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonNotFoundResponse.php b/src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonNotFoundResponse.php index b3e3b4bc0..7b6666650 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonNotFoundResponse.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonNotFoundResponse.php @@ -25,7 +25,7 @@ class JsonNotFoundResponse extends JsonResponse /** * @param array $headers */ - public function __construct($headers = array()) + public function __construct(array $headers = array()) { parent::__construct(null, 404, $headers); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Service/DeprovisionService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Service/DeprovisionService.php index fcb8645ba..c774b1380 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Service/DeprovisionService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Service/DeprovisionService.php @@ -31,25 +31,16 @@ class DeprovisionService implements DeprovisionServiceInterface { - /** - * @var Pipeline - */ - private $pipeline; + private Pipeline $pipeline; - /** - * @var IdentityRepository - */ - private $eventSourcingRepository; + private IdentityRepository $eventSourcingRepository; /** * @var ApiIdentityRepository */ - private $apiRepository; + private ApiIdentityRepository $apiRepository; - /** - * @var LoggerInterface - */ - private $logger; + private LoggerInterface $logger; public function __construct( Pipeline $pipeline, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Filter/InstitutionAuthorizationRepositoryFilterTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Filter/InstitutionAuthorizationRepositoryFilterTest.php index 614861f3a..e60179e36 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Filter/InstitutionAuthorizationRepositoryFilterTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Filter/InstitutionAuthorizationRepositoryFilterTest.php @@ -21,7 +21,9 @@ use Doctrine\ORM\EntityManager; use Doctrine\ORM\QueryBuilder; +use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; +use PHPUnit_Framework_MockObject_MockObject; use Surfnet\Stepup\Identity\Collection\InstitutionCollection; use Surfnet\Stepup\Identity\Value\Institution as InstitutionValue; use Surfnet\StepupMiddleware\ApiBundle\Authorization\Filter\InstitutionAuthorizationRepositoryFilter; @@ -32,17 +34,17 @@ class InstitutionAuthorizationRepositoryFilterTest extends TestCase /** * @var QueryBuilder */ - private $queryBuilder; + private QueryBuilder $queryBuilder; /** * @var EntityManager */ - private $entityManager; + private MockObject $entityManager; /** - * @var InstitutionAuthorizationContextInterface|\PHPUnit_Framework_MockObject_MockObject + * @var InstitutionAuthorizationContextInterface|PHPUnit_Framework_MockObject_MockObject */ - private $mockedAuthorizationContext; + private MockObject $mockedAuthorizationContext; public function setUp(): void { @@ -60,7 +62,7 @@ public function setUp(): void * @test * @group domain */ - public function a_querybuilder_object_is_filtered_with_an_institution_authorization_context() + public function a_querybuilder_object_is_filtered_with_an_institution_authorization_context(): void { $this->mockedAuthorizationContext->method('getInstitutions') ->willReturn(new InstitutionCollection([ @@ -76,4 +78,4 @@ public function a_querybuilder_object_is_filtered_with_an_institution_authorizat $this->assertEquals(['institution-a','institution-c'], $this->queryBuilder->getParameter('iacalias_institutions')->getValue()); } -} \ No newline at end of file +} diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationContextServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationContextServiceTest.php index 23b56248a..6a30d2591 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationContextServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationContextServiceTest.php @@ -31,6 +31,7 @@ use Surfnet\StepupMiddleware\ApiBundle\Authorization\Service\AuthorizationContextService; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity\ConfiguredInstitution; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository\ConfiguredInstitutionRepository; +use Surfnet\StepupMiddleware\ApiBundle\Exception\InvalidArgumentException; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Identity; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Sraa; use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\AuthorizationRepository; @@ -39,10 +40,7 @@ class AuthorizationContextServiceTest extends TestCase { - /** - * @var AuthorizationContextService - */ - private $service; + private AuthorizationContextService $service; /** * @var IdentityService|m\Mock @@ -86,7 +84,7 @@ public function setUp(): void * @test * @group domain */ - public function it_can_build_a_context() + public function it_can_build_a_context(): void { $actorInstitution = new Institution('institution-a'); $role = RegistrationAuthorityRole::raa(); @@ -139,7 +137,7 @@ public function it_can_build_a_context() * @test * @group domain */ - public function it_can_build_a_context_with_sraa_actor() + public function it_can_build_a_context_with_sraa_actor(): void { $actorInstitution = new Institution('institution-a'); $role = RegistrationAuthorityRole::raa(); @@ -197,7 +195,7 @@ public function it_can_build_a_context_with_sraa_actor() $this->assertTrue($context->isActorSraa()); } - public function test_it_can_retrieve_select_raa_institutions() + public function test_it_can_retrieve_select_raa_institutions(): void { $actorInstitution = new Institution('institution-a'); @@ -248,10 +246,10 @@ public function test_it_can_retrieve_select_raa_institutions() * @test * @group domain */ - public function it_rejects_unknown_actor() + public function it_rejects_unknown_actor(): void { $this->expectExceptionMessage("The provided id is not associated with any known identity"); - $this->expectException(\Surfnet\StepupMiddleware\ApiBundle\Exception\InvalidArgumentException::class); + $this->expectException(InvalidArgumentException::class); $role = RegistrationAuthorityRole::raa(); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationServiceTest.php index 249fced6c..59928a75c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationServiceTest.php @@ -62,7 +62,7 @@ class AuthorizationServiceTest extends TestCase /** * @var AuthorizationService */ - private $service; + private AuthorizationService $service; protected function setUp(): void { @@ -79,7 +79,7 @@ protected function setUp(): void ); } - public function test_it_rejects_unknown_user() + public function test_it_rejects_unknown_user(): void { $this->identityService ->shouldReceive('find') @@ -93,7 +93,7 @@ public function test_it_rejects_unknown_user() $this->assertEquals('Identity not found', reset($messages)); } - public function test_it_rejects_unknown_institution_configuration() + public function test_it_rejects_unknown_institution_configuration(): void { $identity = new Identity(); $identity->institution = new Institution('Unknown institution'); @@ -115,7 +115,7 @@ public function test_it_rejects_unknown_institution_configuration() $this->assertEquals('Institution configuration could not be found, unable to ascertain if self-asserted tokens feature is enabled', reset($messages)); } - public function test_it_rejects_disabled_self_asserted_tokens_feature_flag_on_institution() + public function test_it_rejects_disabled_self_asserted_tokens_feature_flag_on_institution(): void { $identity = new Identity(); $identity->institution = new Institution('Known institution'); @@ -139,7 +139,7 @@ public function test_it_rejects_disabled_self_asserted_tokens_feature_flag_on_in $this->assertEquals('Institution "known institution", does not allow self-asserted tokens', reset($messages)); } - public function test_it_rejects_when_identity_has_vetted_token() + public function test_it_rejects_when_identity_has_vetted_token(): void { $identity = new Identity(); $identity->institution = new Institution('Known institution'); @@ -179,7 +179,7 @@ public function test_it_rejects_when_identity_has_vetted_token() $this->assertEquals('Identity already has a vetted second factor', reset($messages)); } - public function test_it_rejects_when_identity_had_prior_non_sat_token() + public function test_it_rejects_when_identity_had_prior_non_sat_token(): void { $identity = new Identity(); $identity->institution = new Institution('Known institution'); @@ -219,7 +219,7 @@ public function test_it_rejects_when_identity_had_prior_non_sat_token() $this->assertEquals('Identity never possessed a self-asserted token, but did/does possess one of the other types', reset($messages)); } - public function test_recovery_tokens_never_owned_a_sat_token_but_did_own_other_token_type() + public function test_recovery_tokens_never_owned_a_sat_token_but_did_own_other_token_type(): void { $identity = new Identity(); $identity->institution = new Institution('Known institution'); @@ -259,7 +259,7 @@ public function test_recovery_tokens_never_owned_a_sat_token_but_did_own_other_t $this->assertEquals('Identity never possessed a self-asserted token, deny access to recovery token CRUD actions', reset($messages)); } - public function test_you_cant_sat_when_you_lost_both_rt_and_sf_tokens() + public function test_you_cant_sat_when_you_lost_both_rt_and_sf_tokens(): void { $identity = new Identity(); $identity->institution = new Institution('Known institution'); @@ -305,7 +305,7 @@ public function test_you_cant_sat_when_you_lost_both_rt_and_sf_tokens() $this->assertEquals('Identity lost both Recovery and Second Factor token, SAT is not allowed', reset($messages)); } - public function test_recovery_tokens_all_requirements_met() + public function test_recovery_tokens_all_requirements_met(): void { $identity = new Identity(); $identity->institution = new Institution('Known institution'); @@ -345,7 +345,7 @@ public function test_recovery_tokens_all_requirements_met() $this->assertEmpty($messages); } - public function test_it_allows_when_identity_meets_all_requirements() + public function test_it_allows_when_identity_meets_all_requirements(): void { $identity = new Identity(); $identity->institution = new Institution('Known institution'); @@ -391,7 +391,7 @@ public function test_it_allows_when_identity_meets_all_requirements() $this->assertEmpty($messages); } - public function test_it_allows_when_identity_with_prior_sat_meets_all_requirements() + public function test_it_allows_when_identity_with_prior_sat_meets_all_requirements(): void { $identity = new Identity(); $identity->institution = new Institution('Known institution'); @@ -437,7 +437,7 @@ public function test_it_allows_when_identity_with_prior_sat_meets_all_requiremen $this->assertEmpty($messages); } - public function test_it_allows_self_vetting_when_one_sat_present() + public function test_it_allows_self_vetting_when_one_sat_present(): void { $identity = new Identity(); $identity->institution = new Institution('Known institution'); @@ -474,7 +474,7 @@ public function test_it_allows_self_vetting_when_one_sat_present() $this->assertEmpty($messages); } - public function test_it_allows_self_vetting_when_multiple_sat_present() + public function test_it_allows_self_vetting_when_multiple_sat_present(): void { $identity = new Identity(); $identity->institution = new Institution('Known institution'); @@ -510,7 +510,7 @@ public function test_it_allows_self_vetting_when_multiple_sat_present() $this->assertEmpty($messages); } - public function test_it_denies_self_vetting_when_other_vetting_type() + public function test_it_denies_self_vetting_when_other_vetting_type(): void { $identity = new Identity(); $identity->institution = new Institution('Known institution'); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php index 06a42bb5c..a0dc9a7a9 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php @@ -66,7 +66,7 @@ class CommandAuthorizationServiceTest extends TestCase /** * @var CommandAuthorizationService */ - private $service; + private CommandAuthorizationService $service; public function setUp(): void { @@ -85,7 +85,7 @@ public function setUp(): void $this->service = $service; } - public function test_shared_ra_and_ss_commands_are_correctly_authorized() + public function test_shared_ra_and_ss_commands_are_correctly_authorized(): void { $actorId = new IdentityId('123'); $actorInstitution = new Institution('institution'); @@ -114,7 +114,7 @@ public function test_shared_ra_and_ss_commands_are_correctly_authorized() * * @param mixed $value */ - public function a_sraa_should_be_able_to_execute_all_commands($file, $command) + public function a_sraa_should_be_able_to_execute_all_commands($file, Command $command): void { $this->assertInstanceOf(Command::class, $command); @@ -142,7 +142,7 @@ public function a_sraa_should_be_able_to_execute_all_commands($file, $command) * * @param mixed $value */ - public function an_identity_should_be_able_to_execute_own_selfservice_commands($file, $command) + public function an_identity_should_be_able_to_execute_own_selfservice_commands($file, $command): void { $this->assertInstanceOf(Command::class, $command); @@ -177,7 +177,7 @@ public function an_identity_should_be_able_to_execute_own_selfservice_commands($ * * @param mixed $value */ - public function an_identity_should_be_able_to_execute_configured_ra_commands($file, $command) + public function an_identity_should_be_able_to_execute_configured_ra_commands($file, $command): void { $this->assertInstanceOf(Command::class, $command); @@ -225,7 +225,7 @@ public function an_identity_should_be_able_to_execute_configured_ra_commands($fi } $this->authorizationContextService->shouldReceive('buildInstitutionAuthorizationContext') - ->with($actorId, m::on(function($arg) use ($role){ + ->with($actorId, m::on(function($arg) use ($role): bool{ return $arg == $role; })) ->andReturn($authorizationContext); @@ -242,7 +242,7 @@ public function an_identity_should_be_able_to_execute_configured_ra_commands($fi * * @param mixed $value */ - public function an_identity_should_be_able_to_execute_configured_ra_and_selfservice_commands($file, $command) + public function an_identity_should_be_able_to_execute_configured_ra_and_selfservice_commands($file, $command): void { $this->assertInstanceOf(Command::class, $command); @@ -285,7 +285,7 @@ public function an_identity_should_be_able_to_execute_configured_ra_and_selfserv } $this->authorizationContextService->shouldReceive('buildInstitutionAuthorizationContext') - ->with($actorId, m::on(function($arg) use ($role){ + ->with($actorId, m::on(function($arg) use ($role): bool{ return $arg == $role; })) ->andReturn($authorizationContext); @@ -303,7 +303,7 @@ public function an_identity_should_be_able_to_execute_configured_ra_and_selfserv * * @param mixed $value */ - public function an_identity_should_not_be_able_to_execute_someone_elses_selfservice_commands($file, $command) + public function an_identity_should_not_be_able_to_execute_someone_elses_selfservice_commands($file, $command): void { $this->assertInstanceOf(Command::class, $command); @@ -346,7 +346,7 @@ public function an_identity_should_not_be_able_to_execute_someone_elses_selfserv * * @param mixed $value */ - public function an_identity_should_be_able_to_execute_unconfigured_ra_commands($file, $command) + public function an_identity_should_be_able_to_execute_unconfigured_ra_commands($file, $command): void { $this->assertInstanceOf(Command::class, $command); @@ -393,7 +393,7 @@ public function an_identity_should_be_able_to_execute_unconfigured_ra_commands($ } $this->authorizationContextService->shouldReceive('buildInstitutionAuthorizationContext') - ->with($actorId, m::on(function($arg) use ($role) { + ->with($actorId, m::on(function($arg) use ($role): bool { return $arg == $role; })) ->andReturn($authorizationContext); @@ -409,7 +409,7 @@ public function an_identity_should_be_able_to_execute_unconfigured_ra_commands($ * * @param mixed $value */ - public function all_available_commands_should_be_tested() + public function all_available_commands_should_be_tested(): void { $tested = array ( 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Configuration\\Command\\AddRaLocationCommand', @@ -463,7 +463,10 @@ public function all_available_commands_should_be_tested() } - public function availableCommands() + /** + * @return string[][]|Command[][] + */ + public function availableCommands(): array { $rootPath = realpath(__DIR__ . '/../../../../../../../src'); $basePath = realPath($rootPath . '/Surfnet/StepupMiddleware/CommandHandlingBundle').'/*'; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Entity/ConfiguredInstitutionTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Entity/ConfiguredInstitutionTest.php index e4338aee7..6934fef92 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Entity/ConfiguredInstitutionTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Entity/ConfiguredInstitutionTest.php @@ -28,7 +28,7 @@ class ConfiguredInstitutionTest extends TestCase * @test * @group entity */ - public function a_configured_institution_is_correctly_serialized_to_json() + public function a_configured_institution_is_correctly_serialized_to_json(): void { $deserializedConfiguredInstitution = ['institution' => 'surfnet.nl']; $configuredInstitution = ConfiguredInstitution::createFrom( diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Entity/RaLocationTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Entity/RaLocationTest.php index 4b09d03de..d68e47ade 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Entity/RaLocationTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Entity/RaLocationTest.php @@ -31,7 +31,7 @@ class RaLocationTest extends TestCase * @test * @group entity */ - public function an_ra_location_is_correctly_serialized_to_json() + public function an_ra_location_is_correctly_serialized_to_json(): void { $deserializedRaLocation = [ 'id' => 'An id', diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/AllowedSecondFactorMapTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/AllowedSecondFactorMapTest.php index e8257b962..07d93cd1b 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/AllowedSecondFactorMapTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/AllowedSecondFactorMapTest.php @@ -31,7 +31,7 @@ class AllowedSecondFactorMapTest extends TestCase * @test * @group domain */ - public function an_allowed_second_factor_that_contains_a_given_institution_will_result_in_a_filled_allowed_second_factor_list() + public function an_allowed_second_factor_that_contains_a_given_institution_will_result_in_a_filled_allowed_second_factor_list(): void { $institution = new Institution('institution-with-filled-list.test'); $allowedSecondFactors = [ @@ -54,7 +54,7 @@ public function an_allowed_second_factor_that_contains_a_given_institution_will_ * @test * @group domain */ - public function an_allowed_second_factor_map_that_does_not_contain_a_given_institution_will_result_in_a_blank_allowed_second_factor_list() + public function an_allowed_second_factor_map_that_does_not_contain_a_given_institution_will_result_in_a_blank_allowed_second_factor_list(): void { $institution = new Institution('institution-with-blank-list.test'); $allowedSecondFactors = []; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationOptionMapTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationOptionMapTest.php index 674b3e3dc..b7652a806 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationOptionMapTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationOptionMapTest.php @@ -30,7 +30,7 @@ class InstitutionAuthorizationOptionMapTest extends TestCase /** * @var Institution */ - private $institution; + private Institution $institution; public function setUp(): void { @@ -41,7 +41,7 @@ public function setUp(): void * @test * @group domain */ - public function an_array_initialized_with_authorizations_should_return_valid_institutions_per_role() + public function an_array_initialized_with_authorizations_should_return_valid_institutions_per_role(): void { $testData = [ ['inst ', 'inst', 'use_ra'], @@ -71,7 +71,7 @@ public function an_array_initialized_with_authorizations_should_return_valid_ins * @test * @group domain */ - public function an_array_initialized_with_no_authorizations_should_return_valid_institutions_per_role() + public function an_array_initialized_with_no_authorizations_should_return_valid_institutions_per_role(): void { $institutionAuthorizationMap = InstitutionAuthorizationOptionMap::fromInstitutionAuthorizations($this->institution, []); @@ -79,4 +79,4 @@ public function an_array_initialized_with_no_authorizations_should_return_valid_ $this->assertEquals([], $institutionAuthorizationMap->getAuthorizationOptionsByRole(InstitutionRole::useRaa())->getInstitutions($this->institution)); $this->assertEquals([], $institutionAuthorizationMap->getAuthorizationOptionsByRole(InstitutionRole::selectRaa())->getInstitutions($this->institution)); } -} \ No newline at end of file +} diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationServiceTest.php index bbb8df3bb..3921de14e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationServiceTest.php @@ -31,7 +31,7 @@ class InstitutionAuthorizationServiceTest extends TestCase /** * @var InstitutionAuthorizationService */ - private $service; + private InstitutionAuthorizationService $service; /** * @var InstitutionAuthorizationRepository|Mock @@ -51,7 +51,7 @@ public function setUp(): void * Simulates the use case where an institution does have a specific institution config, but the token setting is * disabled. */ - public function test_get_institution_options_from_service() + public function test_get_institution_options_from_service(): void { $institution = new Institution('surfnet.nl'); @@ -72,7 +72,10 @@ public function test_get_institution_options_from_service() $this->assertEquals(InstitutionRole::useRa(), $institutionOptions->getInstitutionRole()); } - private function buildAuthorizations($expectedInstitutions) + /** + * @return mixed[] + */ + private function buildAuthorizations(array $expectedInstitutions): array { $authorizations = []; foreach ($expectedInstitutions as $institution) { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionConfigurationOptionsServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionConfigurationOptionsServiceTest.php index ce690c8a8..464ff1d2c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionConfigurationOptionsServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionConfigurationOptionsServiceTest.php @@ -31,7 +31,7 @@ class InstitutionConfigurationOptionsServiceTest extends TestCase /** * @var InstitutionConfigurationOptionsService */ - private $service; + private InstitutionConfigurationOptionsService $service; /** * @var InstitutionConfigurationOptionsRepository|Mock @@ -41,9 +41,8 @@ class InstitutionConfigurationOptionsServiceTest extends TestCase /** * A representation of the globally configured application setting for the numberOfTokensPerIdentity, this value * is configured in the parameters.yml under the moniker of 'number_of_tokens_per_identity' - * @var int */ - private $numberOfTokensPerIdentityDefault = 13; + private int $numberOfTokensPerIdentityDefault = 13; public function setUp(): void { @@ -55,7 +54,7 @@ public function setUp(): void ); } - public function test_get_max_number_of_tokens_for_with_available_institution_configuration() + public function test_get_max_number_of_tokens_for_with_available_institution_configuration(): void { $institution = new Institution('surfnet.nl'); @@ -75,7 +74,7 @@ public function test_get_max_number_of_tokens_for_with_available_institution_con * Simulates the use case where an institution does have a specific institution config, but the token setting is * disabled. */ - public function test_get_max_number_of_tokens_for_with_default_institution_configuration_settings() + public function test_get_max_number_of_tokens_for_with_default_institution_configuration_settings(): void { $institution = new Institution('surfnet.nl'); @@ -97,7 +96,7 @@ public function test_get_max_number_of_tokens_for_with_default_institution_confi * Simulates the use case where an institution does not have specific institution config, but defaults are used * instead. */ - public function test_nullable_tokens_per_identity_options_in_institution_configuration_settings() + public function test_nullable_tokens_per_identity_options_in_institution_configuration_settings(): void { $institution = new Institution('surfnet.nl'); @@ -112,7 +111,7 @@ public function test_nullable_tokens_per_identity_options_in_institution_configu $this->assertEquals($expectedNumberOfTokens, $numberOfTokens); } - private function buildConfigurationOption($expectedNumberOfTokens) + private function buildConfigurationOption(int $expectedNumberOfTokens) { $numberOfTokensOptionMock = m::mock(NumberOfTokensPerIdentityOption::class); $numberOfTokensOptionMock diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/AuthorityRoleTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/AuthorityRoleTypeTest.php index f69e400d1..3cbed1a99 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/AuthorityRoleTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/AuthorityRoleTypeTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\AuthorityRoleType; @@ -26,10 +27,7 @@ class AuthorityRoleTypeTest extends UnitTest { - /** - * @var \Doctrine\DBAL\Platforms\MySqlPlatform - */ - private $platform; + private MySqlPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -48,7 +46,7 @@ public function setUp(): void * @test * @group doctrine */ - public function a_null_value_remains_null_in_to_sql_conversion() + public function a_null_value_remains_null_in_to_sql_conversion(): void { $authorityRole = Type::getType(AuthorityRoleType::NAME); @@ -61,7 +59,7 @@ public function a_null_value_remains_null_in_to_sql_conversion() * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_the_correct_format() + public function a_non_null_value_is_converted_to_the_correct_format(): void { $authorityRole = Type::getType(AuthorityRoleType::NAME); @@ -76,7 +74,7 @@ public function a_non_null_value_is_converted_to_the_correct_format() * @test * @group doctrine */ - public function a_null_value_remains_null_when_converting_from_db_to_php_value() + public function a_null_value_remains_null_when_converting_from_db_to_php_value(): void { $authorityRole = Type::getType(AuthorityRoleType::NAME); @@ -89,7 +87,7 @@ public function a_null_value_remains_null_when_converting_from_db_to_php_value() * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_an_authority_role_value_object() + public function a_non_null_value_is_converted_to_an_authority_role_value_object(): void { $authorityRole = Type::getType(AuthorityRoleType::NAME); @@ -105,9 +103,9 @@ public function a_non_null_value_is_converted_to_an_authority_role_value_object( * @test * @group doctrine */ - public function an_invalid_database_value_causes_an_exception_upon_conversion() + public function an_invalid_database_value_causes_an_exception_upon_conversion(): void { - $this->expectException(\Doctrine\DBAL\Types\ConversionException::class); + $this->expectException(ConversionException::class); $authorityRole = Type::getType(AuthorityRoleType::NAME); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/CommonNameTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/CommonNameTypeTest.php index 6d106141f..cce7ad129 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/CommonNameTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/CommonNameTypeTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Identity\Value\CommonName; @@ -27,9 +28,9 @@ class CommonNameTypeTest extends UnitTest { /** - * @var \Doctrine\DBAL\Platforms\MySqlPlatform + * @var MySqlPlatform */ - private $platform; + private MySqlPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -48,7 +49,7 @@ public function setUp(): void * @test * @group doctrine */ - public function a_null_value_remains_null_in_to_sql_conversion() + public function a_null_value_remains_null_in_to_sql_conversion(): void { $commonName = Type::getType(CommonNameType::NAME); @@ -61,7 +62,7 @@ public function a_null_value_remains_null_in_to_sql_conversion() * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_the_correct_format() + public function a_non_null_value_is_converted_to_the_correct_format(): void { $commonName = Type::getType(CommonNameType::NAME); @@ -76,7 +77,7 @@ public function a_non_null_value_is_converted_to_the_correct_format() * @test * @group doctrine */ - public function a_null_value_remains_null_when_converting_from_db_to_php_value() + public function a_null_value_remains_null_when_converting_from_db_to_php_value(): void { $commonName = Type::getType(CommonNameType::NAME); @@ -89,7 +90,7 @@ public function a_null_value_remains_null_when_converting_from_db_to_php_value() * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_the_stepup_common_name_object() + public function a_non_null_value_is_converted_to_the_stepup_common_name_object(): void { $commonName = Type::getType(CommonNameType::NAME); @@ -105,9 +106,9 @@ public function a_non_null_value_is_converted_to_the_stepup_common_name_object() * @test * @group doctrine */ - public function an_invalid_database_value_causes_an_exception_upon_conversion() + public function an_invalid_database_value_causes_an_exception_upon_conversion(): void { - $this->expectException(\Doctrine\DBAL\Types\ConversionException::class); + $this->expectException(ConversionException::class); $commonName = Type::getType(CommonNameType::NAME); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationContactInformationTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationContactInformationTypeTest.php index fc1345167..768af88a2 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationContactInformationTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationContactInformationTypeTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Configuration\Value\ContactInformation; @@ -27,9 +28,9 @@ class ConfigurationContactInformationTypeTest extends UnitTest { /** - * @var \Doctrine\DBAL\Platforms\MySqlPlatform + * @var MySqlPlatform */ - private $platform; + private MySqlPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -54,7 +55,7 @@ public function setUp(): void * @dataProvider \Surfnet\StepupMiddleware\ApiBundle\Tests\TestDataProvider::notNull * @param $incorrectValue */ - public function a_value_can_only_be_converted_to_sql_if_it_is_contact_information_or_null($incorrectValue) + public function a_value_can_only_be_converted_to_sql_if_it_is_contact_information_or_null($incorrectValue): void { $this->expectException('Doctrine\DBAL\Types\ConversionException'); @@ -66,7 +67,7 @@ public function a_value_can_only_be_converted_to_sql_if_it_is_contact_informatio * @test * @group doctrine */ - public function a_null_value_remains_null_in_to_sql_conversion() + public function a_null_value_remains_null_in_to_sql_conversion(): void { $configurationContactInformation = Type::getType(ConfigurationContactInformationType::NAME); @@ -79,7 +80,7 @@ public function a_null_value_remains_null_in_to_sql_conversion() * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_the_correct_format() + public function a_non_null_value_is_converted_to_the_correct_format(): void { $configurationContactInformation = Type::getType(ConfigurationContactInformationType::NAME); @@ -95,7 +96,7 @@ public function a_non_null_value_is_converted_to_the_correct_format() * @test * @group doctrine */ - public function a_null_value_remains_null_when_converting_from_db_to_php_value() + public function a_null_value_remains_null_when_converting_from_db_to_php_value(): void { $configurationContactInformation = Type::getType(ConfigurationContactInformationType::NAME); @@ -108,7 +109,7 @@ public function a_null_value_remains_null_when_converting_from_db_to_php_value() * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_a_contact_information_value_object() + public function a_non_null_value_is_converted_to_a_contact_information_value_object(): void { $configurationContactInformation = Type::getType(ConfigurationContactInformationType::NAME); @@ -124,9 +125,9 @@ public function a_non_null_value_is_converted_to_a_contact_information_value_obj * @test * @group doctrine */ - public function an_invalid_database_value_causes_an_exception_upon_conversion() + public function an_invalid_database_value_causes_an_exception_upon_conversion(): void { - $this->expectException(\Doctrine\DBAL\Types\ConversionException::class); + $this->expectException(ConversionException::class); $configurationContactInformation = Type::getType(ConfigurationContactInformationType::NAME); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationInstitutionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationInstitutionTypeTest.php index e04a0860d..e3c451322 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationInstitutionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationInstitutionTypeTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Configuration\Value\Institution; @@ -27,9 +28,9 @@ class ConfigurationInstitutionTypeTest extends UnitTest { /** - * @var \Doctrine\DBAL\Platforms\MySqlPlatform + * @var MySqlPlatform */ - private $platform; + private MySqlPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -51,7 +52,7 @@ public function setUp(): void * @test * @group doctrine */ - public function a_null_value_remains_null_in_to_sql_conversion() + public function a_null_value_remains_null_in_to_sql_conversion(): void { $configurationInstitution = Type::getType(ConfigurationInstitutionType::NAME); @@ -67,7 +68,7 @@ public function a_null_value_remains_null_in_to_sql_conversion() * @dataProvider \Surfnet\StepupMiddleware\ApiBundle\Tests\TestDataProvider::notNull * @param $incorrectValue */ - public function a_value_can_only_be_converted_to_sql_if_it_is_an_institution_or_null($incorrectValue) + public function a_value_can_only_be_converted_to_sql_if_it_is_an_institution_or_null($incorrectValue): void { $this->expectException('Doctrine\DBAL\Types\ConversionException'); @@ -79,7 +80,7 @@ public function a_value_can_only_be_converted_to_sql_if_it_is_an_institution_or_ * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_the_correct_format() + public function a_non_null_value_is_converted_to_the_correct_format(): void { $configurationInstitution = Type::getType(ConfigurationInstitutionType::NAME); @@ -96,7 +97,7 @@ public function a_non_null_value_is_converted_to_the_correct_format() * @test * @group doctrine */ - public function a_null_value_remains_null_when_converting_from_db_to_php_value() + public function a_null_value_remains_null_when_converting_from_db_to_php_value(): void { $configurationInstitution = Type::getType(ConfigurationInstitutionType::NAME); @@ -109,7 +110,7 @@ public function a_null_value_remains_null_when_converting_from_db_to_php_value() * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_a_configuration_institution_value_object() + public function a_non_null_value_is_converted_to_a_configuration_institution_value_object(): void { $configurationInstitution = Type::getType(ConfigurationInstitutionType::NAME); @@ -125,9 +126,9 @@ public function a_non_null_value_is_converted_to_a_configuration_institution_val * @test * @group doctrine */ - public function an_invalid_database_value_causes_an_exception_upon_conversion() + public function an_invalid_database_value_causes_an_exception_upon_conversion(): void { - $this->expectException(\Doctrine\DBAL\Types\ConversionException::class); + $this->expectException(ConversionException::class); $configurationInstitution = Type::getType(ConfigurationInstitutionType::NAME); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationLocationTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationLocationTypeTest.php index 51edb2ae3..b89e0a147 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationLocationTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationLocationTypeTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Configuration\Value\Location; @@ -27,9 +28,9 @@ class ConfigurationLocationTypeTest extends UnitTest { /** - * @var \Doctrine\DBAL\Platforms\MySqlPlatform + * @var MySqlPlatform */ - private $platform; + private MySqlPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -51,7 +52,7 @@ public function setUp(): void * @test * @group doctrine */ - public function a_null_value_remains_null_in_to_sql_conversion() + public function a_null_value_remains_null_in_to_sql_conversion(): void { $configurationLocation = Type::getType(ConfigurationLocationType::NAME); @@ -67,9 +68,9 @@ public function a_null_value_remains_null_in_to_sql_conversion() * @dataProvider \Surfnet\StepupMiddleware\ApiBundle\Tests\TestDataProvider::notNull * @param $incorrectValue */ - public function a_value_can_only_be_converted_to_sql_if_it_is_a_location_or_null($incorrectValue) + public function a_value_can_only_be_converted_to_sql_if_it_is_a_location_or_null($incorrectValue): void { - $this->expectException(\Doctrine\DBAL\Types\ConversionException::class); + $this->expectException(ConversionException::class); $configurationContactInformation = Type::getType(ConfigurationLocationType::NAME); $configurationContactInformation->convertToDatabaseValue($incorrectValue, $this->platform); @@ -79,7 +80,7 @@ public function a_value_can_only_be_converted_to_sql_if_it_is_a_location_or_null * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_the_correct_format() + public function a_non_null_value_is_converted_to_the_correct_format(): void { $configurationLocation = Type::getType(ConfigurationLocationType::NAME); @@ -95,7 +96,7 @@ public function a_non_null_value_is_converted_to_the_correct_format() * @test * @group doctrine */ - public function a_null_value_remains_null_when_converting_from_db_to_php_value() + public function a_null_value_remains_null_when_converting_from_db_to_php_value(): void { $configurationLocation = Type::getType(ConfigurationLocationType::NAME); @@ -108,7 +109,7 @@ public function a_null_value_remains_null_when_converting_from_db_to_php_value() * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_a_configuration_location_value_object() + public function a_non_null_value_is_converted_to_a_configuration_location_value_object(): void { $configurationLocation = Type::getType(ConfigurationLocationType::NAME); @@ -124,9 +125,9 @@ public function a_non_null_value_is_converted_to_a_configuration_location_value_ * @test * @group doctrine */ - public function an_invalid_database_value_causes_an_exception_upon_conversion() + public function an_invalid_database_value_causes_an_exception_upon_conversion(): void { - $this->expectException(\Doctrine\DBAL\Types\ConversionException::class); + $this->expectException(ConversionException::class); $configurationLocation = Type::getType(ConfigurationLocationType::NAME); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ContactInformationTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ContactInformationTypeTest.php index 865281b1e..6b8cb1475 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ContactInformationTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ContactInformationTypeTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Identity\Value\ContactInformation; @@ -27,9 +28,9 @@ class ContactInformationTypeTest extends UnitTest { /** - * @var \Doctrine\DBAL\Platforms\MySqlPlatform + * @var MySqlPlatform */ - private $platform; + private MySqlPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -51,7 +52,7 @@ public function setUp(): void * @test * @group doctrine */ - public function a_null_value_remains_null_in_to_sql_conversion() + public function a_null_value_remains_null_in_to_sql_conversion(): void { $contactInformation = Type::getType(ContactInformationType::NAME); @@ -64,7 +65,7 @@ public function a_null_value_remains_null_in_to_sql_conversion() * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_the_correct_format() + public function a_non_null_value_is_converted_to_the_correct_format(): void { $contactInformation = Type::getType(ContactInformationType::NAME); @@ -80,7 +81,7 @@ public function a_non_null_value_is_converted_to_the_correct_format() * @test * @group doctrine */ - public function a_null_value_remains_null_when_converting_from_db_to_php_value() + public function a_null_value_remains_null_when_converting_from_db_to_php_value(): void { $contactInformation = Type::getType(ContactInformationType::NAME); @@ -93,7 +94,7 @@ public function a_null_value_remains_null_when_converting_from_db_to_php_value() * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_a_contact_information_value_object() + public function a_non_null_value_is_converted_to_a_contact_information_value_object(): void { $contactInformation = Type::getType(ContactInformationType::NAME); @@ -109,9 +110,9 @@ public function a_non_null_value_is_converted_to_a_contact_information_value_obj * @test * @group doctrine */ - public function an_invalid_database_value_causes_an_exception_upon_conversion() + public function an_invalid_database_value_causes_an_exception_upon_conversion(): void { - $this->expectException(\Doctrine\DBAL\Types\ConversionException::class); + $this->expectException(ConversionException::class); $contactInformation = Type::getType(ContactInformationType::NAME); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DateTimeTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DateTimeTypeTest.php index 0b1e3b42d..255933b60 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DateTimeTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DateTimeTypeTest.php @@ -21,6 +21,7 @@ use DateTime as CoreDateTime; use DateTimeZone; use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\DateTime\DateTime; @@ -29,9 +30,9 @@ class DateTimeTypeTest extends UnitTest { /** - * @var \Doctrine\DBAL\Platforms\MySqlPlatform + * @var MySqlPlatform */ - private $platform; + private MySqlPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -50,7 +51,7 @@ public function setUp(): void * @test * @group doctrine */ - public function a_null_value_remains_null_in_to_sql_conversion() + public function a_null_value_remains_null_in_to_sql_conversion(): void { $dateTime = Type::getType(DateTimeType::NAME); @@ -63,7 +64,7 @@ public function a_null_value_remains_null_in_to_sql_conversion() * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_the_correct_format() + public function a_non_null_value_is_converted_to_the_correct_format(): void { $dateTime = Type::getType(DateTimeType::NAME); @@ -78,7 +79,7 @@ public function a_non_null_value_is_converted_to_the_correct_format() * @test * @group doctrine */ - public function a_null_value_remains_null_when_converting_from_db_to_php_value() + public function a_null_value_remains_null_when_converting_from_db_to_php_value(): void { $dateTime = Type::getType(DateTimeType::NAME); @@ -91,7 +92,7 @@ public function a_null_value_remains_null_when_converting_from_db_to_php_value() * @test * @group doctrine */ - public function a_string_is_converted_to_the_stepup_datetime_object() + public function a_string_is_converted_to_the_stepup_datetime_object(): void { $dateTime = Type::getType(DateTimeType::NAME); @@ -110,9 +111,9 @@ public function a_string_is_converted_to_the_stepup_datetime_object() * @group doctrine * */ - public function an_invalid_database_value_causes_an_exception_upon_conversion() + public function an_invalid_database_value_causes_an_exception_upon_conversion(): void { - $this->expectException(\Doctrine\DBAL\Types\ConversionException::class); + $this->expectException(ConversionException::class); $dateTime = Type::getType(DateTimeType::NAME); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DocumentNumberTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DocumentNumberTypeTest.php index c40641c97..dbd59fec2 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DocumentNumberTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DocumentNumberTypeTest.php @@ -19,17 +19,19 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; +use Surfnet\Stepup\Exception\InvalidArgumentException; use Surfnet\Stepup\Identity\Value\DocumentNumber; use Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\DocumentNumberType; class DocumentNumberTypeTest extends UnitTest { /** - * @var \Doctrine\DBAL\Platforms\MySqlPlatform + * @var MySqlPlatform */ - private $platform; + private MySqlPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -48,7 +50,7 @@ public function setUp(): void * @test * @group doctrine */ - public function a_null_value_remains_null_in_to_sql_conversion() + public function a_null_value_remains_null_in_to_sql_conversion(): void { $type = Type::getType(DocumentNumberType::NAME); @@ -61,7 +63,7 @@ public function a_null_value_remains_null_in_to_sql_conversion() * @test * @group doctrine */ - public function a_normal_document_number_is_converted_to_a_database_value() + public function a_normal_document_number_is_converted_to_a_database_value(): void { $type = Type::getType(DocumentNumberType::NAME); @@ -76,7 +78,7 @@ public function a_normal_document_number_is_converted_to_a_database_value() * @test * @group doctrine */ - public function a_null_value_remains_null_when_converting_from_db_to_php_value() + public function a_null_value_remains_null_when_converting_from_db_to_php_value(): void { $type = Type::getType(DocumentNumberType::NAME); @@ -92,9 +94,9 @@ public function a_null_value_remains_null_when_converting_from_db_to_php_value() * @dataProvider \Surfnet\StepupMiddleware\ApiBundle\Tests\TestDataProvider::notNull * @param $incorrectValue */ - public function a_value_can_only_be_converted_to_sql_if_it_is_a_document_number_or_null($incorrectValue) + public function a_value_can_only_be_converted_to_sql_if_it_is_a_document_number_or_null($incorrectValue): void { - $this->expectException(\Doctrine\DBAL\Types\ConversionException::class); + $this->expectException(ConversionException::class); $configurationContactInformation = Type::getType(DocumentNumberType::NAME); $configurationContactInformation->convertToDatabaseValue($incorrectValue, $this->platform); @@ -104,7 +106,7 @@ public function a_value_can_only_be_converted_to_sql_if_it_is_a_document_number_ * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_the_stepup_document_number_object() + public function a_non_null_value_is_converted_to_the_stepup_document_number_object(): void { $type = Type::getType(DocumentNumberType::NAME); @@ -119,9 +121,9 @@ public function a_non_null_value_is_converted_to_the_stepup_document_number_obje * @test * @group doctrine */ - public function an_invalid_database_value_causes_an_exception_upon_conversion() + public function an_invalid_database_value_causes_an_exception_upon_conversion(): void { - $this->expectException(\Surfnet\Stepup\Exception\InvalidArgumentException::class); + $this->expectException(InvalidArgumentException::class); $type = Type::getType(DocumentNumberType::NAME); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/EmailTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/EmailTypeTest.php index f630b2a8f..0539f5ae9 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/EmailTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/EmailTypeTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Identity\Value\Email; @@ -27,9 +28,9 @@ class EmailTypeTest extends UnitTest { /** - * @var \Doctrine\DBAL\Platforms\MySqlPlatform + * @var MySqlPlatform */ - private $platform; + private MySqlPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -48,7 +49,7 @@ public function setUp(): void * @test * @group doctrine */ - public function a_null_value_remains_null_in_to_sql_conversion() + public function a_null_value_remains_null_in_to_sql_conversion(): void { $email = Type::getType(EmailType::NAME); @@ -61,7 +62,7 @@ public function a_null_value_remains_null_in_to_sql_conversion() * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_the_correct_format() + public function a_non_null_value_is_converted_to_the_correct_format(): void { $email = Type::getType(EmailType::NAME); @@ -76,7 +77,7 @@ public function a_non_null_value_is_converted_to_the_correct_format() * @test * @group doctrine */ - public function a_null_value_remains_null_when_converting_from_db_to_php_value() + public function a_null_value_remains_null_when_converting_from_db_to_php_value(): void { $email = Type::getType(EmailType::NAME); @@ -89,7 +90,7 @@ public function a_null_value_remains_null_when_converting_from_db_to_php_value() * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_the_stepup_email_object() + public function a_non_null_value_is_converted_to_the_stepup_email_object(): void { $email = Type::getType(EmailType::NAME); @@ -105,9 +106,9 @@ public function a_non_null_value_is_converted_to_the_stepup_email_object() * @test * @group doctrine */ - public function an_invalid_database_value_causes_an_exception_upon_conversion() + public function an_invalid_database_value_causes_an_exception_upon_conversion(): void { - $this->expectException(\Doctrine\DBAL\Types\ConversionException::class); + $this->expectException(ConversionException::class); $email = Type::getType(EmailType::NAME); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionRoleTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionRoleTypeTest.php index 08a2c71d8..297342535 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionRoleTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionRoleTypeTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Configuration\Value\InstitutionRole; @@ -28,9 +29,9 @@ class InstitutionRoleTypeTest extends UnitTest { /** - * @var \Doctrine\DBAL\Platforms\MySqlPlatform + * @var MySqlPlatform */ - private $platform; + private MySqlPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -52,7 +53,7 @@ public function setUp(): void * @test * @group doctrine */ - public function a_null_value_remains_null_in_to_sql_conversion() + public function a_null_value_remains_null_in_to_sql_conversion(): void { $configurationInstitution = Type::getType(InstitutionRoleType::NAME); @@ -65,7 +66,7 @@ public function a_null_value_remains_null_in_to_sql_conversion() * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_the_correct_format() + public function a_non_null_value_is_converted_to_the_correct_format(): void { $configurationInstitution = Type::getType(InstitutionRoleType::NAME); @@ -81,7 +82,7 @@ public function a_non_null_value_is_converted_to_the_correct_format() * @test * @group doctrine */ - public function a_null_value_remains_null_when_converting_from_db_to_php_value() + public function a_null_value_remains_null_when_converting_from_db_to_php_value(): void { $configurationInstitution = Type::getType(InstitutionRoleType::NAME); @@ -94,7 +95,7 @@ public function a_null_value_remains_null_when_converting_from_db_to_php_value() * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_a_configuration_institution_value_object() + public function a_non_null_value_is_converted_to_a_configuration_institution_value_object(): void { $configurationInstitution = Type::getType(InstitutionRoleType::NAME); @@ -110,9 +111,9 @@ public function a_non_null_value_is_converted_to_a_configuration_institution_val * @test * @group doctrine */ - public function an_invalid_database_value_causes_an_exception_upon_conversion() + public function an_invalid_database_value_causes_an_exception_upon_conversion(): void { - $this->expectException(\Doctrine\DBAL\Types\ConversionException::class); + $this->expectException(ConversionException::class); $configurationInstitution = Type::getType(InstitutionRoleType::NAME); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionTypeTest.php index 1c3c1ff33..b042520b0 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionTypeTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Identity\Value\Institution; @@ -27,9 +28,9 @@ class InstitutionTypeTest extends UnitTest { /** - * @var \Doctrine\DBAL\Platforms\MySqlPlatform + * @var MySqlPlatform */ - private $platform; + private MySqlPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -51,7 +52,7 @@ public function setUp(): void * @test * @group doctrine */ - public function a_null_value_remains_null_in_to_sql_conversion() + public function a_null_value_remains_null_in_to_sql_conversion(): void { $configurationInstitution = Type::getType(InstitutionType::NAME); @@ -64,7 +65,7 @@ public function a_null_value_remains_null_in_to_sql_conversion() * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_the_correct_format() + public function a_non_null_value_is_converted_to_the_correct_format(): void { $configurationInstitution = Type::getType(InstitutionType::NAME); @@ -80,7 +81,7 @@ public function a_non_null_value_is_converted_to_the_correct_format() * @test * @group doctrine */ - public function a_null_value_remains_null_when_converting_from_db_to_php_value() + public function a_null_value_remains_null_when_converting_from_db_to_php_value(): void { $configurationInstitution = Type::getType(InstitutionType::NAME); @@ -93,7 +94,7 @@ public function a_null_value_remains_null_when_converting_from_db_to_php_value() * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_a_configuration_institution_value_object() + public function a_non_null_value_is_converted_to_a_configuration_institution_value_object(): void { $configurationInstitution = Type::getType(InstitutionType::NAME); @@ -109,9 +110,9 @@ public function a_non_null_value_is_converted_to_a_configuration_institution_val * @test * @group doctrine */ - public function an_invalid_database_value_causes_an_exception_upon_conversion() + public function an_invalid_database_value_causes_an_exception_upon_conversion(): void { - $this->expectException(\Doctrine\DBAL\Types\ConversionException::class); + $this->expectException(ConversionException::class); $configurationInstitution = Type::getType(InstitutionType::NAME); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocaleTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocaleTypeTest.php index 4770cd7da..bbdd2a4d3 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocaleTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocaleTypeTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Identity\Value\Locale; @@ -27,9 +28,9 @@ class LocaleTypeTest extends UnitTest { /** - * @var \Doctrine\DBAL\Platforms\MySqlPlatform + * @var MySqlPlatform */ - private $platform; + private MySqlPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -48,7 +49,7 @@ public function setUp(): void * @test * @group doctrine */ - public function a_null_value_remains_null_in_to_sql_conversion() + public function a_null_value_remains_null_in_to_sql_conversion(): void { $locale = Type::getType(LocaleType::NAME); @@ -61,7 +62,7 @@ public function a_null_value_remains_null_in_to_sql_conversion() * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_the_correct_format() + public function a_non_null_value_is_converted_to_the_correct_format(): void { $locale = Type::getType(LocaleType::NAME); @@ -77,7 +78,7 @@ public function a_non_null_value_is_converted_to_the_correct_format() * @test * @group doctrine */ - public function a_null_value_remains_null_when_converting_from_db_to_php_value() + public function a_null_value_remains_null_when_converting_from_db_to_php_value(): void { $locale = Type::getType(LocaleType::NAME); @@ -90,7 +91,7 @@ public function a_null_value_remains_null_when_converting_from_db_to_php_value() * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_a_locale_value_object() + public function a_non_null_value_is_converted_to_a_locale_value_object(): void { $locale = Type::getType(LocaleType::NAME); @@ -106,9 +107,9 @@ public function a_non_null_value_is_converted_to_a_locale_value_object() * @test * @group doctrine */ - public function an_invalid_database_value_causes_an_exception_upon_conversion() + public function an_invalid_database_value_causes_an_exception_upon_conversion(): void { - $this->expectException(\Doctrine\DBAL\Types\ConversionException::class); + $this->expectException(ConversionException::class); $locale = Type::getType(LocaleType::NAME); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocationTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocationTypeTest.php index 46f08157e..19606dbe2 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocationTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocationTypeTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Identity\Value\Location; @@ -27,9 +28,9 @@ class LocationTypeTest extends UnitTest { /** - * @var \Doctrine\DBAL\Platforms\MySqlPlatform + * @var MySqlPlatform */ - private $platform; + private MySqlPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -51,7 +52,7 @@ public function setUp(): void * @test * @group doctrine */ - public function a_null_value_remains_null_in_to_sql_conversion() + public function a_null_value_remains_null_in_to_sql_conversion(): void { $location = Type::getType(LocationType::NAME); @@ -64,7 +65,7 @@ public function a_null_value_remains_null_in_to_sql_conversion() * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_the_correct_format() + public function a_non_null_value_is_converted_to_the_correct_format(): void { $location = Type::getType(LocationType::NAME); @@ -80,7 +81,7 @@ public function a_non_null_value_is_converted_to_the_correct_format() * @test * @group doctrine */ - public function a_null_value_remains_null_when_converting_from_db_to_php_value() + public function a_null_value_remains_null_when_converting_from_db_to_php_value(): void { $location = Type::getType(LocationType::NAME); @@ -93,7 +94,7 @@ public function a_null_value_remains_null_when_converting_from_db_to_php_value() * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_a_location_value_object() + public function a_non_null_value_is_converted_to_a_location_value_object(): void { $location = Type::getType(LocationType::NAME); @@ -109,9 +110,9 @@ public function a_non_null_value_is_converted_to_a_location_value_object() * @test * @group doctrine */ - public function an_invalid_database_value_causes_an_exception_upon_conversion() + public function an_invalid_database_value_causes_an_exception_upon_conversion(): void { - $this->expectException(\Doctrine\DBAL\Types\ConversionException::class); + $this->expectException(ConversionException::class); $location = Type::getType(LocationType::NAME); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NameIdTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NameIdTypeTest.php index 79e36da52..5a7da7af7 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NameIdTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NameIdTypeTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Identity\Value\NameId; @@ -27,9 +28,9 @@ class NameIdTypeTest extends UnitTest { /** - * @var \Doctrine\DBAL\Platforms\MySqlPlatform + * @var MySqlPlatform */ - private $platform; + private MySqlPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -48,7 +49,7 @@ public function setUp(): void * @test * @group doctrine */ - public function a_null_value_remains_null_in_to_sql_conversion() + public function a_null_value_remains_null_in_to_sql_conversion(): void { $nameId = Type::getType(NameIdType::NAME); @@ -61,7 +62,7 @@ public function a_null_value_remains_null_in_to_sql_conversion() * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_the_correct_format() + public function a_non_null_value_is_converted_to_the_correct_format(): void { $nameId = Type::getType(NameIdType::NAME); @@ -77,7 +78,7 @@ public function a_non_null_value_is_converted_to_the_correct_format() * @test * @group doctrine */ - public function a_null_value_remains_null_when_converting_from_db_to_php_value() + public function a_null_value_remains_null_when_converting_from_db_to_php_value(): void { $nameId = Type::getType(NameIdType::NAME); @@ -90,7 +91,7 @@ public function a_null_value_remains_null_when_converting_from_db_to_php_value() * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_a_name_id_value_object() + public function a_non_null_value_is_converted_to_a_name_id_value_object(): void { $nameId = Type::getType(NameIdType::NAME); @@ -106,9 +107,9 @@ public function a_non_null_value_is_converted_to_a_name_id_value_object() * @test * @group doctrine */ - public function an_invalid_database_value_causes_an_exception_upon_conversion() + public function an_invalid_database_value_causes_an_exception_upon_conversion(): void { - $this->expectException(\Doctrine\DBAL\Types\ConversionException::class); + $this->expectException(ConversionException::class); $nameId = Type::getType(NameIdType::NAME); @@ -119,9 +120,9 @@ public function an_invalid_database_value_causes_an_exception_upon_conversion() * @test * @group doctrine */ - public function a_excessive_long_database_value_causes_an_exception_upon_conversion() + public function a_excessive_long_database_value_causes_an_exception_upon_conversion(): void { - $this->expectException(\Doctrine\DBAL\Types\ConversionException::class); + $this->expectException(ConversionException::class); $nameId = Type::getType(NameIdType::NAME); // the bin2hex openssle random bytes combination creates a string of 256 characters long. diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NumberOfTokensPerIdentityTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NumberOfTokensPerIdentityTypeTest.php index f44998ed6..546e14e22 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NumberOfTokensPerIdentityTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NumberOfTokensPerIdentityTypeTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Configuration\Value\NumberOfTokensPerIdentityOption; @@ -28,9 +29,9 @@ class NumberOfTokensPerIdentityTypeTest extends UnitTest { /** - * @var \Doctrine\DBAL\Platforms\MySqlPlatform + * @var MySqlPlatform */ - private $platform; + private MySqlPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -52,7 +53,7 @@ public function setUp(): void * @test * @group doctrine */ - public function a_null_value_remains_null_in_to_sql_conversion() + public function a_null_value_remains_null_in_to_sql_conversion(): void { $numberOfTokensPerIdentity = Type::getType(NumberOfTokensPerIdentityType::NAME); @@ -68,9 +69,9 @@ public function a_null_value_remains_null_in_to_sql_conversion() * @dataProvider \Surfnet\StepupMiddleware\ApiBundle\Tests\TestDataProvider::notNull * @param $incorrectValue */ - public function a_value_can_only_be_converted_to_sql_if_it_is_an_option_type_or_null($incorrectValue) + public function a_value_can_only_be_converted_to_sql_if_it_is_an_option_type_or_null($incorrectValue): void { - $this->expectException(\Doctrine\DBAL\Types\ConversionException::class); + $this->expectException(ConversionException::class); $numberOfTokensPerIdentity = Type::getType(NumberOfTokensPerIdentityType::NAME); $numberOfTokensPerIdentity->convertToDatabaseValue($incorrectValue, $this->platform); @@ -80,7 +81,7 @@ public function a_value_can_only_be_converted_to_sql_if_it_is_an_option_type_or_ * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_the_correct_format() + public function a_non_null_value_is_converted_to_the_correct_format(): void { $numberOfTokensPerIdentity = Type::getType(NumberOfTokensPerIdentityType::NAME); @@ -96,7 +97,7 @@ public function a_non_null_value_is_converted_to_the_correct_format() * @test * @group doctrine */ - public function a_null_value_remains_null_when_converting_from_db_to_php_value() + public function a_null_value_remains_null_when_converting_from_db_to_php_value(): void { $numberOfTokensPerIdentity = Type::getType(NumberOfTokensPerIdentityType::NAME); @@ -109,7 +110,7 @@ public function a_null_value_remains_null_when_converting_from_db_to_php_value() * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_an_option_value_object() + public function a_non_null_value_is_converted_to_an_option_value_object(): void { $numberOfTokensPerIdentity = Type::getType(NumberOfTokensPerIdentityType::NAME); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RaLocationNameTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RaLocationNameTypeTest.php index b868f6197..923cc3580 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RaLocationNameTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RaLocationNameTypeTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Configuration\Value\RaLocationName; @@ -27,9 +28,9 @@ class RaLocationNameTypeTest extends UnitTest { /** - * @var \Doctrine\DBAL\Platforms\MySqlPlatform + * @var MySqlPlatform */ - private $platform; + private MySqlPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -51,7 +52,7 @@ public function setUp(): void * @test * @group doctrine */ - public function a_null_value_remains_null_in_to_sql_conversion() + public function a_null_value_remains_null_in_to_sql_conversion(): void { $raLocationName = Type::getType(RaLocationNameType::NAME); @@ -64,7 +65,7 @@ public function a_null_value_remains_null_in_to_sql_conversion() * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_the_correct_format() + public function a_non_null_value_is_converted_to_the_correct_format(): void { $raLocationName = Type::getType(RaLocationNameType::NAME); @@ -83,9 +84,9 @@ public function a_non_null_value_is_converted_to_the_correct_format() * @dataProvider \Surfnet\StepupMiddleware\ApiBundle\Tests\TestDataProvider::notNull * @param $incorrectValue */ - public function a_value_can_only_be_converted_to_sql_if_it_is_an_ra_location_or_null($incorrectValue) + public function a_value_can_only_be_converted_to_sql_if_it_is_an_ra_location_or_null($incorrectValue): void { - $this->expectException(\Doctrine\DBAL\Types\ConversionException::class); + $this->expectException(ConversionException::class); $configurationContactInformation = Type::getType(RaLocationNameType::NAME); $configurationContactInformation->convertToDatabaseValue($incorrectValue, $this->platform); @@ -95,7 +96,7 @@ public function a_value_can_only_be_converted_to_sql_if_it_is_an_ra_location_or_ * @test * @group doctrine */ - public function a_null_value_remains_null_when_converting_from_db_to_php_value() + public function a_null_value_remains_null_when_converting_from_db_to_php_value(): void { $raLocationName = Type::getType(RaLocationNameType::NAME); @@ -108,7 +109,7 @@ public function a_null_value_remains_null_when_converting_from_db_to_php_value() * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_a_ra_location_name_value_object() + public function a_non_null_value_is_converted_to_a_ra_location_name_value_object(): void { $raLocationName = Type::getType(RaLocationNameType::NAME); @@ -124,9 +125,9 @@ public function a_non_null_value_is_converted_to_a_ra_location_name_value_object * @test * @group doctrine */ - public function an_invalid_database_value_causes_an_exception_upon_conversion() + public function an_invalid_database_value_causes_an_exception_upon_conversion(): void { - $this->expectException(\Doctrine\DBAL\Types\ConversionException::class); + $this->expectException(ConversionException::class); $raLocationName = Type::getType(RaLocationNameType::NAME); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RecoveryTokenStatusTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RecoveryTokenStatusTypeTest.php index 1358bf4c8..d4508bcb4 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RecoveryTokenStatusTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RecoveryTokenStatusTypeTest.php @@ -19,17 +19,19 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; +use stdClass; use Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\RecoveryTokenStatusType; use Surfnet\StepupMiddleware\ApiBundle\Identity\Value\RecoveryTokenStatus; class RecoveryTokenStatusTypeTest extends UnitTest { /** - * @var \Doctrine\DBAL\Platforms\MySqlPlatform + * @var MySqlPlatform */ - private $platform; + private MySqlPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -44,7 +46,7 @@ public function setUp(): void $this->platform = new MySqlPlatform(); } - public function invalidPhpValues() + public function invalidPhpValues(): array { return [ 'null' => [null], @@ -52,7 +54,7 @@ public function invalidPhpValues() 'int' => [9], 'float' => [9.1], 'array' => [array()], - 'object of a different type' => [new \stdClass], + 'object of a different type' => [new stdClass], 'resource' => [fopen('php://memory', 'w')], ]; } @@ -64,15 +66,15 @@ public function invalidPhpValues() * * @param mixed $value */ - public function an_invalid_php_value_is_not_accepted_in_to_sql_conversion($value) + public function an_invalid_php_value_is_not_accepted_in_to_sql_conversion($value): void { - $this->expectException(\Doctrine\DBAL\Types\ConversionException::class); + $this->expectException(ConversionException::class); $type = Type::getType(RecoveryTokenStatusType::NAME); $type->convertToDatabaseValue($value, $this->platform); } - public function validPhpValues() + public function validPhpValues(): array { return [ 'active' => [RecoveryTokenStatus::active(), 0], @@ -89,13 +91,13 @@ public function validPhpValues() * @param mixed $phpValue * @param mixed $databaseValue */ - public function a_valid_php_value_is_converted_to_a_sql_value($phpValue, $databaseValue) + public function a_valid_php_value_is_converted_to_a_sql_value(RecoveryTokenStatus $phpValue, int $databaseValue): void { $type = Type::getType(RecoveryTokenStatusType::NAME); $this->assertSame($databaseValue, $type->convertToDatabaseValue($phpValue, $this->platform)); } - public function invalidDatabaseValues() + public function invalidDatabaseValues(): array { return [ 'null' => [null], @@ -103,7 +105,7 @@ public function invalidDatabaseValues() 'int' => [9], 'float' => [9.1], 'array' => [array()], - 'object of a different type' => [new \stdClass], + 'object of a different type' => [new stdClass], 'resource' => [fopen('php://memory', 'w')], ]; } @@ -115,15 +117,15 @@ public function invalidDatabaseValues() * * @param mixed $input */ - public function an_invalid_database_value_causes_an_exception_upon_conversion($input) + public function an_invalid_database_value_causes_an_exception_upon_conversion($input): void { - $this->expectException(\Doctrine\DBAL\Types\ConversionException::class); + $this->expectException(ConversionException::class); $type = Type::getType(RecoveryTokenStatusType::NAME); $type->convertToPHPValue($input, $this->platform); } - public function validDatabaseValues() + public function validDatabaseValues(): array { return [ 'active' => ['0', RecoveryTokenStatus::active()], @@ -140,7 +142,7 @@ public function validDatabaseValues() * @param int $databaseValue * @param mixed $phpValue */ - public function a_valid_database_value_is_converted_to_a_sql_value($databaseValue, $phpValue) + public function a_valid_database_value_is_converted_to_a_sql_value(string $databaseValue, RecoveryTokenStatus $phpValue): void { $type = Type::getType(RecoveryTokenStatusType::NAME); $this->assertTrue($phpValue->equals($type->convertToPHPValue($databaseValue, $this->platform))); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SecondFactorStatusTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SecondFactorStatusTypeTest.php index 69b4cacee..d0b0a20ad 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SecondFactorStatusTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SecondFactorStatusTypeTest.php @@ -19,17 +19,19 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; +use stdClass; use Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\SecondFactorStatusType; use Surfnet\StepupMiddleware\ApiBundle\Identity\Value\SecondFactorStatus; class SecondFactorStatusTypeTest extends UnitTest { /** - * @var \Doctrine\DBAL\Platforms\MySqlPlatform + * @var MySqlPlatform */ - private $platform; + private MySqlPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -44,7 +46,7 @@ public function setUp(): void $this->platform = new MySqlPlatform(); } - public function invalidPhpValues() + public function invalidPhpValues(): array { return [ 'null' => [null], @@ -52,7 +54,7 @@ public function invalidPhpValues() 'int' => [9], 'float' => [9.1], 'array' => [array()], - 'object of a different type' => [new \stdClass], + 'object of a different type' => [new stdClass], 'resource' => [fopen('php://memory', 'w')], ]; } @@ -64,15 +66,15 @@ public function invalidPhpValues() * * @param mixed $value */ - public function an_invalid_php_value_is_not_accepted_in_to_sql_conversion($value) + public function an_invalid_php_value_is_not_accepted_in_to_sql_conversion($value): void { - $this->expectException(\Doctrine\DBAL\Types\ConversionException::class); + $this->expectException(ConversionException::class); $type = Type::getType(SecondFactorStatusType::NAME); $type->convertToDatabaseValue($value, $this->platform); } - public function validPhpValues() + public function validPhpValues(): array { return [ 'unverified' => [SecondFactorStatus::unverified(), 0], @@ -91,13 +93,13 @@ public function validPhpValues() * @param mixed $phpValue * @param int $databaseValue */ - public function a_valid_php_value_is_converted_to_a_sql_value($phpValue, $databaseValue) + public function a_valid_php_value_is_converted_to_a_sql_value($phpValue, int $databaseValue): void { $type = Type::getType(SecondFactorStatusType::NAME); $this->assertSame($databaseValue, $type->convertToDatabaseValue($phpValue, $this->platform)); } - public function invalidDatabaseValues() + public function invalidDatabaseValues(): array { return [ 'null' => [null], @@ -105,7 +107,7 @@ public function invalidDatabaseValues() 'int' => [9], 'float' => [9.1], 'array' => [array()], - 'object of a different type' => [new \stdClass], + 'object of a different type' => [new stdClass], 'resource' => [fopen('php://memory', 'w')], ]; } @@ -117,15 +119,15 @@ public function invalidDatabaseValues() * * @param mixed $input */ - public function an_invalid_database_value_causes_an_exception_upon_conversion($input) + public function an_invalid_database_value_causes_an_exception_upon_conversion($input): void { - $this->expectException(\Doctrine\DBAL\Types\ConversionException::class); + $this->expectException(ConversionException::class); $type = Type::getType(SecondFactorStatusType::NAME); $type->convertToPHPValue($input, $this->platform); } - public function validDatabaseValues() + public function validDatabaseValues(): array { return [ 'unverified' => ['0', SecondFactorStatus::unverified()], @@ -144,7 +146,7 @@ public function validDatabaseValues() * @param int $databaseValue * @param mixed $phpValue */ - public function a_valid_database_value_is_converted_to_a_sql_value($databaseValue, $phpValue) + public function a_valid_database_value_is_converted_to_a_sql_value(string $databaseValue, $phpValue): void { $type = Type::getType(SecondFactorStatusType::NAME); $this->assertTrue($phpValue->equals($type->convertToPHPValue($databaseValue, $this->platform))); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SelfVetOptionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SelfVetOptionTypeTest.php index 449945e99..4ab4b14ad 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SelfVetOptionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SelfVetOptionTypeTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Configuration\Value\SelfVetOption; @@ -27,9 +28,9 @@ class SelfVetOptionTypeTest extends UnitTest { /** - * @var \Doctrine\DBAL\Platforms\MySqlPlatform + * @var MySqlPlatform */ - private $platform; + private MySqlPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -51,7 +52,7 @@ public function setUp(): void * @test * @group doctrine */ - public function a_null_value_remains_null_in_to_sql_conversion() + public function a_null_value_remains_null_in_to_sql_conversion(): void { $configurationInstitution = Type::getType(SelfVetOptionType::NAME); @@ -67,9 +68,9 @@ public function a_null_value_remains_null_in_to_sql_conversion() * @dataProvider \Surfnet\StepupMiddleware\ApiBundle\Tests\TestDataProvider::notNull * @param $incorrectValue */ - public function a_value_can_only_be_converted_to_sql_if_it_is_an_option_type_or_null($incorrectValue) + public function a_value_can_only_be_converted_to_sql_if_it_is_an_option_type_or_null($incorrectValue): void { - $this->expectException(\Doctrine\DBAL\Types\ConversionException::class); + $this->expectException(ConversionException::class); $configurationContactInformation = Type::getType(SelfVetOptionType::NAME); $configurationContactInformation->convertToDatabaseValue($incorrectValue, $this->platform); @@ -79,7 +80,7 @@ public function a_value_can_only_be_converted_to_sql_if_it_is_an_option_type_or_ * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_the_correct_format() + public function a_non_null_value_is_converted_to_the_correct_format(): void { $configurationInstitution = Type::getType(SelfVetOptionType::NAME); @@ -95,7 +96,7 @@ public function a_non_null_value_is_converted_to_the_correct_format() * @test * @group doctrine */ - public function a_null_value_remains_null_when_converting_from_db_to_php_value() + public function a_null_value_remains_null_when_converting_from_db_to_php_value(): void { $configurationInstitution = Type::getType(SelfVetOptionType::NAME); @@ -108,7 +109,7 @@ public function a_null_value_remains_null_when_converting_from_db_to_php_value() * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_an_option_valu_object() + public function a_non_null_value_is_converted_to_an_option_valu_object(): void { $configurationInstitution = Type::getType(SelfVetOptionType::NAME); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ShowRaaContactInformationOptionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ShowRaaContactInformationOptionTypeTest.php index 19505c17b..7ee9882d5 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ShowRaaContactInformationOptionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ShowRaaContactInformationOptionTypeTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Configuration\Value\ShowRaaContactInformationOption; @@ -28,9 +29,9 @@ class ShowRaaContactInformationOptionTypeTest extends UnitTest { /** - * @var \Doctrine\DBAL\Platforms\MySqlPlatform + * @var MySqlPlatform */ - private $platform; + private MySqlPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -52,7 +53,7 @@ public function setUp(): void * @test * @group doctrine */ - public function a_null_value_remains_null_in_to_sql_conversion() + public function a_null_value_remains_null_in_to_sql_conversion(): void { $configurationInstitution = Type::getType(ShowRaaContactInformationOptionType::NAME); @@ -68,9 +69,9 @@ public function a_null_value_remains_null_in_to_sql_conversion() * @dataProvider \Surfnet\StepupMiddleware\ApiBundle\Tests\TestDataProvider::notNull * @param $incorrectValue */ - public function a_value_can_only_be_converted_to_sql_if_it_is_a_show_raa_contact_information_option_or_null($incorrectValue) + public function a_value_can_only_be_converted_to_sql_if_it_is_a_show_raa_contact_information_option_or_null($incorrectValue): void { - $this->expectException(\Doctrine\DBAL\Types\ConversionException::class); + $this->expectException(ConversionException::class); $configurationContactInformation = Type::getType(ShowRaaContactInformationOptionType::NAME); $configurationContactInformation->convertToDatabaseValue($incorrectValue, $this->platform); @@ -80,7 +81,7 @@ public function a_value_can_only_be_converted_to_sql_if_it_is_a_show_raa_contact * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_the_correct_format() + public function a_non_null_value_is_converted_to_the_correct_format(): void { $configurationInstitution = Type::getType(ShowRaaContactInformationOptionType::NAME); @@ -96,7 +97,7 @@ public function a_non_null_value_is_converted_to_the_correct_format() * @test * @group doctrine */ - public function a_null_value_remains_null_when_converting_from_db_to_php_value() + public function a_null_value_remains_null_when_converting_from_db_to_php_value(): void { $configurationInstitution = Type::getType(ShowRaaContactInformationOptionType::NAME); @@ -109,7 +110,7 @@ public function a_null_value_remains_null_when_converting_from_db_to_php_value() * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_a_show_raa_contact_information_option_value_object() + public function a_non_null_value_is_converted_to_a_show_raa_contact_information_option_value_object(): void { $configurationInstitution = Type::getType(ShowRaaContactInformationOptionType::NAME); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/UseRaLocationsOptionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/UseRaLocationsOptionTypeTest.php index 693c10e5a..fa9b13556 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/UseRaLocationsOptionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/UseRaLocationsOptionTypeTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Configuration\Value\UseRaLocationsOption; @@ -27,9 +28,9 @@ class UseRaLocationsOptionTypeTest extends UnitTest { /** - * @var \Doctrine\DBAL\Platforms\MySqlPlatform + * @var MySqlPlatform */ - private $platform; + private MySqlPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -51,7 +52,7 @@ public function setUp(): void * @test * @group doctrine */ - public function a_null_value_remains_null_in_to_sql_conversion() + public function a_null_value_remains_null_in_to_sql_conversion(): void { $configurationInstitution = Type::getType(UseRaLocationsOptionType::NAME); @@ -67,9 +68,9 @@ public function a_null_value_remains_null_in_to_sql_conversion() * @dataProvider \Surfnet\StepupMiddleware\ApiBundle\Tests\TestDataProvider::notNull * @param $incorrectValue */ - public function a_value_can_only_be_converted_to_sql_if_it_is_a_use_ra_locations_option_or_null($incorrectValue) + public function a_value_can_only_be_converted_to_sql_if_it_is_a_use_ra_locations_option_or_null($incorrectValue): void { - $this->expectException(\Doctrine\DBAL\Types\ConversionException::class); + $this->expectException(ConversionException::class); $configurationContactInformation = Type::getType(UseRaLocationsOptionType::NAME); $configurationContactInformation->convertToDatabaseValue($incorrectValue, $this->platform); @@ -79,7 +80,7 @@ public function a_value_can_only_be_converted_to_sql_if_it_is_a_use_ra_locations * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_the_correct_format() + public function a_non_null_value_is_converted_to_the_correct_format(): void { $configurationInstitution = Type::getType(UseRaLocationsOptionType::NAME); @@ -95,7 +96,7 @@ public function a_non_null_value_is_converted_to_the_correct_format() * @test * @group doctrine */ - public function a_null_value_remains_null_when_converting_from_db_to_php_value() + public function a_null_value_remains_null_when_converting_from_db_to_php_value(): void { $configurationInstitution = Type::getType(UseRaLocationsOptionType::NAME); @@ -108,7 +109,7 @@ public function a_null_value_remains_null_when_converting_from_db_to_php_value() * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_a_use_ra_locations_option_value_object() + public function a_non_null_value_is_converted_to_a_use_ra_locations_option_value_object(): void { $configurationInstitution = Type::getType(UseRaLocationsOptionType::NAME); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/VerifyEmailOptionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/VerifyEmailOptionTypeTest.php index 8524a3479..0cd1f921e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/VerifyEmailOptionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/VerifyEmailOptionTypeTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Configuration\Value\VerifyEmailOption; @@ -27,9 +28,9 @@ class VerifyEmailOptionTypeTest extends UnitTest { /** - * @var \Doctrine\DBAL\Platforms\MySqlPlatform + * @var MySqlPlatform */ - private $platform; + private MySqlPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -51,7 +52,7 @@ public function setUp(): void * @test * @group doctrine */ - public function a_null_value_remains_null_in_to_sql_conversion() + public function a_null_value_remains_null_in_to_sql_conversion(): void { $configurationInstitution = Type::getType(VerifyEmailOptionType::NAME); @@ -67,9 +68,9 @@ public function a_null_value_remains_null_in_to_sql_conversion() * @dataProvider \Surfnet\StepupMiddleware\ApiBundle\Tests\TestDataProvider::notNull * @param $incorrectValue */ - public function a_value_can_only_be_converted_to_sql_if_it_is_an_option_type_or_null($incorrectValue) + public function a_value_can_only_be_converted_to_sql_if_it_is_an_option_type_or_null($incorrectValue): void { - $this->expectException(\Doctrine\DBAL\Types\ConversionException::class); + $this->expectException(ConversionException::class); $configurationContactInformation = Type::getType(VerifyEmailOptionType::NAME); $configurationContactInformation->convertToDatabaseValue($incorrectValue, $this->platform); @@ -79,7 +80,7 @@ public function a_value_can_only_be_converted_to_sql_if_it_is_an_option_type_or_ * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_the_correct_format() + public function a_non_null_value_is_converted_to_the_correct_format(): void { $configurationInstitution = Type::getType(VerifyEmailOptionType::NAME); @@ -95,7 +96,7 @@ public function a_non_null_value_is_converted_to_the_correct_format() * @test * @group doctrine */ - public function a_null_value_remains_null_when_converting_from_db_to_php_value() + public function a_null_value_remains_null_when_converting_from_db_to_php_value(): void { $configurationInstitution = Type::getType(VerifyEmailOptionType::NAME); @@ -108,7 +109,7 @@ public function a_null_value_remains_null_when_converting_from_db_to_php_value() * @test * @group doctrine */ - public function a_non_null_value_is_converted_to_an_option_valu_object() + public function a_non_null_value_is_converted_to_an_option_valu_object(): void { $configurationInstitution = Type::getType(VerifyEmailOptionType::NAME); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php index 2e2b746cb..7735bd917 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php @@ -20,24 +20,26 @@ use Generator; use Liip\TestFixturesBundle\Services\DatabaseToolCollection; +use Symfony\Bundle\FrameworkBundle\Client; +use Symfony\Bundle\FrameworkBundle\KernelBrowser; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; class ConfiguredInstitutionControllerTest extends WebTestCase { /** - * @var \Symfony\Bundle\FrameworkBundle\Client + * @var Client */ - private $client; + private KernelBrowser $client; /** * @var string[] */ - private $accounts; + private array $accounts; /** * @var string */ - private $endpoint; + private string $endpoint; private DatabaseToolCollection $databaseTool; @@ -69,7 +71,7 @@ public function tearDown(): void * * @dataProvider invalidHttpMethodProvider */ - public function only_get_requests_are_accepted($invalidHttpMethod) + public function only_get_requests_are_accepted(string $invalidHttpMethod): void { $this->client->request( $invalidHttpMethod, @@ -91,7 +93,7 @@ public function only_get_requests_are_accepted($invalidHttpMethod) * @group api * @dataProvider notAllowedAccountsProvider */ - public function no_access_for_not_allowed_account(string $account) + public function no_access_for_not_allowed_account(string $account): void { $this->client->request( 'GET', @@ -114,7 +116,7 @@ public function no_access_for_not_allowed_account(string $account) * @test * @group api */ - public function json_is_returned_from_the_api() + public function json_is_returned_from_the_api(): void { $this->client->request( 'GET', @@ -143,7 +145,7 @@ public function json_is_returned_from_the_api() * @group api * @dataProvider allowedAccountsProvider */ - public function correct_institutions_are_returned(string $account) + public function correct_institutions_are_returned(string $account): void { $this->client->request( 'GET', @@ -167,7 +169,7 @@ public function correct_institutions_are_returned(string $account) /** * Dataprovider for only_get_requests_are_accepted */ - public function invalidHttpMethodProvider() + public function invalidHttpMethodProvider(): array { return [ 'POST' => ['POST'], diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php index bbef6041e..3a0ae1c91 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php @@ -21,24 +21,26 @@ use Generator; use Liip\TestFixturesBundle\Services\DatabaseToolCollection; use Liip\TestFixturesBundle\Test\FixturesTrait; +use Symfony\Bundle\FrameworkBundle\Client; +use Symfony\Bundle\FrameworkBundle\KernelBrowser; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; class SraaControllerTest extends WebTestCase { /** - * @var \Symfony\Bundle\FrameworkBundle\Client + * @var Client */ - private $client; + private KernelBrowser $client; /** * @var string[] */ - private $accounts; + private array $accounts; /** * @var string */ - private $endpoint; + private string $endpoint; private DatabaseToolCollection $databaseTool; @@ -71,7 +73,7 @@ public function tearDown(): void * * @dataProvider invalidHttpMethodProvider */ - public function only_get_requests_are_accepted($invalidHttpMethod) + public function only_get_requests_are_accepted(string $invalidHttpMethod): void { $this->client->request( $invalidHttpMethod, @@ -93,7 +95,7 @@ public function only_get_requests_are_accepted($invalidHttpMethod) * @group api * @dataProvider notAllowedAccountsProvider */ - public function no_access_for_not_allowed_account(string $account) + public function no_access_for_not_allowed_account(string $account): void { $this->client->request( 'GET', @@ -116,7 +118,7 @@ public function no_access_for_not_allowed_account(string $account) * @test * @group api */ - public function json_is_returned_from_the_api() + public function json_is_returned_from_the_api(): void { $this->client->request( 'GET', @@ -145,7 +147,7 @@ public function json_is_returned_from_the_api() * @group api * @dataProvider allowedAccountsProvider */ - public function correct_institutions_are_returned(string $account) + public function correct_institutions_are_returned(string $account): void { $this->client->request( 'GET', @@ -169,7 +171,7 @@ public function correct_institutions_are_returned(string $account) /** * Dataprovider for only_get_requests_are_accepted */ - public function invalidHttpMethodProvider() + public function invalidHttpMethodProvider(): array { return [ 'POST' => ['POST'], diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/AuditLogProjectorTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/AuditLogProjectorTest.php index adc25c7d8..0c21859c1 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/AuditLogProjectorTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/AuditLogProjectorTest.php @@ -23,6 +23,7 @@ use Broadway\Domain\Metadata as MessageMetadata; use DateTime as CoreDateTime; use Mockery as m; +use Mockery\Matcher\MatcherAbstract; use PHPUnit\Framework\TestCase; use Surfnet\Stepup\DateTime\DateTime as StepupDateTime; use Surfnet\Stepup\Identity\AuditLog\Metadata; @@ -39,9 +40,9 @@ final class AuditLogProjectorTest extends TestCase { - private static $actorCommonName = 'Actor CommonName'; + private static string $actorCommonName = 'Actor CommonName'; - public function auditable_events() + public function auditable_events(): array { return [ 'no actor, with second factor' => [ @@ -136,7 +137,7 @@ public function auditable_events() * @param DomainMessage $message * @param AuditLogEntry $expectedEntry */ - public function it_creates_entries_for_auditable_events(DomainMessage $message, AuditLogEntry $expectedEntry) + public function it_creates_entries_for_auditable_events(DomainMessage $message, AuditLogEntry $expectedEntry): void { $repository = m::mock('Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\AuditLogRepository'); $repository->shouldReceive('save')->once()->with(self::spy($actualEntry)); @@ -163,7 +164,8 @@ private function createAuditLogMetadata( SecondFactorId $secondFactorId = null, SecondFactorType $secondFactorType = null, SecondFactorIdentifier $secondFactorIdentifier = null - ) { + ): Metadata + { $metadata = new Metadata(); $metadata->identityId = $identityId; $metadata->identityInstitution = $institution; @@ -175,17 +177,17 @@ private function createAuditLogMetadata( } private function createExpectedAuditLogEntry( - IdentityId $actorId = null, - Institution $actorInstitution = null, - IdentityId $identityId, - Institution $identityInstitution, - SecondFactorId $secondFactorId = null, + IdentityId $actorId = null, + Institution $actorInstitution = null, + IdentityId $identityId, + Institution $identityInstitution, + SecondFactorId $secondFactorId = null, SecondFactorType $secondFactorType = null, - SecondFactorIdentifier $secondFactorIdentifier = null, - $event, - StepupDateTime $recordedOn, - $actorCommonName = null - ) { + ?YubikeyPublicId $secondFactorIdentifier = null, + string $event, + StepupDateTime $recordedOn, + $actorCommonName = null + ): AuditLogEntry { $entry = new AuditLogEntry(); $entry->actorId = $actorId ? (string) $actorId : null; $entry->actorInstitution = $actorInstitution ? (string) $actorInstitution : null; @@ -203,12 +205,12 @@ private function createExpectedAuditLogEntry( /** * @param mixed &$spy - * @return \Mockery\Matcher\MatcherAbstract + * @return MatcherAbstract */ private static function spy(&$spy) { return m::on( - function ($value) use (&$spy) { + function ($value) use (&$spy): bool { $spy = $value; return true; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/Event/EventStub.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/Event/EventStub.php index 701175b41..0d3653bab 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/Event/EventStub.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/Event/EventStub.php @@ -23,10 +23,7 @@ final class EventStub implements AuditableEvent { - /** - * @var \Surfnet\Stepup\Identity\AuditLog\Metadata - */ - private $metadata; + private Metadata $metadata; public function __construct(Metadata $metadata) { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Value/AuthorizedInstitutionCollectionTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Value/AuthorizedInstitutionCollectionTest.php index ba0d6ef48..d06bb4ebb 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Value/AuthorizedInstitutionCollectionTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Value/AuthorizedInstitutionCollectionTest.php @@ -28,7 +28,7 @@ final class AuthorizedInstitutionCollectionTest extends TestCase /** * @test */ - public function empty_collection() + public function empty_collection(): void { $collection = AuthorizedInstitutionCollection::from($this->buildInstitutionCollection([]), null); $this->assertEmpty($collection->getAuthorizations()); @@ -37,7 +37,7 @@ public function empty_collection() /** * @test */ - public function retrieve_institutions() + public function retrieve_institutions(): void { $collection = AuthorizedInstitutionCollection::from( $this->buildInstitutionCollection(['a', 'b']), @@ -54,7 +54,7 @@ public function retrieve_institutions() /** * @test */ - public function retrieve_institutions_only_raa() + public function retrieve_institutions_only_raa(): void { $collection = AuthorizedInstitutionCollection::from( $this->buildInstitutionCollection([]), @@ -68,7 +68,7 @@ public function retrieve_institutions_only_raa() $this->assertEquals('raa', $collection->getAuthorizations()['b'][0]); } - private function buildInstitutionCollection(array $institutions) + private function buildInstitutionCollection(array $institutions): InstitutionCollection { $institutionList = []; foreach ($institutions as $institution) { @@ -77,7 +77,7 @@ private function buildInstitutionCollection(array $institutions) return new InstitutionCollection($institutionList); } - private function buildInstitution($name) + private function buildInstitution($name): Institution { return new Institution($name); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php index d422feb65..0a58b9149 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php @@ -19,7 +19,10 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Request; use Mockery as m; +use Mockery\Matcher\MatcherAbstract; use PHPUnit\Framework\TestCase; +use stdClass; +use Surfnet\StepupMiddleware\ApiBundle\Exception\BadCommandRequestException; use Surfnet\StepupMiddleware\ApiBundle\Request\CommandParamConverter; class CommandParamConverterTest extends TestCase @@ -30,9 +33,9 @@ class CommandParamConverterTest extends TestCase * @dataProvider invalidCommandJsonStructures * @param string $commandJson */ - public function it_validates_the_command_structure($commandJson) + public function it_validates_the_command_structure($commandJson): void { - $this->expectException(\Surfnet\StepupMiddleware\ApiBundle\Exception\BadCommandRequestException::class); + $this->expectException(BadCommandRequestException::class); $request = m::mock('Symfony\Component\HttpFoundation\Request') ->shouldReceive('getContent')->with()->andReturn($commandJson) @@ -50,9 +53,9 @@ public function it_validates_the_command_structure($commandJson) * @param string $expectedCommandClass * @param string $commandName */ - public function it_can_convert_command_name_notation($expectedCommandClass, $commandName) + public function it_can_convert_command_name_notation($expectedCommandClass, string $commandName): void { - $command = ['command' => ['name' => $commandName, 'uuid' => 'abcdef', 'payload' => new \stdClass]]; + $command = ['command' => ['name' => $commandName, 'uuid' => 'abcdef', 'payload' => new stdClass]]; $request = m::mock('Symfony\Component\HttpFoundation\Request') ->shouldReceive('getContent')->with()->andReturn(json_encode($command)) @@ -72,9 +75,9 @@ public function it_can_convert_command_name_notation($expectedCommandClass, $com * @test * @group api-bundle */ - public function it_sets_uuid() + public function it_sets_uuid(): void { - $command = ['command' => ['name' => 'Root:FooBar', 'uuid' => 'abcdef', 'payload' => new \stdClass]]; + $command = ['command' => ['name' => 'Root:FooBar', 'uuid' => 'abcdef', 'payload' => new stdClass]]; $request = m::mock('Symfony\Component\HttpFoundation\Request') ->shouldReceive('getContent')->with()->andReturn(json_encode($command)) @@ -94,7 +97,7 @@ public function it_sets_uuid() * @test * @group api-bundle */ - public function it_sets_payload() + public function it_sets_payload(): void { $command = ['command' => ['name' => 'Root:FooBar', 'uuid' => 'abcdef', 'payload' => ['snake_case' => true]]]; @@ -114,10 +117,10 @@ public function it_sets_payload() $this->assertSame(['snakeCase' => true], $spiedPayload, 'Payload mismatch'); } - public function invalidCommandJsonStructures() + public function invalidCommandJsonStructures(): array { return array_map( - function ($command) { + function ($command): array { return [json_encode($command)]; }, [ @@ -125,7 +128,7 @@ function ($command) { 'Body may not be integer' => 1, 'Body may not be float' => 1.1, 'Body may not be array' => [], - 'Object must contain command property' => new \stdClass, + 'Object must contain command property' => new stdClass, 'Command may not be null' => ['command' => null], 'Command may not be integer' => ['command' => 1], 'Command may not be float' => ['command' => 1.1], @@ -141,7 +144,7 @@ function ($command) { ); } - public function convertibleCommandNames() + public function convertibleCommandNames(): array { return [ 'It can convert simple command notation with a namespace' => [ @@ -158,12 +161,12 @@ public function convertibleCommandNames() /** * @param mixed &$spy - * @return \Mockery\Matcher\MatcherAbstract + * @return MatcherAbstract */ private static function spy(&$spy) { return m::on( - function ($value) use (&$spy) { + function ($value) use (&$spy): bool { $spy = $value; return true; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php index 551d0f134..76cd8040f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php @@ -19,20 +19,22 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Request; use Mockery as m; +use Mockery\MockInterface; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Identity\Value\Institution; +use Surfnet\StepupMiddleware\ApiBundle\Exception\BadApiRequestException; use Surfnet\StepupMiddleware\ApiBundle\Request\InstitutionParamConverter; use Symfony\Component\HttpFoundation\ParameterBag; class InstitutionParamConverterTest extends UnitTest { /** - * @var \Mockery\MockInterface + * @var MockInterface */ private $request; /** - * @var \Mockery\MockInterface + * @var MockInterface */ private $paramConverterConfig; @@ -46,9 +48,9 @@ public function setUp(): void * @test * @group api-bundle */ - public function an_exception_is_thrown_when_the_parameter_is_missing() + public function an_exception_is_thrown_when_the_parameter_is_missing(): void { - $this->expectException(\Surfnet\StepupMiddleware\ApiBundle\Exception\BadApiRequestException::class); + $this->expectException(BadApiRequestException::class); $this->request->query = $this->mockQuery(false); @@ -60,7 +62,7 @@ public function an_exception_is_thrown_when_the_parameter_is_missing() * @test * @group api-bundle */ - public function an_institution_is_set_as_attribute() + public function an_institution_is_set_as_attribute(): void { $query = $this->mockQuery('ABC'); $query @@ -79,7 +81,7 @@ public function an_institution_is_set_as_attribute() $this->assertTrue($this->request->attributes->get('institution')->equals($equal)); } - private function mockQuery($returnValue) + private function mockQuery(bool|string $returnValue) { $query = m::mock('Symfony\Component\HttpFoundation\ParameterBag'); $query diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Response/JsonAuthorizationResponseTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Response/JsonAuthorizationResponseTest.php index 61e3c86eb..dfaec3c68 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Response/JsonAuthorizationResponseTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Response/JsonAuthorizationResponseTest.php @@ -24,31 +24,31 @@ class JsonAuthorizationResponseTest extends TestCase { - public function test_happy_flow() { + public function test_happy_flow(): void { $response = new JsonAuthorizationResponse(200); $this->assertEquals('{"code":200}',$response->getContent()); $this->assertEquals(200, $response->getStatusCode()); } - public function test_happy_flow_error_response() { + public function test_happy_flow_error_response(): void { $response = new JsonAuthorizationResponse(403); $this->assertEquals('{"code":403}',$response->getContent()); $this->assertEquals(200, $response->getStatusCode()); } - public function test_happy_flow_error_response_with_error_message() { + public function test_happy_flow_error_response_with_error_message(): void { $response = new JsonAuthorizationResponse(403, ['Not allowed']); $this->assertEquals('{"code":403,"errors":["Not allowed"]}',$response->getContent()); $this->assertEquals(200, $response->getStatusCode()); } - public function test_response_code_can_be_one_of_200_or_403() { + public function test_response_code_can_be_one_of_200_or_403(): void { $this->expectException(InvalidArgumentException::class); $this->expectExceptionMessage('The status code can be either 200 or 403'); new JsonAuthorizationResponse(402); } - public function test_all_errors_should_be_string() { + public function test_all_errors_should_be_string(): void { $this->expectException(InvalidArgumentException::class); $this->expectExceptionMessage('The error messages should all be strings'); new JsonAuthorizationResponse(403, ['Test', false]); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Service/DeprovisionServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Service/DeprovisionServiceTest.php index 4a187d122..694087c42 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Service/DeprovisionServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Service/DeprovisionServiceTest.php @@ -38,7 +38,7 @@ class DeprovisionServiceTest extends TestCase /** * @var DeprovisionService */ - private $deprovisionService; + private DeprovisionService $deprovisionService; /** * @var m\LegacyMockInterface|m\MockInterface|Pipeline @@ -65,7 +65,7 @@ protected function setUp(): void $this->deprovisionService = new DeprovisionService($this->pipeline, $this->eventRepo, $this->apiRepo, $logger); } - public function test_it_can_be_created() + public function test_it_can_be_created(): void { $this->assertInstanceOf(DeprovisionService::class, $this->deprovisionService); } @@ -73,7 +73,7 @@ public function test_it_can_be_created() /** * @group api-bundle */ - public function test_it_deals_with_non_exisiting_collab_user_id() + public function test_it_deals_with_non_exisiting_collab_user_id(): void { $this->apiRepo ->shouldReceive('findOneByNameId') @@ -87,7 +87,7 @@ public function test_it_deals_with_non_exisiting_collab_user_id() /** * @group api-bundle */ - public function test_it_can_return_data() + public function test_it_can_return_data(): void { $identity = m::mock(Identity::class); $identity->id = '0bf0b464-a5de-11ec-b909-0242ac120002'; @@ -105,7 +105,7 @@ public function test_it_can_return_data() $this->assertEquals($data['status'], 'OK'); } - public function test_deprovision_does_not_deprovision_when_user_is_not_found() + public function test_deprovision_does_not_deprovision_when_user_is_not_found(): void { $this->apiRepo ->shouldReceive('findOneByNameId') @@ -118,7 +118,7 @@ public function test_deprovision_does_not_deprovision_when_user_is_not_found() $this->assertNull($data); } - public function test_deprovision_method_performs_the_right_to_be_forgotten_command() + public function test_deprovision_method_performs_the_right_to_be_forgotten_command(): void { $identity = m::mock(Identity::class); $identity->id = '0bf0b464-a5de-11ec-b909-0242ac120002'; @@ -130,7 +130,7 @@ public function test_deprovision_method_performs_the_right_to_be_forgotten_comma ->andReturn($identity); $this->pipeline ->shouldReceive('process') - ->withArgs(function(ForgetIdentityCommand $command){ + ->withArgs(function(ForgetIdentityCommand $command): bool{ $this->assertEquals($command->nameId, 'urn:collab:person:example.com:maynard_keenan'); $this->assertEquals($command->institution, 'tool'); return true; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/TestDataProvider.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/TestDataProvider.php index 31867f1bf..b8848eb4d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/TestDataProvider.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/TestDataProvider.php @@ -18,9 +18,11 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests; +use StdClass; + final class TestDataProvider { - public static function notNull() + public static function notNull(): array { return [ 'string' => ['a string'], @@ -29,7 +31,7 @@ public static function notNull() 'true' => [true], 'false' => [false], 'array' => [[]], - 'object' => [new \StdClass], + 'object' => [new StdClass], ]; } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/AbstractCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/AbstractCommand.php index f1c7e590d..9fb2cf987 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/AbstractCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/AbstractCommand.php @@ -35,7 +35,7 @@ abstract class AbstractCommand implements Command #[Assert\Regex(pattern: '~^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$~i')] public $UUID; - public function __toString() + public function __toString(): string { return get_class($this) . '[' . $this->UUID . ']'; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/Command.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/Command.php index d72c21b6d..877968402 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/Command.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/Command.php @@ -20,7 +20,7 @@ /** * Interface that must be implemented by all Step-up commands. All Step-up commands MUST sport a $UUID string - * field, {@see \Surfnet\StepupMiddleware\CommandHandlingBundle\Command\AbstractCommand} + * field, {@see AbstractCommand} */ interface Command { diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/ConfigurationCommandHandler.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/ConfigurationCommandHandler.php index af0afbe30..40b42fe39 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/ConfigurationCommandHandler.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/ConfigurationCommandHandler.php @@ -26,10 +26,7 @@ class ConfigurationCommandHandler extends SimpleCommandHandler { - /** - * @var \Surfnet\Stepup\Configuration\EventSourcing\ConfigurationRepository - */ - private $repository; + private ConfigurationRepository $repository; /** * @param ConfigurationRepository $repository @@ -39,7 +36,7 @@ public function __construct(ConfigurationRepository $repository) $this->repository = $repository; } - public function handleUpdateConfigurationCommand(UpdateConfigurationCommand $command) + public function handleUpdateConfigurationCommand(UpdateConfigurationCommand $command): void { $configuration = $this->getConfiguration(); if (!$configuration) { diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/InstitutionConfigurationCommandHandler.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/InstitutionConfigurationCommandHandler.php index ea018ff24..2fccba359 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/InstitutionConfigurationCommandHandler.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/InstitutionConfigurationCommandHandler.php @@ -54,14 +54,14 @@ class InstitutionConfigurationCommandHandler extends SimpleCommandHandler /** * @var RepositoryInterface */ - private $repository; + private RepositoryInterface $repository; public function __construct(RepositoryInterface $repository) { $this->repository = $repository; } - public function handleCreateInstitutionConfigurationCommand(CreateInstitutionConfigurationCommand $command) + public function handleCreateInstitutionConfigurationCommand(CreateInstitutionConfigurationCommand $command): void { $institution = new Institution($command->institution); $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); @@ -82,10 +82,10 @@ public function handleCreateInstitutionConfigurationCommand(CreateInstitutionCon public function handleReconfigureInstitutionConfigurationOptionsCommand( ReconfigureInstitutionConfigurationOptionsCommand $command - ) { + ): void { $institution = new Institution($command->institution); - $allowedSecondFactors = array_map(function ($allowedSecondFactor) { + $allowedSecondFactors = array_map(function ($allowedSecondFactor): SecondFactorType { return new SecondFactorType($allowedSecondFactor); }, $command->allowedSecondFactors); @@ -137,7 +137,7 @@ public function handleReconfigureInstitutionConfigurationOptionsCommand( $this->repository->save($institutionConfiguration); } - public function handleAddRaLocationCommand(AddRaLocationCommand $command) + public function handleAddRaLocationCommand(AddRaLocationCommand $command): void { $institution = new Institution($command->institution); @@ -152,7 +152,7 @@ public function handleAddRaLocationCommand(AddRaLocationCommand $command) $this->repository->save($institutionConfiguration); } - public function handleChangeRaLocationCommand(ChangeRaLocationCommand $command) + public function handleChangeRaLocationCommand(ChangeRaLocationCommand $command): void { $institution = new Institution($command->institution); @@ -167,7 +167,7 @@ public function handleChangeRaLocationCommand(ChangeRaLocationCommand $command) $this->repository->save($institutionConfiguration); } - public function handleRemoveRaLocationCommand(RemoveRaLocationCommand $command) + public function handleRemoveRaLocationCommand(RemoveRaLocationCommand $command): void { $institution = new Institution($command->institution); @@ -179,7 +179,7 @@ public function handleRemoveRaLocationCommand(RemoveRaLocationCommand $command) public function handleRemoveInstitutionConfigurationByUnnormalizedIdCommand( RemoveInstitutionConfigurationByUnnormalizedIdCommand $command - ) { + ): void { $institution = new Institution($command->institution); $institutionConfigurationId = InstitutionConfigurationId::from($institution); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Processor/InstitutionConfigurationProcessor.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Processor/InstitutionConfigurationProcessor.php index bfd08cac7..9cd2a8f43 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Processor/InstitutionConfigurationProcessor.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Processor/InstitutionConfigurationProcessor.php @@ -31,15 +31,9 @@ final class InstitutionConfigurationProcessor extends Processor { - /** - * @var ConfiguredInstitutionRepository - */ - private $configuredInstitutionRepository; + private ConfiguredInstitutionRepository $configuredInstitutionRepository; - /** - * @var ContainerInterface - */ - private $container; + private ContainerInterface $container; /** * The container needs to be called during runtime in order to prevent a circular reference @@ -56,7 +50,7 @@ public function __construct( $this->container = $container; } - public function handleIdentityCreatedEvent(IdentityCreatedEvent $event) + public function handleIdentityCreatedEvent(IdentityCreatedEvent $event): void { $institution = new Institution($event->identityInstitution->getInstitution()); @@ -67,7 +61,7 @@ public function handleIdentityCreatedEvent(IdentityCreatedEvent $event) $this->createConfigurationFor($institution); } - public function handleWhitelistCreatedEvent(WhitelistCreatedEvent $event) + public function handleWhitelistCreatedEvent(WhitelistCreatedEvent $event): void { foreach ($event->whitelistedInstitutions as $whitelistedInstitution) { $institution = new Institution($whitelistedInstitution->getInstitution()); @@ -80,7 +74,7 @@ public function handleWhitelistCreatedEvent(WhitelistCreatedEvent $event) } } - public function handleWhitelistReplacedEvent(WhitelistReplacedEvent $event) + public function handleWhitelistReplacedEvent(WhitelistReplacedEvent $event): void { foreach ($event->whitelistedInstitutions as $whitelistedInstitution) { $institution = new Institution($whitelistedInstitution->getInstitution()); @@ -93,7 +87,7 @@ public function handleWhitelistReplacedEvent(WhitelistReplacedEvent $event) } } - public function handleInstitutionsAddedToWhitelistEvent(InstitutionsAddedToWhitelistEvent $event) + public function handleInstitutionsAddedToWhitelistEvent(InstitutionsAddedToWhitelistEvent $event): void { foreach ($event->addedInstitutions as $addedInstitution) { $institution = new Institution($addedInstitution->getInstitution()); @@ -109,7 +103,7 @@ public function handleInstitutionsAddedToWhitelistEvent(InstitutionsAddedToWhite /** * @param Institution $institution */ - private function createConfigurationFor(Institution $institution) + private function createConfigurationFor(Institution $institution): void { $command = new CreateInstitutionConfigurationCommand(); $command->UUID = (string) Uuid::uuid4(); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/CompilerPass/AddCommandBusCommandHandlersCompilerPass.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/CompilerPass/AddCommandBusCommandHandlersCompilerPass.php index 2b82f1a18..77f70bc63 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/CompilerPass/AddCommandBusCommandHandlersCompilerPass.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/CompilerPass/AddCommandBusCommandHandlersCompilerPass.php @@ -24,7 +24,7 @@ class AddCommandBusCommandHandlersCompilerPass implements CompilerPassInterface { - public function process(ContainerBuilder $container) + public function process(ContainerBuilder $container): void { $definition = $container->getDefinition('surfnet_stepup_middleware_command_handling.command_bus'); $commandHandlerDefinitions = $container->findTaggedServiceIds('command_bus.command_handler'); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/CompilerPass/AddEventBusListenersCompilerPass.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/CompilerPass/AddEventBusListenersCompilerPass.php index dd6578db0..517db3dd1 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/CompilerPass/AddEventBusListenersCompilerPass.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/CompilerPass/AddEventBusListenersCompilerPass.php @@ -25,7 +25,7 @@ class AddEventBusListenersCompilerPass implements CompilerPassInterface { - public function process(ContainerBuilder $container) + public function process(ContainerBuilder $container): void { $definition = $container->getDefinition('surfnet_stepup_middleware_command_handling.event_bus.buffered'); $eventListenerDefinitions = $container->findTaggedServiceIds('event_bus.event_listener'); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/CompilerPass/AddPipelineStagesCompilerPass.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/CompilerPass/AddPipelineStagesCompilerPass.php index 9bd9a4783..5a7d23ab7 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/CompilerPass/AddPipelineStagesCompilerPass.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/CompilerPass/AddPipelineStagesCompilerPass.php @@ -30,7 +30,7 @@ class AddPipelineStagesCompilerPass implements CompilerPassInterface * {@inheritdoc} Since the priorities cannot be changed runtime but only through configuration, we're doing the * sorting based on priority here. A higher priority means the stage is added earlier. */ - public function process(ContainerBuilder $container) + public function process(ContainerBuilder $container): void { $definition = $container->getDefinition('surfnet_stepup_middleware_command_handling.pipeline.staged_pipeline'); $stageDefinitions = $container->findTaggedServiceIds('pipeline.stage'); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/Configuration.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/Configuration.php index 645508182..64c916f20 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/Configuration.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/Configuration.php @@ -33,7 +33,7 @@ public function getConfigTreeBuilder(): TreeBuilder ->isRequired() ->info('Configures the URL where registrants can verify e-mail address ownership.') ->validate() - ->ifTrue(function ($url) { + ->ifTrue(function ($url): bool { $parts = parse_url($url); return empty($parts['scheme']) || empty($parts['host']) || empty($parts['path']); @@ -50,7 +50,7 @@ public function getConfigTreeBuilder(): TreeBuilder ->info('Configures the URL for Self Service.') ->validate() ->ifTrue( - function ($url) { + function ($url): bool { return filter_var($url, FILTER_VALIDATE_URL) === false; } ) @@ -64,7 +64,7 @@ function ($url) { ->scalarNode('name') ->isRequired() ->validate() - ->ifTrue(function ($name) { + ->ifTrue(function ($name): bool { return !is_string($name) || empty($name); }) ->thenInvalid("E-mail sender name must be non-empty string, got '%s'") @@ -73,7 +73,7 @@ function ($url) { ->scalarNode('email') ->isRequired() ->validate() - ->ifTrue(function ($name) { + ->ifTrue(function ($name): bool { return !is_string($name) || empty($name); }) ->thenInvalid("E-mail sender e-mail must be non-empty string, got '%s'") diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/SurfnetStepupMiddlewareCommandHandlingExtension.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/SurfnetStepupMiddlewareCommandHandlingExtension.php index b3418b119..402ae7ba0 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/SurfnetStepupMiddlewareCommandHandlingExtension.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/SurfnetStepupMiddlewareCommandHandlingExtension.php @@ -26,7 +26,7 @@ class SurfnetStepupMiddlewareCommandHandlingExtension extends Extension { - public function load(array $config, ContainerBuilder $container) + public function load(array $config, ContainerBuilder $container): void { $loader = new YamlFileLoader( $container, diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php index b6c495a58..e5f80b943 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php @@ -30,7 +30,7 @@ class BufferedEventBus implements EventBusInterface /** * @var EventListenerInterface[] */ - private $eventListeners = []; + private array $eventListeners = []; /** * @var DomainMessage[] @@ -39,15 +39,10 @@ class BufferedEventBus implements EventBusInterface /** * Flag to ensure only one loop is publishing domain messages from the buffer. - * - * @var bool */ - private $isFlushing = false; + private bool $isFlushing = false; - /** - * @var EntityManagerInterface - */ - private $entityManager; + private EntityManagerInterface $entityManager; public function __construct(EntityManagerInterface $entityManager) { @@ -69,7 +64,7 @@ public function publish(DomainEventStreamInterface $domainMessages): void /** * Flushes the buffered domain messages to all event listeners. */ - public function flush() + public function flush(): void { if ($this->isFlushing) { // If already flushing, we're in a nested pipeline. This means that an event that is currently being diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventListener/ProcessingAbortedExceptionListener.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventListener/ProcessingAbortedExceptionListener.php index e6335ff25..c19b4ca50 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventListener/ProcessingAbortedExceptionListener.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventListener/ProcessingAbortedExceptionListener.php @@ -31,7 +31,7 @@ public static function getSubscribedEvents() return [KernelEvents::EXCEPTION => 'onKernelException']; } - public function onKernelException(ExceptionEvent $event) + public function onKernelException(ExceptionEvent $event): void { $throwable = $event->getThrowable(); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventSourcing/MetadataEnrichingEventStreamDecorator.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventSourcing/MetadataEnrichingEventStreamDecorator.php index 4a08c89dc..b00e1b30b 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventSourcing/MetadataEnrichingEventStreamDecorator.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventSourcing/MetadataEnrichingEventStreamDecorator.php @@ -19,18 +19,16 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\EventSourcing; use Broadway\Domain\DomainEventStream; +use Broadway\Domain\DomainMessage; use Broadway\Domain\Metadata as BroadwayMetadata; use Broadway\EventSourcing\EventStreamDecorator; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Metadata; final class MetadataEnrichingEventStreamDecorator implements EventStreamDecorator, MetadataEnricher { - /** - * @var Metadata|null - */ - private $metadata; + private ?Metadata $metadata = null; - public function setMetadata(Metadata $metadata = null) + public function setMetadata(Metadata $metadata = null): void { $this->metadata = $metadata; } @@ -47,7 +45,7 @@ public function decorateForWrite( $domainMessages = []; foreach ($eventStream as $domainMessage) { - /** @var \Broadway\Domain\DomainMessage $domainMessage */ + /** @var DomainMessage $domainMessage */ $domainMessages[] = $domainMessage->andMetadata( new BroadwayMetadata([ 'actorId' => $this->metadata->actorId, diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Exception/InvalidArgumentException.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Exception/InvalidArgumentException.php index cb955f458..b927c6d10 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Exception/InvalidArgumentException.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Exception/InvalidArgumentException.php @@ -27,7 +27,7 @@ class InvalidArgumentException extends \InvalidArgumentException implements Exce * * @return self */ - public static function invalidType($expected, $parameterName, $parameter) + public static function invalidType($expected, $parameterName, $parameter): self { $message = sprintf( 'Invalid argument type: "%s" expected, "%s" given for "%s"', diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RegisterSelfAssertedSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RegisterSelfAssertedSecondFactorCommand.php index 050953817..9a1a339fd 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RegisterSelfAssertedSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RegisterSelfAssertedSecondFactorCommand.php @@ -61,7 +61,7 @@ class RegisterSelfAssertedSecondFactorCommand extends AbstractCommand implements #[Assert\Type(type: 'string')] public $authoringRecoveryTokenId; - public function getIdentityId() + public function getIdentityId(): void { $this->identityId; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SelfVetSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SelfVetSecondFactorCommand.php index 8863d9dc1..debdb3a37 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SelfVetSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SelfVetSecondFactorCommand.php @@ -67,7 +67,7 @@ class SelfVetSecondFactorCommand extends AbstractCommand implements SelfServiceE #[Assert\Type(type: 'string')] public $authoringSecondFactorIdentifier; - public function getIdentityId() + public function getIdentityId(): void { $this->identityId; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/Exception/DuplicateIdentityException.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/Exception/DuplicateIdentityException.php index 095b2d05b..758bb14ae 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/Exception/DuplicateIdentityException.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/Exception/DuplicateIdentityException.php @@ -35,7 +35,7 @@ public function __construct($message = "", $code = 0, Exception $previous = null * * @return DuplicateIdentityException */ - public static function forBootstrappingWithYubikeySecondFactor(NameId $nameId, Institution $institution) + public static function forBootstrappingWithYubikeySecondFactor(NameId $nameId, Institution $institution): self { return new self( sprintf( diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/IdentityCommandHandler.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/IdentityCommandHandler.php index a980d8f6f..e96ef2c17 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/IdentityCommandHandler.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/IdentityCommandHandler.php @@ -86,50 +86,25 @@ class IdentityCommandHandler extends SimpleCommandHandler /** * @var \Surfnet\Stepup\Identity\EventSourcing\IdentityRepository */ - private $eventSourcedRepository; + private RepositoryInterface $eventSourcedRepository; - /** - * @var IdentityRepository - */ - private $identityProjectionRepository; + private IdentityRepository $identityProjectionRepository; - /** - * @var \Surfnet\Stepup\Identity\Entity\ConfigurableSettings - */ - private $configurableSettings; + private ConfigurableSettings $configurableSettings; - /** - * @var AllowedSecondFactorListService - */ - private $allowedSecondFactorListService; + private AllowedSecondFactorListService $allowedSecondFactorListService; - /** @var SecondFactorTypeService */ - private $secondFactorTypeService; + private SecondFactorTypeService $secondFactorTypeService; - /** - * @var InstitutionConfigurationOptionsService - */ - private $institutionConfigurationOptionsService; + private InstitutionConfigurationOptionsService $institutionConfigurationOptionsService; - /** - * @var LoaResolutionService - */ - private $loaResolutionService; + private LoaResolutionService $loaResolutionService; - /** - * @var SecondFactorProvePossessionHelper - */ - private $provePossessionHelper; + private SecondFactorProvePossessionHelper $provePossessionHelper; - /** - * @var RecoveryTokenSecretHelper - */ - private $recoveryTokenSecretHelper; + private RecoveryTokenSecretHelper $recoveryTokenSecretHelper; - /** - * @var RegistrationMailService - */ - private $registrationMailService; + private RegistrationMailService $registrationMailService; /** * @SuppressWarnings(PHPMD.ExcessiveParameterList) @@ -158,7 +133,7 @@ public function __construct( $this->registrationMailService = $registrationMailService; } - public function handleCreateIdentityCommand(CreateIdentityCommand $command) + public function handleCreateIdentityCommand(CreateIdentityCommand $command): void { $preferredLocale = new Locale($command->preferredLocale); $this->assertIsValidLocale($preferredLocale); @@ -175,7 +150,7 @@ public function handleCreateIdentityCommand(CreateIdentityCommand $command) $this->eventSourcedRepository->save($identity); } - public function handleUpdateIdentityCommand(UpdateIdentityCommand $command) + public function handleUpdateIdentityCommand(UpdateIdentityCommand $command): void { /** @var IdentityApi $identity */ $identity = $this->eventSourcedRepository->load(new IdentityId($command->id)); @@ -188,7 +163,7 @@ public function handleUpdateIdentityCommand(UpdateIdentityCommand $command) public function handleBootstrapIdentityWithYubikeySecondFactorCommand( BootstrapIdentityWithYubikeySecondFactorCommand $command - ) { + ): void { $preferredLocale = new Locale($command->preferredLocale); $this->assertIsValidLocale($preferredLocale); @@ -223,7 +198,7 @@ public function handleBootstrapIdentityWithYubikeySecondFactorCommand( $this->eventSourcedRepository->save($identity); } - public function handleProveYubikeyPossessionCommand(ProveYubikeyPossessionCommand $command) + public function handleProveYubikeyPossessionCommand(ProveYubikeyPossessionCommand $command): void { /** @var IdentityApi $identity */ $identity = $this->eventSourcedRepository->load(new IdentityId($command->identityId)); @@ -249,7 +224,7 @@ public function handleProveYubikeyPossessionCommand(ProveYubikeyPossessionComman /** * @param ProvePhonePossessionCommand $command */ - public function handleProvePhonePossessionCommand(ProvePhonePossessionCommand $command) + public function handleProvePhonePossessionCommand(ProvePhonePossessionCommand $command): void { /** @var IdentityApi $identity */ $identity = $this->eventSourcedRepository->load(new IdentityId($command->identityId)); @@ -276,7 +251,7 @@ public function handleProvePhonePossessionCommand(ProvePhonePossessionCommand $c /** * @param ProveGssfPossessionCommand $command */ - public function handleProveGssfPossessionCommand(ProveGssfPossessionCommand $command) + public function handleProveGssfPossessionCommand(ProveGssfPossessionCommand $command): void { /** @var IdentityApi $identity */ $identity = $this->eventSourcedRepository->load(new IdentityId($command->identityId)); @@ -303,7 +278,7 @@ public function handleProveGssfPossessionCommand(ProveGssfPossessionCommand $com $this->eventSourcedRepository->save($identity); } - public function handleProveU2fDevicePossessionCommand(ProveU2fDevicePossessionCommand $command) + public function handleProveU2fDevicePossessionCommand(ProveU2fDevicePossessionCommand $command): void { /** @var IdentityApi $identity */ $identity = $this->eventSourcedRepository->load(new IdentityId($command->identityId)); @@ -330,7 +305,7 @@ public function handleProveU2fDevicePossessionCommand(ProveU2fDevicePossessionCo /** * @param VerifyEmailCommand $command */ - public function handleVerifyEmailCommand(VerifyEmailCommand $command) + public function handleVerifyEmailCommand(VerifyEmailCommand $command): void { /** @var IdentityApi $identity */ $identity = $this->eventSourcedRepository->load(new IdentityId($command->identityId)); @@ -341,7 +316,7 @@ public function handleVerifyEmailCommand(VerifyEmailCommand $command) } - public function handleProvePhoneRecoveryTokenPossessionCommand(ProvePhoneRecoveryTokenPossessionCommand $command) + public function handleProvePhoneRecoveryTokenPossessionCommand(ProvePhoneRecoveryTokenPossessionCommand $command): void { /** @var IdentityApi $identity */ $identity = $this->eventSourcedRepository->load(new IdentityId($command->identityId)); @@ -355,7 +330,7 @@ public function handleProvePhoneRecoveryTokenPossessionCommand(ProvePhoneRecover $this->eventSourcedRepository->save($identity); } - public function handlePromiseSafeStoreSecretTokenPossessionCommand(PromiseSafeStoreSecretTokenPossessionCommand $command) + public function handlePromiseSafeStoreSecretTokenPossessionCommand(PromiseSafeStoreSecretTokenPossessionCommand $command): void { /** @var IdentityApi $identity */ $identity = $this->eventSourcedRepository->load(new IdentityId($command->identityId)); @@ -370,7 +345,7 @@ public function handlePromiseSafeStoreSecretTokenPossessionCommand(PromiseSafeSt $this->eventSourcedRepository->save($identity); } - public function handleVetSecondFactorCommand(VetSecondFactorCommand $command) + public function handleVetSecondFactorCommand(VetSecondFactorCommand $command): void { /** @var IdentityApi $authority */ $authority = $this->eventSourcedRepository->load(new IdentityId($command->authorityId)); @@ -400,7 +375,7 @@ public function handleVetSecondFactorCommand(VetSecondFactorCommand $command) $this->eventSourcedRepository->save($registrant); } - public function handleRegisterSelfAssertedSecondFactorCommand(RegisterSelfAssertedSecondFactorCommand $command) + public function handleRegisterSelfAssertedSecondFactorCommand(RegisterSelfAssertedSecondFactorCommand $command): void { /** @var IdentityApi $identity */ $identity = $this->eventSourcedRepository->load(new IdentityId($command->identityId)); @@ -418,7 +393,7 @@ public function handleRegisterSelfAssertedSecondFactorCommand(RegisterSelfAssert $this->eventSourcedRepository->save($identity); } - public function handleSelfVetSecondFactorCommand(SelfVetSecondFactorCommand $command) + public function handleSelfVetSecondFactorCommand(SelfVetSecondFactorCommand $command): void { /** @var IdentityApi $identity */ $identity = $this->eventSourcedRepository->load(new IdentityId($command->identityId)); @@ -462,7 +437,7 @@ public function handleSelfVetSecondFactorCommand(SelfVetSecondFactorCommand $com $this->eventSourcedRepository->save($identity); } - public function handleMigrateVettedSecondFactorCommand(MigrateVettedSecondFactorCommand $command) + public function handleMigrateVettedSecondFactorCommand(MigrateVettedSecondFactorCommand $command): void { /** @var IdentityApi $sourceIdentity */ /** @var IdentityApi $targetIdentity */ @@ -489,7 +464,7 @@ public function handleMigrateVettedSecondFactorCommand(MigrateVettedSecondFactor $this->eventSourcedRepository->save($targetIdentity); } - public function handleRevokeOwnSecondFactorCommand(RevokeOwnSecondFactorCommand $command) + public function handleRevokeOwnSecondFactorCommand(RevokeOwnSecondFactorCommand $command): void { /** @var IdentityApi $identity */ $identity = $this->eventSourcedRepository->load(new IdentityId($command->identityId)); @@ -498,7 +473,7 @@ public function handleRevokeOwnSecondFactorCommand(RevokeOwnSecondFactorCommand $this->eventSourcedRepository->save($identity); } - public function handleRevokeRegistrantsSecondFactorCommand(RevokeRegistrantsSecondFactorCommand $command) + public function handleRevokeRegistrantsSecondFactorCommand(RevokeRegistrantsSecondFactorCommand $command): void { /** @var IdentityApi $identity */ $identity = $this->eventSourcedRepository->load(new IdentityId($command->identityId)); @@ -510,7 +485,7 @@ public function handleRevokeRegistrantsSecondFactorCommand(RevokeRegistrantsSeco $this->eventSourcedRepository->save($identity); } - public function handleRevokeOwnRecoveryTokenCommand(RevokeOwnRecoveryTokenCommand $command) + public function handleRevokeOwnRecoveryTokenCommand(RevokeOwnRecoveryTokenCommand $command): void { /** @var IdentityApi $identity */ $identity = $this->eventSourcedRepository->load(new IdentityId($command->identityId)); @@ -519,7 +494,7 @@ public function handleRevokeOwnRecoveryTokenCommand(RevokeOwnRecoveryTokenComman $this->eventSourcedRepository->save($identity); } - public function handleRevokeRegistrantsRecoveryTokenCommand(RevokeRegistrantsRecoveryTokenCommand $command) + public function handleRevokeRegistrantsRecoveryTokenCommand(RevokeRegistrantsRecoveryTokenCommand $command): void { /** @var IdentityApi $identity */ $identity = $this->eventSourcedRepository->load(new IdentityId($command->identityId)); @@ -531,12 +506,12 @@ public function handleRevokeRegistrantsRecoveryTokenCommand(RevokeRegistrantsRec $this->eventSourcedRepository->save($identity); } - public function handleSendSecondFactorRegistrationEmailCommand(SendSecondFactorRegistrationEmailCommand $command) + public function handleSendSecondFactorRegistrationEmailCommand(SendSecondFactorRegistrationEmailCommand $command): void { $this->registrationMailService->send($command->identityId, $command->secondFactorId); } - public function handleExpressLocalePreferenceCommand(ExpressLocalePreferenceCommand $command) + public function handleExpressLocalePreferenceCommand(ExpressLocalePreferenceCommand $command): void { $preferredLocale = new Locale($command->preferredLocale); $this->assertIsValidLocale($preferredLocale); @@ -551,7 +526,7 @@ public function handleExpressLocalePreferenceCommand(ExpressLocalePreferenceComm /** * @param Locale $locale */ - private function assertIsValidLocale(Locale $locale) + private function assertIsValidLocale(Locale $locale): void { if (!$this->configurableSettings->isSupportedLocale($locale)) { throw new UnsupportedLocaleException( @@ -560,7 +535,7 @@ private function assertIsValidLocale(Locale $locale) } } - private function assertSecondFactorIsAllowedFor(SecondFactorType $secondFactor, Institution $institution) + private function assertSecondFactorIsAllowedFor(SecondFactorType $secondFactor, Institution $institution): void { $allowedSecondFactorList = $this->allowedSecondFactorListService->getAllowedSecondFactorListFor( new ConfigurationInstitution($institution->getInstitution()) @@ -575,7 +550,7 @@ private function assertSecondFactorIsAllowedFor(SecondFactorType $secondFactor, } } - public function assertSelfAssertedTokensEnabled(Institution $institution) + public function assertSelfAssertedTokensEnabled(Institution $institution): void { $configurationInstitution = new ConfigurationInstitution( (string) $institution diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/RegistrationAuthorityCommandHandler.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/RegistrationAuthorityCommandHandler.php index 4dcf0edad..e4923c128 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/RegistrationAuthorityCommandHandler.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/RegistrationAuthorityCommandHandler.php @@ -25,6 +25,8 @@ use Surfnet\Stepup\Configuration\InstitutionConfiguration; use Surfnet\Stepup\Configuration\Value\InstitutionConfigurationId; use Surfnet\Stepup\Configuration\Value\Institution as ConfigurationInstitution; +use Surfnet\Stepup\Identity\Api\Identity; +use Surfnet\Stepup\Identity\EventSourcing\IdentityRepository; use Surfnet\Stepup\Identity\Value\ContactInformation; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\Institution; @@ -44,18 +46,15 @@ class RegistrationAuthorityCommandHandler extends SimpleCommandHandler { /** - * @var \Surfnet\Stepup\Identity\EventSourcing\IdentityRepository + * @var IdentityRepository */ - private $repository; - /** - * @var InstitutionConfigurationRepository - */ - private $institutionConfigurationRepository; + private RepositoryInterface $repository; + private InstitutionConfigurationRepository $institutionConfigurationRepository; /** * @var VettingTypeHintService; */ - private $vettingTypeHintService; + private VettingTypeHintService $vettingTypeHintService; public function __construct( RepositoryInterface $repository, @@ -67,9 +66,9 @@ public function __construct( $this->vettingTypeHintService = $hintService; } - public function handleAccreditIdentityCommand(AccreditIdentityCommand $command) + public function handleAccreditIdentityCommand(AccreditIdentityCommand $command): void { - /** @var \Surfnet\Stepup\Identity\Api\Identity $identity */ + /** @var Identity $identity */ $identity = $this->repository->load(new IdentityId($command->identityId)); $institutionConfiguration = $this->loadInstitutionConfigurationFor(new Institution($command->raInstitution)); @@ -87,9 +86,9 @@ public function handleAccreditIdentityCommand(AccreditIdentityCommand $command) $this->repository->save($identity); } - public function handleAmendRegistrationAuthorityInformationCommand(AmendRegistrationAuthorityInformationCommand $command) + public function handleAmendRegistrationAuthorityInformationCommand(AmendRegistrationAuthorityInformationCommand $command): void { - /** @var \Surfnet\Stepup\Identity\Api\Identity $identity */ + /** @var Identity $identity */ $identity = $this->repository->load(new IdentityId($command->identityId)); $identity->amendRegistrationAuthorityInformation( @@ -101,9 +100,9 @@ public function handleAmendRegistrationAuthorityInformationCommand(AmendRegistra $this->repository->save($identity); } - public function handleAppointRoleCommand(AppointRoleCommand $command) + public function handleAppointRoleCommand(AppointRoleCommand $command): void { - /** @var \Surfnet\Stepup\Identity\Api\Identity $identity */ + /** @var Identity $identity */ $identity = $this->repository->load(new IdentityId($command->identityId)); $institutionConfiguration = $this->loadInstitutionConfigurationFor(new Institution($command->raInstitution)); @@ -115,9 +114,9 @@ public function handleAppointRoleCommand(AppointRoleCommand $command) $this->repository->save($identity); } - public function handleRetractRegistrationAuthorityCommand(RetractRegistrationAuthorityCommand $command) + public function handleRetractRegistrationAuthorityCommand(RetractRegistrationAuthorityCommand $command): void { - /** @var \Surfnet\Stepup\Identity\Api\Identity $identity */ + /** @var Identity $identity */ $identity = $this->repository->load(new IdentityId($command->identityId)); $identity->retractRegistrationAuthority(new Institution($command->raInstitution)); @@ -125,7 +124,7 @@ public function handleRetractRegistrationAuthorityCommand(RetractRegistrationAut $this->repository->save($identity); } - public function handleSaveVettingTypeHintCommand(SaveVettingTypeHintCommand $command) + public function handleSaveVettingTypeHintCommand(SaveVettingTypeHintCommand $command): void { $identity = $this->repository->load(new IdentityId($command->identityId)); $collection = $this->vettingTypeHintService->collectionFrom($command->hints); @@ -141,7 +140,7 @@ public function handleSaveVettingTypeHintCommand(SaveVettingTypeHintCommand $com * @param string $commandId * @return RegistrationAuthorityRole */ - private function assertValidRoleAndConvertIfValid($role, $commandId) + private function assertValidRoleAndConvertIfValid($role, $commandId): RegistrationAuthorityRole { if ($role === 'ra') { return new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RA); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/ReminderEmailCommandHandler.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/ReminderEmailCommandHandler.php index 9c9168d5d..59a5a6395 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/ReminderEmailCommandHandler.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/ReminderEmailCommandHandler.php @@ -24,10 +24,7 @@ class ReminderEmailCommandHandler extends SimpleCommandHandler { - /** - * @var VerifiedSecondFactorReminderService - */ - private $verifiedSecondFactorReminderService; + private VerifiedSecondFactorReminderService $verifiedSecondFactorReminderService; /** * @param VerifiedSecondFactorReminderService $verifiedSecondFactorReminderService @@ -37,7 +34,7 @@ public function __construct(VerifiedSecondFactorReminderService $verifiedSecondF $this->verifiedSecondFactorReminderService = $verifiedSecondFactorReminderService; } - public function handleSendVerifiedSecondFactorRemindersCommand(SendVerifiedSecondFactorRemindersCommand $command) + public function handleSendVerifiedSecondFactorRemindersCommand(SendVerifiedSecondFactorRemindersCommand $command): void { $this->verifiedSecondFactorReminderService->sendReminders( $command->requestedAt, diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/RightToBeForgottenCommandHandler.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/RightToBeForgottenCommandHandler.php index de0180cf2..b781e728e 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/RightToBeForgottenCommandHandler.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/RightToBeForgottenCommandHandler.php @@ -32,25 +32,16 @@ final class RightToBeForgottenCommandHandler extends SimpleCommandHandler { - /** - * @var \Surfnet\Stepup\Identity\EventSourcing\IdentityRepository - */ - private $repository; + private IdentityRepository $repository; /** - * @var \Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\IdentityRepository + * @var ApiIdentityRepository */ - private $apiIdentityRepository; + private ApiIdentityRepository $apiIdentityRepository; - /** - * @var \Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Service\SensitiveDataService - */ - private $sensitiveDataService; + private SensitiveDataService $sensitiveDataService; - /** - * @var \Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\SraaRepository - */ - private $sraaRepository; + private SraaRepository $sraaRepository; /** * @param IdentityRepository $repository @@ -70,7 +61,7 @@ public function __construct( $this->sraaRepository = $sraaRepository; } - public function handleForgetIdentityCommand(ForgetIdentityCommand $command) + public function handleForgetIdentityCommand(ForgetIdentityCommand $command): void { $nameId = new NameId($command->nameId); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/WhitelistCommandHandler.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/WhitelistCommandHandler.php index e908adc49..f318414d6 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/WhitelistCommandHandler.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/WhitelistCommandHandler.php @@ -19,9 +19,11 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\CommandHandler; use Broadway\CommandHandling\SimpleCommandHandler; +use Broadway\Domain\AggregateRoot; use Broadway\Repository\AggregateNotFoundException; use Broadway\Repository\Repository as RepositoryInterface; use Surfnet\Stepup\Identity\Collection\InstitutionCollection; +use Surfnet\Stepup\Identity\EventSourcing\WhitelistRepository; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\Stepup\Identity\Whitelist; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\AddToWhitelistCommand; @@ -31,9 +33,9 @@ class WhitelistCommandHandler extends SimpleCommandHandler { /** - * @var \Surfnet\Stepup\Identity\EventSourcing\WhitelistRepository + * @var WhitelistRepository */ - private $repository; + private RepositoryInterface $repository; /** * @param RepositoryInterface $repository @@ -46,7 +48,7 @@ public function __construct(RepositoryInterface $repository) /** * @param ReplaceWhitelistCommand $command */ - public function handleReplaceWhitelistCommand(ReplaceWhitelistCommand $command) + public function handleReplaceWhitelistCommand(ReplaceWhitelistCommand $command): void { $whitelist = $this->getWhitelist(); @@ -59,7 +61,7 @@ public function handleReplaceWhitelistCommand(ReplaceWhitelistCommand $command) /** * @param AddToWhitelistCommand $command */ - public function handleAddToWhitelistCommand(AddToWhitelistCommand $command) + public function handleAddToWhitelistCommand(AddToWhitelistCommand $command): void { $whitelist = $this->getWhitelist(); @@ -72,7 +74,7 @@ public function handleAddToWhitelistCommand(AddToWhitelistCommand $command) /** * @param RemoveFromWhitelistCommand $command */ - public function handleRemoveFromWhitelistCommand(RemoveFromWhitelistCommand $command) + public function handleRemoveFromWhitelistCommand(RemoveFromWhitelistCommand $command): void { $whitelist = $this->getWhitelist(); @@ -85,7 +87,7 @@ public function handleRemoveFromWhitelistCommand(RemoveFromWhitelistCommand $com /** * @return Whitelist */ - private function getWhitelist() + private function getWhitelist(): AggregateRoot|Whitelist { try { return $this->repository->load(Whitelist::WHITELIST_AGGREGATE_ID); @@ -98,9 +100,9 @@ private function getWhitelist() * @param array $institutions * @return Institution[] */ - private function mapArrayToInstitutions(array $institutions) + private function mapArrayToInstitutions(array $institutions): array { - return array_map(function ($institutionName) { + return array_map(function ($institutionName): Institution { return new Institution($institutionName); }, $institutions); } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/EmailVerificationMailService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/EmailVerificationMailService.php index 1a0417a44..fa58e935f 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/EmailVerificationMailService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/EmailVerificationMailService.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Service; use Assert\Assertion; +use Assert\AssertionFailedException; use Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\Service\EmailTemplateService; use Surfnet\StepupMiddleware\CommandHandlingBundle\Value\Sender; use Symfony\Bridge\Twig\Mime\TemplatedEmail; @@ -34,38 +35,23 @@ final class EmailVerificationMailService */ private $translator; - /** - * @var EmailTemplateService - */ - private $emailTemplateService; + private EmailTemplateService $emailTemplateService; - /** - * @var string - */ - private $emailVerificationUrlTemplate; + private string $emailVerificationUrlTemplate; - /** - * @var string - */ - private $fallbackLocale; + private string $fallbackLocale; /** * @var Mailer */ - private $mailer; + private Mailer $mailer; - /** - * @var Sender - */ - private $sender; + private Sender $sender; - /** - * @var string - */ - private $selfServiceUrl; + private string $selfServiceUrl; /** - * @throws \Assert\AssertionFailedException + * @throws AssertionFailedException */ public function __construct( Mailer $mailer, diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RecoveryTokenMailService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RecoveryTokenMailService.php index 73b104f00..fb11deb8e 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RecoveryTokenMailService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RecoveryTokenMailService.php @@ -38,40 +38,22 @@ */ class RecoveryTokenMailService { - /** - * @var Mailer - */ - private $mailer; + private Mailer $mailer; - /** - * @var Sender - */ - private $sender; + private Sender $sender; /** * @var TranslatorInterface */ private $translator; - /** - * @var EmailTemplateService - */ - private $emailTemplateService; + private EmailTemplateService $emailTemplateService; - /** - * @var string - */ - private $fallbackLocale; + private string $fallbackLocale; - /** - * @var string - */ - private $selfServiceUrl; + private string $selfServiceUrl; - /** - * @var LoggerInterface - */ - private $logger; + private LoggerInterface $logger; public function __construct( Mailer $mailer, @@ -100,7 +82,7 @@ public function sendRevoked( RecoveryTokenType $recoveryTokenType, RecoveryTokenId $tokenId, bool $revokedByRa - ) { + ): void { $this->logger->notice( sprintf('Sending a recovery token revoked mail message for token type %s', $recoveryTokenType) ); @@ -155,7 +137,7 @@ public function sendRevoked( $this->mailer->send($message); } - public function sendCreated(Locale $locale, CommonName $commonName, Email $email) + public function sendCreated(Locale $locale, CommonName $commonName, Email $email): void { $this->logger->notice('Sending a recovery token created mail message'); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php index d6c0aa333..28c51379d 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php @@ -45,57 +45,30 @@ class RegistrationMailService /** * @var Mailer */ - private $mailer; + private Mailer $mailer; - /** - * @var Sender - */ - private $sender; + private Sender $sender; /** * @var TranslatorInterface */ private $translator; - /** - * @var EmailTemplateService - */ - private $emailTemplateService; + private EmailTemplateService $emailTemplateService; - /** - * @var string - */ - private $fallbackLocale; + private string $fallbackLocale; - /** - * @var string - */ - private $selfServiceUrl; + private string $selfServiceUrl; - /** - * @var IdentityService - */ - private $identityService; + private IdentityService $identityService; - /** - * @var SecondFactorService - */ - private $secondFactorService; + private SecondFactorService $secondFactorService; - /** - * @var RaLocationService - */ - private $raLocationsService; + private RaLocationService $raLocationsService; - /** - * @var RaListingService - */ - private $raListingService; + private RaListingService $raListingService; - /** - * @var LoggerInterface - */ - private $logger; + private LoggerInterface $logger; /** * @SuppressWarnings(PHPMD.ExcessiveParameterList) @@ -130,7 +103,7 @@ public function __construct( $this->logger = $logger; } - public function send(string $identityId, string $secondFactorId) + public function send(string $identityId, string $secondFactorId): void { $this->logger->notice(sprintf('Start processing of a registration email for %s', $identityId)); $identity = $this->identityService->find($identityId); @@ -172,7 +145,7 @@ public function send(string $identityId, string $secondFactorId) return; } - $rasWithoutRaas = array_filter($ras, function (RegistrationAuthorityCredentials $ra) { + $rasWithoutRaas = array_filter($ras, function (RegistrationAuthorityCredentials $ra): bool { return !$ra->isRaa(); }); $this->logger->notice( @@ -197,7 +170,7 @@ private function sendRegistrationEmailWithRas( string $registrationCode, DateTime $expirationDate, array $ras - ) { + ): void { $subject = $this->translator->trans( 'ss.mail.registration_email.subject', ['%commonName%' => $commonName], @@ -247,7 +220,7 @@ private function sendRegistrationEmailWithRaLocations( string $registrationCode, DateTime $expirationDate, array $raLocations - ) { + ): void { $subject = $this->translator->trans( 'ss.mail.registration_email.subject', ['%commonName%' => $commonName], diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorRevocationMailService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorRevocationMailService.php index 669505f1c..f733d0534 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorRevocationMailService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorRevocationMailService.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Service; use Assert\Assertion; +use Assert\AssertionFailedException; use Surfnet\Stepup\Identity\Value\CommonName; use Surfnet\Stepup\Identity\Value\Email; use Surfnet\Stepup\Identity\Value\Locale; @@ -41,40 +42,25 @@ final class SecondFactorRevocationMailService /** * @var Mailer */ - private $mailer; + private Mailer $mailer; - /** - * @var Sender - */ - private $sender; + private Sender $sender; /** * @var TranslatorInterface */ private $translator; - /** - * @var \Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\Service\EmailTemplateService - */ - private $emailTemplateService; + private EmailTemplateService $emailTemplateService; - /** - * @var string - */ - private $fallbackLocale; + private string $fallbackLocale; - /** - * @var string - */ - private $selfServiceUrl; + private string $selfServiceUrl; - /** - * @var \Surfnet\StepupMiddleware\MiddlewareBundle\Service\SecondFactorDisplayNameResolverService - */ - private $displayNameResolver; + private SecondFactorDisplayNameResolverService $displayNameResolver; /** - * @throws \Assert\AssertionFailedException + * @throws AssertionFailedException */ public function __construct( Mailer $mailer, @@ -106,7 +92,7 @@ public function sendVettedSecondFactorRevokedByRaEmail( Email $email, SecondFactorType $secondFactorType, SecondFactorIdentifier $secondFactorIdentifier - ) { + ): void { $subject = $this->translator->trans( 'mw.mail.second_factor_revoked.subject', [ @@ -151,7 +137,7 @@ public function sendVettedSecondFactorRevokedByRegistrantEmail( Email $email, SecondFactorType $secondFactorType, SecondFactorIdentifier $secondFactorIdentifier - ) { + ): void { $subject = $this->translator->trans( 'mw.mail.second_factor_revoked.subject', [ diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorVettedMailService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorVettedMailService.php index d163b032d..1844e7ec9 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorVettedMailService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorVettedMailService.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Service; use Assert\Assertion; +use Assert\AssertionFailedException; use Surfnet\Stepup\Identity\Value\CommonName; use Surfnet\Stepup\Identity\Value\Email; use Surfnet\Stepup\Identity\Value\Locale; @@ -34,35 +35,23 @@ final class SecondFactorVettedMailService /** * @var Mailer */ - private $mailer; + private Mailer $mailer; - /** - * @var Sender - */ - private $sender; + private Sender $sender; /** * @var TranslatorInterface */ private $translator; - /** - * @var \Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\Service\EmailTemplateService - */ - private $emailTemplateService; + private EmailTemplateService $emailTemplateService; - /** - * @var string - */ - private $fallbackLocale; + private string $fallbackLocale; - /** - * @var string - */ - private $selfServiceUrl; + private string $selfServiceUrl; /** - * @throws \Assert\AssertionFailedException + * @throws AssertionFailedException */ public function __construct( Mailer $mailer, @@ -86,7 +75,7 @@ public function sendVettedEmail( Locale $locale, CommonName $commonName, Email $email - ) { + ): void { $subject = $this->translator->trans( 'ss.mail.vetted_email.subject', ['%commonName%' => $commonName->getCommonName(), '%email%' => $email->getEmail()], diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/VettingTypeHintService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/VettingTypeHintService.php index db6e69c94..9acaa566b 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/VettingTypeHintService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/VettingTypeHintService.php @@ -28,20 +28,11 @@ class VettingTypeHintService { - /** - * @var VettingTypeHintRepository - */ - private $repository; + private VettingTypeHintRepository $repository; - /** - * @var array - */ - private $locales; + private array $locales; - /** - * @var LoggerInterface - */ - private $logger; + private LoggerInterface $logger; public function __construct( VettingTypeHintRepository $repository, diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/AuthorizingStage.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/AuthorizingStage.php index 0c9db7427..a1140409b 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/AuthorizingStage.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/AuthorizingStage.php @@ -29,15 +29,9 @@ class AuthorizingStage implements Stage { - /** - * @var LoggerInterface - */ - private $logger; + private LoggerInterface $logger; - /** - * @var AuthorizationCheckerInterface - */ - private $authorizationChecker; + private AuthorizationCheckerInterface $authorizationChecker; /** * @param LoggerInterface $logger @@ -49,7 +43,7 @@ public function __construct(LoggerInterface $logger, AuthorizationCheckerInterfa $this->authorizationChecker = $authorizationChecker; } - public function process(Command $command) + public function process(Command $command): Command { $this->logger->debug(sprintf('Processing authorization for command "%s"', $command)); @@ -95,7 +89,7 @@ public function process(Command $command) * @param array $rolesToCheck * @return bool */ - private function clientHasAtLeastOneRole(array $rolesToCheck) + private function clientHasAtLeastOneRole(array $rolesToCheck): bool { foreach ($rolesToCheck as $role) { if ($this->authorizationChecker->isGranted([$role])) { diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/DispatchStage.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/DispatchStage.php index 5420e512e..4c3f3f3e4 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/DispatchStage.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/DispatchStage.php @@ -24,15 +24,9 @@ class DispatchStage implements Stage { - /** - * @var CommandBus - */ - private $commandBus; + private CommandBus $commandBus; - /** - * @var LoggerInterface - */ - private $logger; + private LoggerInterface $logger; /** * @param LoggerInterface $logger @@ -44,7 +38,7 @@ public function __construct(LoggerInterface $logger, CommandBus $commandBus) $this->commandBus = $commandBus; } - public function process(Command $command) + public function process(Command $command): Command { $this->logger->debug(sprintf('Dispatching command "%s" for handling', $command)); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/EventDispatchingStage.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/EventDispatchingStage.php index 7e45e64b8..4bc560c41 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/EventDispatchingStage.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/EventDispatchingStage.php @@ -24,15 +24,9 @@ class EventDispatchingStage implements Stage { - /** - * @var LoggerInterface - */ - private $logger; + private LoggerInterface $logger; - /** - * @var BufferedEventBus - */ - private $bufferedEventBus; + private BufferedEventBus $bufferedEventBus; public function __construct(LoggerInterface $logger, BufferedEventBus $bufferedEventBus) { @@ -40,7 +34,7 @@ public function __construct(LoggerInterface $logger, BufferedEventBus $bufferedE $this->bufferedEventBus = $bufferedEventBus; } - public function process(Command $command) + public function process(Command $command): Command { $this->logger->debug(sprintf('Dispatching Events for "%s"', $command)); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Exception/InvalidCommandException.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Exception/InvalidCommandException.php index ebea66d3f..a0ce7153c 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Exception/InvalidCommandException.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Exception/InvalidCommandException.php @@ -18,22 +18,24 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\Exception; +use Exception; +use RuntimeException; use Symfony\Component\Validator\ConstraintViolationInterface; use Symfony\Component\Validator\ConstraintViolationListInterface; -class InvalidCommandException extends \RuntimeException implements ProcessingAbortedException +class InvalidCommandException extends RuntimeException implements ProcessingAbortedException { /** * @var string[] */ - private $errors; + private array $errors; - public static function createFromViolations(ConstraintViolationListInterface $violations) + public static function createFromViolations(ConstraintViolationListInterface $violations): self { return new self(self::mapViolationsToErrorStrings($violations)); } - public function __construct(array $errors, $code = 0, \Exception $previous = null) + public function __construct(array $errors, $code = 0, Exception $previous = null) { parent::__construct(sprintf('Command is invalid: %s', join('; ', $errors)), $code, $previous); @@ -52,7 +54,7 @@ public function getErrors() * @param ConstraintViolationListInterface $violations * @return array */ - private static function mapViolationsToErrorStrings(ConstraintViolationListInterface $violations) + private static function mapViolationsToErrorStrings(ConstraintViolationListInterface $violations): array { $errors = []; diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/StagedPipeline.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/StagedPipeline.php index ba61652ec..d63b49d06 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/StagedPipeline.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/StagedPipeline.php @@ -26,12 +26,9 @@ class StagedPipeline implements Pipeline /** * @var Stage[] */ - private $stages = []; + private array $stages = []; - /** - * @var LoggerInterface - */ - private $logger; + private LoggerInterface $logger; public function __construct(LoggerInterface $logger) { @@ -61,7 +58,7 @@ public function process(Command $command) * * @param Stage $stage */ - public function addStage(Stage $stage) + public function addStage(Stage $stage): void { $this->stages[] = $stage; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/TransactionAwarePipeline.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/TransactionAwarePipeline.php index 1465d16a5..401f4486c 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/TransactionAwarePipeline.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/TransactionAwarePipeline.php @@ -19,30 +19,19 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline; use Doctrine\DBAL\Driver\Connection; +use Exception; use Psr\Log\LoggerInterface; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; class TransactionAwarePipeline implements Pipeline { - /** - * @var Pipeline - */ - private $innerPipeline; + private Pipeline $innerPipeline; - /** - * @var Connection - */ - private $middlewareConnection; + private Connection $middlewareConnection; - /** - * @var Connection - */ - private $gatewayConnection; + private Connection $gatewayConnection; - /** - * @var LoggerInterface - */ - private $logger; + private LoggerInterface $logger; /** * @param LoggerInterface $logger @@ -81,7 +70,7 @@ public function process(Command $command) $this->middlewareConnection->commit(); $this->gatewayConnection->commit(); - } catch (\Exception $e) { + } catch (Exception $e) { // log at highest level if we may have a split head in the db-cluster... if (strpos($e->getMessage(), 'ER_UNKNOWN_COM_ERROR')) { $this->logger->emergency( diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/ValidationStage.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/ValidationStage.php index b39237f1c..d1e9b254d 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/ValidationStage.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/ValidationStage.php @@ -25,15 +25,9 @@ class ValidationStage implements Stage { - /** - * @var LoggerInterface - */ - private $logger; + private LoggerInterface $logger; - /** - * @var ValidatorInterface - */ - private $validator; + private ValidatorInterface $validator; /** * @param LoggerInterface $logger @@ -45,7 +39,7 @@ public function __construct(LoggerInterface $logger, ValidatorInterface $validat $this->validator = $validator; } - public function process(Command $command) + public function process(Command $command): Command { $this->logger->debug(sprintf('Processing validation for "%s"', $command)); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/EmailVerificationEmailProcessor.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/EmailVerificationEmailProcessor.php index 8b0b243be..cfd4222be 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/EmailVerificationEmailProcessor.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/EmailVerificationEmailProcessor.php @@ -26,17 +26,14 @@ final class EmailVerificationEmailProcessor extends Processor { - /** - * @var EmailVerificationMailService - */ - private $emailVerificationMailService; + private EmailVerificationMailService $emailVerificationMailService; public function __construct(EmailVerificationMailService $emailVerificationMailService) { $this->emailVerificationMailService = $emailVerificationMailService; } - public function handlePhonePossessionProvenEvent(PhonePossessionProvenEvent $event) + public function handlePhonePossessionProvenEvent(PhonePossessionProvenEvent $event): void { if ($event->emailVerificationRequired !== false) { $this->emailVerificationMailService->sendEmailVerificationEmail( @@ -48,7 +45,7 @@ public function handlePhonePossessionProvenEvent(PhonePossessionProvenEvent $eve } } - public function handleYubikeyPossessionProvenEvent(YubikeyPossessionProvenEvent $event) + public function handleYubikeyPossessionProvenEvent(YubikeyPossessionProvenEvent $event): void { if ($event->emailVerificationRequired !== false) { $this->emailVerificationMailService->sendEmailVerificationEmail( @@ -60,7 +57,7 @@ public function handleYubikeyPossessionProvenEvent(YubikeyPossessionProvenEvent } } - public function handleGssfPossessionProvenEvent(GssfPossessionProvenEvent $event) + public function handleGssfPossessionProvenEvent(GssfPossessionProvenEvent $event): void { if ($event->emailVerificationRequired !== false) { $this->emailVerificationMailService->sendEmailVerificationEmail( diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/RecoveryTokenEmailProcessor.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/RecoveryTokenEmailProcessor.php index f1f730d9f..a01683d9a 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/RecoveryTokenEmailProcessor.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/RecoveryTokenEmailProcessor.php @@ -28,15 +28,9 @@ final class RecoveryTokenEmailProcessor extends Processor { - /** - * @var RecoveryTokenMailService - */ - private $mailService; + private RecoveryTokenMailService $mailService; - /** - * @var IdentityService - */ - private $identityService; + private IdentityService $identityService; public function __construct( RecoveryTokenMailService $recoveryTokenMailService, @@ -48,7 +42,7 @@ public function __construct( public function handleCompliedWithRecoveryCodeRevocationEvent( CompliedWithRecoveryCodeRevocationEvent $event - ) { + ): void { $identity = $this->identityService->find($event->identityId->getIdentityId()); if ($identity === null) { @@ -65,7 +59,7 @@ public function handleCompliedWithRecoveryCodeRevocationEvent( ); } - public function handleRecoveryTokenRevokedEvent(RecoveryTokenRevokedEvent $event) + public function handleRecoveryTokenRevokedEvent(RecoveryTokenRevokedEvent $event): void { $identity = $this->identityService->find($event->identityId->getIdentityId()); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/SecondFactorRevocationEmailProcessor.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/SecondFactorRevocationEmailProcessor.php index b23b429c2..745baea88 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/SecondFactorRevocationEmailProcessor.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/SecondFactorRevocationEmailProcessor.php @@ -26,15 +26,9 @@ final class SecondFactorRevocationEmailProcessor extends Processor { - /** - * @var SecondFactorRevocationMailService - */ - private $mailService; + private SecondFactorRevocationMailService $mailService; - /** - * @var IdentityService - */ - private $identityService; + private IdentityService $identityService; /** * @param SecondFactorRevocationMailService $secondFactorRevocationMailService @@ -50,7 +44,7 @@ public function __construct( public function handleCompliedWithVettedSecondFactorRevocationEvent( CompliedWithVettedSecondFactorRevocationEvent $event - ) { + ): void { $identity = $this->identityService->find($event->identityId->getIdentityId()); if ($identity === null) { @@ -66,7 +60,7 @@ public function handleCompliedWithVettedSecondFactorRevocationEvent( ); } - public function handleVettedSecondFactorRevokedEvent(SecondFactorRevokedEvent $event) + public function handleVettedSecondFactorRevokedEvent(SecondFactorRevokedEvent $event): void { $identity = $this->identityService->find($event->identityId->getIdentityId()); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/SecondFactorVettedEmailProcessor.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/SecondFactorVettedEmailProcessor.php index 3b7be414e..d9eef78d9 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/SecondFactorVettedEmailProcessor.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/SecondFactorVettedEmailProcessor.php @@ -25,22 +25,19 @@ final class SecondFactorVettedEmailProcessor extends Processor { - /** - * @var SecondFactorVettedMailService - */ - private $secondFactorVettedMailService; + private SecondFactorVettedMailService $secondFactorVettedMailService; public function __construct(SecondFactorVettedMailService $secondFactorVettedMailService) { $this->secondFactorVettedMailService = $secondFactorVettedMailService; } - public function handleSecondFactorVettedEvent(SecondFactorVettedEvent $event) + public function handleSecondFactorVettedEvent(SecondFactorVettedEvent $event): void { $this->secondFactorVettedMailService->sendVettedEmail($event->preferredLocale, $event->commonName, $event->email); } - public function handleSecondFactorVettedWithoutTokenProofOfPossession(SecondFactorVettedWithoutTokenProofOfPossession $event) + public function handleSecondFactorVettedWithoutTokenProofOfPossession(SecondFactorVettedWithoutTokenProofOfPossession $event): void { $this->secondFactorVettedMailService->sendVettedEmail($event->preferredLocale, $event->commonName, $event->email); } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessage.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessage.php index 0009673a3..7ad325ef3 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessage.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessage.php @@ -24,15 +24,9 @@ class SensitiveDataMessage { - /** - * @var IdentityId - */ - private $identityId; + private IdentityId $identityId; - /** - * @var int - */ - private $playhead; + private int $playhead; /** * @var SensitiveData @@ -58,7 +52,7 @@ public function __construct(string $identityId, $playhead, SensitiveData $sensit /** * Forgets all contained sensitive data. */ - public function forget() + public function forget(): void { $this->sensitiveData = $this->sensitiveData->forget(); } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessageStream.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessageStream.php index ae40ee5cd..71088464f 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessageStream.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessageStream.php @@ -27,10 +27,7 @@ class SensitiveDataMessageStream implements IteratorAggregate { - /** - * @var array - */ - private $messages; + private array $messages; /** * @param SensitiveDataMessage[] $messages @@ -40,7 +37,7 @@ public function __construct(array $messages) $this->messages = $messages; } - public function applyToDomainEventStream(DomainEventStream $domainEventStream) + public function applyToDomainEventStream(DomainEventStream $domainEventStream): void { $sensitiveDataMap = $this->createSensitiveDataMap($this->messages); @@ -62,7 +59,7 @@ public function applyToDomainEventStream(DomainEventStream $domainEventStream) } } - public function forget() + public function forget(): void { foreach ($this->messages as $message) { $message->forget(); @@ -78,7 +75,7 @@ public function getIterator() * @param DomainMessage $domainMessage * @param SensitiveDataMessage|null $sensitiveDataMessage */ - private function setSensitiveData(DomainMessage $domainMessage, SensitiveDataMessage $sensitiveDataMessage = null) + private function setSensitiveData(DomainMessage $domainMessage, SensitiveDataMessage $sensitiveDataMessage = null): void { $event = $domainMessage->getPayload(); $eventIsForgettable = $event instanceof Forgettable; @@ -118,7 +115,7 @@ private function setSensitiveData(DomainMessage $domainMessage, SensitiveDataMes * @param SensitiveDataMessage[] $messages * @return SensitiveDataMessage[] The same messages, but indexed by their playheads. */ - private function createSensitiveDataMap(array $messages) + private function createSensitiveDataMap(array $messages): array { $map = []; foreach ($messages as $message) { diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventStore/SensitiveDataEventStoreDecorator.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventStore/SensitiveDataEventStoreDecorator.php index b55d12abf..a3ac8abce 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventStore/SensitiveDataEventStoreDecorator.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventStore/SensitiveDataEventStoreDecorator.php @@ -36,12 +36,9 @@ final class SensitiveDataEventStoreDecorator implements EventStoreInterface /** * @var EventStoreInterface */ - private $decoratedEventStore; + private EventStoreInterface $decoratedEventStore; - /** - * @var SensitiveDataMessageRepository - */ - private $sensitiveDataMessageRepository; + private SensitiveDataMessageRepository $sensitiveDataMessageRepository; /** * @param EventStoreInterface $decoratedEventStore @@ -112,7 +109,7 @@ public function loadFromPlayhead($id, int $playhead): DomainEventStreamInterface /** * @param DomainEventStreamInterface $stream */ - public function assertIdentityAggregate(DomainEventStreamInterface $stream) + public function assertIdentityAggregate(DomainEventStreamInterface $stream): void { foreach ($stream as $message) { if (!$message->getPayload() instanceof IdentityEvent) { diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/Repository/SensitiveDataMessageRepository.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/Repository/SensitiveDataMessageRepository.php index adcc7948a..dac1d9eca 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/Repository/SensitiveDataMessageRepository.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/Repository/SensitiveDataMessageRepository.php @@ -29,10 +29,7 @@ class SensitiveDataMessageRepository { - /** - * @var Connection - */ - private $connection; + private Connection $connection; public function __construct(Connection $connection) { @@ -45,7 +42,7 @@ public function __construct(Connection $connection) * @param IdentityId $identityId * @return SensitiveDataMessageStream */ - public function findByIdentityId(IdentityId $identityId) + public function findByIdentityId(IdentityId $identityId): SensitiveDataMessageStream { $sql = 'SELECT identity_id, playhead, sensitive_data FROM event_stream_sensitive_data @@ -53,7 +50,7 @@ public function findByIdentityId(IdentityId $identityId) ORDER BY playhead ASC'; $rows = $this->connection->fetchAll($sql, ['identity_id' => (string) $identityId]); - $messages = array_map(function (array $row) use ($identityId) { + $messages = array_map(function (array $row) use ($identityId): SensitiveDataMessage { return new SensitiveDataMessage( $identityId, (int) $row['playhead'], @@ -68,7 +65,7 @@ public function findByIdentityId(IdentityId $identityId) * @param SensitiveDataMessageStream $sensitiveDataMessageStream * @return void */ - public function append(SensitiveDataMessageStream $sensitiveDataMessageStream) + public function append(SensitiveDataMessageStream $sensitiveDataMessageStream): void { $this->connection->beginTransaction(); @@ -92,7 +89,7 @@ public function append(SensitiveDataMessageStream $sensitiveDataMessageStream) * @param SensitiveDataMessageStream $sensitiveDataMessageStream * @return void */ - public function modify(SensitiveDataMessageStream $sensitiveDataMessageStream) + public function modify(SensitiveDataMessageStream $sensitiveDataMessageStream): void { $this->connection->beginTransaction(); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/SensitiveData.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/SensitiveData.php index 0ba227060..b44c49bce 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/SensitiveData.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/SensitiveData.php @@ -34,46 +34,28 @@ class SensitiveData implements SerializableInterface { - /** - * @var CommonName|null - */ - private $commonName; + private ?CommonName $commonName = null; - /** - * @var Email|null - */ - private $email; + private ?Email $email = null; - /** - * @var SecondFactorIdentifier|null - */ - private $secondFactorIdentifier; + private ?SecondFactorIdentifier $secondFactorIdentifier = null; /** * @var SecondFactorType|null */ private $secondFactorType; - /** - * @var VettingType - */ - private $vettingType; + private ?VettingType $vettingType = null; - /** - * @var RecoveryTokenType - */ - private $recoveryTokenType; + private ?RecoveryTokenType $recoveryTokenType = null; - /** - * @var RecoveryTokenIdentifier - */ - private $recoveryTokenIdentifier; + private ?RecoveryTokenIdentifier $recoveryTokenIdentifier = null; /** * @param CommonName $commonName * @return SensitiveData */ - public function withCommonName(CommonName $commonName) + public function withCommonName(CommonName $commonName): static { $clone = clone $this; $clone->commonName = $commonName; @@ -85,7 +67,7 @@ public function withCommonName(CommonName $commonName) * @param Email $email * @return SensitiveData */ - public function withEmail(Email $email) + public function withEmail(Email $email): static { $clone = clone $this; $clone->email = $email; @@ -101,7 +83,7 @@ public function withEmail(Email $email) public function withSecondFactorIdentifier( SecondFactorIdentifier $secondFactorIdentifier, SecondFactorType $secondFactorType - ) { + ): static { $clone = clone $this; $clone->secondFactorType = $secondFactorType; $clone->secondFactorIdentifier = $secondFactorIdentifier; @@ -133,7 +115,7 @@ public function withVettingType(VettingType $vettingType): self * * @return SensitiveData */ - public function forget() + public function forget(): self { $forgotten = new self(); $forgotten->secondFactorType = $this->secondFactorType; diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/Service/SensitiveDataService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/Service/SensitiveDataService.php index 7d2652f41..95812739a 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/Service/SensitiveDataService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/Service/SensitiveDataService.php @@ -23,17 +23,14 @@ class SensitiveDataService { - /** - * @var \Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Repository\SensitiveDataMessageRepository - */ - private $sensitiveDataMessageRepository; + private SensitiveDataMessageRepository $sensitiveDataMessageRepository; public function __construct(SensitiveDataMessageRepository $sensitiveDataMessageRepository) { $this->sensitiveDataMessageRepository = $sensitiveDataMessageRepository; } - public function forgetSensitiveData(IdentityId $identityId) + public function forgetSensitiveData(IdentityId $identityId): void { $sensitiveDataMessageStream = $this->sensitiveDataMessageRepository->findByIdentityId($identityId); $sensitiveDataMessageStream->forget(); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SurfnetStepupMiddlewareCommandHandlingBundle.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SurfnetStepupMiddlewareCommandHandlingBundle.php index 91e9afeaa..45fd35dfe 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SurfnetStepupMiddlewareCommandHandlingBundle.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SurfnetStepupMiddlewareCommandHandlingBundle.php @@ -26,7 +26,7 @@ class SurfnetStepupMiddlewareCommandHandlingBundle extends Bundle { - public function build(ContainerBuilder $container) + public function build(ContainerBuilder $container): void { parent::build($container); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Command/AbstractCommandTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Command/AbstractCommandTest.php index 4174885e6..ce5689d20 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Command/AbstractCommandTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Command/AbstractCommandTest.php @@ -26,7 +26,7 @@ class AbstractCommandTest extends UnitTest * @test * @group command */ - public function to_string_generates_command_identifiable_information() + public function to_string_generates_command_identifiable_information(): void { $command = new FixedUuidStubCommand(); $uuid = $command->UUID; diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/CommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/CommandHandlerTest.php index a5611e663..4033f298c 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/CommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/CommandHandlerTest.php @@ -26,7 +26,7 @@ abstract class CommandHandlerTest extends CommandHandlerScenarioTestCase /** * @return string */ - protected static function uuid() + protected static function uuid(): string { return (string) Uuid::uuid4(); } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php index bd59ee15e..ee7ff6396 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php @@ -45,7 +45,7 @@ final class ConfigurationCommandHandlerTest extends CommandHandlerTest * @test * @group command-handler */ - public function configuration_can_be_initialised() + public function configuration_can_be_initialised(): void { $configuration = [ 'gateway' => [ @@ -70,7 +70,7 @@ public function configuration_can_be_initialised() * @test * @group command-handler */ - public function configuration_can_be_updated() + public function configuration_can_be_updated(): void { $configuration1 = [ 'gateway' => [ @@ -144,7 +144,7 @@ protected function createCommandHandler(EventStoreInterface $eventStore, EventBu * @param array $configuration * @return UpdateConfigurationCommand */ - private function createUpdateCommand(array $configuration) + private function createUpdateCommand(array $configuration): UpdateConfigurationCommand { $command = new UpdateConfigurationCommand(); $command->configuration = json_encode($configuration); @@ -155,7 +155,7 @@ private function createUpdateCommand(array $configuration) /** * @return NewConfigurationCreatedEvent */ - private function createNewConfigurationCreatedEvent() + private function createNewConfigurationCreatedEvent(): NewConfigurationCreatedEvent { return new NewConfigurationCreatedEvent(self::CID); } @@ -165,7 +165,7 @@ private function createNewConfigurationCreatedEvent() * @param array $oldConfiguration * @return array */ - private function createConfigurationUpdatedEvents(array $newConfiguration, array $oldConfiguration = null) + private function createConfigurationUpdatedEvents(array $newConfiguration, array $oldConfiguration = null): array { return [ new ConfigurationUpdatedEvent(self::CID, $newConfiguration, $oldConfiguration), diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/InstitutionConfigurationCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/InstitutionConfigurationCommandHandlerTest.php index e2fa22ee4..957515742 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/InstitutionConfigurationCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/InstitutionConfigurationCommandHandlerTest.php @@ -23,6 +23,7 @@ use Broadway\EventHandling\EventBus as EventBusInterface; use Broadway\EventSourcing\AggregateFactory\PublicConstructorAggregateFactory; use Broadway\EventStore\EventStore as EventStoreInterface; +use Broadway\Repository\AggregateNotFoundException; use Surfnet\Stepup\Configuration\Event\AllowedSecondFactorListUpdatedEvent; use Surfnet\Stepup\Configuration\Event\InstitutionConfigurationRemovedEvent; use Surfnet\Stepup\Configuration\Event\NewInstitutionConfigurationCreatedEvent; @@ -54,6 +55,7 @@ use Surfnet\Stepup\Configuration\Value\UseRaLocationsOption; use Surfnet\Stepup\Configuration\Value\InstitutionAuthorizationOption; use Surfnet\Stepup\Configuration\Value\VerifyEmailOption; +use Surfnet\Stepup\Exception\DomainException; use Surfnet\StepupBundle\Value\SecondFactorType; use Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\Command\AddRaLocationCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\Command\ChangeRaLocationCommand; @@ -70,7 +72,7 @@ class InstitutionConfigurationCommandHandlerTest extends CommandHandlerTest * @test * @group command-handler */ - public function an_institution_configuration_is_created_when_there_is_none_for_a_given_institution() + public function an_institution_configuration_is_created_when_there_is_none_for_a_given_institution(): void { $command = new CreateInstitutionConfigurationCommand(); $command->institution = 'An institution'; @@ -131,9 +133,9 @@ public function an_institution_configuration_is_created_when_there_is_none_for_a * @test * @group command-handler */ - public function an_institution_configuration_cannot_be_created_when_there_already_is_one_for_a_given_institution() + public function an_institution_configuration_cannot_be_created_when_there_already_is_one_for_a_given_institution(): void { - $this->expectException(\Surfnet\Stepup\Exception\DomainException::class); + $this->expectException(DomainException::class); $this->expectExceptionMessage('Cannot rebuild InstitutionConfiguration as it has not been destroyed'); $command = new CreateInstitutionConfigurationCommand(); @@ -189,7 +191,7 @@ public function an_institution_configuration_cannot_be_created_when_there_alread * @test * @group command-handler */ - public function institution_configuration_options_are_not_changed_if_their_given_value_is_not_different_from_their_current_value() + public function institution_configuration_options_are_not_changed_if_their_given_value_is_not_different_from_their_current_value(): void { $institution = new Institution('Institution'); $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); @@ -261,7 +263,7 @@ public function institution_configuration_options_are_not_changed_if_their_given * @test * @group command-handler */ - public function use_ra_locations_option_is_changed_if_its_given_value_is_different_from_the_current_value() + public function use_ra_locations_option_is_changed_if_its_given_value_is_different_from_the_current_value(): void { $institution = new Institution('Institution'); $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); @@ -343,7 +345,7 @@ public function use_ra_locations_option_is_changed_if_its_given_value_is_differe * @test * @group command-handler */ - public function show_raa_contact_information_option_is_changed_if_its_given_value_is_different_from_the_current_value() + public function show_raa_contact_information_option_is_changed_if_its_given_value_is_different_from_the_current_value(): void { $institution = new Institution('Institution'); $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); @@ -421,7 +423,7 @@ public function show_raa_contact_information_option_is_changed_if_its_given_valu * @test * @group command-handler */ - public function allowed_second_factor_list_is_changed_if_its_values_are_different_than_the_current_list() + public function allowed_second_factor_list_is_changed_if_its_values_are_different_than_the_current_list(): void { $institution = new Institution('Institution'); $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); @@ -504,7 +506,7 @@ public function allowed_second_factor_list_is_changed_if_its_values_are_differen * @test * @group command-handler */ - public function allowed_second_factor_list_is_not_changed_if_its_values_are_the_same_as_the_current_list() + public function allowed_second_factor_list_is_not_changed_if_its_values_are_the_same_as_the_current_list(): void { $secondFactorsToAllow = ['sms', 'yubikey']; $allowedSecondFactorList = AllowedSecondFactorList::ofTypes([ @@ -580,7 +582,7 @@ public function allowed_second_factor_list_is_not_changed_if_its_values_are_the_ * @test * @group command-handler */ - public function an_ra_location_can_be_added_to_an_existing_institution_configuration() + public function an_ra_location_can_be_added_to_an_existing_institution_configuration(): void { $command = new AddRaLocationCommand(); $command->raLocationId = self::uuid(); @@ -631,9 +633,9 @@ public function an_ra_location_can_be_added_to_an_existing_institution_configura * @test * @group command-handler */ - public function the_same_ra_location_cannot_be_added_twice() + public function the_same_ra_location_cannot_be_added_twice(): void { - $this->expectException(\Surfnet\Stepup\Exception\DomainException::class); + $this->expectException(DomainException::class); $this->expectExceptionMessage('already present'); $command = new AddRaLocationCommand(); @@ -683,7 +685,7 @@ public function the_same_ra_location_cannot_be_added_twice() * @test * @group command-handler */ - public function an_ra_location_can_be_renamed() + public function an_ra_location_can_be_renamed(): void { $originalRaLocationName = new RaLocationName('An old RA location name'); @@ -741,7 +743,7 @@ public function an_ra_location_can_be_renamed() * @test * @group command-handler */ - public function an_ra_location_cannot_be_changed_if_it_is_not_present_within_an_institution_configuration() + public function an_ra_location_cannot_be_changed_if_it_is_not_present_within_an_institution_configuration(): void { $this->expectException('Surfnet\Stepup\Exception\DomainException'); $this->expectExceptionMessage('not present'); @@ -785,9 +787,9 @@ public function an_ra_location_cannot_be_changed_if_it_is_not_present_within_an_ * @test * @group command-handler */ - public function an_ra_location_cannot_be_changed_if_its_institution_configuration_cannot_be_found() + public function an_ra_location_cannot_be_changed_if_its_institution_configuration_cannot_be_found(): void { - $this->expectException(\Broadway\Repository\AggregateNotFoundException::class); + $this->expectException(AggregateNotFoundException::class); $this->expectExceptionMessage('not found'); $command = new ChangeRaLocationCommand(); @@ -830,7 +832,7 @@ public function an_ra_location_cannot_be_changed_if_its_institution_configuratio * @group command-handler * @group institution-configuration */ - public function an_ra_location_can_be_relocated() + public function an_ra_location_can_be_relocated(): void { $originalLocation= new Location('An old location'); @@ -889,7 +891,7 @@ public function an_ra_location_can_be_relocated() * @group command-handler * @group institution-configuration */ - public function an_ra_locations_contact_information_can_be_changed() + public function an_ra_locations_contact_information_can_be_changed(): void { $originalContactInformation= new ContactInformation('Old contact information'); @@ -948,7 +950,7 @@ public function an_ra_locations_contact_information_can_be_changed() * @group command-handler * @group institution-configuration */ - public function the_self_vet_option_can_be_changed() + public function the_self_vet_option_can_be_changed(): void { $institution = new Institution('Institution'); $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); @@ -1026,9 +1028,9 @@ public function the_self_vet_option_can_be_changed() * @group command-handler * @group institution-configuration */ - public function an_ra_location_cannot_be_removed_if_its_institution_configuration_cannot_be_found() + public function an_ra_location_cannot_be_removed_if_its_institution_configuration_cannot_be_found(): void { - $this->expectException(\Broadway\Repository\AggregateNotFoundException::class); + $this->expectException(AggregateNotFoundException::class); $this->expectExceptionMessage('not found'); $command = new RemoveRaLocationCommand(); @@ -1068,9 +1070,9 @@ public function an_ra_location_cannot_be_removed_if_its_institution_configuratio * @group command-handler * @group institution-configuration */ - public function an_ra_location_cannot_be_removed_if_it_is_not_present_within_an_institution_configuration() + public function an_ra_location_cannot_be_removed_if_it_is_not_present_within_an_institution_configuration(): void { - $this->expectException(\Surfnet\Stepup\Exception\DomainException::class); + $this->expectException(DomainException::class); $this->expectExceptionMessage('not present'); $command = new RemoveRaLocationCommand(); @@ -1110,7 +1112,7 @@ public function an_ra_location_cannot_be_removed_if_it_is_not_present_within_an_ * @group command-handler * @group institution-configuration */ - public function an_ra_location_can_be_removed() + public function an_ra_location_can_be_removed(): void { $command = new RemoveRaLocationCommand(); $command->raLocationId = self::uuid(); @@ -1163,7 +1165,7 @@ public function an_ra_location_can_be_removed() * @group command-handler * @group institution-configuration */ - public function an_institution_configuration_with_unnormalized_institution_configuration_id_can_be_removed() + public function an_institution_configuration_with_unnormalized_institution_configuration_id_can_be_removed(): void { $command = new RemoveInstitutionConfigurationByUnnormalizedIdCommand(); $command->institution = 'Babelfish Inc.'; diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/Processor/InstitutionConfigurationProcessorTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/Processor/InstitutionConfigurationProcessorTest.php index 5a67d02ea..8e573cd53 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/Processor/InstitutionConfigurationProcessorTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/Processor/InstitutionConfigurationProcessorTest.php @@ -55,7 +55,7 @@ public function setUp(): void * @group processor * @group institution-configuration */ - public function a_create_institution_configuration_command_is_processed_when_an_identity_was_created_with_a_non_configured_institution() + public function a_create_institution_configuration_command_is_processed_when_an_identity_was_created_with_a_non_configured_institution(): void { $expectedInstitution = 'institution'; $identityCreatedEvent = new IdentityCreatedEvent( @@ -91,7 +91,7 @@ public function a_create_institution_configuration_command_is_processed_when_an_ * @group processor * @group institution-configuration */ - public function no_create_institution_configuration_command_is_processed_when_an_identity_was_created_with_an_already_configured_institution() + public function no_create_institution_configuration_command_is_processed_when_an_identity_was_created_with_an_already_configured_institution(): void { $identityCreatedEvent = new IdentityCreatedEvent( new IdentityId('Id'), @@ -125,7 +125,7 @@ public function no_create_institution_configuration_command_is_processed_when_an * @group processor * @group institution-configuration */ - public function create_institution_configuration_commands_are_processed_when_a_whitelist_was_created_containing_non_configured_institutions() + public function create_institution_configuration_commands_are_processed_when_a_whitelist_was_created_containing_non_configured_institutions(): void { $firstInstitution = 'first institution'; $secondInstitution = 'second institution'; @@ -166,7 +166,7 @@ public function create_institution_configuration_commands_are_processed_when_a_w * @group processor * @group institution-configuration */ - public function no_create_institution_configuration_command_is_processed_for_an_already_configured_institution_when_a_whitelist_was_created() + public function no_create_institution_configuration_command_is_processed_for_an_already_configured_institution_when_a_whitelist_was_created(): void { $alreadyPresentInstitution = 'already present'; $newInstitution = 'new'; @@ -211,7 +211,7 @@ public function no_create_institution_configuration_command_is_processed_for_an_ * @group processor * @group institution-configuration */ - public function create_institution_configuration_commands_are_created_when_a_whitelist_was_replaced_containing_non_configured_institutions() + public function create_institution_configuration_commands_are_created_when_a_whitelist_was_replaced_containing_non_configured_institutions(): void { $firstInstitution = 'first institution'; $secondInstitution = 'second institution'; @@ -254,7 +254,7 @@ public function create_institution_configuration_commands_are_created_when_a_whi * @group processor * @group institution-configuration */ - public function no_create_institution_configuration_command_is_processed_for_an_already_configured_institution_when_a_whitelist_was_replaced() + public function no_create_institution_configuration_command_is_processed_for_an_already_configured_institution_when_a_whitelist_was_replaced(): void { $alreadyPresentInstitution = 'already present'; $newInstitution = 'new'; @@ -299,7 +299,7 @@ public function no_create_institution_configuration_command_is_processed_for_an_ * @group processor * @group institution-configuration */ - public function create_institution_configuration_commands_are_created_when_non_configured_institutions_are_added_to_the_whitelist() + public function create_institution_configuration_commands_are_created_when_non_configured_institutions_are_added_to_the_whitelist(): void { $firstInstitution = 'first institution'; $secondInstitution = 'second institution'; @@ -342,7 +342,7 @@ public function create_institution_configuration_commands_are_created_when_non_c * @group processor * @group institution-configuration */ - public function no_create_institution_configuration_command_is_created_for_an_already_configured_institution_when_institutions_are_added_to_a_whitelist() + public function no_create_institution_configuration_command_is_created_for_an_already_configured_institution_when_institutions_are_added_to_a_whitelist(): void { $alreadyPresentInstitution = 'already present'; $newInstitution = 'new'; diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/DateTimeHelper.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/DateTimeHelper.php index 3089d4085..b84d8421b 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/DateTimeHelper.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/DateTimeHelper.php @@ -28,7 +28,7 @@ class DateTimeHelper * * @param DateTime|null $now */ - public static function setCurrentTime(DateTime $now = null) + public static function setCurrentTime(DateTime $now = null): void { $nowProperty = new ReflectionProperty('Surfnet\Stepup\DateTime\DateTime', 'now'); $nowProperty->setAccessible(true); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/DateTimeHelperTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/DateTimeHelperTest.php index cb0b24f47..d8a7625b4 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/DateTimeHelperTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/DateTimeHelperTest.php @@ -31,7 +31,7 @@ class DateTimeHelperTest extends TestCase * @test * @group testing */ - public function it_mocks_now() + public function it_mocks_now(): void { DateTimeHelper::setCurrentTime(new DateTime(new CoreDateTime('@12345'))); @@ -42,7 +42,7 @@ public function it_mocks_now() * @test * @group testing */ - public function it_can_be_disabled_in_the_same_process() + public function it_can_be_disabled_in_the_same_process(): void { DateTimeHelper::setCurrentTime(new DateTime(new CoreDateTime('@12345'))); $this->assertEquals(new DateTime(new CoreDateTime('@12345')), DateTime::now()); @@ -57,7 +57,7 @@ public function it_can_be_disabled_in_the_same_process() * @test * @group testing */ - public function it_works_with_separate_processes() + public function it_works_with_separate_processes(): void { // The stub value has been removed. // Deliberately assigned temporary variable due to microsecond precision in PHP 7.1 diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/BufferedEventBusTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/BufferedEventBusTest.php index 19608e97f..91b7ad466 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/BufferedEventBusTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/BufferedEventBusTest.php @@ -22,6 +22,7 @@ use Broadway\Domain\DomainEventStream; use Broadway\Domain\DomainMessage; use Broadway\Domain\Metadata; +use Broadway\EventHandling\EventListener; use Doctrine\ORM\EntityManagerInterface; use Mockery as m; use PHPUnit\Framework\TestCase; @@ -33,10 +34,10 @@ class BufferedEventBusTest extends TestCase * @test * @group event-handling */ - public function it_buffers_events() + public function it_buffers_events(): void { $event = $this->createDummyDomainMessage(null); - $listener = m::mock(\Broadway\EventHandling\EventListener::class) + $listener = m::mock(EventListener::class) ->shouldReceive('handle')->never() ->getMock(); @@ -53,10 +54,10 @@ public function it_buffers_events() * @test * @group event-handling */ - public function it_flushes_events() + public function it_flushes_events(): void { $event = $this->createDummyDomainMessage(null); - $listener = m::mock(\Broadway\EventHandling\EventListener::class) + $listener = m::mock(EventListener::class) ->shouldReceive('handle')->once()->with($event) ->getMock(); @@ -75,10 +76,10 @@ public function it_flushes_events() * @test * @group event-handling */ - public function flushing_succesfully_empties_the_buffer_to_prevent_flushing_the_same_event_twice() + public function flushing_succesfully_empties_the_buffer_to_prevent_flushing_the_same_event_twice(): void { $event = $this->createDummyDomainMessage(null); - $listener = m::mock(\Broadway\EventHandling\EventListener::class) + $listener = m::mock(EventListener::class) ->shouldReceive('handle')->once()->with($event) ->getMock(); @@ -96,7 +97,7 @@ public function flushing_succesfully_empties_the_buffer_to_prevent_flushing_the_ * @test * @group event-handling */ - public function an_event_caused_by_an_event_in_the_current_buffer_being_flushed_is_buffered_and_flushed_after_events_in_the_current_buffer() + public function an_event_caused_by_an_event_in_the_current_buffer_being_flushed_is_buffered_and_flushed_after_events_in_the_current_buffer(): void { $bus = new BufferedEventBus($this->getDummyEntityManager()); @@ -123,7 +124,7 @@ public function an_event_caused_by_an_event_in_the_current_buffer_being_flushed_ * @param mixed $payload * @return DomainMessage */ - private function createDummyDomainMessage($payload) + private function createDummyDomainMessage(?string $payload): DomainMessage { return new DomainMessage('1', 0, new Metadata(), $payload, DateTime::fromString('1970-01-01H00:00:00.000')); } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/RecordEventsAndPublishToBusOnFirstCallEventListener.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/RecordEventsAndPublishToBusOnFirstCallEventListener.php index 075c13374..1c4c21817 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/RecordEventsAndPublishToBusOnFirstCallEventListener.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/RecordEventsAndPublishToBusOnFirstCallEventListener.php @@ -25,25 +25,16 @@ class RecordEventsAndPublishToBusOnFirstCallEventListener implements EventListenerInterface { - /** - * @var bool - */ - private $firstEventHandled = false; + private bool $firstEventHandled = false; - /** - * @var BufferedEventBus - */ - private $eventBus; + private BufferedEventBus $eventBus; - /** - * @var DomainEventStream - */ - private $toPublish; + private DomainEventStream $toPublish; /** * @var DomainMessage[] */ - private $recordedEvents = []; + private array $recordedEvents = []; /** * @param BufferedEventBus $eventBus diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerMoveTokenTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerMoveTokenTest.php index fb5d83d82..7a49db78d 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerMoveTokenTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerMoveTokenTest.php @@ -69,7 +69,7 @@ */ class IdentityCommandHandlerMoveTokenTest extends CommandHandlerTest { - private static $window = 3600; + private static int $window = 3600; /** * @var AllowedSecondFactorListService|m\MockInterface @@ -136,7 +136,7 @@ protected function createCommandHandler(EventStoreInterface $eventStore, EventBu * @group command-handler * @runInSeparateProcess */ - public function test_a_second_factor_can_be_moved() + public function test_a_second_factor_can_be_moved(): void { $this->setUpInstitutionConfiguration(2, ['yubikey']); @@ -225,7 +225,7 @@ public function test_a_second_factor_can_be_moved() ]); } - public function test_can_not_be_moved_if_already_moved() + public function test_can_not_be_moved_if_already_moved(): void { $this->expectExceptionMessage("The second factor was registered as a vetted second factor"); $this->expectException(DomainException::class); @@ -316,7 +316,7 @@ public function test_can_not_be_moved_if_already_moved() ->then([]); } - public function test_can_not_be_moved_if_already_present_as_bootstrapped_thus_vetted_token() + public function test_can_not_be_moved_if_already_present_as_bootstrapped_thus_vetted_token(): void { $this->expectExceptionMessage("The second factor was registered as a vetted second factor"); $this->expectException(DomainException::class); @@ -396,7 +396,7 @@ public function test_can_not_be_moved_if_already_present_as_bootstrapped_thus_ve } - public function test_can_not_be_moved_if_already_present_as_vetted_token() + public function test_can_not_be_moved_if_already_present_as_vetted_token(): void { $this->expectExceptionMessage("The second factor was registered as a vetted second factor"); $this->expectException(DomainException::class); @@ -504,7 +504,7 @@ public function test_can_not_be_moved_if_already_present_as_vetted_token() ->then([]); } - public function test_can_not_be_moved_if_already_present_as_verified_token() + public function test_can_not_be_moved_if_already_present_as_verified_token(): void { $this->expectExceptionMessage("The second factor was already registered as a verified second factor"); $this->expectException(DomainException::class); @@ -600,7 +600,7 @@ public function test_can_not_be_moved_if_already_present_as_verified_token() ->then([]); } - public function test_can_not_be_moved_if_already_present_as_unverified_token() + public function test_can_not_be_moved_if_already_present_as_unverified_token(): void { $this->expectExceptionMessage("The second factor was already registered as a unverified second factor"); $this->expectException(DomainException::class); @@ -684,7 +684,7 @@ public function test_can_not_be_moved_if_already_present_as_unverified_token() ->then([]); } - public function test_can_not_be_moved_to_same_institution() + public function test_can_not_be_moved_to_same_institution(): void { $this->expectExceptionMessage("Cannot move the second factor to the same institution"); $this->expectException(DomainException::class); @@ -751,7 +751,7 @@ public function test_can_not_be_moved_to_same_institution() ->then([]); } - public function test_can_not_be_moved_if_token_type_not_allowed_for_institution() + public function test_can_not_be_moved_if_token_type_not_allowed_for_institution(): void { $this->expectExceptionMessage('Institution "institution2.com" does not support second factor "yubikey"'); $this->expectException(SecondFactorNotAllowedException::class); @@ -829,7 +829,7 @@ public function test_can_not_be_moved_if_token_type_not_allowed_for_institution( ]); } - public function test_the_max_number_of_tokens_can_not_be_exceeded() + public function test_the_max_number_of_tokens_can_not_be_exceeded(): void { $this->expectExceptionMessage("User may not have more than 1 token(s)"); $this->expectException(DomainException::class); @@ -908,7 +908,7 @@ public function test_the_max_number_of_tokens_can_not_be_exceeded() ->then([]); } - private function setUpInstitutionConfiguration(int $allowedMaxNumberOfTokens, array $allowedTokenTypes) + private function setUpInstitutionConfiguration(int $allowedMaxNumberOfTokens, array $allowedTokenTypes): void { $secondFactorTypes = []; foreach ($allowedTokenTypes as $type) { diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerSelfAssertedTokensTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerSelfAssertedTokensTest.php index 396a7d3dc..1b21128b6 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerSelfAssertedTokensTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerSelfAssertedTokensTest.php @@ -92,7 +92,7 @@ */ class IdentityCommandHandlerSelfAssertedTokensTest extends CommandHandlerTest { - private static $window = 3600; + private static int $window = 3600; /** * @var AllowedSecondFactorListService|m\MockInterface @@ -127,36 +127,33 @@ class IdentityCommandHandlerSelfAssertedTokensTest extends CommandHandlerTest /** * @var IdentityId */ - private $id; + private IdentityId $id; /** * @var Institution */ - private $institution; + private Institution $institution; /** * @var Email */ - private $email; + private Email $email; /** * @var CommonName */ - private $commonName; + private CommonName $commonName; /** * @var Locale */ - private $preferredLocale; + private Locale $preferredLocale; /** * @var RecoveryTokenSecretHelper|m\MockInterface */ private $recoveryTokenSecretHelper; - /** - * @var NameId - */ - private $nameId; + private ?NameId $nameId = null; public function setUp(): void { @@ -176,7 +173,7 @@ public function setUp(): void * @group command-handler * @runInSeparateProcess */ - public function test_a_sms_recovery_code_possession_can_be_proven() + public function test_a_sms_recovery_code_possession_can_be_proven(): void { $recoveryTokenId = new RecoveryTokenId(self::uuid()); $phoneNumber = new PhoneNumber('+31 (0) 612345678'); @@ -211,7 +208,7 @@ public function test_a_sms_recovery_code_possession_can_be_proven() * @group command-handler * @runInSeparateProcess */ - public function test_a_safe_store_secret_recovery_code_possession_can_be_proven() + public function test_a_safe_store_secret_recovery_code_possession_can_be_proven(): void { $recoveryTokenId = new RecoveryTokenId(self::uuid()); $secret = m::mock(HashedSecret::class); @@ -227,7 +224,7 @@ public function test_a_safe_store_secret_recovery_code_possession_can_be_proven( $this->recoveryTokenSecretHelper ->shouldReceive('hash') - ->with(m::on(function ($unhashedSecret) { + ->with(m::on(function ($unhashedSecret): bool { $isUnhashedSecret = $unhashedSecret instanceof UnhashedSecret; $hasExpectedSecret = $unhashedSecret->getSecret() === 'super-safe-secret'; return $isUnhashedSecret && $hasExpectedSecret; @@ -255,7 +252,7 @@ public function test_a_safe_store_secret_recovery_code_possession_can_be_proven( * @group command-handler * @runInSeparateProcess */ - public function test_a_safe_store_secret_and_phone_recovery_code_possession_can_be_proven() + public function test_a_safe_store_secret_and_phone_recovery_code_possession_can_be_proven(): void { $recoveryTokenId = new RecoveryTokenId(self::uuid()); @@ -274,7 +271,7 @@ public function test_a_safe_store_secret_and_phone_recovery_code_possession_can_ $secret = new HashedSecret('secret-for-safe-keeping'); $this->recoveryTokenSecretHelper ->shouldReceive('hash') - ->with(m::on(function ($unhashedSecret) { + ->with(m::on(function ($unhashedSecret): bool { $isUnhashedSecret = $unhashedSecret instanceof UnhashedSecret; $hasExpectedSecret = $unhashedSecret->getSecret() === 'secret-for-safe-keeping'; return $isUnhashedSecret && $hasExpectedSecret; @@ -318,7 +315,7 @@ public function test_a_safe_store_secret_and_phone_recovery_code_possession_can_ * @group command-handler * @runInSeparateProcess */ - public function test_a_sms_recovery_code_possession_can_not_be_proven_twice() + public function test_a_sms_recovery_code_possession_can_not_be_proven_twice(): void { $recoveryTokenId = new RecoveryTokenId(self::uuid()); $phoneNumber = new PhoneNumber('+31 (0) 612345678'); @@ -356,7 +353,7 @@ public function test_a_sms_recovery_code_possession_can_not_be_proven_twice() * @group command-handler * @runInSeparateProcess */ - public function test_only_one_safe_store_secret_allowed() + public function test_only_one_safe_store_secret_allowed(): void { $recoveryTokenId = new RecoveryTokenId(self::uuid()); @@ -372,7 +369,7 @@ public function test_only_one_safe_store_secret_allowed() $secret = new HashedSecret('secret-for-safe-keeping'); $this->recoveryTokenSecretHelper ->shouldReceive('hash') - ->with(m::on(function ($unhashedSecret) { + ->with(m::on(function ($unhashedSecret): bool { $isUnhashedSecret = $unhashedSecret instanceof UnhashedSecret; $hasExpectedSecret = $unhashedSecret->getSecret() === 'secret-for-safe-keeping'; return $isUnhashedSecret && $hasExpectedSecret; @@ -404,7 +401,7 @@ public function test_only_one_safe_store_secret_allowed() * @group command-handler * @runInSeparateProcess */ - public function test_a_sms_recovery_token_possession_requires_institution_configuration_feature_enabled() + public function test_a_sms_recovery_token_possession_requires_institution_configuration_feature_enabled(): void { $identityCreatedEvent = $this->buildIdentityCreatedEvent(); $recoveryTokenId = new RecoveryTokenId(self::uuid()); @@ -442,7 +439,7 @@ public function test_a_sms_recovery_token_possession_requires_institution_config * @group command-handler * @runInSeparateProcess */ - public function test_a_safe_store_secret_recovery_code_possession_can_be_revoked_by_ra() + public function test_a_safe_store_secret_recovery_code_possession_can_be_revoked_by_ra(): void { $recoveryTokenId = new RecoveryTokenId(self::uuid()); $secret = m::mock(HashedSecret::class); @@ -513,7 +510,7 @@ public function test_a_safe_store_secret_recovery_code_possession_can_be_revoked * @group command-handler * @runInSeparateProcess */ - public function test_a_token_can_be_registered_self_asserted() + public function test_a_token_can_be_registered_self_asserted(): void { $recoveryTokenId = new RecoveryTokenId(self::uuid()); $secret = m::mock(HashedSecret::class); @@ -597,7 +594,7 @@ public function test_a_token_can_be_registered_self_asserted() * @group command-handler * @runInSeparateProcess */ - public function test_self_asserted_token_registration_requires_possession_of_recovery_token() + public function test_self_asserted_token_registration_requires_possession_of_recovery_token(): void { $madeUpRecoveryTokenId = new RecoveryTokenId(self::uuid()); @@ -658,7 +655,7 @@ public function test_self_asserted_token_registration_requires_possession_of_rec * @group command-handler * @runInSeparateProcess */ - public function test_a_safe_store_secret_recovery_code_possession_can_be_revoked() + public function test_a_safe_store_secret_recovery_code_possession_can_be_revoked(): void { $recoveryTokenId = new RecoveryTokenId(self::uuid()); $secret = m::mock(HashedSecret::class); @@ -700,7 +697,7 @@ public function test_a_safe_store_secret_recovery_code_possession_can_be_revoked * @group command-handler * @runInSeparateProcess */ - public function test_a_sat_token_can_be_used_to_self_vet_a_token() + public function test_a_sat_token_can_be_used_to_self_vet_a_token(): void { $recoveryTokenId = new RecoveryTokenId(self::uuid()); $secret = m::mock(HashedSecret::class); @@ -831,7 +828,7 @@ public function test_a_sat_token_can_be_used_to_self_vet_a_token() * @group command-handler * @runInSeparateProcess */ - public function test_sat_not_allowed_when_one_vetted_token_is_identity_vetted() + public function test_sat_not_allowed_when_one_vetted_token_is_identity_vetted(): void { $recoveryTokenId = new RecoveryTokenId(self::uuid()); $secret = m::mock(HashedSecret::class); @@ -1038,7 +1035,7 @@ protected function createCommandHandler(EventStoreInterface $eventStore, EventBu ); } - private function buildIdentityCreatedEvent() + private function buildIdentityCreatedEvent(): IdentityCreatedEvent { $this->nameId = new NameId(md5(__METHOD__)); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php index 06f8b08b7..0b218b9c3 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php @@ -29,6 +29,7 @@ use Psr\Log\LoggerInterface; use Surfnet\Stepup\Configuration\Value\AllowedSecondFactorList; use Surfnet\Stepup\DateTime\DateTime; +use Surfnet\Stepup\Exception\DomainException; use Surfnet\Stepup\Helper\RecoveryTokenSecretHelper; use Surfnet\Stepup\Helper\SecondFactorProvePossessionHelper; use Surfnet\Stepup\Helper\UserDataFilterInterface; @@ -72,6 +73,7 @@ use Surfnet\StepupMiddleware\ApiBundle\Configuration\Service\InstitutionConfigurationOptionsService; use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\IdentityRepository as IdentityProjectionRepository; use Surfnet\StepupMiddleware\CommandHandlingBundle\Exception\SecondFactorNotAllowedException; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Exception\UnsupportedLocaleException; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\BootstrapIdentityWithYubikeySecondFactorCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\CreateIdentityCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\ExpressLocalePreferenceCommand; @@ -96,7 +98,7 @@ */ class IdentityCommandHandlerTest extends CommandHandlerTest { - private static $window = 3600; + private static int $window = 3600; /** * @var AllowedSecondFactorListService|m\MockInterface @@ -179,7 +181,7 @@ protected function createCommandHandler(EventStoreInterface $eventStore, EventBu * @group command-handler * @runInSeparateProcess */ - public function an_identity_can_be_bootstrapped_with_a_yubikey_second_factor() + public function an_identity_can_be_bootstrapped_with_a_yubikey_second_factor(): void { $command = new BootstrapIdentityWithYubikeySecondFactorCommand(); $command->identityId = 'ID-ID'; @@ -229,7 +231,7 @@ public function an_identity_can_be_bootstrapped_with_a_yubikey_second_factor() * @group command-handler * @runInSeparateProcess */ - public function an_identity_cannot_be_bootstrapped_twice() + public function an_identity_cannot_be_bootstrapped_twice(): void { $command = new BootstrapIdentityWithYubikeySecondFactorCommand(); $command->identityId = 'ID-ID'; @@ -257,7 +259,7 @@ public function an_identity_cannot_be_bootstrapped_twice() * @group command-handler * @runInSeparateProcess */ - public function a_yubikey_possession_can_be_proven() + public function a_yubikey_possession_can_be_proven(): void { DateTimeHelper::setCurrentTime(new DateTime(new CoreDateTime('@12345'))); @@ -321,7 +323,7 @@ public function a_yubikey_possession_can_be_proven() * @group command-handler * @runInSeparateProcess */ - public function a_yubikey_possession_cannot_be_proven_if_the_second_factor_is_not_allowed_by_the_institution() + public function a_yubikey_possession_cannot_be_proven_if_the_second_factor_is_not_allowed_by_the_institution(): void { DateTimeHelper::setCurrentTime(new DateTime(new CoreDateTime('@12345'))); @@ -370,9 +372,9 @@ public function a_yubikey_possession_cannot_be_proven_if_the_second_factor_is_no * @test * @group command-handler */ - public function yubikey_possession_cannot_be_proven_twice() + public function yubikey_possession_cannot_be_proven_twice(): void { - $this->expectException(\Surfnet\Stepup\Exception\DomainException::class); + $this->expectException(DomainException::class); $this->expectExceptionMessage('more than 1 token(s)'); $id = new IdentityId(self::uuid()); @@ -430,7 +432,7 @@ public function yubikey_possession_cannot_be_proven_twice() * @group command-handler * @runInSeparateProcess */ - public function a_phone_possession_can_be_proven() + public function a_phone_possession_can_be_proven(): void { DateTimeHelper::setCurrentTime(new DateTime(new CoreDateTime('@12345'))); @@ -494,7 +496,7 @@ public function a_phone_possession_can_be_proven() * @group command-handler * @runInSeparateProcess */ - public function a_phone_possession_cannot_be_proven_if_the_second_factor_is_not_allowed_by_the_institution() + public function a_phone_possession_cannot_be_proven_if_the_second_factor_is_not_allowed_by_the_institution(): void { DateTimeHelper::setCurrentTime(new DateTime(new CoreDateTime('@12345'))); @@ -543,7 +545,7 @@ public function a_phone_possession_cannot_be_proven_if_the_second_factor_is_not_ * @group command-handler * @runInSeparateProcess */ - public function a_gssf_possession_can_be_proven() + public function a_gssf_possession_can_be_proven(): void { DateTimeHelper::setCurrentTime(new DateTime(new CoreDateTime('@12345'))); @@ -621,7 +623,7 @@ public function a_gssf_possession_can_be_proven() * @group command-handler * @runInSeparateProcess */ - public function a_gssf_possession_can_not_be_proven_if_the_second_factor_is_not_allowed_by_the_institution() + public function a_gssf_possession_can_not_be_proven_if_the_second_factor_is_not_allowed_by_the_institution(): void { DateTimeHelper::setCurrentTime(new DateTime(new CoreDateTime('@12345'))); @@ -674,7 +676,7 @@ public function a_gssf_possession_can_not_be_proven_if_the_second_factor_is_not_ * @group command-handler * @runInSeparateProcess */ - public function a_u2f_device_possession_can_be_proven() + public function a_u2f_device_possession_can_be_proven(): void { DateTimeHelper::setCurrentTime(new DateTime(new CoreDateTime('@12345'))); @@ -738,7 +740,7 @@ public function a_u2f_device_possession_can_be_proven() * @group command-handler * @runInSeparateProcess */ - public function a_u2f_device_possession_cannot_be_proven_if_the_second_factor_is_not_allowed_by_the_institution() + public function a_u2f_device_possession_cannot_be_proven_if_the_second_factor_is_not_allowed_by_the_institution(): void { DateTimeHelper::setCurrentTime(new DateTime(new CoreDateTime('@12345'))); @@ -786,9 +788,9 @@ public function a_u2f_device_possession_cannot_be_proven_if_the_second_factor_is * @test * @group command-handler */ - public function phone_possession_cannot_be_proven_twice() + public function phone_possession_cannot_be_proven_twice(): void { - $this->expectException(\Surfnet\Stepup\Exception\DomainException::class); + $this->expectException(DomainException::class); $this->expectExceptionMessage('more than 1 token(s)'); $id = new IdentityId(self::uuid()); @@ -845,9 +847,9 @@ public function phone_possession_cannot_be_proven_twice() * @test * @group command-handler */ - public function cannot_prove_possession_of_arbitrary_second_factor_type_twice() + public function cannot_prove_possession_of_arbitrary_second_factor_type_twice(): void { - $this->expectException(\Surfnet\Stepup\Exception\DomainException::class); + $this->expectException(DomainException::class); $this->expectExceptionMessage('more than 1 token(s)'); $id = new IdentityId(self::uuid()); @@ -906,7 +908,7 @@ public function cannot_prove_possession_of_arbitrary_second_factor_type_twice() * @group command-handler * @runInSeparateProcess */ - public function an_unverified_second_factors_email_can_be_verified() + public function an_unverified_second_factors_email_can_be_verified(): void { DateTimeHelper::setCurrentTime(new DateTime(new CoreDateTime('@12345'))); @@ -974,9 +976,9 @@ public function an_unverified_second_factors_email_can_be_verified() * @test * @group command-handler */ - public function a_verified_second_factors_email_cannot_be_verified() + public function a_verified_second_factors_email_cannot_be_verified(): void { - $this->expectException(\Surfnet\Stepup\Exception\DomainException::class); + $this->expectException(DomainException::class); $this->expectExceptionMessage('Cannot verify second factor, no unverified second factor can be verified using the given nonce'); $id = new IdentityId(self::uuid()); @@ -1038,9 +1040,9 @@ public function a_verified_second_factors_email_cannot_be_verified() * @test * @group command-handler */ - public function cannot_verify_an_email_after_the_verification_window_has_closed() + public function cannot_verify_an_email_after_the_verification_window_has_closed(): void { - $this->expectException(\Surfnet\Stepup\Exception\DomainException::class); + $this->expectException(DomainException::class); $this->expectExceptionMessage('Cannot verify second factor, the verification window is closed.'); $id = new IdentityId(self::uuid()); @@ -1090,7 +1092,7 @@ public function cannot_verify_an_email_after_the_verification_window_has_closed( * @test * @group command-handler */ - public function it_can_create_a_new_identity() + public function it_can_create_a_new_identity(): void { $createCommand = new CreateIdentityCommand(); $createCommand->UUID = '1'; @@ -1129,7 +1131,7 @@ public function it_can_create_a_new_identity() * @test * @group command-handler */ - public function an_identity_can_be_updated() + public function an_identity_can_be_updated(): void { $id = new IdentityId('42'); $institution = new Institution('A Corp.'); @@ -1164,7 +1166,7 @@ public function an_identity_can_be_updated() * @test * @group command-handler */ - public function an_identity_can_be_updated_twice_only_emitting_events_when_changed() + public function an_identity_can_be_updated_twice_only_emitting_events_when_changed(): void { $id = new IdentityId('42'); $institution = new Institution('A Corp.'); @@ -1200,7 +1202,7 @@ public function an_identity_can_be_updated_twice_only_emitting_events_when_chang * @test * @group command-handler */ - public function a_second_factor_can_be_vetted() + public function a_second_factor_can_be_vetted(): void { $command = new VetSecondFactorCommand(); $command->authorityId = 'AID'; @@ -1315,10 +1317,10 @@ public function a_second_factor_can_be_vetted() * @test * @group command-handler */ - public function a_second_factor_cannot_be_vetted_without_a_secure_enough_vetted_second_factor() + public function a_second_factor_cannot_be_vetted_without_a_secure_enough_vetted_second_factor(): void { $this->expectExceptionMessage("Authority does not have the required LoA"); - $this->expectException(\Surfnet\Stepup\Exception\DomainException::class); + $this->expectException(DomainException::class); $command = new VetSecondFactorCommand(); $command->authorityId = 'AID'; @@ -1459,7 +1461,7 @@ public function a_second_factor_cannot_be_vetted_without_a_secure_enough_vetted_ * @test * @group command-handler */ - public function a_second_factor_can_be_vetted_without_a_physical_proven_possession() + public function a_second_factor_can_be_vetted_without_a_physical_proven_possession(): void { $command = new VetSecondFactorCommand(); $command->authorityId = 'AID'; @@ -1574,10 +1576,10 @@ public function a_second_factor_can_be_vetted_without_a_physical_proven_possessi * @test * @group command-handler */ - public function a_second_factor_cannot_be_vetted_without_physical_prove_of_possession_when_not_configured() + public function a_second_factor_cannot_be_vetted_without_physical_prove_of_possession_when_not_configured(): void { $this->expectExceptionMessage("The possession of registrants second factor with ID 'ISFID' of type 'yubikey' has to be physically proven"); - $this->expectException(\Surfnet\Stepup\Exception\DomainException::class); + $this->expectException(DomainException::class); $command = new VetSecondFactorCommand(); $command->authorityId = 'AID'; @@ -1724,7 +1726,7 @@ public function a_second_factor_cannot_be_vetted_without_physical_prove_of_posse * @group command-handler * @runInSeparateProcess */ - public function an_identity_can_express_its_locale_preference() + public function an_identity_can_express_its_locale_preference(): void { $command = new ExpressLocalePreferenceCommand(); $command->identityId = $this->uuid(); @@ -1756,7 +1758,7 @@ public function an_identity_can_express_its_locale_preference() * @group command-handler * @runInSeparateProcess */ - public function an_identity_can_send_registration_mail() + public function an_identity_can_send_registration_mail(): void { $command = new SendSecondFactorRegistrationEmailCommand(); $command->identityId = self::uuid(); @@ -1790,10 +1792,10 @@ public function an_identity_can_send_registration_mail() * @group command-handler * @runInSeparateProcess */ - public function an_identity_cannot_express_a_preference_for_an_unsupported_locale() + public function an_identity_cannot_express_a_preference_for_an_unsupported_locale(): void { $this->expectExceptionMessage("Given locale \"fi_FI\" is not a supported locale"); - $this->expectException(\Surfnet\StepupMiddleware\CommandHandlingBundle\Exception\UnsupportedLocaleException::class); + $this->expectException(UnsupportedLocaleException::class); $command = new ExpressLocalePreferenceCommand(); $command->identityId = $this->uuid(); @@ -1822,7 +1824,7 @@ public function an_identity_cannot_express_a_preference_for_an_unsupported_local * @group command-handler * @runInSeparateProcess */ - public function an_identity_can_express_its_locale_preference_more_than_one_time() + public function an_identity_can_express_its_locale_preference_more_than_one_time(): void { $command = new ExpressLocalePreferenceCommand(); $command->identityId = $this->uuid(); @@ -1856,7 +1858,7 @@ public function an_identity_can_express_its_locale_preference_more_than_one_time * @group command-handler * @runInSeparateProcess */ - public function a_second_factor_can_be_self_vetted() + public function a_second_factor_can_be_self_vetted(): void { $command = new SelfVetSecondFactorCommand(); $command->secondFactorId = '+31 (0) 612345678'; @@ -1985,7 +1987,7 @@ public function a_second_factor_can_be_self_vetted() * * @todo remove this test once we drop BC support for SelfService 3.5 */ - public function a_second_factor_can_be_self_vetted_using_old_authoringSecondFactorIdentifier_command_property() + public function a_second_factor_can_be_self_vetted_using_old_authoringSecondFactorIdentifier_command_property(): void { $command = new SelfVetSecondFactorCommand(); $command->secondFactorId = '+31 (0) 612345678'; diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityIdEnforcingEventStoreDecorator.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityIdEnforcingEventStoreDecorator.php index 2e68ce726..596efa741 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityIdEnforcingEventStoreDecorator.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityIdEnforcingEventStoreDecorator.php @@ -28,7 +28,7 @@ final class IdentityIdEnforcingEventStoreDecorator implements EventStoreInterfac /** * @var EventStoreInterface */ - private $decoratedEventStore; + private EventStoreInterface $decoratedEventStore; public function __construct(EventStoreInterface $decoratedEventStore) { @@ -68,7 +68,7 @@ public function loadFromPlayhead($id, int $playhead): DomainEventStreamInterface /** * @param DomainEventStreamInterface $stream */ - public function assertIdentityAggregate(DomainEventStreamInterface $stream) + public function assertIdentityAggregate(DomainEventStreamInterface $stream): void { foreach ($stream as $message) { if (!$message->getPayload() instanceof IdentityEvent) { diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RegistrationAuthorityCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RegistrationAuthorityCommandHandlerTest.php index f05b51bea..8d9cd1294 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RegistrationAuthorityCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RegistrationAuthorityCommandHandlerTest.php @@ -28,6 +28,7 @@ use Psr\Log\LoggerInterface; use Surfnet\Stepup\Configuration\EventSourcing\InstitutionConfigurationRepository; use Surfnet\Stepup\Configuration\InstitutionConfiguration; +use Surfnet\Stepup\Exception\DomainException; use Surfnet\Stepup\Helper\UserDataFilterInterface; use Surfnet\Stepup\Identity\Event\AppointedAsRaaForInstitutionEvent; use Surfnet\Stepup\Identity\Event\AppointedAsRaForInstitutionEvent; @@ -50,6 +51,7 @@ use Surfnet\Stepup\Identity\Value\RegistrationAuthorityRole; use Surfnet\Stepup\Identity\Value\SecondFactorId; use Surfnet\Stepup\Identity\Value\YubikeyPublicId; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Exception\RuntimeException; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\AccreditIdentityCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\AmendRegistrationAuthorityInformationCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\AppointRoleCommand; @@ -111,10 +113,10 @@ protected function createCommandHandler(EventStoreInterface $eventStore, EventBu * @group command-handler * @group ra-command-handler */ - public function an_identity_cannot_be_accredited_for_another_institution_than_configured() + public function an_identity_cannot_be_accredited_for_another_institution_than_configured(): void { $this->expectExceptionMessage("An Identity may only be accredited by configured institutions"); - $this->expectException(\Surfnet\Stepup\Exception\DomainException::class); + $this->expectException(DomainException::class); $command = new AccreditIdentityCommand(); $command->identityId = static::uuid(); @@ -166,10 +168,10 @@ public function an_identity_cannot_be_accredited_for_another_institution_than_co * @group command-handler * @group ra-command-handler */ - public function an_identity_cannot_be_accredited_when_it_does_not_have_a_vetted_second_factor() + public function an_identity_cannot_be_accredited_when_it_does_not_have_a_vetted_second_factor(): void { $this->expectExceptionMessage("An Identity must have at least one vetted second factor before it can be accredited"); - $this->expectException(\Surfnet\Stepup\Exception\DomainException::class); + $this->expectException(DomainException::class); $command = new AccreditIdentityCommand(); $command->identityId = static::uuid(); $command->institution = 'Babelfish Inc.'; @@ -209,10 +211,10 @@ public function an_identity_cannot_be_accredited_when_it_does_not_have_a_vetted_ * @group command-handler * @group ra-command-handler */ - public function an_identity_cannot_be_accredited_when_it_already_has_been_accredited() + public function an_identity_cannot_be_accredited_when_it_already_has_been_accredited(): void { $this->expectExceptionMessage("Cannot accredit Identity as it has already been accredited for institution"); - $this->expectException(\Surfnet\Stepup\Exception\DomainException::class); + $this->expectException(DomainException::class); $command = new AccreditIdentityCommand(); $command->identityId = static::uuid(); $command->institution = 'Babelfish Inc.'; @@ -273,9 +275,9 @@ public function an_identity_cannot_be_accredited_when_it_already_has_been_accred * @group command-handler * @group ra-command-handler */ - public function an_identity_cannot_be_accredited_with_an_invalid_role() + public function an_identity_cannot_be_accredited_with_an_invalid_role(): void { - $this->expectException(\Surfnet\StepupMiddleware\CommandHandlingBundle\Exception\RuntimeException::class); + $this->expectException(RuntimeException::class); $command = new AccreditIdentityCommand(); $command->identityId = static::uuid(); @@ -325,7 +327,7 @@ public function an_identity_cannot_be_accredited_with_an_invalid_role() * @group command-handler * @group ra-command-handler */ - public function an_identity_can_be_accredited_with_ra_role() + public function an_identity_can_be_accredited_with_ra_role(): void { $command = new AccreditIdentityCommand(); $command->identityId = static::uuid(); @@ -391,7 +393,7 @@ public function an_identity_can_be_accredited_with_ra_role() * @group command-handler * @group ra-command-handler */ - public function an_identity_can_be_accredited_with_raa_role() + public function an_identity_can_be_accredited_with_raa_role(): void { $command = new AccreditIdentityCommand(); $command->identityId = static::uuid(); @@ -459,7 +461,7 @@ public function an_identity_can_be_accredited_with_raa_role() * @group command-handler * @group ra-command-handler */ - public function a_registration_authoritys_information_can_be_amended() + public function a_registration_authoritys_information_can_be_amended(): void { $command = new AmendRegistrationAuthorityInformationCommand(); $command->identityId = static::uuid(); @@ -528,10 +530,10 @@ public function a_registration_authoritys_information_can_be_amended() * @group command-handler * @group ra-command-handler */ - public function an_identitys_registration_authority_information_cannot_be_amended() + public function an_identitys_registration_authority_information_cannot_be_amended(): void { $this->expectExceptionMessage("Cannot amend registration authority information: identity is not a registration authority"); - $this->expectException(\Surfnet\Stepup\Exception\DomainException::class); + $this->expectException(DomainException::class); $command = new AmendRegistrationAuthorityInformationCommand(); $command->identityId = static::uuid(); @@ -579,10 +581,10 @@ public function an_identitys_registration_authority_information_cannot_be_amende * @group command-handler * @group ra-command-handler */ - public function an_identity_without_vetted_second_factor_may_not_be_accredited_as_ra() + public function an_identity_without_vetted_second_factor_may_not_be_accredited_as_ra(): void { $this->expectExceptionMessage("An Identity must have at least one vetted second factor before it can be accredited"); - $this->expectException(\Surfnet\Stepup\Exception\DomainException::class); + $this->expectException(DomainException::class); $command = new AccreditIdentityCommand(); $command->identityId = static::uuid(); @@ -622,7 +624,7 @@ public function an_identity_without_vetted_second_factor_may_not_be_accredited_a * @group command-handler * @group ra-command-handler */ - public function an_identity_with_a_vetted_second_factor_can_be_accredited_as_ra() + public function an_identity_with_a_vetted_second_factor_can_be_accredited_as_ra(): void { $command = new AccreditIdentityCommand(); $command->identityId = static::uuid(); @@ -688,10 +690,10 @@ public function an_identity_with_a_vetted_second_factor_can_be_accredited_as_ra( * @group command-handler * @group ra-command-handler */ - public function an_identity_cannot_be_accredited_twice() + public function an_identity_cannot_be_accredited_twice(): void { $this->expectExceptionMessage("Cannot accredit Identity as it has already been accredited for institution"); - $this->expectException(\Surfnet\Stepup\Exception\DomainException::class); + $this->expectException(DomainException::class); $command = new AccreditIdentityCommand(); $command->identityId = static::uuid(); @@ -752,9 +754,9 @@ public function an_identity_cannot_be_accredited_twice() * @group command-handler * @group ra-command-handler */ - public function an_identity_cannot_be_accredited_as_sraa() + public function an_identity_cannot_be_accredited_as_sraa(): void { - $this->expectException(\Surfnet\StepupMiddleware\CommandHandlingBundle\Exception\RuntimeException::class); + $this->expectException(RuntimeException::class); $command = new AccreditIdentityCommand(); $command->identityId = static::uuid(); @@ -803,7 +805,7 @@ public function an_identity_cannot_be_accredited_as_sraa() * @group command-handler * @group ra-command-handler */ - public function an_identity_that_is_accredited_as_raa_can_be_appointed_as_ra() + public function an_identity_that_is_accredited_as_raa_can_be_appointed_as_ra(): void { $command = new AppointRoleCommand(); $command->identityId = static::uuid(); @@ -869,7 +871,7 @@ public function an_identity_that_is_accredited_as_raa_can_be_appointed_as_ra() * @group command-handler * @group ra-command-handler */ - public function an_identity_that_is_accredited_as_ra_can_be_appointed_as_raa() + public function an_identity_that_is_accredited_as_ra_can_be_appointed_as_raa(): void { $command = new AppointRoleCommand(); $command->identityId = static::uuid(); @@ -936,10 +938,10 @@ public function an_identity_that_is_accredited_as_ra_can_be_appointed_as_raa() * @group command-handler * @group ra-command-handler */ - public function an_unaccredited_identity_cannot_be_appointed_a_registration_authority_role() + public function an_unaccredited_identity_cannot_be_appointed_a_registration_authority_role(): void { $this->expectExceptionMessage("Cannot appoint as different RegistrationAuthorityRole: identity is not a registration authority"); - $this->expectException(\Surfnet\Stepup\Exception\DomainException::class); + $this->expectException(DomainException::class); $command = new AppointRoleCommand(); $command->identityId = static::uuid(); @@ -988,10 +990,10 @@ public function an_unaccredited_identity_cannot_be_appointed_a_registration_auth * @group command-handler * @group ra-command-handler */ - public function an_unaccredited_identity_cannot_have_its_registration_authority_retracted() + public function an_unaccredited_identity_cannot_have_its_registration_authority_retracted(): void { $this->expectExceptionMessage("Cannot Retract Registration Authority as the Identity is not a registration authority"); - $this->expectException(\Surfnet\Stepup\Exception\DomainException::class); + $this->expectException(DomainException::class); $command = new RetractRegistrationAuthorityCommand(); $command->identityId = static::uuid(); @@ -1030,7 +1032,7 @@ public function an_unaccredited_identity_cannot_have_its_registration_authority_ ->when($command); } - public function an_accredited_identity_can_retract_its_registration_authority() + public function an_accredited_identity_can_retract_its_registration_authority(): void { $command = new RetractRegistrationAuthorityCommand(); $command->identityId = static::uuid(); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RightToBeForgottenCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RightToBeForgottenCommandHandlerTest.php index 65c557641..9731c11f5 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RightToBeForgottenCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RightToBeForgottenCommandHandlerTest.php @@ -26,6 +26,7 @@ use Mockery as m; use Mockery\MockInterface; use Psr\Log\LoggerInterface; +use Surfnet\Stepup\Exception\DomainException; use Surfnet\Stepup\Helper\UserDataFilterInterface; use Surfnet\Stepup\Identity\Event\IdentityAccreditedAsRaEvent; use Surfnet\Stepup\Identity\Event\IdentityAccreditedAsRaForInstitutionEvent; @@ -44,6 +45,7 @@ use Surfnet\Stepup\Identity\Value\RegistrationAuthorityRole; use Surfnet\Stepup\Identity\Value\SecondFactorId; use Surfnet\Stepup\Identity\Value\YubikeyPublicId; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Exception\RuntimeException; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\ForgetIdentityCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\CommandHandler\RightToBeForgottenCommandHandler; use Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\CommandHandlerTest; @@ -91,7 +93,7 @@ protected function createCommandHandler(EventStoreInterface $eventStore, EventBu * @group command-handler * @group sensitive-data */ - public function an_identity_can_be_forgotten() + public function an_identity_can_be_forgotten(): void { $identityId = new IdentityId('A'); $institution = new Institution('Helsingin Yliopisto'); @@ -150,10 +152,10 @@ public function an_identity_can_be_forgotten() * @group command-handler * @group sensitive-data */ - public function an_identity_may_not_be_forgotten_twice() + public function an_identity_may_not_be_forgotten_twice(): void { $this->expectExceptionMessage("Operation on this Identity is not allowed: it has been forgotten"); - $this->expectException(\Surfnet\Stepup\Exception\DomainException::class); + $this->expectException(DomainException::class); $identityId = new IdentityId('A'); $institution = new Institution('Helsingin Yliopisto'); @@ -210,10 +212,10 @@ public function an_identity_may_not_be_forgotten_twice() * @group command-handler * @group sensitive-data */ - public function an_ra_cannot_be_forgotten() + public function an_ra_cannot_be_forgotten(): void { $this->expectExceptionMessage("Cannot forget an identity that is currently accredited as an RA(A)"); - $this->expectException(\Surfnet\Stepup\Exception\DomainException::class); + $this->expectException(DomainException::class); $identityId = new IdentityId('A'); $institution = new Institution('Helsingin Yliopisto'); @@ -278,10 +280,10 @@ public function an_ra_cannot_be_forgotten() * @group command-handler * @group sensitive-data */ - public function an_raa_cannot_be_forgotten() + public function an_raa_cannot_be_forgotten(): void { $this->expectExceptionMessage("Cannot forget an identity that is currently accredited as an RA(A)"); - $this->expectException(\Surfnet\Stepup\Exception\DomainException::class); + $this->expectException(DomainException::class); $identityId = new IdentityId('A'); $institution = new Institution('Helsingin Yliopisto'); @@ -346,10 +348,10 @@ public function an_raa_cannot_be_forgotten() * @group command-handler * @group sensitive-data */ - public function an_sraa_cannae_be_forgotten() + public function an_sraa_cannae_be_forgotten(): void { $this->expectExceptionMessage("Cannot forget an identity that is currently accredited as an SRAA"); - $this->expectException(\Surfnet\StepupMiddleware\CommandHandlingBundle\Exception\RuntimeException::class); + $this->expectException(RuntimeException::class); $identityId = new IdentityId('A'); $institution = new Institution('Helsingin Yliopisto'); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/SecondFactorRevocationTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/SecondFactorRevocationTest.php index f7613f750..294cabd1e 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/SecondFactorRevocationTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/SecondFactorRevocationTest.php @@ -74,7 +74,7 @@ */ class SecondFactorRevocationTest extends CommandHandlerTest { - private static $window = 3600; + private static int $window = 3600; protected function createCommandHandler(EventStoreInterface $eventStore, EventBusInterface $eventBus): CommandHandler { @@ -106,7 +106,7 @@ protected function createCommandHandler(EventStoreInterface $eventStore, EventBu * @test * @group command-handler */ - public function an_identity_can_revoke_its_own_unverified_second_factor() + public function an_identity_can_revoke_its_own_unverified_second_factor(): void { $command = new RevokeOwnSecondFactorCommand(); $command->identityId = '42'; @@ -162,7 +162,7 @@ public function an_identity_can_revoke_its_own_unverified_second_factor() * @test * @group command-handler */ - public function an_identity_can_revoke_its_own_verified_second_factor() + public function an_identity_can_revoke_its_own_verified_second_factor(): void { $command = new RevokeOwnSecondFactorCommand(); $command->identityId = '42'; @@ -230,7 +230,7 @@ public function an_identity_can_revoke_its_own_verified_second_factor() * @test * @group command-handler */ - public function an_identity_can_revoke_its_own_vetted_second_factor() + public function an_identity_can_revoke_its_own_vetted_second_factor(): void { $command = new RevokeOwnSecondFactorCommand(); $command->identityId = '42'; @@ -316,7 +316,7 @@ public function an_identity_can_revoke_its_own_vetted_second_factor() * @test * @group command-handler */ - public function a_registration_authority_can_revoke_an_unverified_second_factor() + public function a_registration_authority_can_revoke_an_unverified_second_factor(): void { $command = new RevokeRegistrantsSecondFactorCommand(); $command->authorityId = static::uuid(); @@ -402,7 +402,7 @@ public function a_registration_authority_can_revoke_an_unverified_second_factor( * @test * @group command-handler */ - public function a_registration_authority_can_revoke_a_verified_second_factor() + public function a_registration_authority_can_revoke_a_verified_second_factor(): void { $command = new RevokeRegistrantsSecondFactorCommand(); $command->authorityId = static::uuid(); @@ -501,7 +501,7 @@ public function a_registration_authority_can_revoke_a_verified_second_factor() * @test * @group command-handler */ - public function a_registration_authority_can_revoke_a_vetted_second_factor() + public function a_registration_authority_can_revoke_a_vetted_second_factor(): void { $command = new RevokeRegistrantsSecondFactorCommand(); $command->authorityId = static::uuid(); @@ -618,7 +618,7 @@ public function a_registration_authority_can_revoke_a_vetted_second_factor() * @test * @group command-handler */ - public function a_registration_authority_can_revoke_a_possession_proved_skipped_vetted_second_factor() + public function a_registration_authority_can_revoke_a_possession_proved_skipped_vetted_second_factor(): void { $command = new RevokeRegistrantsSecondFactorCommand(); $command->authorityId = static::uuid(); @@ -734,7 +734,7 @@ public function a_registration_authority_can_revoke_a_possession_proved_skipped_ * @test * @group command-handler */ - public function a_registration_authority_can_revoke_one_of_multiple_vetted_second_factors() + public function a_registration_authority_can_revoke_one_of_multiple_vetted_second_factors(): void { $command = new RevokeRegistrantsSecondFactorCommand(); $command->authorityId = static::uuid(); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/WhitelistCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/WhitelistCommandHandlerTest.php index 70a8e0fcf..4d893400a 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/WhitelistCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/WhitelistCommandHandlerTest.php @@ -22,6 +22,7 @@ use Broadway\EventHandling\EventBus as EventBusInterface; use Broadway\EventSourcing\AggregateFactory\PublicConstructorAggregateFactory; use Broadway\EventStore\EventStore as EventStoreInterface; +use Surfnet\Stepup\Exception\DomainException; use Surfnet\Stepup\Identity\Collection\InstitutionCollection; use Surfnet\Stepup\Identity\Event\InstitutionsAddedToWhitelistEvent; use Surfnet\Stepup\Identity\Event\InstitutionsRemovedFromWhitelistEvent; @@ -55,7 +56,7 @@ protected function createCommandHandler(EventStoreInterface $eventStore, EventBu * @group command-handler * @group whitelist */ - public function when_the_whitelist_does_not_exist_yet_it_is_created() + public function when_the_whitelist_does_not_exist_yet_it_is_created(): void { $command = new ReplaceWhitelistCommand(); $command->institutions = ['Replace A', 'Replace B', 'Replace C']; @@ -74,7 +75,7 @@ public function when_the_whitelist_does_not_exist_yet_it_is_created() * @group command-handler * @group whitelist */ - public function the_whitelist_can_be_fully_replaced() + public function the_whitelist_can_be_fully_replaced(): void { $initialInstitutions = $this->mapStringValuesToInstitutions(['Initial One', 'Initial Two']); @@ -98,7 +99,7 @@ public function the_whitelist_can_be_fully_replaced() * @group command-handler * @group whitelist */ - public function an_institution_not_yet_on_the_whitelist_can_be_added_to_the_whitelist() + public function an_institution_not_yet_on_the_whitelist_can_be_added_to_the_whitelist(): void { $initialInstitutions = $this->mapStringValuesToInstitutions(['Initial One', 'Initial Two']); @@ -121,10 +122,10 @@ public function an_institution_not_yet_on_the_whitelist_can_be_added_to_the_whit * @group command-handler * @group whitelist */ - public function an_institution_on_the_whitelist_may_not_be_added_again() + public function an_institution_on_the_whitelist_may_not_be_added_again(): void { $this->expectExceptionMessage("Cannot add institution \"already exists\" as it is already whitelisted"); - $this->expectException(\Surfnet\Stepup\Exception\DomainException::class); + $this->expectException(DomainException::class); $initialInstitutions = $this->mapStringValuesToInstitutions(['Initial One', 'Already Exists']); @@ -142,7 +143,7 @@ public function an_institution_on_the_whitelist_may_not_be_added_again() * @group command-handler * @group whitelist */ - public function an_institution_on_the_whitelist_can_be_removed_from_the_whitelist() + public function an_institution_on_the_whitelist_can_be_removed_from_the_whitelist(): void { $initialInstitutions = $this->mapStringValuesToInstitutions(['Initial One', 'On the whitelist']); @@ -165,10 +166,10 @@ public function an_institution_on_the_whitelist_can_be_removed_from_the_whitelis * @group command-handler * @group whitelist */ - public function an_institution_that_is_not_on_the_whitelist_cannot_be_removed() + public function an_institution_that_is_not_on_the_whitelist_cannot_be_removed(): void { $this->expectExceptionMessage("Cannot remove institution \"not on the whitelist\" as it is not whitelisted"); - $this->expectException(\Surfnet\Stepup\Exception\DomainException::class); + $this->expectException(DomainException::class); $initialInstitutions = $this->mapStringValuesToInstitutions(['Initial One', 'Initial Two']); $command = new RemoveFromWhitelistCommand(); @@ -185,9 +186,9 @@ public function an_institution_that_is_not_on_the_whitelist_cannot_be_removed() * @param array $institutions * @return array */ - private function mapStringValuesToInstitutions(array $institutions) + private function mapStringValuesToInstitutions(array $institutions): array { - return array_map(function ($institution) { + return array_map(function ($institution): Institution { return new Institution($institution); }, $institutions); } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcher.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcher.php index 2a6453aa4..fbc5b12a5 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcher.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcher.php @@ -50,7 +50,7 @@ public function match(&$actual) return false; } - public function __toString() + public function __toString(): string { return sprintf('', $this->_expected); } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcherTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcherTest.php index b4c2c0769..9e03538ce 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcherTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcherTest.php @@ -20,6 +20,7 @@ use Mockery\Exception\RuntimeException; use PHPUnit\Framework\TestCase as TestCase; +use stdClass; use Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\Mockery\TestObjects\ObjectWithInstitutionAccessor; use Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\Mockery\TestObjects\ObjectWithInstitutionProperty; use Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\Mockery\TestObjects\ObjectWithoutInstitutionPropertyAndAccessor; @@ -33,7 +34,7 @@ class HasInstitutionMatcherTest extends TestCase * * @dataProvider nonStringProvider */ - public function has_institution_matcher_only_matches_against_strings($nonString) + public function has_institution_matcher_only_matches_against_strings(bool|int|float|stdClass|array|null $nonString): void { $this->expectException(RuntimeException::class); @@ -47,7 +48,7 @@ public function has_institution_matcher_only_matches_against_strings($nonString) * * @dataProvider nonObjectProvider */ - public function has_institution_matcher_only_matches_objects_against_a_given_institution($nonObject) + public function has_institution_matcher_only_matches_objects_against_a_given_institution(bool|int|float|string|array|null $nonObject): void { $institution = 'surfnet.nl'; @@ -62,7 +63,7 @@ public function has_institution_matcher_only_matches_objects_against_a_given_ins * @group mockery * @group institution */ - public function has_institution_matcher_does_not_match_when_object_has_no_institution_property_and_no_institution_accessor() + public function has_institution_matcher_does_not_match_when_object_has_no_institution_property_and_no_institution_accessor(): void { $institution = 'surfnet.nl'; @@ -79,7 +80,7 @@ public function has_institution_matcher_does_not_match_when_object_has_no_instit * @group mockery * @group institution */ - public function has_institution_matcher_does_not_match_when_objects_accessed_institution_differs_from_given_institution() + public function has_institution_matcher_does_not_match_when_objects_accessed_institution_differs_from_given_institution(): void { $institution = 'surfnet.nl'; $differentInstitution = 'not-surfnet.nl'; @@ -97,7 +98,7 @@ public function has_institution_matcher_does_not_match_when_objects_accessed_ins * @group mockery * @group institution */ - public function has_institution_matcher_matches_when_objects_accessed_institution_is_the_same_as_given_institution() + public function has_institution_matcher_matches_when_objects_accessed_institution_is_the_same_as_given_institution(): void { $institution = 'surfnet.nl'; @@ -114,7 +115,7 @@ public function has_institution_matcher_matches_when_objects_accessed_institutio * @group mockery * @group institution */ - public function has_institution_matcher_does_not_match_when_objects_institution_property_differs_from_given_institution() + public function has_institution_matcher_does_not_match_when_objects_institution_property_differs_from_given_institution(): void { $institution = 'surfnet.nl'; $differentInstitution = 'not-surfnet.nl'; @@ -132,7 +133,7 @@ public function has_institution_matcher_does_not_match_when_objects_institution_ * @group mockery * @group institution */ - public function has_institution_matcher_matches_when_objects_institution_property_is_the_same_as_given_institution() + public function has_institution_matcher_matches_when_objects_institution_property_is_the_same_as_given_institution(): void { $institution = 'surfnet.nl'; @@ -144,7 +145,7 @@ public function has_institution_matcher_matches_when_objects_institution_propert $this->assertTrue($match); } - public function nonStringProvider() + public function nonStringProvider(): array { return [ 'null' => [null], @@ -152,11 +153,11 @@ public function nonStringProvider() 'boolean' => [true], 'integer' => [1], 'float' => [1.2], - 'object' => [new \stdClass()], + 'object' => [new stdClass()], ]; } - public function nonObjectProvider() + public function nonObjectProvider(): array { return [ 'null' => [null], diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/AuthorizingStageTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/AuthorizingStageTest.php index b96570df0..e97714ae6 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/AuthorizingStageTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/AuthorizingStageTest.php @@ -19,21 +19,23 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\Pipeline; use Mockery as m; +use Mockery\MockInterface; use PHPUnit\Framework\TestCase as UnitTest; use Psr\Log\NullLogger; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Exception\ForbiddenException; use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\AuthorizingStage; class AuthorizingStageTest extends UnitTest { /** - * @var \Mockery\MockInterface mock of Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface + * @var MockInterface mock of Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface */ private $authorizationChecker; /** * @var NullLogger */ - private $logger; + private NullLogger $logger; public function setUp(): void { @@ -47,7 +49,7 @@ public function setUp(): void * @test * @group pipeline */ - public function when_a_command_has_no_marker_interface_authorization_is_granted_by_default() + public function when_a_command_has_no_marker_interface_authorization_is_granted_by_default(): void { $command = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command'); $this->authorizationChecker->shouldReceive('isGranted')->never(); @@ -67,7 +69,7 @@ public function when_a_command_has_no_marker_interface_authorization_is_granted_ * @param string $interface * @param string $role */ - public function a_command_with_a_marker_interface_triggers_a_check_for_the_correct_role($interface, $role) + public function a_command_with_a_marker_interface_triggers_a_check_for_the_correct_role(string $interface, string $role): void { $command = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command, ' . $interface); $this->authorizationChecker @@ -87,7 +89,7 @@ public function a_command_with_a_marker_interface_triggers_a_check_for_the_corre * @test * @group pipeline */ - public function when_a_command_implements_multiple_marker_interfaces_at_least_one_corresponding_role_is_required() + public function when_a_command_implements_multiple_marker_interfaces_at_least_one_corresponding_role_is_required(): void { $command = m::mock( 'Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command, ' @@ -122,9 +124,9 @@ public function when_a_command_implements_multiple_marker_interfaces_at_least_on * @test * @group pipeline */ - public function when_the_client_does_not_have_the_required_role_an_forbidden_exception_is_thrown() + public function when_the_client_does_not_have_the_required_role_an_forbidden_exception_is_thrown(): void { - $this->expectException(\Surfnet\StepupMiddleware\CommandHandlingBundle\Exception\ForbiddenException::class); + $this->expectException(ForbiddenException::class); $command = m::mock( 'Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command, ' @@ -144,7 +146,7 @@ public function when_the_client_does_not_have_the_required_role_an_forbidden_exc $this->assertInstanceOf($authorizingStage, AuthorizingStage::class); } - public function interfaceToRoleMappingProvider() + public function interfaceToRoleMappingProvider(): array { return [ 'SelfServiceExecutable => ROLE_SS' => [ diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/DispatchStageTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/DispatchStageTest.php index 9f3366964..d01d22786 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/DispatchStageTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/DispatchStageTest.php @@ -30,7 +30,7 @@ class DispatchStageTest extends TestCase * @test * @group pipeline */ - public function it_dispatches_commands() + public function it_dispatches_commands(): void { $command = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command'); $commandBus = m::mock(CommandBus::class)->makePartial() diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/EventDispatchingStageTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/EventDispatchingStageTest.php index 6f6928be8..6e453b709 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/EventDispatchingStageTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/EventDispatchingStageTest.php @@ -30,7 +30,7 @@ class EventDispatchingStageTest extends UnitTest * @test * @group pipeline */ - public function buffered_event_bus_flush_is_called_during_process() + public function buffered_event_bus_flush_is_called_during_process(): void { $command = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command'); $eventBus = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\EventHandling\BufferedEventBus') @@ -47,7 +47,7 @@ public function buffered_event_bus_flush_is_called_during_process() * @test * @group pipeline */ - public function it_returns_the_same_command_as_it_processes_unmodified() + public function it_returns_the_same_command_as_it_processes_unmodified(): void { $command = new FixedUuidStubCommand(); $uuid = $command->UUID; diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/StagedPipelineTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/StagedPipelineTest.php index ab22e271a..40a3adf16 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/StagedPipelineTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/StagedPipelineTest.php @@ -29,7 +29,7 @@ class StagedPipelineTest extends TestCase * @test * @group pipeline */ - public function it_passes_a_command_through_a_single_stage() + public function it_passes_a_command_through_a_single_stage(): void { $command = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command'); $stage = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\Stage') @@ -46,7 +46,7 @@ public function it_passes_a_command_through_a_single_stage() * @test * @group pipeline */ - public function it_passes_a_command_through_multiple_stages() + public function it_passes_a_command_through_multiple_stages(): void { $command = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command'); $stage1 = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\Stage') @@ -67,7 +67,7 @@ public function it_passes_a_command_through_multiple_stages() * @test * @group pipeline */ - public function it_passes_the_command_returned_from_an_earlier_stage_on_to_the_next() + public function it_passes_the_command_returned_from_an_earlier_stage_on_to_the_next(): void { $command1 = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command'); $command2 = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command'); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/ValidationStageTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/ValidationStageTest.php index 1fd8c2dd8..bce8c72a2 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/ValidationStageTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/ValidationStageTest.php @@ -18,9 +18,11 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\Pipeline; +use ArrayIterator; use Mockery as m; use PHPUnit\Framework\TestCase; use Psr\Log\NullLogger; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\Exception\InvalidCommandException; use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\ValidationStage; class ValidationStageTest extends TestCase @@ -29,7 +31,7 @@ class ValidationStageTest extends TestCase * @test * @group pipeline */ - public function it_validates_commands() + public function it_validates_commands(): void { $command = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command'); $violations = m::mock('Symfony\Component\Validator\ConstraintViolationListInterface') @@ -48,14 +50,14 @@ public function it_validates_commands() * @test * @group pipeline */ - public function it_throws_an_exception_when_validation_fails() + public function it_throws_an_exception_when_validation_fails(): void { - $this->expectException(\Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\Exception\InvalidCommandException::class); + $this->expectException(InvalidCommandException::class); $command = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command'); $violations = m::mock('Symfony\Component\Validator\ConstraintViolationListInterface') ->shouldReceive('count')->with()->andReturn(1) - ->shouldReceive('getIterator')->with()->andReturn(new \ArrayIterator()) + ->shouldReceive('getIterator')->with()->andReturn(new ArrayIterator()) ->getMock(); $validator = m::mock('Symfony\Component\Validator\Validator\ValidatorInterface') ->shouldReceive('validate')->once()->with($command)->andReturn($violations) diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Processor/RecoveryTokenEmailProcessorTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Processor/RecoveryTokenEmailProcessorTest.php index fefcbeae8..25d70503f 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Processor/RecoveryTokenEmailProcessorTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Processor/RecoveryTokenEmailProcessorTest.php @@ -48,7 +48,7 @@ class RecoveryTokenEmailProcessorTest extends TestCase /** * @var RecoveryTokenEmailProcessor */ - private $processor; + private RecoveryTokenEmailProcessor $processor; /** * @var Mockery\MockInterface|RecoveryTokenMailService */ @@ -71,7 +71,7 @@ public function setUp(): void /** * @group processor */ - public function test_mails_when_complied_with_recovery_token_revocation() + public function test_mails_when_complied_with_recovery_token_revocation(): void { $identity = $this->returnABogusIdentity(); $this->identityService @@ -103,7 +103,7 @@ public function test_mails_when_complied_with_recovery_token_revocation() /** * @group processor */ - public function test_does_not_mail_when_identity_not_found_complied_with_recovery_token_revocation() + public function test_does_not_mail_when_identity_not_found_complied_with_recovery_token_revocation(): void { $this->identityService ->shouldReceive('find') @@ -125,7 +125,7 @@ public function test_does_not_mail_when_identity_not_found_complied_with_recover /** * @group processor */ - public function test_it_mails_when_recovery_token_revoked_by_identity() + public function test_it_mails_when_recovery_token_revoked_by_identity(): void { $identity = $this->returnABogusIdentity(); $this->identityService @@ -156,7 +156,7 @@ public function test_it_mails_when_recovery_token_revoked_by_identity() /** * @group processor */ - public function test_does_not_mail_when_identity_not_found_recovery_token_revocation() + public function test_does_not_mail_when_identity_not_found_recovery_token_revocation(): void { $this->identityService ->shouldReceive('find') @@ -177,7 +177,7 @@ public function test_does_not_mail_when_identity_not_found_recovery_token_revoca /** * @group processor */ - public function test_it_mails_when_sms_token_created() + public function test_it_mails_when_sms_token_created(): void { $identity = $this->returnABogusIdentity(); $this->identityService @@ -208,7 +208,7 @@ public function test_it_mails_when_sms_token_created() /** * @group processor */ - public function test_does_not_mail_when_identity_not_found_sms_creation() + public function test_does_not_mail_when_identity_not_found_sms_creation(): void { $this->identityService ->shouldReceive('find') @@ -232,7 +232,7 @@ public function test_does_not_mail_when_identity_not_found_sms_creation() /** * @group processor */ - public function test_it_mails_when_safe_store_token_created() + public function test_it_mails_when_safe_store_token_created(): void { $identity = $this->returnABogusIdentity(); $this->identityService @@ -263,7 +263,7 @@ public function test_it_mails_when_safe_store_token_created() /** * @group processor */ - public function test_does_not_mail_when_identity_not_found_safe_store_creation() + public function test_does_not_mail_when_identity_not_found_safe_store_creation(): void { $this->identityService ->shouldReceive('find') diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/EventSourcing/ForgettableEventStub.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/EventSourcing/ForgettableEventStub.php index 334c7e0c0..6c89de3b5 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/EventSourcing/ForgettableEventStub.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/EventSourcing/ForgettableEventStub.php @@ -40,7 +40,7 @@ public function getSensitiveData() * @param SensitiveData $sensitiveData * @return void */ - public function setSensitiveData(SensitiveData $sensitiveData) + public function setSensitiveData(SensitiveData $sensitiveData): void { $this->sensitiveData = $sensitiveData; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/EventSourcing/SensitiveDataMessageStreamTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/EventSourcing/SensitiveDataMessageStreamTest.php index 627578ec6..a9bed74e1 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/EventSourcing/SensitiveDataMessageStreamTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/EventSourcing/SensitiveDataMessageStreamTest.php @@ -29,6 +29,7 @@ use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\EventSourcing\SensitiveDataMessage; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\EventSourcing\SensitiveDataMessageStream; +use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Exception\SensitiveDataApplicationException; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\SensitiveData; final class SensitiveDataMessageStreamTest extends TestCase @@ -40,7 +41,7 @@ final class SensitiveDataMessageStreamTest extends TestCase * @test * @group sensitive-data */ - public function it_can_work_with_zero_sensitive_data_messages_and_zero_events() + public function it_can_work_with_zero_sensitive_data_messages_and_zero_events(): void { $this->apply([], []); @@ -51,7 +52,7 @@ public function it_can_work_with_zero_sensitive_data_messages_and_zero_events() * @test * @group sensitive-data */ - public function it_can_apply_one_sensitive_data_message_to_one_matching_event() + public function it_can_apply_one_sensitive_data_message_to_one_matching_event(): void { $sensitiveDataMessages = [ new SensitiveDataMessage( @@ -78,7 +79,7 @@ public function it_can_apply_one_sensitive_data_message_to_one_matching_event() * @test * @group sensitive-data */ - public function it_can_apply_two_sensitive_data_message_to_two_matching_events() + public function it_can_apply_two_sensitive_data_message_to_two_matching_events(): void { $sensitiveDataMessages = [ new SensitiveDataMessage( @@ -118,7 +119,7 @@ public function it_can_apply_two_sensitive_data_message_to_two_matching_events() * @test * @group sensitive-data */ - public function it_can_apply_one_sensitive_data_message_to_one_regular_event_and_one_matching_forgettable_event() + public function it_can_apply_one_sensitive_data_message_to_one_regular_event_and_one_matching_forgettable_event(): void { $sensitiveDataMessages = [ new SensitiveDataMessage( @@ -152,10 +153,10 @@ public function it_can_apply_one_sensitive_data_message_to_one_regular_event_and * @test * @group sensitive-data */ - public function it_fails_when_sensitive_data_is_missing_for_an_event() + public function it_fails_when_sensitive_data_is_missing_for_an_event(): void { $this->expectExceptionMessage("Sensitive data is missing for event with UUID A, playhead 0"); - $this->expectException(\Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Exception\SensitiveDataApplicationException::class); + $this->expectException(SensitiveDataApplicationException::class); $sensitiveDataMessages = []; $domainMessages = [ @@ -175,10 +176,10 @@ public function it_fails_when_sensitive_data_is_missing_for_an_event() * @test * @group sensitive-data */ - public function it_fails_when_not_all_sensitive_data_could_be_matched_to_an_event() + public function it_fails_when_not_all_sensitive_data_could_be_matched_to_an_event(): void { $this->expectExceptionMessage("1 sensitive data messages are still to be matched to events"); - $this->expectException(\Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Exception\SensitiveDataApplicationException::class); + $this->expectException(SensitiveDataApplicationException::class); $sensitiveDataMessages = [ new SensitiveDataMessage( new IdentityId(self::EVENT_STREAM_A), @@ -203,10 +204,10 @@ public function it_fails_when_not_all_sensitive_data_could_be_matched_to_an_even * @test * @group sensitive-data */ - public function it_fails_when_sensitive_data_matches_a_regular_event() + public function it_fails_when_sensitive_data_matches_a_regular_event(): void { $this->expectExceptionMessage("Encountered sensitive data for event which does not support sensitive data, UUID A, playhead 0"); - $this->expectException(\Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Exception\SensitiveDataApplicationException::class); + $this->expectException(SensitiveDataApplicationException::class); $sensitiveDataMessages = [ new SensitiveDataMessage( @@ -232,10 +233,10 @@ public function it_fails_when_sensitive_data_matches_a_regular_event() * @test * @group sensitive-data */ - public function it_fails_when_stream_ids_dont_match() + public function it_fails_when_stream_ids_dont_match(): void { $this->expectExceptionMessage("Encountered sensitive data from stream A for event from stream B"); - $this->expectException(\Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Exception\SensitiveDataApplicationException::class); + $this->expectException(SensitiveDataApplicationException::class); $sensitiveDataMessages = [ new SensitiveDataMessage( @@ -261,7 +262,7 @@ public function it_fails_when_stream_ids_dont_match() * @test * @group sensitive-data */ - public function it_can_forget_all_sensitive_data() + public function it_can_forget_all_sensitive_data(): void { $sensitiveDataMessageStream = new SensitiveDataMessageStream([ m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\EventSourcing\SensitiveDataMessage') @@ -273,13 +274,13 @@ public function it_can_forget_all_sensitive_data() $this->assertInstanceOf(SensitiveDataMessageStream::class, $sensitiveDataMessageStream); } - private function apply(array $sensitiveDataMessages, array $domainMessages) + private function apply(array $sensitiveDataMessages, array $domainMessages): void { (new SensitiveDataMessageStream($sensitiveDataMessages)) ->applyToDomainEventStream(new DomainEventStream($domainMessages)); } - private function assertSensitiveDataEquals(SensitiveDataMessage $sensitiveDataMessage, DomainMessage $domainMessage) + private function assertSensitiveDataEquals(SensitiveDataMessage $sensitiveDataMessage, DomainMessage $domainMessage): void { $this->assertEquals($sensitiveDataMessage->getSensitiveData(), $domainMessage->getPayload()->sensitiveData); } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/SensitiveDataTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/SensitiveDataTest.php index 69da5eb85..b40934e55 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/SensitiveDataTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/SensitiveDataTest.php @@ -31,7 +31,7 @@ class SensitiveDataTest extends TestCase { - public function sensitiveDataToSerialise() + public function sensitiveDataToSerialise(): array { return [ 'None' => [ @@ -110,7 +110,7 @@ public function sensitiveDataToSerialise() public function it_serialises_and_deserialises( SensitiveData $sensitiveData, array $getterExpectations - ) { + ): void { $sensitiveData = SensitiveData::deserialize(json_decode(json_encode($sensitiveData->serialize()), true)); foreach ($getterExpectations as $data => $expectedValue) { diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/Service/SensitiveDataServiceTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/Service/SensitiveDataServiceTest.php index e637573d7..ae876311c 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/Service/SensitiveDataServiceTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/Service/SensitiveDataServiceTest.php @@ -29,7 +29,7 @@ final class SensitiveDataServiceTest extends TestCase * @test * @group sensitive-data */ - public function it_can_forget_sensitive_data_in_a_stream() + public function it_can_forget_sensitive_data_in_a_stream(): void { $identityId = new IdentityId('A'); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Value/InstitutionTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Value/InstitutionTest.php index 7f7fe08b0..8199349c9 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Value/InstitutionTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Value/InstitutionTest.php @@ -19,6 +19,8 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\Value; use PHPUnit\Framework\TestCase as UnitTest; +use StdClass; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Exception\InvalidArgumentException; use Surfnet\StepupMiddleware\CommandHandlingBundle\Value\Institution; class InstitutionTest extends UnitTest @@ -29,9 +31,9 @@ class InstitutionTest extends UnitTest * * @param mixed $invalidValue */ - public function an_institution_cannot_be_created_with_anything_but_a_nonempty_string($invalidValue) + public function an_institution_cannot_be_created_with_anything_but_a_nonempty_string(string|int|float|StdClass|array $invalidValue): void { - $this->expectException(\Surfnet\StepupMiddleware\CommandHandlingBundle\Exception\InvalidArgumentException::class); + $this->expectException(InvalidArgumentException::class); new Institution($invalidValue); } @@ -39,7 +41,7 @@ public function an_institution_cannot_be_created_with_anything_but_a_nonempty_st /** * @test */ - public function two_institutions_with_the_same_value_are_equal() + public function two_institutions_with_the_same_value_are_equal(): void { $institution = new Institution('a'); $theSame = new Institution('a'); @@ -51,7 +53,7 @@ public function two_institutions_with_the_same_value_are_equal() $this->assertFalse($institution->equals($different)); } - public function nonStringOrNonEmptyStringProvider() + public function nonStringOrNonEmptyStringProvider(): array { return [ 'empty string' => [''], @@ -59,7 +61,7 @@ public function nonStringOrNonEmptyStringProvider() 'array' => [[]], 'integer' => [1], 'float' => [1.2], - 'object' => [new \StdClass()], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Value/Institution.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Value/Institution.php index ee4efada1..4ae94338d 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Value/Institution.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Value/Institution.php @@ -22,10 +22,7 @@ final class Institution { - /** - * @var string - */ - private $institution; + private string $institution; /** * @param string $institution may not be an empty string @@ -51,12 +48,12 @@ public function getInstitution() * @param Institution $otherInstitution * @return bool */ - public function equals(Institution $otherInstitution) + public function equals(Institution $otherInstitution): bool { return $this->institution === $otherInstitution->institution; } - public function __toString() + public function __toString(): string { return $this->institution; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Value/Sender.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Value/Sender.php index 1e5e35486..2e91a79f9 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Value/Sender.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Value/Sender.php @@ -22,15 +22,9 @@ class Sender { - /** - * @var string - */ - private $name; + private string $name; - /** - * @var string - */ - private $email; + private string $email; public function __construct(string $name, string $email) { diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/DependencyInjection/SurfnetStepupMiddlewareGatewayExtension.php b/src/Surfnet/StepupMiddleware/GatewayBundle/DependencyInjection/SurfnetStepupMiddlewareGatewayExtension.php index 82e1c1e1c..c4691aaed 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/DependencyInjection/SurfnetStepupMiddlewareGatewayExtension.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/DependencyInjection/SurfnetStepupMiddlewareGatewayExtension.php @@ -25,7 +25,7 @@ class SurfnetStepupMiddlewareGatewayExtension extends Extension { - public function load(array $configs, ContainerBuilder $container) + public function load(array $configs, ContainerBuilder $container): void { $configuration = new Configuration(); $this->processConfiguration($configuration, $configs); diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntity.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntity.php index 5ac5dc383..7ae3131b5 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntity.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntity.php @@ -75,7 +75,7 @@ private function __construct($entityId, $type, $configuration) * @param array $configuration * @return SamlEntity */ - public static function createServiceProvider($entityId, array $configuration) + public static function createServiceProvider($entityId, array $configuration): self { return new self($entityId, self::TYPE_SP, json_encode($configuration)); } @@ -85,7 +85,7 @@ public static function createServiceProvider($entityId, array $configuration) * @param array $configuration * @return SamlEntity */ - public static function createIdentityProvider($entityId, array $configuration) + public static function createIdentityProvider($entityId, array $configuration): self { return new self($entityId, self::TYPE_IDP, json_encode($configuration)); } diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntityRepository.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntityRepository.php index 615fb4d6b..6e23e0174 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntityRepository.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntityRepository.php @@ -27,7 +27,7 @@ class SamlEntityRepository extends EntityRepository * * @param array $newSamlEntities */ - public function replaceAllSps(array $newSamlEntities) + public function replaceAllSps(array $newSamlEntities): void { $this->replaceAllOfType(SamlEntity::TYPE_SP, $newSamlEntities); } @@ -37,7 +37,7 @@ public function replaceAllSps(array $newSamlEntities) * * @param array $newSamlEntities */ - public function replaceAllIdps(array $newSamlEntities) + public function replaceAllIdps(array $newSamlEntities): void { $this->replaceAllOfType(SamlEntity::TYPE_IDP, $newSamlEntities); } @@ -50,7 +50,7 @@ public function replaceAllIdps(array $newSamlEntities) * @param string $type * @param array $newSamlEntities */ - private function replaceAllOfType($type, array $newSamlEntities) + private function replaceAllOfType(string $type, array $newSamlEntities): void { $entityManager = $this->getEntityManager(); $counter = 0; @@ -74,7 +74,7 @@ private function replaceAllOfType($type, array $newSamlEntities) * * @param string $type */ - private function removeAllOfType($type) + private function removeAllOfType($type): void { $this ->getEntityManager() diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SecondFactor.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SecondFactor.php index 3b5b3a618..5bdd31181 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SecondFactor.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SecondFactor.php @@ -33,12 +33,9 @@ #[ORM\Entity(repositoryClass: SecondFactorRepository::class)] class SecondFactor { - /** - * @var int - */ #[ORM\Id] #[ORM\Column(length: 36)] - private $id; + private string $id; /** * @var string diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/WhitelistEntry.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/WhitelistEntry.php index 6fbc7701c..c1fd71aa9 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/WhitelistEntry.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/WhitelistEntry.php @@ -29,7 +29,7 @@ class WhitelistEntry #[ORM\Column(type: 'institution')] public Institution $institution; - public static function createFrom(Institution $institution) + public static function createFrom(Institution $institution): self { $instance = new self(); $instance->institution = $institution; diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/InstitutionConfigurationProjector.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/InstitutionConfigurationProjector.php index 9b97ff064..53a0f14a6 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/InstitutionConfigurationProjector.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/InstitutionConfigurationProjector.php @@ -29,10 +29,7 @@ class InstitutionConfigurationProjector extends Projector { - /** - * @var InstitutionConfigurationRepository - */ - private $repository; + private InstitutionConfigurationRepository $repository; /** * @param InstitutionConfigurationRepository $repository diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/SamlEntityProjector.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/SamlEntityProjector.php index 875777308..fd2da1824 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/SamlEntityProjector.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/SamlEntityProjector.php @@ -26,10 +26,7 @@ class SamlEntityProjector extends Projector { - /** - * @var SamlEntityRepository - */ - private $samlEntityRepository; + private SamlEntityRepository $samlEntityRepository; /** * @param SamlEntityRepository $samlEntityRepository @@ -42,7 +39,7 @@ public function __construct(SamlEntityRepository $samlEntityRepository) /** * @param ServiceProvidersUpdatedEvent $event */ - public function applyServiceProvidersUpdatedEvent(ServiceProvidersUpdatedEvent $event) + public function applyServiceProvidersUpdatedEvent(ServiceProvidersUpdatedEvent $event): void { $spConfigurations = []; foreach ($event->serviceProviders as $configuration) { @@ -58,7 +55,7 @@ public function applyServiceProvidersUpdatedEvent(ServiceProvidersUpdatedEvent $ /** * @param IdentityProvidersUpdatedEvent $event */ - public function applyIdentityProvidersUpdatedEvent(IdentityProvidersUpdatedEvent $event) + public function applyIdentityProvidersUpdatedEvent(IdentityProvidersUpdatedEvent $event): void { $spConfigurations = []; foreach ($event->identityProviders as $configuration) { diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/SecondFactorProjector.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/SecondFactorProjector.php index 0d9cdc06b..65bf704b4 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/SecondFactorProjector.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/SecondFactorProjector.php @@ -34,10 +34,7 @@ class SecondFactorProjector extends Projector { - /** - * @var SecondFactorRepository - */ - private $repository; + private SecondFactorRepository $repository; /** * @param SecondFactorRepository $repository @@ -47,7 +44,7 @@ public function __construct(SecondFactorRepository $repository) $this->repository = $repository; } - public function applyYubikeySecondFactorBootstrappedEvent(YubikeySecondFactorBootstrappedEvent $event) + public function applyYubikeySecondFactorBootstrappedEvent(YubikeySecondFactorBootstrappedEvent $event): void { $this->repository->save( new SecondFactor( @@ -63,7 +60,7 @@ public function applyYubikeySecondFactorBootstrappedEvent(YubikeySecondFactorBoo ); } - public function applySecondFactorMigratedEvent(SecondFactorMigratedEvent $event) + public function applySecondFactorMigratedEvent(SecondFactorMigratedEvent $event): void { $this->repository->save( new SecondFactor( @@ -79,7 +76,7 @@ public function applySecondFactorMigratedEvent(SecondFactorMigratedEvent $event) ); } - public function applySecondFactorVettedEvent(SecondFactorVettedEvent $event) + public function applySecondFactorVettedEvent(SecondFactorVettedEvent $event): void { $this->repository->save( new SecondFactor( @@ -95,7 +92,7 @@ public function applySecondFactorVettedEvent(SecondFactorVettedEvent $event) ); } - public function applySecondFactorVettedWithoutTokenProofOfPossession(SecondFactorVettedWithoutTokenProofOfPossession $event) + public function applySecondFactorVettedWithoutTokenProofOfPossession(SecondFactorVettedWithoutTokenProofOfPossession $event): void { $this->repository->save( new SecondFactor( diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/WhitelistProjector.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/WhitelistProjector.php index 1b04429fb..894a2372a 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/WhitelistProjector.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/WhitelistProjector.php @@ -28,10 +28,7 @@ class WhitelistProjector extends Projector { - /** - * @var WhitelistEntryRepository - */ - private $whitelistEntryRepository; + private WhitelistEntryRepository $whitelistEntryRepository; /** * @param WhitelistEntryRepository $whitelistRepository diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/SecondFactorRepository.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/SecondFactorRepository.php index dcfd29f47..0735ef774 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/SecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/SecondFactorRepository.php @@ -28,7 +28,7 @@ class SecondFactorRepository extends EntityRepository /** * @param SecondFactor $secondFactor */ - public function save(SecondFactor $secondFactor) + public function save(SecondFactor $secondFactor): void { $this->getEntityManager()->persist($secondFactor); $this->getEntityManager()->flush(); @@ -38,7 +38,7 @@ public function save(SecondFactor $secondFactor) * @param SecondFactorId $secondFactorId * @return SecondFactor|null */ - public function findOneBySecondFactorId(SecondFactorId $secondFactorId) + public function findOneBySecondFactorId(SecondFactorId $secondFactorId): ?object { return $this->findOneBy(['secondFactorId' => (string) $secondFactorId]); } @@ -47,12 +47,12 @@ public function findOneBySecondFactorId(SecondFactorId $secondFactorId) * @param IdentityId $identityId * @return SecondFactor[] */ - public function findByIdentityId(IdentityId $identityId) + public function findByIdentityId(IdentityId $identityId): array { return $this->findBy(['identityId' => (string) $identityId]); } - public function removeByIdentityId(IdentityId $identityId) + public function removeByIdentityId(IdentityId $identityId): void { $this->getEntityManager()->createQueryBuilder() ->delete($this->_entityName, 'sf') @@ -65,7 +65,7 @@ public function removeByIdentityId(IdentityId $identityId) /** * @param SecondFactor $secondFactor */ - public function remove(SecondFactor $secondFactor) + public function remove(SecondFactor $secondFactor): void { $this->getEntityManager()->remove($secondFactor); $this->getEntityManager()->flush(); diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/WhitelistEntryRepository.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/WhitelistEntryRepository.php index 4c0461dea..54f33d9a3 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/WhitelistEntryRepository.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/WhitelistEntryRepository.php @@ -41,7 +41,7 @@ public function findEntriesByInstitutions(array $institutions) /** * @param WhitelistEntry[] $whitelistEntries */ - public function saveEntries(array $whitelistEntries) + public function saveEntries(array $whitelistEntries): void { $entityManager = $this->getEntityManager(); @@ -55,7 +55,7 @@ public function saveEntries(array $whitelistEntries) /** * Removes all WhitelistEntries */ - public function removeAll() + public function removeAll(): void { $this->createQueryBuilder('w') ->delete() @@ -67,7 +67,7 @@ public function removeAll() /** * @param WhitelistEntry[] $whitelistEntries */ - public function remove(array $whitelistEntries) + public function remove(array $whitelistEntries): void { $entityManager = $this->getEntityManager(); diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Tests/Projector/InstitutionConfigurationProjectorTest.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Tests/Projector/InstitutionConfigurationProjectorTest.php index 89088ed7c..8e2d1c826 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Tests/Projector/InstitutionConfigurationProjectorTest.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Tests/Projector/InstitutionConfigurationProjectorTest.php @@ -35,7 +35,7 @@ class InstitutionConfigurationProjectorTest extends TestCase { use m\Adapter\Phpunit\MockeryPHPUnitIntegration; - private $projector; + private InstitutionConfigurationProjector $projector; private $repository; protected function setUp(): void @@ -46,7 +46,7 @@ protected function setUp(): void $this->projector = $projector; } - public function test_create_row_when_non_existent() + public function test_create_row_when_non_existent(): void { $event = new SsoOn2faOptionChangedEvent( new InstitutionConfigurationId(Uuid::uuid4()->toString()), @@ -54,13 +54,13 @@ public function test_create_row_when_non_existent() new SsoOn2faOption(true) ); $this->repository->shouldReceive('findByInstitution')->with('institution-a.nl')->andReturn(null); - $this->repository->shouldReceive('save')->withArgs(function(InstitutionConfiguration $configuration){ + $this->repository->shouldReceive('save')->withArgs(function(InstitutionConfiguration $configuration): bool{ return $configuration->institution === 'institution-a.nl' && $configuration->ssoOn2faEnabled === true; }); $this->projector->applySsoOn2faOptionChangedEvent($event); } - public function test_updates_existing_row() + public function test_updates_existing_row(): void { $event = new SsoOn2faOptionChangedEvent( new InstitutionConfigurationId(Uuid::uuid4()->toString()), @@ -70,7 +70,7 @@ public function test_updates_existing_row() $configuration = new InstitutionConfiguration('institution-a.nl', false); $this->repository->shouldReceive('findByInstitution')->with('institution-a.nl')->andReturn($configuration); - $this->repository->shouldReceive('save')->withArgs(function(InstitutionConfiguration $configuration){ + $this->repository->shouldReceive('save')->withArgs(function(InstitutionConfiguration $configuration): bool{ return $configuration->institution === 'institution-a.nl' && $configuration->ssoOn2faEnabled === true; }); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Entity/EmailTemplate.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Entity/EmailTemplate.php index 7d81235ba..ffeda2054 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Entity/EmailTemplate.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Entity/EmailTemplate.php @@ -26,14 +26,11 @@ #[ORM\Entity(repositoryClass: EmailTemplateRepository::class)] class EmailTemplate { - /** - * - * @var string - */ + #[ORM\Id] #[ORM\GeneratedValue(strategy: 'NONE')] #[ORM\Column] - private $id; + private ?string $id = null; /** * @var string @@ -53,7 +50,7 @@ class EmailTemplate #[ORM\Column(type: 'text')] private $htmlContent; - public static function create($name, $locale, $htmlContent) + public static function create($name, $locale, $htmlContent): self { $self = new self(); $self->id = (string) Uuid::uuid4(); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Projector/EmailTemplatesProjector.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Projector/EmailTemplatesProjector.php index 4a0a17ef1..72fe6aa61 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Projector/EmailTemplatesProjector.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Projector/EmailTemplatesProjector.php @@ -25,17 +25,14 @@ final class EmailTemplatesProjector extends Projector { - /** - * @var \Surfnet\StepupMiddleware\ManagementBundle\Configuration\Repository\EmailTemplateRepository - */ - private $repository; + private EmailTemplateRepository $repository; public function __construct(EmailTemplateRepository $repository) { $this->repository = $repository; } - public function applyEmailTemplatesUpdatedEvent(EmailTemplatesUpdatedEvent $event) + public function applyEmailTemplatesUpdatedEvent(EmailTemplatesUpdatedEvent $event): void { $this->repository->removeAll(); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Repository/EmailTemplateRepository.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Repository/EmailTemplateRepository.php index 1c86e5f30..f92186095 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Repository/EmailTemplateRepository.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Repository/EmailTemplateRepository.php @@ -35,7 +35,7 @@ public function __construct(ManagerRegistry $registry) * @param string $fallbackLocale * @return EmailTemplate|null */ - public function findOneByName($name, $preferredLocale, $fallbackLocale) + public function findOneByName(mixed $name, mixed $preferredLocale, mixed $fallbackLocale) { return $this ->createQueryBuilder('tpl') @@ -62,7 +62,7 @@ public function findOneByName($name, $preferredLocale, $fallbackLocale) * removed from the IdentityMap. This to prevent issues when replaying the events, where * deleting them with a delete query would cause errors due to templates not being found. */ - public function removeAll() + public function removeAll(): void { $templates = $this->findAll(); $em = $this->getEntityManager(); @@ -76,7 +76,7 @@ public function removeAll() unset($templates); } - public function save(EmailTemplate $template) + public function save(EmailTemplate $template): void { $entityManager = $this->getEntityManager(); $entityManager->persist($template); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Service/EmailTemplateService.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Service/EmailTemplateService.php index 9dbda5d4e..89aab91c8 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Service/EmailTemplateService.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Service/EmailTemplateService.php @@ -26,10 +26,7 @@ final class EmailTemplateService implements CommandHandlingEmailTemplateService { - /** - * @var \Surfnet\StepupMiddleware\ManagementBundle\Configuration\Repository\EmailTemplateRepository - */ - private $repository; + private EmailTemplateRepository $repository; public function __construct( EmailTemplateRepository $repository @@ -43,7 +40,7 @@ public function __construct( * @param string $fallbackLocale * @return null|EmailTemplate */ - public function findByName($name, $preferredLocale, $fallbackLocale) + public function findByName($name, $preferredLocale, $fallbackLocale): ?EmailTemplate { try { $emailTemplateEntity = $this->repository->findOneByName($name, $preferredLocale, $fallbackLocale); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php index e8893e233..cd46341a0 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php @@ -32,7 +32,7 @@ class ConfigurationController extends AbstractController /** * @return TransactionAwarePipeline */ - private $pipeline; + private TransactionAwarePipeline $pipeline; public function __construct(TransactionAwarePipeline $pipeline) { @@ -53,7 +53,7 @@ public function updateAction(Request $request) * @param Command $command * @return JsonResponse */ - private function handleCommand(Request $request, Command $command) + private function handleCommand(Request $request, Command $command): JsonResponse { $this->pipeline->process($command); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php index 58f20af83..e49d79653 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php @@ -49,37 +49,34 @@ final class InstitutionConfigurationController extends AbstractController /** * @return InstitutionConfigurationOptionsService */ - private $institutionConfigurationOptionsService; + private InstitutionConfigurationOptionsService $institutionConfigurationOptionsService; /** * @return InstitutionAuthorizationService */ - private $institutionAuthorizationService; + private InstitutionAuthorizationService $institutionAuthorizationService; /** * @return ValidatorInterface */ - private $validator; + private ValidatorInterface $validator; /** * @return AllowedSecondFactorListService */ - private $allowedSecondFactorListService; + private AllowedSecondFactorListService $allowedSecondFactorListService; /** * @return LoggerInterface */ - private $logger; + private LoggerInterface $logger; /** * @return TransactionAwarePipeline */ - private $pipeline; + private TransactionAwarePipeline $pipeline; - /** - * @var DBALConnectionHelper - */ - private $connectionHelper; + private DBALConnectionHelper $connectionHelper; public function __construct( InstitutionConfigurationOptionsService $institutionConfigurationOptionsService, @@ -99,7 +96,7 @@ public function __construct( $this->connectionHelper = $dbalConnectionHelper; } - public function showAction() + public function showAction(): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_MANAGEMENT']); @@ -138,7 +135,7 @@ public function showAction() return new JsonResponse($overview); } - public function reconfigureAction(Request $request) + public function reconfigureAction(Request $request): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_MANAGEMENT']); @@ -198,7 +195,7 @@ public function reconfigureAction(Request $request) * @param Command[] $commands * @throws Exception */ - private function handleCommands(array $commands) + private function handleCommands(array $commands): void { $connectionHelper = $this->connectionHelper; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php index 5d44ee7dd..66746b82c 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php @@ -41,12 +41,9 @@ class RightToBeForgottenController extends AbstractController /** * @return TransactionAwarePipeline */ - private $pipeline; + private TransactionAwarePipeline $pipeline; - /** - * @var IdentityService - */ - private $identityService; + private IdentityService $identityService; public function __construct(TransactionAwarePipeline $pipeline, IdentityService $identityService) { @@ -83,7 +80,7 @@ public function forgetIdentityAction(Request $request) * @param Command $command * @return JsonResponse */ - private function handleCommand(Request $request, Command $command) + private function handleCommand(Request $request, Command $command): JsonResponse { $this->pipeline->process($command); @@ -102,7 +99,7 @@ private function handleCommand(Request $request, Command $command) * @param Institution $institution * @throws ConflictHttpException */ - private function assertMayForget(NameId $nameId, Institution $institution) + private function assertMayForget(NameId $nameId, Institution $institution): void { $credentials = $this->identityService->findRegistrationAuthorityCredentialsByNameIdAndInstitution($nameId, $institution); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php index 337adea48..0cbf0122d 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php @@ -42,12 +42,9 @@ class WhitelistController extends AbstractController /** * @return TransactionAwarePipeline */ - private $pipeline; + private TransactionAwarePipeline $pipeline; - /** - * @var WhitelistService - */ - private $whitelistService; + private WhitelistService $whitelistService; public function __construct(TransactionAwarePipeline $pipeline, WhitelistService $whitelistService) { @@ -88,7 +85,7 @@ public function removeFromWhitelistAction(Request $request) return $this->handleCommand($request, $command); } - public function showWhitelistAction() + public function showWhitelistAction(): JsonResponse { $entries = $this->whitelistService->getAllEntries(); @@ -100,7 +97,7 @@ public function showWhitelistAction() * @param Command $command * @return JsonResponse */ - private function handleCommand(Request $request, Command $command) + private function handleCommand(Request $request, Command $command): JsonResponse { try { $this->pipeline->process($command); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/DependencyInjection/SurfnetStepupMiddlewareManagementExtension.php b/src/Surfnet/StepupMiddleware/ManagementBundle/DependencyInjection/SurfnetStepupMiddlewareManagementExtension.php index 4f10d1086..220073974 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/DependencyInjection/SurfnetStepupMiddlewareManagementExtension.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/DependencyInjection/SurfnetStepupMiddlewareManagementExtension.php @@ -25,7 +25,7 @@ class SurfnetStepupMiddlewareManagementExtension extends Extension { - public function load(array $config, ContainerBuilder $container) + public function load(array $config, ContainerBuilder $container): void { $configuration = new Configuration(); $config = $this->processConfiguration($configuration, $config); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Exception/InvalidArgumentException.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Exception/InvalidArgumentException.php index 999bf4970..6360d3622 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Exception/InvalidArgumentException.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Exception/InvalidArgumentException.php @@ -27,7 +27,7 @@ class InvalidArgumentException extends \InvalidArgumentException implements Exce * * @return self */ - public static function invalidType($expected, $parameterName, $parameter) + public static function invalidType($expected, $parameterName, $parameter): self { $message = sprintf( 'Invalid argument type: "%s" expected, "%s" given for "%s"', diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Service/DBALConnectionHelper.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Service/DBALConnectionHelper.php index 096df5eaa..a0bf63841 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Service/DBALConnectionHelper.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Service/DBALConnectionHelper.php @@ -27,7 +27,7 @@ class DBALConnectionHelper /** * @var Connection[] */ - private $connections; + private array $connections; /** * @param Connection[] $connections @@ -46,7 +46,7 @@ public function __construct(array $connections) /** * Start transaction on each connection */ - public function beginTransaction() + public function beginTransaction(): void { foreach ($this->connections as $connection) { $connection->beginTransaction(); @@ -56,7 +56,7 @@ public function beginTransaction() /** * Commit transaction on each connection */ - public function commit() + public function commit(): void { foreach ($this->connections as $connection) { $connection->commit(); @@ -66,7 +66,7 @@ public function commit() /** * Roll back the transaction on each connection */ - public function rollBack() + public function rollBack(): void { foreach ($this->connections as $connection) { $connection->rollBack(); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php index 0d04e40d0..539788ab3 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php @@ -19,14 +19,16 @@ namespace Surfnet\StepupMiddleware\ManagementBundle\Tests\Controller; use Liip\TestFixturesBundle\Services\DatabaseToolCollection; +use Symfony\Bundle\FrameworkBundle\Client; +use Symfony\Bundle\FrameworkBundle\KernelBrowser; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; class ConfigurationControllerTest extends WebTestCase { /** - * @var \Symfony\Bundle\FrameworkBundle\Client + * @var Client */ - private $client; + private KernelBrowser $client; /** * @var string @@ -61,7 +63,7 @@ public function tearDown(): void * @test * @group management */ - public function requests_with_invalid_content_are_bad_requests() + public function requests_with_invalid_content_are_bad_requests(): void { $this->client->request( 'POST', @@ -84,7 +86,7 @@ public function requests_with_invalid_content_are_bad_requests() * @test * @group management */ - public function authorization_is_required() + public function authorization_is_required(): void { $this->client->request( 'POST', @@ -105,7 +107,7 @@ public function authorization_is_required() * @test * @group management */ - public function readonly_user_cannot_modify_configuration() + public function readonly_user_cannot_modify_configuration(): void { $this->client->request( 'POST', @@ -130,7 +132,7 @@ public function readonly_user_cannot_modify_configuration() * * @dataProvider invalidHttpMethodProvider */ - public function only_post_requests_are_accepted($invalidHttpMethod) + public function only_post_requests_are_accepted(string $invalidHttpMethod): void { $this->client->request( $invalidHttpMethod, @@ -151,7 +153,7 @@ public function only_post_requests_are_accepted($invalidHttpMethod) * @test * @group management */ - public function json_is_returned_from_the_configuration_api() + public function json_is_returned_from_the_configuration_api(): void { $this->client->request( 'POST', @@ -178,7 +180,7 @@ public function json_is_returned_from_the_configuration_api() /** * Dataprovider for only_post_requests_are_accepted */ - public function invalidHttpMethodProvider() + public function invalidHttpMethodProvider(): array { return [ 'GET' => ['GET'], diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php index 714cc886e..a9149bb6e 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php @@ -19,14 +19,16 @@ namespace Surfnet\StepupMiddleware\ManagementBundle\Tests\Controller; use Liip\TestFixturesBundle\Services\DatabaseToolCollection; +use Symfony\Bundle\FrameworkBundle\Client; +use Symfony\Bundle\FrameworkBundle\KernelBrowser; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; class InstitutionConfigurationControllerTest extends WebTestCase { /** - * @var \Symfony\Bundle\FrameworkBundle\Client + * @var Client */ - private $client; + private KernelBrowser $client; /** * @var string @@ -60,7 +62,7 @@ public function tearDown(): void * @test * @group management */ - public function authorization_is_required_for_reconfiguring_institution_configuration_options() + public function authorization_is_required_for_reconfiguring_institution_configuration_options(): void { $this->client->request( 'POST', @@ -81,7 +83,7 @@ public function authorization_is_required_for_reconfiguring_institution_configur * @test * @group management */ - public function readonly_user_cannot_reconfigure_institution_configuration_options() + public function readonly_user_cannot_reconfigure_institution_configuration_options(): void { $this->client->request( 'POST', @@ -104,7 +106,7 @@ public function readonly_user_cannot_reconfigure_institution_configuration_optio * @test * @group management */ - public function authorization_is_required_for_querying_institution_configuration_options() + public function authorization_is_required_for_querying_institution_configuration_options(): void { $this->client->request( 'GET', @@ -125,7 +127,7 @@ public function authorization_is_required_for_querying_institution_configuration * @test * @group management */ - public function requests_with_invalid_content_are_bad_requests() + public function requests_with_invalid_content_are_bad_requests(): void { $this->client->request( 'POST', @@ -151,7 +153,7 @@ public function requests_with_invalid_content_are_bad_requests() * @dataProvider invalidHttpMethodProvider * @param $invalidHttpMethod */ - public function only_post_and_get_requests_are_accepted($invalidHttpMethod) + public function only_post_and_get_requests_are_accepted(string $invalidHttpMethod): void { $this->client->request( $invalidHttpMethod, @@ -172,7 +174,7 @@ public function only_post_and_get_requests_are_accepted($invalidHttpMethod) * @test * @group management */ - public function a_get_request_without_content_is_valid() + public function a_get_request_without_content_is_valid(): void { $this->client->request( 'GET', @@ -195,7 +197,7 @@ public function a_get_request_without_content_is_valid() * @test * @group management */ - public function json_is_returned_from_the_institution_configuration_api() + public function json_is_returned_from_the_institution_configuration_api(): void { $this->client->request( 'POST', @@ -222,7 +224,7 @@ public function json_is_returned_from_the_institution_configuration_api() /** * Dataprovider for only_post_and_get_requests_are_accepted */ - public function invalidHttpMethodProvider() + public function invalidHttpMethodProvider(): array { return [ 'DELETE' => ['DELETE'], diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ConfigurationValidationTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ConfigurationValidationTest.php index 43c2469c0..a9cad81fc 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ConfigurationValidationTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ConfigurationValidationTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ManagementBundle\Tests\Validator; use Mockery as m; +use Mockery\Matcher\MatcherAbstract; use PHPUnit\Framework\TestCase as TestCase; use Surfnet\StepupMiddleware\ManagementBundle\Validator\ConfigurationStructureValidator; use Surfnet\StepupMiddleware\ManagementBundle\Validator\Constraints\HasValidConfigurationStructure; @@ -29,7 +30,10 @@ final class ConfigurationValidationTest extends TestCase { - public function invalidConfigurations() + /** + * @return mixed[][] + */ + public function invalidConfigurations(): array { $dataSet = []; @@ -51,7 +55,7 @@ public function invalidConfigurations() * @param array $configuration * @param string $expectedPropertyPath */ - public function it_rejects_invalid_configuration($configuration, $expectedPropertyPath) + public function it_rejects_invalid_configuration($configuration, $expectedPropertyPath): void { $builder = m::mock('Symfony\Component\Validator\Violation\ConstraintViolationBuilderInterface'); $builder->shouldReceive('addViolation')->with()->once(); @@ -80,12 +84,12 @@ public function it_rejects_invalid_configuration($configuration, $expectedProper /** * @param mixed &$spy - * @return \Mockery\Matcher\MatcherAbstract + * @return MatcherAbstract */ private static function spy(&$spy) { return m::on( - function ($value) use (&$spy) { + function ($value) use (&$spy): bool { $spy = $value; return true; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ReconfigureInstitutionRequestValidatorTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ReconfigureInstitutionRequestValidatorTest.php index ab8fb92d7..b990a9f3f 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ReconfigureInstitutionRequestValidatorTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ReconfigureInstitutionRequestValidatorTest.php @@ -20,6 +20,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Mockery; +use Mockery\Matcher\MatcherAbstract; use PHPUnit\Framework\TestCase; use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\Stepup\Identity\Value\Institution as IdentityInstitution; @@ -35,7 +36,10 @@ class ReconfigureInstitutionRequestValidatorTest extends TestCase { - public function invalidReconfigureInstitutionRequests() + /** + * @return mixed[][] + */ + public function invalidReconfigureInstitutionRequests(): array { $dataSet = []; @@ -62,8 +66,8 @@ public function invalidReconfigureInstitutionRequests() public function it_rejects_invalid_configuration( $reconfigureRequest, $expectedPropertyPath, - $expectErrorMessageToContain - ) { + string $expectErrorMessageToContain + ): void { $existingInstitution = ConfiguredInstitution::createFrom(new Institution('surfnet.nl')); $anotherExistingInstitution = ConfiguredInstitution::createFrom(new Institution('another-organisation.test')); @@ -118,7 +122,7 @@ public function it_rejects_invalid_configuration( * @test * @group validator */ - public function reconfigure_institution_request_cannot_contain_institutions_that_do_not_exist() + public function reconfigure_institution_request_cannot_contain_institutions_that_do_not_exist(): void { $existingInstitutions = []; $nonExistentInstitution = 'non-existing.organisation.test'; @@ -158,7 +162,7 @@ public function reconfigure_institution_request_cannot_contain_institutions_that * @test * @group validator */ - public function validation_for_existing_institutions_is_done_case_insensitively() + public function validation_for_existing_institutions_is_done_case_insensitively(): void { $existingInstitutions = [ConfiguredInstitution::createFrom(new Institution('surfnet.nl'))]; $differentlyCasedButSameInstitution = 'Surfnet.nl'; @@ -207,7 +211,7 @@ public function validation_for_existing_institutions_is_done_case_insensitively( * @test * @group validator */ - public function valid_reconfigure_institution_requests_do_not_cause_any_violations() + public function valid_reconfigure_institution_requests_do_not_cause_any_violations(): void { $institution = 'surfnet.nl'; $validRequest = [ @@ -252,12 +256,12 @@ public function valid_reconfigure_institution_requests_do_not_cause_any_violatio /** * @param mixed &$spy - * @return \Mockery\Matcher\MatcherAbstract + * @return MatcherAbstract */ private static function spy(&$spy) { return Mockery::on( - function ($value) use (&$spy) { + function ($value) use (&$spy): bool { $spy = $value; return true; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Assert.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Assert.php index 0fc7f95b6..4e5712ea3 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Assert.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Assert.php @@ -22,7 +22,7 @@ final class Assert { - public static function keysMatch(array $value, array $keys, $message = null, $propertyPath = null) + public static function keysMatch(array $value, array $keys, $message = null, $propertyPath = null): void { $keysOfValue = array_keys($value); $extraKeys = array_diff($keysOfValue, $keys); @@ -41,7 +41,7 @@ public static function keysMatch(array $value, array $keys, $message = null, $pr ); } - public static function requiredAndOptionalOptions(array $value, array $required, array $optional, $message = null, $propertyPath = null) + public static function requiredAndOptionalOptions(array $value, array $required, array $optional, $message = null, $propertyPath = null): void { // Filter out the optional items from the value array $requiredValueSet = array_diff_key($value, array_flip($optional)); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationStructureValidator.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationStructureValidator.php index 7809ac6ea..4a1fb9c76 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationStructureValidator.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationStructureValidator.php @@ -25,6 +25,7 @@ use Surfnet\StepupMiddleware\ManagementBundle\Validator\Assert as StepupAssert; use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\ConstraintValidator; +use Symfony\Component\Validator\Violation\ConstraintViolationBuilder; /** * Once the Assert 2.0 library has been built this should be converted to the lazy assertions so we can report @@ -32,15 +33,9 @@ */ class ConfigurationStructureValidator extends ConstraintValidator { - /** - * @var GatewayConfigurationValidator - */ - private $gatewayConfigurationValidator; + private GatewayConfigurationValidator $gatewayConfigurationValidator; - /** - * @var EmailTemplatesConfigurationValidator - */ - private $emailTemplatesConfigurationValidator; + private EmailTemplatesConfigurationValidator $emailTemplatesConfigurationValidator; public function __construct( GatewayConfigurationValidator $gatewayConfigurationValidator, @@ -50,9 +45,9 @@ public function __construct( $this->emailTemplatesConfigurationValidator = $emailTemplatesConfigurationValidator; } - public function validate($value, Constraint $constraint) + public function validate($value, Constraint $constraint): void { - /** @var \Symfony\Component\Validator\Violation\ConstraintViolationBuilder|false $violation */ + /** @var ConstraintViolationBuilder|false $violation */ $violation = false; try { @@ -77,7 +72,7 @@ private function decodeJson($rawValue) return JsonHelper::decode($rawValue); } - public function validateRoot($configuration) + public function validateRoot($configuration): void { Assertion::isArray($configuration, 'Invalid body structure, must be an object', '(root)'); @@ -94,14 +89,14 @@ public function validateRoot($configuration) $this->validateEmailTemplatesConfiguration($configuration, 'email_templates'); } - private function validateGatewayConfiguration($configuration, $propertyPath) + private function validateGatewayConfiguration(array $configuration, string $propertyPath): void { Assertion::isArray($configuration['gateway'], 'Property "gateway" must have an object as value', $propertyPath); $this->gatewayConfigurationValidator->validate($configuration['gateway'], $propertyPath); } - private function validateSraaConfiguration($configuration, $propertyPath) + private function validateSraaConfiguration(array $configuration, string $propertyPath): void { Assertion::isArray( $configuration['sraa'], @@ -118,7 +113,7 @@ private function validateSraaConfiguration($configuration, $propertyPath) } } - private function validateEmailTemplatesConfiguration($configuration, $propertyPath) + private function validateEmailTemplatesConfiguration(array $configuration, string $propertyPath): void { Assertion::isArray( $configuration['email_templates'], diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationValidatorInterface.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationValidatorInterface.php index d9c641c12..29fdc5f3d 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationValidatorInterface.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationValidatorInterface.php @@ -18,13 +18,15 @@ namespace Surfnet\StepupMiddleware\ManagementBundle\Validator; +use Assert\InvalidArgumentException; + interface ConfigurationValidatorInterface { /** * @param array $configuration * @param string $propertyPath * @return void - * @throws \Assert\InvalidArgumentException + * @throws InvalidArgumentException */ public function validate(array $configuration, $propertyPath); } diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/EmailTemplatesConfigurationValidator.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/EmailTemplatesConfigurationValidator.php index 87d2ea9cf..42c502845 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/EmailTemplatesConfigurationValidator.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/EmailTemplatesConfigurationValidator.php @@ -24,10 +24,7 @@ final class EmailTemplatesConfigurationValidator implements ConfigurationValidatorInterface { - /** - * @var string - */ - private $requiredLocale; + private string $requiredLocale; /** * @param string $requiredLocale @@ -41,7 +38,7 @@ public function __construct($requiredLocale) $this->requiredLocale = $requiredLocale; } - public function validate(array $configuration, $propertyPath) + public function validate(array $configuration, $propertyPath): void { $templateNames = [ 'confirm_email', diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/GatewayConfigurationValidator.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/GatewayConfigurationValidator.php index f49f47a39..a7832a9db 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/GatewayConfigurationValidator.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/GatewayConfigurationValidator.php @@ -23,15 +23,9 @@ class GatewayConfigurationValidator implements ConfigurationValidatorInterface { - /** - * @var \Surfnet\StepupMiddleware\ManagementBundle\Validator\IdentityProviderConfigurationValidator - */ - private $identityProviderConfigurationValidator; + private IdentityProviderConfigurationValidator $identityProviderConfigurationValidator; - /** - * @var \Surfnet\StepupMiddleware\ManagementBundle\Validator\ServiceProviderConfigurationValidator - */ - private $serviceProviderConfigurationValidator; + private ServiceProviderConfigurationValidator $serviceProviderConfigurationValidator; public function __construct( IdentityProviderConfigurationValidator $identityProviderConfigurationValidator, @@ -45,7 +39,7 @@ public function __construct( * @param array $gatewayConfiguration * @param string $propertyPath */ - public function validate(array $gatewayConfiguration, $propertyPath) + public function validate(array $gatewayConfiguration, $propertyPath): void { StepupAssert::keysMatch( $gatewayConfiguration, @@ -64,7 +58,7 @@ public function validate(array $gatewayConfiguration, $propertyPath) ); } - private function validateIdentityProviders($identityProviders, $propertyPath) + private function validateIdentityProviders($identityProviders, string $propertyPath): void { Assertion::isArray( $identityProviders, @@ -80,7 +74,7 @@ private function validateIdentityProviders($identityProviders, $propertyPath) } } - private function validateServiceProviders($serviceProviders, $propertyPath) + private function validateServiceProviders($serviceProviders, string $propertyPath): void { Assertion::isArray( $serviceProviders, diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/IdentityProviderConfigurationValidator.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/IdentityProviderConfigurationValidator.php index 51bb47326..bb18afab9 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/IdentityProviderConfigurationValidator.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/IdentityProviderConfigurationValidator.php @@ -23,7 +23,7 @@ class IdentityProviderConfigurationValidator implements ConfigurationValidatorInterface { - public function validate(array $configuration, $propertyPath) + public function validate(array $configuration, $propertyPath): void { Assertion::isArray($configuration, 'invalid configuration format, must be an object', $propertyPath); @@ -57,7 +57,7 @@ public function validate(array $configuration, $propertyPath) * @param string $name * @param string $propertyPath */ - private function validateStringValue($configuration, $name, $propertyPath) + private function validateStringValue(array $configuration, string $name, string $propertyPath): void { Assertion::string($configuration[$name], 'value must be a string', $propertyPath . '.' . $name); } @@ -67,7 +67,7 @@ private function validateStringValue($configuration, $name, $propertyPath) * @param string $name * @param string $propertyPath */ - private function validateBooleanValue($configuration, $name, $propertyPath) + private function validateBooleanValue(array $configuration, string $name, string $propertyPath): void { Assertion::boolean($configuration[$name], 'value must be a boolean', $propertyPath . '.' . $name); } @@ -76,7 +76,7 @@ private function validateBooleanValue($configuration, $name, $propertyPath) * @param array $configuration * @param string $propertyPath */ - private function validateLoaDefinition($configuration, $propertyPath) + private function validateLoaDefinition(array $configuration, string $propertyPath): void { $value = $configuration['loa']; $path = $propertyPath . '.loa'; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php index bd3b9a97a..6ebf8eb08 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ManagementBundle\Validator; use Assert\Assertion; +use Assert\AssertionFailedException; use Assert\InvalidArgumentException as AssertionException; use InvalidArgumentException as CoreInvalidArgumentException; use Surfnet\StepupBundle\Service\SecondFactorTypeService; @@ -30,33 +31,25 @@ use Surfnet\StepupMiddleware\ManagementBundle\Validator\Assert as StepupAssert; use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\ConstraintValidator; +use Symfony\Component\Validator\Violation\ConstraintViolationBuilder; final class ReconfigureInstitutionRequestValidator extends ConstraintValidator { - /** - * @var ConfiguredInstitutionService - */ - private $configuredInstitutionsService; + private ConfiguredInstitutionService $configuredInstitutionsService; /** * @var string[] internal cache, access through getConfiguredInstitutions() */ - private $configuredInstitutions; + private ?array $configuredInstitutions = null; - /** - * @var SecondFactorTypeService - */ - private $secondFactorTypeService; + private SecondFactorTypeService $secondFactorTypeService; - /** - * @var WhitelistService - */ - private $whitelistService; + private WhitelistService $whitelistService; /** * @var string[] internal cache, access through getWhitelistedInstitutions() */ - private $whitelistedInstitutions; + private ?array $whitelistedInstitutions = null; public function __construct( ConfiguredInstitutionService $configuredInstitutionsService, @@ -68,9 +61,9 @@ public function __construct( $this->whitelistService = $whitelistService; } - public function validate($value, Constraint $constraint) + public function validate($value, Constraint $constraint): void { - /** @var \Symfony\Component\Validator\Violation\ConstraintViolationBuilder|false $violation */ + /** @var ConstraintViolationBuilder|false $violation */ $violation = false; try { @@ -88,7 +81,7 @@ public function validate($value, Constraint $constraint) } } - public function validateRoot(array $configuration) + public function validateRoot(array $configuration): void { Assertion::isArray($configuration, 'Invalid body structure, must be an object', '(root)'); $this->validateInstitutionsExist(array_keys($configuration)); @@ -101,7 +94,7 @@ public function validateRoot(array $configuration) /** * @param array $institutions */ - public function validateInstitutionsExist(array $institutions) + public function validateInstitutionsExist(array $institutions): void { $configuredInstitutions = $this->getConfiguredInstitutions(); @@ -114,7 +107,7 @@ public function validateInstitutionsExist(array $institutions) } } - public function validateInstitutionConfigurationOptions(array $options, string $institution) + public function validateInstitutionConfigurationOptions(array $options, string $institution): void { $propertyPath = sprintf('Institution(%s)', $institution); Assertion::isArray($options, 'Invalid institution configuration, must be an object', $propertyPath); @@ -244,7 +237,7 @@ private function getWhitelistedInstitutions() } $this->whitelistedInstitutions = array_map( - function (WhitelistEntry $whitelistEntry) { + function (WhitelistEntry $whitelistEntry): string { return (string)$whitelistEntry->institution; }, $this->whitelistService->getAllEntries()->toArray() @@ -258,10 +251,10 @@ function (WhitelistEntry $whitelistEntry) { * @param $configuredInstitutions * @return string[] */ - public function determineNonExistentInstitutions(array $institutions, $configuredInstitutions) + public function determineNonExistentInstitutions(array $institutions, $configuredInstitutions): array { $normalizedConfiguredInstitutions = array_map( - function ($institution) { + function ($institution): string { return strtolower($institution); }, $configuredInstitutions @@ -269,7 +262,7 @@ function ($institution) { return array_filter( $institutions, - function ($institution) use ($normalizedConfiguredInstitutions) { + function ($institution) use ($normalizedConfiguredInstitutions): bool { $normalizedInstitution = strtolower($institution); return !in_array($normalizedInstitution, $normalizedConfiguredInstitutions); @@ -286,9 +279,9 @@ function ($institution) use ($normalizedConfiguredInstitutions) { * @param $authorizationSettings * @param $institution * @param $propertyPath - * @throws \Assert\AssertionFailedException + * @throws AssertionFailedException */ - private function validateAuthorizationSettings($authorizationSettings, $institution, $propertyPath) + private function validateAuthorizationSettings(array $authorizationSettings, string $institution, string $propertyPath): void { $acceptedOptions = [ 'use_ra', diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php index 1f91d124c..08ea89a3a 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php @@ -23,7 +23,7 @@ class ServiceProviderConfigurationValidator implements ConfigurationValidatorInterface { - public function validate(array $configuration, $propertyPath) + public function validate(array $configuration, $propertyPath): void { Assertion::isArray($configuration, 'invalid configuration format, must be an object', $propertyPath); @@ -97,7 +97,7 @@ public function validate(array $configuration, $propertyPath) * @param string $name * @param string $propertyPath */ - private function validateStringValue($configuration, $name, $propertyPath) + private function validateStringValue(array $configuration, string $name, string $propertyPath): void { Assertion::string($configuration[$name], 'value must be a string', $propertyPath . '.' . $name); } @@ -107,7 +107,7 @@ private function validateStringValue($configuration, $name, $propertyPath) * @param string $name * @param string $propertyPath */ - private function validateStringValues($configuration, $name, $propertyPath) + private function validateStringValues(array $configuration, string $name, string $propertyPath): void { Assertion::isArray($configuration[$name], 'value must be an array', $propertyPath . '.' . $name); Assertion::allString($configuration[$name], 'value must be an array of strings', $propertyPath . '.' . $name); @@ -118,7 +118,7 @@ private function validateStringValues($configuration, $name, $propertyPath) * @param string $name * @param string $propertyPath */ - private function validateBooleanValue($configuration, $name, $propertyPath) + private function validateBooleanValue(array $configuration, string $name, string $propertyPath): void { Assertion::boolean($configuration[$name], 'value must be a boolean', $propertyPath . '.' . $name); } @@ -127,7 +127,7 @@ private function validateBooleanValue($configuration, $name, $propertyPath) * @param array $configuration * @param string $propertyPath */ - private function validateAssertionConsumerUrls($configuration, $propertyPath) + private function validateAssertionConsumerUrls(array $configuration, $propertyPath): void { $value = $configuration['acs']; $propertyPath = $propertyPath . '.acs'; @@ -141,7 +141,7 @@ private function validateAssertionConsumerUrls($configuration, $propertyPath) * @param array $configuration * @param string $propertyPath */ - private function validateLoaDefinition($configuration, $propertyPath) + private function validateLoaDefinition(array $configuration, string $propertyPath): void { $value = $configuration['loa']; $path = $propertyPath . '.loa'; @@ -163,7 +163,7 @@ private function validateLoaDefinition($configuration, $propertyPath) * @param string $name * @param string $propertyPath */ - private function validateListOfNameIdPatterns($configuration, $name, $propertyPath) + private function validateListOfNameIdPatterns(array $configuration, string $name, $propertyPath): void { $value = $configuration[$name]; $propertyPath = $propertyPath . '.' . $name; @@ -186,9 +186,9 @@ private function validateListOfNameIdPatterns($configuration, $name, $propertyPa * @param string $message * @param $propertyPath */ - private function assertValidInstitutionIdentifiers(array $spLoaConfiguration, $message, $propertyPath) + private function assertValidInstitutionIdentifiers(array $spLoaConfiguration, string $message, string $propertyPath): void { - $assertLowerCase = function ($sho) { + $assertLowerCase = function ($sho): bool { return ($sho === strtolower($sho)); }; diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php index bf0759a86..1327f33de 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php @@ -32,14 +32,8 @@ final class BootstrapGsspSecondFactorCommand extends Command { - /** - * @var BootstrapCommandService - */ - private $bootstrapService; - /** - * @var TransactionHelper - */ - private $transactionHelper; + private BootstrapCommandService $bootstrapService; + private TransactionHelper $transactionHelper; public function __construct(BootstrapCommandService $bootstrapService, TransactionHelper $transactionHelper) { @@ -48,7 +42,7 @@ public function __construct(BootstrapCommandService $bootstrapService, Transacti parent::__construct(); } - protected function configure() + protected function configure(): void { $this ->setDescription('Creates a Generic SAML Second Factor (GSSF) second factor for a specified user') @@ -72,7 +66,7 @@ protected function configure() ->addArgument('actor-id', InputArgument::REQUIRED, 'The id of the vetting actor'); } - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): void { $registrationStatus = $input->getArgument('registration-status'); $this->bootstrapService->validRegistrationStatus($registrationStatus); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityCommand.php index 09f1caf0a..fd1627b71 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityCommand.php @@ -31,14 +31,8 @@ final class BootstrapIdentityCommand extends Command { - /** - * @var BootstrapCommandService - */ - private $bootstrapService; - /** - * @var TransactionHelper - */ - private $transactionHelper; + private BootstrapCommandService $bootstrapService; + private TransactionHelper $transactionHelper; public function __construct(BootstrapCommandService $bootstrapService, TransactionHelper $transactionHelper) { @@ -47,7 +41,7 @@ public function __construct(BootstrapCommandService $bootstrapService, Transacti parent::__construct(); } - protected function configure() + protected function configure(): void { $this ->setDescription('Creates an identity') @@ -59,7 +53,7 @@ protected function configure() ->addArgument('actor-id', InputArgument::REQUIRED, 'The id of the vetting actor'); } - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): void { $this->bootstrapService->setToken( new AnonymousToken('cli.bootstrap-identity-with-sms-token', 'cli', ['ROLE_SS']) diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php index c81e24914..c99159c7f 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php @@ -39,20 +39,16 @@ */ final class BootstrapIdentityWithYubikeySecondFactorCommand extends Command { - /** @var BootstrapCommandService */ - private $bootstrapService; + private BootstrapCommandService $bootstrapService; - /** - * @var TransactionHelper - */ - private $transactionHelper; + private TransactionHelper $transactionHelper; /** * @var IdentityRepository */ - private $projectionRepository; + private ServiceEntityRepository $projectionRepository; - protected function configure() + protected function configure(): void { $this ->setName('middleware:bootstrap:identity-with-yubikey') diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapSmsSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapSmsSecondFactorCommand.php index d10d5836b..c554985cb 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapSmsSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapSmsSecondFactorCommand.php @@ -32,14 +32,8 @@ final class BootstrapSmsSecondFactorCommand extends Command { - /** - * @var BootstrapCommandService - */ - private $bootstrapService; - /** - * @var TransactionHelper - */ - private $transactionHelper; + private BootstrapCommandService $bootstrapService; + private TransactionHelper $transactionHelper; public function __construct(BootstrapCommandService $bootstrapService, TransactionHelper $transactionHelper) { @@ -48,7 +42,7 @@ public function __construct(BootstrapCommandService $bootstrapService, Transacti parent::__construct(); } - protected function configure() + protected function configure(): void { $this ->setDescription('Creates a SMS second factor for a specified user') @@ -67,7 +61,7 @@ protected function configure() ->addArgument('actor-id', InputArgument::REQUIRED, 'The id of the vetting actor'); } - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): void { $registrationStatus = $input->getArgument('registration-status'); $this->bootstrapService->validRegistrationStatus($registrationStatus); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapYubikeySecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapYubikeySecondFactorCommand.php index 0edc09e41..fd9fcc448 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapYubikeySecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapYubikeySecondFactorCommand.php @@ -32,14 +32,8 @@ final class BootstrapYubikeySecondFactorCommand extends Command { - /** - * @var BootstrapCommandService - */ - private $bootstrapService; - /** - * @var TransactionHelper - */ - private $transactionHelper; + private BootstrapCommandService $bootstrapService; + private TransactionHelper $transactionHelper; public function __construct(BootstrapCommandService $bootstrapService, TransactionHelper $transactionHelper) { @@ -48,7 +42,7 @@ public function __construct(BootstrapCommandService $bootstrapService, Transacti parent::__construct(); } - protected function configure() + protected function configure(): void { $this ->setDescription('Creates a Yubikey second factor for a specified user') @@ -67,7 +61,7 @@ protected function configure() ->addArgument('actor-id', InputArgument::REQUIRED, 'The id of the vetting actor'); } - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): void { $registrationStatus = $input->getArgument('registration-status'); $this->bootstrapService->validRegistrationStatus($registrationStatus); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/EmailVerifiedSecondFactorRemindersCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/EmailVerifiedSecondFactorRemindersCommand.php index b5476d32e..88d2227b3 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/EmailVerifiedSecondFactorRemindersCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/EmailVerifiedSecondFactorRemindersCommand.php @@ -44,27 +44,15 @@ */ final class EmailVerifiedSecondFactorRemindersCommand extends Command { - /** - * @var TransactionAwarePipeline - */ - private $pipeline; - - /** - * @var BufferedEventBus - */ - private $eventBus; - - /** - * @var DBALConnectionHelper - */ - private $connection; - - /** - * @var LoggerInterface - */ - private $logger; - - protected function configure() + private TransactionAwarePipeline $pipeline; + + private BufferedEventBus $eventBus; + + private DBALConnectionHelper $connection; + + private LoggerInterface $logger; + + protected function configure(): void { $this ->setName('middleware:cron:email-reminder') @@ -135,7 +123,7 @@ protected function execute(InputInterface $input, OutputInterface $output) } } - private function validateInput(InputInterface $input) + private function validateInput(InputInterface $input): void { if ($input->hasOption('date')) { $date = $input->getOption('date'); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php index a86eb44b6..c85f27a0c 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php @@ -35,14 +35,8 @@ final class MigrateSecondFactorCommand extends Command { - /** - * @var BootstrapCommandService - */ - private $bootstrapService; - /** - * @var TransactionHelper - */ - private $transactionHelper; + private BootstrapCommandService $bootstrapService; + private TransactionHelper $transactionHelper; public function __construct(BootstrapCommandService $bootstrapService, TransactionHelper $transactionHelper) { @@ -51,7 +45,7 @@ public function __construct(BootstrapCommandService $bootstrapService, Transacti parent::__construct(); } - protected function configure() + protected function configure(): void { $this ->setDescription('Migrates the tokens of an identity to a new institution while preserving the old tokens') @@ -69,7 +63,7 @@ protected function configure() ->addArgument('email', InputArgument::OPTIONAL, 'The e-mail address of the identity to create'); } - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): void { $sourceNameId = new NameId($input->getArgument('old-name-id')); $targetNameId = new NameId($input->getArgument('new-name-id')); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplayEventsCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplayEventsCommand.php index 854ad9fee..48c382aa6 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplayEventsCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplayEventsCommand.php @@ -30,10 +30,7 @@ class ReplayEventsCommand extends Command { - /** - * @var EventStreamReplayer - */ - private $replayer; + private EventStreamReplayer $replayer; public function __construct(EventStreamReplayer $eventStreamReplayer) { diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplaySpecificEventsCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplaySpecificEventsCommand.php index 194ad6036..7e39f9c3f 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplaySpecificEventsCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplaySpecificEventsCommand.php @@ -34,24 +34,12 @@ class ReplaySpecificEventsCommand extends Command const OPTION_LIST_EVENTS = 'list-events'; const OPTION_LIST_PROJECTORS = 'list-projectors'; - /** - * @var EventCollection - */ - private $collection; - - /** - * @var PastEventsService - */ - private $pastEventsService; - - /** - * @var TransactionAwareEventDispatcher - */ - private $eventDispatcher; - /** - * @var ProjectorCollection - */ - private $projectorCollection; + private EventCollection $collection; + + private PastEventsService $pastEventsService; + + private TransactionAwareEventDispatcher $eventDispatcher; + private ProjectorCollection $projectorCollection; protected function configure() { diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/DependencyInjection/CompilerPass/CollectProjectorsForEventReplayCompilerPass.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/DependencyInjection/CompilerPass/CollectProjectorsForEventReplayCompilerPass.php index 6778a225d..a153238db 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/DependencyInjection/CompilerPass/CollectProjectorsForEventReplayCompilerPass.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/DependencyInjection/CompilerPass/CollectProjectorsForEventReplayCompilerPass.php @@ -24,7 +24,7 @@ class CollectProjectorsForEventReplayCompilerPass implements CompilerPassInterface { - public function process(ContainerBuilder $container) + public function process(ContainerBuilder $container): void { $projectorCollectionDefinition = $container->getDefinition('middleware.event_replay.projector_collection'); $projectorDefinitions = $container->findTaggedServiceIds('projector.register_for_replay'); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/DependencyInjection/Configuration.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/DependencyInjection/Configuration.php index 8e9a7a167..92b3b0749 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/DependencyInjection/Configuration.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/DependencyInjection/Configuration.php @@ -34,7 +34,7 @@ public function getConfigTreeBuilder(): TreeBuilder ->info('The amount of seconds after which the email verification url/code expires') ->defaultValue(3600) ->validate() - ->ifTrue(function ($seconds) { + ->ifTrue(function ($seconds): bool { return !is_int($seconds) || $seconds < 1; }) ->thenInvalid( diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/DependencyInjection/SurfnetStepupMiddlewareMiddlewareExtension.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/DependencyInjection/SurfnetStepupMiddlewareMiddlewareExtension.php index e2f77034d..430c0f2a8 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/DependencyInjection/SurfnetStepupMiddlewareMiddlewareExtension.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/DependencyInjection/SurfnetStepupMiddlewareMiddlewareExtension.php @@ -27,7 +27,7 @@ class SurfnetStepupMiddlewareMiddlewareExtension extends Extension { - public function load(array $config, ContainerBuilder $container) + public function load(array $config, ContainerBuilder $container): void { $processor = new Processor(); $config = $processor->processConfiguration(new Configuration(), $config); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php index 86a4a1db5..3c263bc7d 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php @@ -23,26 +23,19 @@ use Broadway\Domain\DomainMessage; use Broadway\Serializer\SimpleInterfaceSerializer; use Doctrine\DBAL\Connection; +use Doctrine\DBAL\DBALException; +use Doctrine\DBAL\Driver\Statement; use PDO; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Forgettable; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\SensitiveData; class DBALEventHydrator { - /** - * @var Connection - */ - private $connection; + private Connection $connection; - /** - * @var SimpleInterfaceSerializer - */ - private $payloadSerializer; + private SimpleInterfaceSerializer $payloadSerializer; - /** - * @var SimpleInterfaceSerializer - */ - private $metadataSerializer; + private SimpleInterfaceSerializer $metadataSerializer; /** * @var string @@ -55,7 +48,7 @@ class DBALEventHydrator private $sensitiveDataTable; /** - * @var \Doctrine\DBAL\Driver\Statement + * @var Statement */ private $loadStatement = null; @@ -82,7 +75,7 @@ public function __construct( /** * @return string - * @throws \Doctrine\DBAL\DBALException + * @throws DBALException */ public function getCount() { @@ -99,7 +92,7 @@ public function getCount() * @param int $offset * @return DomainEventStream */ - public function getFromTill($limit, $offset) + public function getFromTill($limit, $offset): DomainEventStream { $statement = $this->prepareLoadStatement(); $statement->bindValue('limit', $limit, PDO::PARAM_INT); @@ -115,7 +108,7 @@ public function getFromTill($limit, $offset) return new DomainEventStream($events); } - public function fetchByEventTypes($eventTypes) + public function fetchByEventTypes($eventTypes): DomainEventStream { $eventTypePlaceholders = implode(', ', array_fill(0, count($eventTypes), '?')); @@ -142,7 +135,7 @@ public function fetchByEventTypes($eventTypes) return new DomainEventStream($events); } - private function deserializeEvent($row) + private function deserializeEvent(array $row): DomainMessage { $event = $this->payloadSerializer->deserialize(json_decode($row['payload'], true)); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/EventCollection.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/EventCollection.php index 97fcce385..fa5eddf7f 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/EventCollection.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/EventCollection.php @@ -27,7 +27,7 @@ final class EventCollection implements IteratorAggregate /** * @var string[] */ - private $eventNames = []; + private array $eventNames = []; public function __construct(array $eventNames) { @@ -55,10 +55,10 @@ public function getEventNames() return $this->eventNames; } - public function formatAsEventStreamTypes() + public function formatAsEventStreamTypes(): array { return array_map( - function ($eventName) { + function ($eventName): string { return strtr($eventName, '\\', '.'); }, $this->eventNames @@ -69,7 +69,7 @@ function ($eventName) { * @param array $subset * @return EventCollection */ - public function select(array $subset) + public function select(array $subset): self { $nonAvailableEventNames = array_diff($subset, $this->eventNames); @@ -89,7 +89,7 @@ public function select(array $subset) * @param $eventName * @return bool */ - public function contains($eventName) + public function contains($eventName): bool { return in_array($eventName, $this->eventNames); } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/ProjectorCollection.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/ProjectorCollection.php index de683c885..08b2e2a45 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/ProjectorCollection.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/ProjectorCollection.php @@ -28,12 +28,12 @@ final class ProjectorCollection implements IteratorAggregate /** * @var ProjectorInterface[] */ - private $projectors = []; + private array $projectors = []; /** * @param ProjectorInterface $projector */ - public function add(ProjectorInterface $projector) + public function add(ProjectorInterface $projector): void { $this->projectors[get_class($projector)] = $projector; } @@ -41,10 +41,10 @@ public function add(ProjectorInterface $projector) /** * @return string[] */ - public function getProjectorNames() + public function getProjectorNames(): array { return array_map( - function (ProjectorInterface $projector) { + function (ProjectorInterface $projector): string { return get_class($projector); }, array_values($this->projectors) @@ -55,7 +55,7 @@ function (ProjectorInterface $projector) { * @param array $projectorNames * @return ProjectorCollection */ - public function selectByNames(array $projectorNames) + public function selectByNames(array $projectorNames): ProjectorCollection { $subsetCollection = new ProjectorCollection; @@ -79,7 +79,7 @@ public function selectByNames(array $projectorNames) * @param ProjectorInterface $projector * @return bool */ - public function contains(ProjectorInterface $projector) + public function contains(ProjectorInterface $projector): bool { return array_key_exists(get_class($projector), $this->projectors); } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Exception/InvalidArgumentException.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Exception/InvalidArgumentException.php index a3a6e32e5..e20b63c55 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Exception/InvalidArgumentException.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Exception/InvalidArgumentException.php @@ -29,7 +29,7 @@ class InvalidArgumentException extends CoreInvalidArgumentException * * @return self */ - public static function invalidType($expected, $parameterName, $parameter) + public static function invalidType($expected, $parameterName, $parameter): self { $message = sprintf( 'Invalid argument type: "%s" expected, "%s" given for "%s"', diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/InstitutionConfigurationProvider.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/InstitutionConfigurationProvider.php index cd2f4c10b..c2aefb35e 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/InstitutionConfigurationProvider.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/InstitutionConfigurationProvider.php @@ -24,20 +24,11 @@ final class InstitutionConfigurationProvider { - /** - * @var ConfiguredInstitutionService - */ - private $configuredInstitutionService; + private ConfiguredInstitutionService $configuredInstitutionService; - /** - * @var InstitutionConfigurationOptionsService - */ - private $institutionConfigurationOptionsService; + private InstitutionConfigurationOptionsService $institutionConfigurationOptionsService; - /** - * @var RaLocationService - */ - private $raLocationService; + private RaLocationService $raLocationService; /** * @param ConfiguredInstitutionService $configuredInstitutionService @@ -54,7 +45,7 @@ public function __construct( $this->raLocationService = $raLocationService; } - public function loadData() + public function loadData(): InstitutionConfigurationState { $configuredInstitutions = $this->configuredInstitutionService->getAll(); $institutionConfigurationOptions = $this->institutionConfigurationOptionsService diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/InstitutionConfigurationState.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/InstitutionConfigurationState.php index b56b1501c..01c37e152 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/InstitutionConfigurationState.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/InstitutionConfigurationState.php @@ -18,6 +18,7 @@ namespace Surfnet\StepupMiddleware\MiddlewareBundle\Migrations\InstitutionConfiguration; +use Generator; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity\ConfiguredInstitution; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity\InstitutionConfigurationOptions; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity\RaLocation; @@ -28,7 +29,7 @@ final class InstitutionConfigurationState /** * @var MappedInstitutionConfiguration[] */ - private $mappedInstitutionConfigurations; + private array $mappedInstitutionConfigurations; /** * @param ConfiguredInstitution[] $configuredInstitutions @@ -40,7 +41,7 @@ public static function load( $configuredInstitutions, $institutionConfigurationOptions, $raLocations - ) { + ): self { $optionInstitutions = array_map(function (InstitutionConfigurationOptions $options) { return $options->institution->getInstitution(); }, $institutionConfigurationOptions); @@ -89,7 +90,7 @@ private function __construct(array $mappedInstitutionConfigurations) } /** - * @return \Generator + * @return Generator */ public function inferRemovalCommands() { @@ -99,7 +100,7 @@ public function inferRemovalCommands() } /** - * @return \Generator + * @return Generator */ public function inferCreateCommands() { @@ -109,7 +110,7 @@ public function inferCreateCommands() } /** - * @return \Generator + * @return Generator */ public function inferReconfigureCommands() { @@ -119,7 +120,7 @@ public function inferReconfigureCommands() } /** - * @return \Generator + * @return Generator */ public function inferAddRaLocationCommands() { diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/MappedInstitutionConfiguration.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/MappedInstitutionConfiguration.php index 6ab228aa2..b8b3c6b7d 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/MappedInstitutionConfiguration.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/MappedInstitutionConfiguration.php @@ -33,38 +33,22 @@ final class MappedInstitutionConfiguration { - /** - * @var Institution - */ - private $institution; + private Institution $institution; - /** - * @var ShowRaaContactInformationOption - */ - private $showRaaContactInformationOption; + private ShowRaaContactInformationOption $showRaaContactInformationOption; - /** - * @var UseRaLocationsOption - */ - private $useRaLocationsOption; + private UseRaLocationsOption $useRaLocationsOption; - /** - * @var VerifyEmailOption - */ - private $verifyEmailOption; + private VerifyEmailOption $verifyEmailOption; - /** @var SelfVetOption */ - private $selfVetOption; + private SelfVetOption $selfVetOption; - /** - * @var NumberOfTokensPerIdentityOption - */ - private $numberOfTokensPerIdentityOption; + private NumberOfTokensPerIdentityOption $numberOfTokensPerIdentityOption; /** * @var RaLocation[] */ - private $raLocations; + private array $raLocations; /** * @param Institution $institution @@ -96,7 +80,7 @@ public function __construct( /** * @return RemoveInstitutionConfigurationByUnnormalizedIdCommand */ - public function inferRemoveInstitutionConfigurationByIdCommand() + public function inferRemoveInstitutionConfigurationByIdCommand(): RemoveInstitutionConfigurationByUnnormalizedIdCommand { $command = new RemoveInstitutionConfigurationByUnnormalizedIdCommand(); $command->UUID = (string) Uuid::uuid4(); @@ -108,7 +92,7 @@ public function inferRemoveInstitutionConfigurationByIdCommand() /** * @return CreateInstitutionConfigurationCommand */ - public function inferCreateInstitutionConfigurationCommand() + public function inferCreateInstitutionConfigurationCommand(): CreateInstitutionConfigurationCommand { $command = new CreateInstitutionConfigurationCommand(); $command->UUID = (string) Uuid::uuid4(); @@ -120,7 +104,7 @@ public function inferCreateInstitutionConfigurationCommand() /** * @return ReconfigureInstitutionConfigurationOptionsCommand */ - public function inferReconfigureInstitutionConfigurationCommand() + public function inferReconfigureInstitutionConfigurationCommand(): ReconfigureInstitutionConfigurationOptionsCommand { $command = new ReconfigureInstitutionConfigurationOptionsCommand(); $command->UUID = (string) Uuid::uuid4(); @@ -137,7 +121,7 @@ public function inferReconfigureInstitutionConfigurationCommand() /** * @return AddRaLocationCommand[] */ - public function inferAddRaLocationCommands() + public function inferAddRaLocationCommands(): array { $commands = []; $institution = $this->institution->getInstitution(); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/BootstrapCommandService.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/BootstrapCommandService.php index be88e6db0..e68443e4b 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/BootstrapCommandService.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/BootstrapCommandService.php @@ -49,24 +49,16 @@ */ class BootstrapCommandService { - /** @var Pipeline */ - private $pipeline; - /** @var TokenStorageInterface */ - private $tokenStorage; - /** @var MetadataEnricher */ - private $enricher; - /** @var IdentityRepository */ - private $identityRepository; - /** @var UnverifiedSecondFactorRepository */ - private $unverifiedSecondFactorRepository; - /** @var VerifiedSecondFactorRepository */ - private $verifiedSecondFactorRepository; - /** @var InstitutionConfigurationOptionsRepository */ - private $institutionConfigurationRepository; - /** @var VettedSecondFactorRepository */ - private $vettedSecondFactorRepository; - - private $validRegistrationStatuses = ['unverified', 'verified', 'vetted']; + private Pipeline $pipeline; + private TokenStorageInterface $tokenStorage; + private MetadataEnricher $enricher; + private IdentityRepository $identityRepository; + private UnverifiedSecondFactorRepository $unverifiedSecondFactorRepository; + private VerifiedSecondFactorRepository $verifiedSecondFactorRepository; + private InstitutionConfigurationOptionsRepository $institutionConfigurationRepository; + private VettedSecondFactorRepository $vettedSecondFactorRepository; + + private array $validRegistrationStatuses = ['unverified', 'verified', 'vetted']; public function __construct( Pipeline $pipeline, @@ -88,7 +80,7 @@ public function __construct( $this->vettedSecondFactorRepository = $vettedSecondFactorRepository; } - public function setToken(TokenInterface $token) + public function setToken(TokenInterface $token): void { $this->tokenStorage->setToken($token); } @@ -96,7 +88,7 @@ public function setToken(TokenInterface $token) /** * @param string $registrationStatus */ - public function validRegistrationStatus($registrationStatus) + public function validRegistrationStatus($registrationStatus): void { if (!in_array($registrationStatus, $this->validRegistrationStatuses)) { throw new InvalidArgumentException( @@ -157,7 +149,8 @@ public function createIdentity( $commonName, $email, $preferredLocale - ) { + ): CreateIdentityCommand + { $command = new CreateIdentityCommand(); $command->UUID = (string)Uuid::uuid4(); $command->id = (string)Uuid::uuid4(); @@ -172,7 +165,7 @@ public function createIdentity( return $command; } - public function proveGsspPossession($secondFactorId, $identity, $tokenType, $tokenIdentifier) + public function proveGsspPossession($secondFactorId, $identity, $tokenType, $tokenIdentifier): void { $command = new ProveGssfPossessionCommand(); $command->UUID = (string)Uuid::uuid4(); @@ -184,7 +177,7 @@ public function proveGsspPossession($secondFactorId, $identity, $tokenType, $tok $this->pipeline->process($command); } - public function provePhonePossession($secondFactorId, $identity, $phoneNumber) + public function provePhonePossession($secondFactorId, $identity, $phoneNumber): void { $command = new ProvePhonePossessionCommand(); $command->UUID = (string)Uuid::uuid4(); @@ -195,7 +188,7 @@ public function provePhonePossession($secondFactorId, $identity, $phoneNumber) $this->pipeline->process($command); } - public function proveYubikeyPossession($secondFactorId, $identity, $yubikeyPublicId) + public function proveYubikeyPossession($secondFactorId, $identity, $yubikeyPublicId): void { $command = new ProveYubikeyPossessionCommand(); $command->UUID = (string)Uuid::uuid4(); @@ -206,7 +199,7 @@ public function proveYubikeyPossession($secondFactorId, $identity, $yubikeyPubli $this->pipeline->process($command); } - public function verifyEmail(Identity $identity, string $tokenType) + public function verifyEmail(Identity $identity, string $tokenType): void { $unverifiedSecondFactor = $this->unverifiedSecondFactorRepository->findOneBy( ['identityId' => $identity->id, 'type' => $tokenType] @@ -220,7 +213,7 @@ public function verifyEmail(Identity $identity, string $tokenType) $this->pipeline->process($command); } - public function migrateVettedSecondFactor(Identity $sourceIdentity, Identity $targetIdentity, VettedSecondFactor $vettedSecondFactor) + public function migrateVettedSecondFactor(Identity $sourceIdentity, Identity $targetIdentity, VettedSecondFactor $vettedSecondFactor): void { $command = new CommandHandlingMigrateSecondFactorCommand(); $command->UUID = (string)Uuid::uuid4(); @@ -232,7 +225,7 @@ public function migrateVettedSecondFactor(Identity $sourceIdentity, Identity $ta $this->pipeline->process($command); } - public function enrichEventMetadata($actorId) + public function enrichEventMetadata($actorId): void { $actor = $this->identityRepository->findOneBy(['id' => $actorId]); @@ -253,12 +246,12 @@ public function getIdentity(NameId $nameId, Institution $institution) /** ** @return Identity */ - public function getIdentityByNameId(NameId $nameId) + public function getIdentityByNameId(NameId $nameId): ?Identity { return $this->identityRepository->findOneByNameId($nameId); } - public function identityExists(NameId $nameId, Institution $institution) + public function identityExists(NameId $nameId, Institution $institution): bool { return $this->identityRepository->hasIdentityWithNameIdAndInstitution($nameId, $institution); } @@ -267,7 +260,7 @@ public function identityExists(NameId $nameId, Institution $institution) * @param Identity $identity * @return array|VettedSecondFactor[] */ - public function getVettedSecondFactorsFromIdentity(Identity $identity) + public function getVettedSecondFactorsFromIdentity(Identity $identity): array { return $this->vettedSecondFactorRepository->findBy(['identityId' => $identity->id]); } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/DBALConnectionHelper.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/DBALConnectionHelper.php index e987b210a..710b57d3d 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/DBALConnectionHelper.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/DBALConnectionHelper.php @@ -27,7 +27,7 @@ class DBALConnectionHelper /** * @var Connection[] */ - private $connections; + private array $connections; /** * @param Connection[] $connections @@ -46,7 +46,7 @@ public function __construct(array $connections) /** * Start transaction on each connection */ - public function beginTransaction() + public function beginTransaction(): void { foreach ($this->connections as $connection) { $connection->beginTransaction(); @@ -56,7 +56,7 @@ public function beginTransaction() /** * Commit transaction on each connection */ - public function commit() + public function commit(): void { foreach ($this->connections as $connection) { $connection->commit(); @@ -66,7 +66,7 @@ public function commit() /** * Roll back the transaction on each connection */ - public function rollBack() + public function rollBack(): void { foreach ($this->connections as $connection) { $connection->rollBack(); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php index 65da85b25..a3edb575c 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php @@ -28,25 +28,16 @@ class EventStreamReplayer { - /** - * @var BufferedEventBus - */ - private $eventBus; + private BufferedEventBus $eventBus; - /** - * @var DBALEventHydrator - */ - private $eventHydrator; + private DBALEventHydrator $eventHydrator; - /** - * @var DBALConnectionHelper - */ - private $connectionHelper; + private DBALConnectionHelper $connectionHelper; /** * @var string[] */ - private $middlewareTables = [ + private array $middlewareTables = [ 'unverified_second_factor', 'verified_second_factor', 'vetted_second_factor', @@ -66,7 +57,7 @@ class EventStreamReplayer /** * @var string[] */ - private $gatewayTables = [ + private array $gatewayTables = [ 'second_factor', 'saml_entity', 'whitelist_entry', @@ -88,7 +79,7 @@ public function __construct( ); } - public function replayEvents(OutputInterface $output, $increments) + public function replayEvents(OutputInterface $output, $increments): void { $preparationProgress = new ProgressBar($output, 3); $preparationProgress->setFormat('event_replay'); @@ -167,7 +158,7 @@ public function replayEvents(OutputInterface $output, $increments) } } - private function wipeReadTables(OutputInterface $output) + private function wipeReadTables(OutputInterface $output): void { if ($output->getVerbosity() === OutputInterface::VERBOSITY_DEBUG) { $output->writeln('Retrieving connections to wipe READ tables'); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/PastEventsService.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/PastEventsService.php index 27da5d086..27f0cc092 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/PastEventsService.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/PastEventsService.php @@ -18,15 +18,13 @@ namespace Surfnet\StepupMiddleware\MiddlewareBundle\Service; +use Broadway\Domain\DomainEventStream; use Surfnet\StepupMiddleware\MiddlewareBundle\EventSourcing\DBALEventHydrator; use Surfnet\StepupMiddleware\MiddlewareBundle\EventSourcing\EventCollection; final class PastEventsService { - /** - * @var DBALEventHydrator - */ - private $eventHydrator; + private DBALEventHydrator $eventHydrator; public function __construct(DBALEventHydrator $eventHydrator) { @@ -35,7 +33,7 @@ public function __construct(DBALEventHydrator $eventHydrator) /** * @param EventCollection $events - * @return \Broadway\Domain\DomainEventStream + * @return DomainEventStream */ public function findEventsBy(EventCollection $events) { diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/ReplayingEventDispatcher.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/ReplayingEventDispatcher.php index ec7f33a66..6c0b97676 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/ReplayingEventDispatcher.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/ReplayingEventDispatcher.php @@ -26,17 +26,17 @@ final class ReplayingEventDispatcher implements EventDispatcher /** * @var ProjectorInterface[] */ - private $projectors; + private ?array $projectors = null; /** * @param ProjectorInterface $projector */ - public function registerProjector(ProjectorInterface $projector) + public function registerProjector(ProjectorInterface $projector): void { $this->projectors[] = $projector; } - public function dispatch(DomainEventStreamInterface $events) + public function dispatch(DomainEventStreamInterface $events): void { foreach ($events as $event) { foreach ($this->projectors as $projector) { diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/SecondFactorDisplayNameResolverService.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/SecondFactorDisplayNameResolverService.php index cbe55b9c1..4cbf9693f 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/SecondFactorDisplayNameResolverService.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/SecondFactorDisplayNameResolverService.php @@ -22,10 +22,7 @@ final class SecondFactorDisplayNameResolverService { - /** - * @var array - */ - private $secondFactors; + private array $secondFactors; /** * @param array $secondFactors diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/TransactionAwareEventDispatcher.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/TransactionAwareEventDispatcher.php index eb1fdb9b2..721408353 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/TransactionAwareEventDispatcher.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/TransactionAwareEventDispatcher.php @@ -24,15 +24,9 @@ final class TransactionAwareEventDispatcher implements EventDispatcher { - /** - * @var EventDispatcher - */ - private $eventDispatcher; + private EventDispatcher $eventDispatcher; - /** - * @var DBALConnectionHelper - */ - private $connectionHelper; + private DBALConnectionHelper $connectionHelper; public function __construct(DBALConnectionHelper $connectionHelper, EventDispatcher $eventDispatcher) { @@ -40,12 +34,12 @@ public function __construct(DBALConnectionHelper $connectionHelper, EventDispatc $this->eventDispatcher = $eventDispatcher; } - public function registerProjector(ProjectorInterface $projector) + public function registerProjector(ProjectorInterface $projector): void { $this->eventDispatcher->registerProjector($projector); } - public function dispatch(DomainEventStreamInterface $events) + public function dispatch(DomainEventStreamInterface $events): void { $this->connectionHelper->beginTransaction(); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/TransactionHelper.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/TransactionHelper.php index ef4c35b36..66243218c 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/TransactionHelper.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/TransactionHelper.php @@ -24,12 +24,10 @@ final class TransactionHelper { - /** @var Pipeline */ - private $pipeline; + private Pipeline $pipeline; /** @var EventBusInterface */ - private $eventBus; - /** @var DBALConnectionHelper */ - private $connection; + private EventBusInterface $eventBus; + private DBALConnectionHelper $connection; public function __construct(Pipeline $pipeline, EventBusInterface $eventBus, DBALConnectionHelper $connection) { diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php index 25b1353f5..304e8fa6b 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php @@ -42,42 +42,24 @@ class VerifiedSecondFactorReminderMailService /** * @var Mailer */ - private $mailer; + private Mailer $mailer; - /** - * @var Sender - */ - private $sender; + private Sender $sender; /** * @var TranslatorInterface */ private $translator; - /** - * @var EmailTemplateService - */ - private $emailTemplateService; + private EmailTemplateService $emailTemplateService; - /** - * @var InstitutionConfigurationOptionsService - */ - private $institutionConfigurationOptionsService; + private InstitutionConfigurationOptionsService $institutionConfigurationOptionsService; - /** - * @var RaListingService - */ - private $raListingService; + private RaListingService $raListingService; - /** - * @var RaLocationService - */ - private $raLocationService; + private RaLocationService $raLocationService; - /** - * @var string - */ - private $fallbackLocale; + private string $fallbackLocale; public function __construct( Mailer $mailer, @@ -133,7 +115,7 @@ public function sendReminder(VerifiedTokenInformation $tokenInformation) ); } - $rasWithoutRaas = array_filter($ras, function (RegistrationAuthorityCredentials $ra) { + $rasWithoutRaas = array_filter($ras, function (RegistrationAuthorityCredentials $ra): bool { return !$ra->isRaa(); }); @@ -163,7 +145,7 @@ private function sendReminderWithInstitution( $requestedAt, $registrationCode, $raLocations - ) { + ): void { $subject = $this->translator->trans( 'ss.mail.registration_email.subject', ['%commonName%' => $commonName], @@ -202,7 +184,7 @@ private function sendReminderWithRas( $requestedAt, $registrationCode, array $ras - ) { + ): void { $subject = $this->translator->trans( 'ss.mail.registration_email.subject', ['%commonName%' => $commonName], diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderService.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderService.php index d18d153cb..bd4eb5a8f 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderService.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderService.php @@ -31,25 +31,13 @@ */ class VerifiedSecondFactorReminderService { - /** - * @var VerifiedSecondFactorRepository - */ - private $verifiedRepository; + private VerifiedSecondFactorRepository $verifiedRepository; - /** - * @var IdentityRepository - */ - private $identityRepository; + private IdentityRepository $identityRepository; - /** - * @var VerifiedSecondFactorReminderMailService - */ - private $mailService; + private VerifiedSecondFactorReminderMailService $mailService; - /** - * @var LoggerInterface - */ - private $logger; + private LoggerInterface $logger; /** * @param VerifiedSecondFactorRepository $verifiedRepository @@ -73,7 +61,7 @@ public function __construct( * @param DateTime $date * @param bool $dryRun */ - public function sendReminders(DateTime $date, $dryRun) + public function sendReminders(DateTime $date, $dryRun): void { $this->logger->info( sprintf( @@ -124,7 +112,7 @@ public function sendReminders(DateTime $date, $dryRun) * @param DateTime $date * @return VerifiedTokenInformation[] */ - private function buildCollection(DateTime $date) + private function buildCollection(DateTime $date): array { $collection = []; diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/SurfnetStepupMiddlewareMiddlewareBundle.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/SurfnetStepupMiddlewareMiddlewareBundle.php index e19d0f741..665949203 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/SurfnetStepupMiddlewareMiddlewareBundle.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/SurfnetStepupMiddlewareMiddlewareBundle.php @@ -29,7 +29,7 @@ class SurfnetStepupMiddlewareMiddlewareBundle extends Bundle { - public function build(ContainerBuilder $container) + public function build(ContainerBuilder $container): void { parent::build($container); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/EventSourcing/EventCollectionTest.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/EventSourcing/EventCollectionTest.php index 74a4fca85..28887fc27 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/EventSourcing/EventCollectionTest.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/EventSourcing/EventCollectionTest.php @@ -34,7 +34,7 @@ class EventCollectionTest extends TestCase * @dataProvider emptyOrNonStringProvider * @param $emptyOrNonString */ - public function an_event_collection_must_be_created_from_an_array_of_non_empty_strings($emptyOrNonString) + public function an_event_collection_must_be_created_from_an_array_of_non_empty_strings(bool|int|string|stdClass|array|null $emptyOrNonString): void { $this->expectException(InvalidArgumentException::class); $this->expectExceptionMessage('Invalid argument type: "non-empty string" expected'); @@ -46,7 +46,7 @@ public function an_event_collection_must_be_created_from_an_array_of_non_empty_s * @test * @group event-replay */ - public function an_event_collection_must_contain_event_names_that_are_existing_class_names() + public function an_event_collection_must_contain_event_names_that_are_existing_class_names(): void { $this->expectException(InvalidArgumentException::class); $this->expectExceptionMessage('does not exist'); @@ -60,7 +60,7 @@ public function an_event_collection_must_contain_event_names_that_are_existing_c * @test * @group event-replay */ - public function an_event_collection_contains_given_event_names() + public function an_event_collection_contains_given_event_names(): void { $eventCollection = new EventCollection([NewConfigurationCreatedEvent::class]); @@ -74,7 +74,7 @@ public function an_event_collection_contains_given_event_names() * @test * @group event-replay */ - public function event_names_can_be_retrieved_from_an_event_collection() + public function event_names_can_be_retrieved_from_an_event_collection(): void { $eventNames = [NewConfigurationCreatedEvent::class]; $eventCollection = new EventCollection($eventNames); @@ -92,7 +92,7 @@ public function event_names_can_be_retrieved_from_an_event_collection() * @test * @group event-replay */ - public function an_event_collection_does_not_contain_given_event_names() + public function an_event_collection_does_not_contain_given_event_names(): void { $eventCollection = new EventCollection([SecondFactorVettedEvent::class]); @@ -106,7 +106,7 @@ public function an_event_collection_does_not_contain_given_event_names() * @test * @group event-replay */ - public function a_subset_of_events_can_be_selected_from_an_event_collection() + public function a_subset_of_events_can_be_selected_from_an_event_collection(): void { $eventCollection = new EventCollection([NewConfigurationCreatedEvent::class, SecondFactorVettedEvent::class]); @@ -122,7 +122,7 @@ public function a_subset_of_events_can_be_selected_from_an_event_collection() * @test * @group event-replay */ - public function a_subset_containing_events_not_present_in_the_event_collection_cannot_be_selected() + public function a_subset_containing_events_not_present_in_the_event_collection_cannot_be_selected(): void { $this->expectException(InvalidArgumentException::class); $this->expectExceptionMessage('Subset of event names contains event names not present in collection'); @@ -135,7 +135,7 @@ public function a_subset_containing_events_not_present_in_the_event_collection_c * @test * @group event-replay */ - public function events_in_an_event_collection_can_be_formatted_as_event_stream_compatible_event_types() + public function events_in_an_event_collection_can_be_formatted_as_event_stream_compatible_event_types(): void { $eventCollection = new EventCollection([NewConfigurationCreatedEvent::class, SecondFactorVettedEvent::class]); @@ -152,7 +152,7 @@ public function events_in_an_event_collection_can_be_formatted_as_event_stream_c ); } - public function emptyOrNonStringProvider() + public function emptyOrNonStringProvider(): array { return [ 'null' => [null], diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/EventSourcing/ProjectorCollectionTest.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/EventSourcing/ProjectorCollectionTest.php index 4473d7306..f02871567 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/EventSourcing/ProjectorCollectionTest.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/EventSourcing/ProjectorCollectionTest.php @@ -33,7 +33,7 @@ class ProjectorCollectionTest extends TestCase * @test * @group event-replay */ - public function projectors_can_be_added_to_a_projector_collection_during_runtime() + public function projectors_can_be_added_to_a_projector_collection_during_runtime(): void { $sraaProjector = new SraaProjector(m::mock(SraaRepository::class)); $whitelistProjector = new WhitelistProjector(m::mock(WhitelistEntryRepository::class)); @@ -56,7 +56,7 @@ public function projectors_can_be_added_to_a_projector_collection_during_runtime * @test * @group event-replay */ - public function projector_names_can_be_retrieved_from_a_projector_collection() + public function projector_names_can_be_retrieved_from_a_projector_collection(): void { $sraaProjector = new SraaProjector(m::mock(SraaRepository::class)); $whitelistProjector = new WhitelistProjector(m::mock(WhitelistEntryRepository::class)); @@ -79,7 +79,7 @@ public function projector_names_can_be_retrieved_from_a_projector_collection() * @test * @group event-replay */ - public function a_subset_of_projectors_can_be_selected_from_a_projector_collection() + public function a_subset_of_projectors_can_be_selected_from_a_projector_collection(): void { $sraaProjector = new SraaProjector( m::mock(SraaRepository::class)); $whitelistProjector = new WhitelistProjector(m::mock(WhitelistEntryRepository::class)); @@ -104,7 +104,7 @@ public function a_subset_of_projectors_can_be_selected_from_a_projector_collecti * @test * @group event-replay */ - public function a_subset_containing_projectors_not_present_in_a_projector_collection_cannot_be_selected() + public function a_subset_containing_projectors_not_present_in_a_projector_collection_cannot_be_selected(): void { $this->expectException(InvalidArgumentException::class); $this->expectExceptionMessage('not present in the collection'); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Migrations/InstitutionConfiguration/MappedInstitutionConfigurationTest.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Migrations/InstitutionConfiguration/MappedInstitutionConfigurationTest.php index 5c52dda2f..9bd9d92ed 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Migrations/InstitutionConfiguration/MappedInstitutionConfigurationTest.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Migrations/InstitutionConfiguration/MappedInstitutionConfigurationTest.php @@ -42,7 +42,7 @@ class MappedInstitutionConfigurationTest extends UnitTest * @test * @group middleware-migration */ - public function infers_the_correct_remove_institution_configuration_command() + public function infers_the_correct_remove_institution_configuration_command(): void { $institution = new Institution('Babelfish Inc.'); $useRaLocationsOption = UseRaLocationsOption::getDefault(); @@ -72,7 +72,7 @@ public function infers_the_correct_remove_institution_configuration_command() * @test * @group middleware-migration */ - public function infers_the_correct_create_institution_configuration_command() + public function infers_the_correct_create_institution_configuration_command(): void { $institution = new Institution('Babelfish Inc.'); $useRaLocationsOption = UseRaLocationsOption::getDefault(); @@ -102,7 +102,7 @@ public function infers_the_correct_create_institution_configuration_command() * @test * @group middleware-migration */ - public function infers_the_correct_reconfigure_institution_configuration_command() + public function infers_the_correct_reconfigure_institution_configuration_command(): void { $institution = new Institution('Babelfish Inc.'); $useRaLocationsOption = new UseRaLocationsOption(true); @@ -136,7 +136,7 @@ public function infers_the_correct_reconfigure_institution_configuration_command * @test * @group middleware-migration */ - public function no_ra_locations_means_no_add_ra_location_command() + public function no_ra_locations_means_no_add_ra_location_command(): void { $institution = new Institution('Babelfish Inc.'); $useRaLocationsOption = new UseRaLocationsOption(true); @@ -165,7 +165,7 @@ public function no_ra_locations_means_no_add_ra_location_command() * @test * @group middleware-migration */ - public function a_single_ra_location_means_a_single_correct_add_ra_location_command() + public function a_single_ra_location_means_a_single_correct_add_ra_location_command(): void { $institution = new Institution('Babelfish Inc.'); $useRaLocationsOption = new UseRaLocationsOption(true); @@ -204,7 +204,7 @@ public function a_single_ra_location_means_a_single_correct_add_ra_location_comm * @test * @group middleware-migration */ - public function multiple_ra_locations_mean_multiple_correct_add_ra_location_commands() + public function multiple_ra_locations_mean_multiple_correct_add_ra_location_commands(): void { $institution = new Institution('Babelfish Inc.'); $useRaLocationsOption = new UseRaLocationsOption(true); @@ -250,7 +250,7 @@ public function assertCommandMatches( AddRaLocationCommand $command, Institution $institution, RaLocation $raLocation - ) { + ): void { $this->assertEquals($institution->getInstitution(), $command->institution); $this->assertEquals($raLocation->id, $command->raLocationId); $this->assertEquals($raLocation->name->getRaLocationName(), $command->raLocationName); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Service/VerifiedSecondFactorReminderServiceTest.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Service/VerifiedSecondFactorReminderServiceTest.php index c1808ef0f..811e5b0df 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Service/VerifiedSecondFactorReminderServiceTest.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Service/VerifiedSecondFactorReminderServiceTest.php @@ -34,7 +34,7 @@ class VerifiedSecondFactorReminderServiceTest extends TestCase /** * @var VerifiedSecondFactorReminderService */ - private $service; + private VerifiedSecondFactorReminderService $service; /** * @var VerifiedSecondFactorReminderMailService|Mock @@ -71,7 +71,7 @@ public function setUp(): void ); } - public function test_no_token_reminders_sent() + public function test_no_token_reminders_sent(): void { $date = new DateTime('2018-01-01'); @@ -95,7 +95,7 @@ public function test_no_token_reminders_sent() $this->assertInstanceOf(VerifiedSecondFactorReminderService::class, $this->service); } - public function test_one_token_reminders_sent() + public function test_one_token_reminders_sent(): void { $date = new DateTime('2018-01-01'); @@ -150,7 +150,7 @@ public function test_one_token_reminders_sent() $this->assertInstanceOf(VerifiedSecondFactorReminderService::class, $this->service); } - public function test_one_token_reminders_sent_failing_mailer() + public function test_one_token_reminders_sent_failing_mailer(): void { $date = new DateTime('2018-01-01'); @@ -200,7 +200,7 @@ public function test_one_token_reminders_sent_failing_mailer() $this->assertInstanceOf(VerifiedSecondFactorReminderService::class, $this->service); } - public function test_multiple_tokens_reminders_sent() + public function test_multiple_tokens_reminders_sent(): void { $date = new DateTime('2018-01-01'); @@ -239,7 +239,7 @@ public function test_multiple_tokens_reminders_sent() $this->logger ->shouldReceive('info') - ->with(\Mockery::pattern('/^Message successfully sent to "mail@example\d.org" with token id "fa125c7c-c9ee-11e7-800\d-00000000000\d" of type "yubikey"/')) + ->with(m::pattern('/^Message successfully sent to "mail@example\d.org" with token id "fa125c7c-c9ee-11e7-800\d-00000000000\d" of type "yubikey"/')) ->times(9); $this->logger @@ -252,7 +252,7 @@ public function test_multiple_tokens_reminders_sent() $this->assertInstanceOf(VerifiedSecondFactorReminderService::class, $this->service); } - public function test_missing_identity() + public function test_missing_identity(): void { $date = new DateTime('2018-01-01'); @@ -290,7 +290,7 @@ public function test_missing_identity() $this->assertInstanceOf(VerifiedSecondFactorReminderService::class, $this->service); } - public function test_one_token_reminders_sent_dry_run() + public function test_one_token_reminders_sent_dry_run(): void { $date = new DateTime('2018-01-01'); @@ -334,7 +334,7 @@ public function test_one_token_reminders_sent_dry_run() $this->assertInstanceOf(VerifiedSecondFactorReminderService::class, $this->service); } - public function test_multiple_tokens_reminders_sent_dry_run() + public function test_multiple_tokens_reminders_sent_dry_run(): void { $date = new DateTime('2018-01-01'); @@ -367,7 +367,7 @@ public function test_multiple_tokens_reminders_sent_dry_run() $this->logger ->shouldReceive('info') - ->with(\Mockery::pattern('/^Message successfully sent in dry run mode to "mail@example\d.org" with token id "fa125c7c-c9ee-11e7-800\d-00000000000\d" of type "yubikey"/')) + ->with(m::pattern('/^Message successfully sent in dry run mode to "mail@example\d.org" with token id "fa125c7c-c9ee-11e7-800\d-00000000000\d" of type "yubikey"/')) ->times(9); $this->logger @@ -380,7 +380,7 @@ public function test_multiple_tokens_reminders_sent_dry_run() $this->assertInstanceOf(VerifiedSecondFactorReminderService::class, $this->service); } - public function test_no_token_reminders_sent_dry_run() + public function test_no_token_reminders_sent_dry_run(): void { $date = new DateTime('2018-01-01'); @@ -409,7 +409,7 @@ public function test_no_token_reminders_sent_dry_run() * @param DateTime $requestedAt * @return VerifiedSecondFactor[] */ - private function buildVerifiedSecondFactors($numberOfResults, DateTime $requestedAt) + private function buildVerifiedSecondFactors(int $numberOfResults, DateTime $requestedAt): array { $collection = []; for ($i=1; $i<=$numberOfResults; $i++) { @@ -430,7 +430,7 @@ private function buildVerifiedSecondFactors($numberOfResults, DateTime $requeste * @param VerifiedSecondFactor $token * @return Identity */ - private function buildIdentity(VerifiedSecondFactor $token) + private function buildIdentity(VerifiedSecondFactor $token): Identity { $identity = new Identity(); $identity->id = $token->identityId; From c25652232f6957c70497a1e142505455d9079502 Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Tue, 27 Feb 2024 09:15:41 +0100 Subject: [PATCH 14/89] Improve code quality Simplify certain code constructs like: - Simplify return statement - Make 'is empty' statements more specific - Simplify regex statements --- config/packages/doctrine.yaml | 10 +- config/routes/dev/routes.yml | 2 +- .../InstitutionConfiguration.php | 7 +- .../Value/AllowedSecondFactorList.php | 2 +- .../Configuration/Value/Institution.php | 2 +- .../Value/InstitutionAuthorizationOption.php | 9 +- .../Value/InstitutionConfigurationId.php | 2 +- .../Configuration/Value/RaLocationId.php | 2 +- src/Surfnet/Stepup/Identity/Identity.php | 4 +- .../Stepup/Identity/Value/DocumentNumber.php | 2 +- .../Stepup/Identity/Value/Institution.php | 2 +- .../Stepup/Identity/Value/StepupProvider.php | 2 +- .../Stepup/Identity/Value/YubikeyPublicId.php | 2 +- .../Configuration/Value/RaLocationIdTest.php | 8 +- .../Value/RaLocationListTest.php | 2 +- ...entSerializationAndDeserializationTest.php | 148 +++++++++--------- .../Service/AuthorizationContextService.php | 3 +- .../Service/AuthorizationService.php | 12 +- .../Service/CommandAuthorizationService.php | 20 +-- .../Controller/CommandController.php | 4 +- .../Controller/DeprovisionController.php | 2 +- .../Controller/IdentityController.php | 3 +- .../Controller/ProfileController.php | 3 +- .../UnverifiedSecondFactorController.php | 3 +- .../VerifiedSecondFactorController.php | 5 +- .../VettedSecondFactorController.php | 3 +- .../Exception/BadCommandRequestException.php | 2 +- .../Identity/Projector/AuditLogProjector.php | 11 +- .../Identity/Projector/IdentityProjector.php | 5 +- ...ntitySelfAssertedTokenOptionsProjector.php | 2 +- .../Projector/RaSecondFactorProjector.php | 6 +- .../Repository/AuthorizationRepository.php | 10 +- .../Identity/Repository/SraaRepository.php | 2 +- .../Identity/Service/AuditLogService.php | 4 +- .../Identity/Service/IdentityService.php | 14 +- .../Identity/Service/ProfileService.php | 3 +- .../Identity/Service/RaCandidateService.php | 4 +- .../Identity/Service/RaListingService.php | 4 +- .../Service/RaSecondFactorService.php | 4 +- .../Identity/Service/RecoveryTokenService.php | 2 +- .../Identity/Service/SecondFactorService.php | 18 +-- .../Value/AuthorizedInstitutionCollection.php | 2 +- .../Value/VerifiedTokenInformation.php | 4 +- ...ConfigurationInstitutionParamConverter.php | 4 +- .../Response/JsonAuthorizationResponse.php | 2 +- .../JsonBasicAuthenticationEntryPoint.php | 6 +- .../ApiBundle/Service/DeprovisionService.php | 2 +- .../Projector/AuditLogProjectorTest.php | 48 +++--- .../Request/CommandParamConverterTest.php | 6 +- .../EventHandling/BufferedEventBus.php | 2 +- .../MetadataEnrichingEventStreamDecorator.php | 2 +- .../Service/RegistrationMailService.php | 1 + .../Service/VettingTypeHintService.php | 3 +- .../Pipeline/AuthorizingStage.php | 2 +- .../Exception/InvalidCommandException.php | 2 +- .../Processor/RecoveryTokenEmailProcessor.php | 9 +- .../SecondFactorRevocationEmailProcessor.php | 5 +- .../SensitiveDataMessageStream.php | 2 +- .../SensitiveData/SensitiveData.php | 6 +- .../Value/Institution.php | 2 +- .../DependencyInjection/Configuration.php | 3 +- .../InstitutionConfigurationProjector.php | 2 +- .../Repository/SecondFactorRepository.php | 1 + .../Controller/ConfigurationController.php | 5 +- .../InstitutionConfigurationController.php | 2 +- .../RightToBeForgottenController.php | 11 +- .../Controller/WhitelistController.php | 5 +- .../Validator/ConfigurationValidationTest.php | 6 +- ...nfigureInstitutionRequestValidatorTest.php | 8 +- .../ManagementBundle/Validator/Assert.php | 4 +- .../ConfigurationStructureValidator.php | 2 +- .../EmailTemplatesConfigurationValidator.php | 2 +- ...IdentityProviderConfigurationValidator.php | 2 +- ...ReconfigureInstitutionRequestValidator.php | 10 +- .../ServiceProviderConfigurationValidator.php | 4 +- .../Command/MigrateSecondFactorCommand.php | 2 +- .../Command/ReplaySpecificEventsCommand.php | 6 +- .../EventSourcing/EventCollection.php | 2 +- .../VerifiedSecondFactorReminderService.php | 8 +- 79 files changed, 250 insertions(+), 300 deletions(-) diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml index 072a3b3ae..9d54a276c 100644 --- a/config/packages/doctrine.yaml +++ b/config/packages/doctrine.yaml @@ -127,19 +127,19 @@ doctrine: mappings: api_identity: mapping: true - type: annotation + type: attribute dir: "%kernel.project_dir%/src/Surfnet/StepupMiddleware/ApiBundle/Identity" prefix: Surfnet\StepupMiddleware\ApiBundle\Identity is_bundle: false api_configuration: mapping: true - type: annotation + type: attribute dir: "%kernel.project_dir%/src/Surfnet/StepupMiddleware/ApiBundle/Configuration" prefix: Surfnet\StepupMiddleware\ApiBundle\Configuration is_bundle: false management_configuration: mapping: true - type: annotation + type: attribute dir: "%kernel.project_dir%/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration" prefix: Surfnet\StepupMiddleware\ManagementBundle\Configuration is_bundle: false @@ -147,9 +147,9 @@ doctrine: connection: gateway naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware mappings: - SurfnetStepupMiddlewareGatewayBundle: + Surfnet\StepupMiddleware\GatewayBundle\SurfnetStepupMiddlewareGatewayBundle: mapping: true - type: annotation + type: attribute is_bundle: true deploy: connection: deploy diff --git a/config/routes/dev/routes.yml b/config/routes/dev/routes.yml index 7e857e8f3..ae22ca45a 100644 --- a/config/routes/dev/routes.yml +++ b/config/routes/dev/routes.yml @@ -8,5 +8,5 @@ _profiler: JMSTranslationBundle_ui: resource: "@JMSTranslationBundle/Controller/" - type: annotation + type: attribute prefix: /_trans diff --git a/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php b/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php index c04191a86..5a7d62533 100644 --- a/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php +++ b/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php @@ -548,12 +548,7 @@ public function isInstitutionAllowedToAccreditRoles(Institution $institution) if ($this->selectRaaOption == null) { return $this->institution->equals($institution); } - - if ($this->selectRaaOption->hasInstitution($institution, $this->institution)) { - return true; - } - - return false; + return $this->selectRaaOption->hasInstitution($institution, $this->institution); } protected function applyNewInstitutionConfigurationCreatedEvent(NewInstitutionConfigurationCreatedEvent $event) diff --git a/src/Surfnet/Stepup/Configuration/Value/AllowedSecondFactorList.php b/src/Surfnet/Stepup/Configuration/Value/AllowedSecondFactorList.php index 23d2538a2..41fab6a92 100644 --- a/src/Surfnet/Stepup/Configuration/Value/AllowedSecondFactorList.php +++ b/src/Surfnet/Stepup/Configuration/Value/AllowedSecondFactorList.php @@ -69,7 +69,7 @@ public function allows(SecondFactorType $secondFactor): bool */ public function isBlank(): bool { - return empty($this->allowedSecondFactors); + return $this->allowedSecondFactors === []; } /** diff --git a/src/Surfnet/Stepup/Configuration/Value/Institution.php b/src/Surfnet/Stepup/Configuration/Value/Institution.php index fb9ecb430..16a0ca37f 100644 --- a/src/Surfnet/Stepup/Configuration/Value/Institution.php +++ b/src/Surfnet/Stepup/Configuration/Value/Institution.php @@ -30,7 +30,7 @@ final class Institution implements JsonSerializable */ public function __construct($institution) { - if (!is_string($institution) || strlen(trim($institution)) === 0) { + if (!is_string($institution) || trim($institution) === '') { throw InvalidArgumentException::invalidType('non-empty string', 'institution', $institution); } diff --git a/src/Surfnet/Stepup/Configuration/Value/InstitutionAuthorizationOption.php b/src/Surfnet/Stepup/Configuration/Value/InstitutionAuthorizationOption.php index 2c0fb097e..984a69618 100644 --- a/src/Surfnet/Stepup/Configuration/Value/InstitutionAuthorizationOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/InstitutionAuthorizationOption.php @@ -66,7 +66,7 @@ public static function fromInstitutionConfig(InstitutionRole $role, $institution array_walk( $institutions, function ($institution, $key) use ($institutions): void { - if (!is_string($institution) || strlen(trim($institution)) === 0) { + if (!is_string($institution) || trim($institution) === '') { throw InvalidArgumentException::invalidType( 'string', 'institutions', @@ -185,12 +185,7 @@ function (Institution $institution) { }, $institutions ); - - if (!in_array($institution->getInstitution(), $list)) { - return false; - } - - return true; + return in_array($institution->getInstitution(), $list); } /** diff --git a/src/Surfnet/Stepup/Configuration/Value/InstitutionConfigurationId.php b/src/Surfnet/Stepup/Configuration/Value/InstitutionConfigurationId.php index eee782de6..da6930325 100644 --- a/src/Surfnet/Stepup/Configuration/Value/InstitutionConfigurationId.php +++ b/src/Surfnet/Stepup/Configuration/Value/InstitutionConfigurationId.php @@ -50,7 +50,7 @@ public static function normalizedFrom(Institution $institution): self public function __construct($institutionConfigurationId) { - if (!is_string($institutionConfigurationId) || strlen(trim($institutionConfigurationId)) === 0) { + if (!is_string($institutionConfigurationId) || trim($institutionConfigurationId) === '') { throw InvalidArgumentException::invalidType( 'non-empty string', 'institutionConfigurationId', diff --git a/src/Surfnet/Stepup/Configuration/Value/RaLocationId.php b/src/Surfnet/Stepup/Configuration/Value/RaLocationId.php index 033b588bc..972a20e0c 100644 --- a/src/Surfnet/Stepup/Configuration/Value/RaLocationId.php +++ b/src/Surfnet/Stepup/Configuration/Value/RaLocationId.php @@ -31,7 +31,7 @@ final class RaLocationId implements JsonSerializable */ public function __construct($raLocationId) { - if (!is_string($raLocationId) || strlen(trim($raLocationId)) === 0) { + if (!is_string($raLocationId) || trim($raLocationId) === '') { throw InvalidArgumentException::invalidType( 'non-empty string', 'raLocationId', diff --git a/src/Surfnet/Stepup/Identity/Identity.php b/src/Surfnet/Stepup/Identity/Identity.php index e0a7c4a10..835d60159 100644 --- a/src/Surfnet/Stepup/Identity/Identity.php +++ b/src/Surfnet/Stepup/Identity/Identity.php @@ -675,7 +675,7 @@ public function migrateVettedSecondFactor( $this->assertNotForgotten(); $this->assertUserMayAddSecondFactor($maxNumberOfTokens); $secondFactor = $sourceIdentity->getVettedSecondFactorById($secondFactorId); - if (!$secondFactor) { + if (!$secondFactor instanceof VettedSecondFactor) { throw new DomainException("The second factor on the original identity can not be found"); } $this->assertTokenNotAlreadyRegistered($secondFactor->getType(), $secondFactor->getIdentifier()); @@ -981,7 +981,7 @@ public function forget(): void { $this->assertNotForgotten(); - if ($this->registrationAuthorities->count()) { + if ($this->registrationAuthorities->count() !== 0) { throw new DomainException('Cannot forget an identity that is currently accredited as an RA(A)'); } diff --git a/src/Surfnet/Stepup/Identity/Value/DocumentNumber.php b/src/Surfnet/Stepup/Identity/Value/DocumentNumber.php index c574373da..7db32c042 100644 --- a/src/Surfnet/Stepup/Identity/Value/DocumentNumber.php +++ b/src/Surfnet/Stepup/Identity/Value/DocumentNumber.php @@ -38,7 +38,7 @@ public static function unknown(): self */ public function __construct($documentNumber) { - if (!is_string($documentNumber) || empty($documentNumber)) { + if (!is_string($documentNumber) || ($documentNumber === '' || $documentNumber === '0')) { throw InvalidArgumentException::invalidType('non-empty string', 'documentNumber', $documentNumber); } diff --git a/src/Surfnet/Stepup/Identity/Value/Institution.php b/src/Surfnet/Stepup/Identity/Value/Institution.php index ce255f3ae..b9b07a1e4 100644 --- a/src/Surfnet/Stepup/Identity/Value/Institution.php +++ b/src/Surfnet/Stepup/Identity/Value/Institution.php @@ -30,7 +30,7 @@ final class Institution implements JsonSerializable */ public function __construct($institution) { - if (!is_string($institution) || strlen(trim($institution)) === 0) { + if (!is_string($institution) || trim($institution) === '') { throw InvalidArgumentException::invalidType('non-empty string', 'institution', $institution); } diff --git a/src/Surfnet/Stepup/Identity/Value/StepupProvider.php b/src/Surfnet/Stepup/Identity/Value/StepupProvider.php index 915c12fb6..a7959be7a 100644 --- a/src/Surfnet/Stepup/Identity/Value/StepupProvider.php +++ b/src/Surfnet/Stepup/Identity/Value/StepupProvider.php @@ -26,7 +26,7 @@ final class StepupProvider public function __construct($provider) { - if (!is_string($provider) || strlen(trim($provider)) === 0) { + if (!is_string($provider) || trim($provider) === '') { throw InvalidArgumentException::invalidType('non-empty string', 'provider', $provider); } diff --git a/src/Surfnet/Stepup/Identity/Value/YubikeyPublicId.php b/src/Surfnet/Stepup/Identity/Value/YubikeyPublicId.php index 74bd2070f..34aa0f9db 100644 --- a/src/Surfnet/Stepup/Identity/Value/YubikeyPublicId.php +++ b/src/Surfnet/Stepup/Identity/Value/YubikeyPublicId.php @@ -44,7 +44,7 @@ public function __construct($value) // Numeric IDs must be left-padded with zeroes until eight characters. Longer IDs, up to twenty characters, may // not be padded. - if (!preg_match('~^[0-9]{8,20}$~', $value)) { + if (!preg_match('~^\d{8,20}$~', $value)) { throw new InvalidArgumentException('Given Yubikey public ID is not a string of 8 to 20 digits'); } if ($value !== sprintf('%08s', ltrim($value, '0'))) { diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php index 76b8da46a..cf8dc4f36 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php @@ -58,7 +58,7 @@ public function an_ra_location_id_cannot_be_created_with_anything_but_a_uuid(): */ public function two_ra_location_ids_with_the_same_values_are_equal(): void { - $uuid = self::uuid(); + $uuid = $this->uuid(); $raLocationId = new RaLocationId($uuid); $theSame = new RaLocationId($uuid); @@ -72,8 +72,8 @@ public function two_ra_location_ids_with_the_same_values_are_equal(): void */ public function two_ra_location_ids_with_different_values_are_not_equal(): void { - $raLocationId = new RaLocationId(self::uuid()); - $different = new RaLocationId(self::uuid()); + $raLocationId = new RaLocationId($this->uuid()); + $different = new RaLocationId($this->uuid()); $this->assertFalse($raLocationId->equals($different)); } @@ -90,7 +90,7 @@ public function nonStringOrEmptyStringProvider(): array ]; } - private static function uuid(): string { + private function uuid(): string { return (string) Uuid::uuid4(); } } diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationListTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationListTest.php index 955c49b1c..7ef942c0d 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationListTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationListTest.php @@ -42,7 +42,7 @@ public function an_ra_location_list_does_not_allow_ra_locations_with_the_same_ra $raLocations = $this->getRaLocationsArray(); $existingRaLocation = $raLocations[0]; - array_push($raLocations, $existingRaLocation); + $raLocations[] = $existingRaLocation; new RaLocationList($raLocations); } diff --git a/src/Surfnet/Stepup/Tests/Identity/Event/EventSerializationAndDeserializationTest.php b/src/Surfnet/Stepup/Tests/Identity/Event/EventSerializationAndDeserializationTest.php index 43176fdbe..3afaf71ff 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Event/EventSerializationAndDeserializationTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Event/EventSerializationAndDeserializationTest.php @@ -148,99 +148,99 @@ public function eventProvider(): array return [ 'CompliedWithUnverifiedSecondFactorRevocationEvent:sms' => [ new CompliedWithUnverifiedSecondFactorRevocationEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), - new SecondFactorId(static::UUID()), + new SecondFactorId($this->UUID()), new SecondFactorType('sms'), new PhoneNumber('+358 (0) 687654321'), - new IdentityId(static::UUID()) + new IdentityId($this->UUID()) ) ], 'CompliedWithUnverifiedSecondFactorRevocationEvent:yubikey' => [ new CompliedWithUnverifiedSecondFactorRevocationEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), - new SecondFactorId(static::UUID()), + new SecondFactorId($this->UUID()), new SecondFactorType('yubikey'), new YubikeyPublicId('01906382'), - new IdentityId(static::UUID()) + new IdentityId($this->UUID()) ) ], 'CompliedWithUnverifiedSecondFactorRevocationEvent:tiqr' => [ new CompliedWithUnverifiedSecondFactorRevocationEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), - new SecondFactorId(static::UUID()), + new SecondFactorId($this->UUID()), new SecondFactorType('tiqr'), new GssfId('bleep-blorp'), - new IdentityId(static::UUID()) + new IdentityId($this->UUID()) ) ], 'CompliedWithVerifiedSecondFactorRevocationEvent:sms' => [ new CompliedWithVerifiedSecondFactorRevocationEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), - new SecondFactorId(static::UUID()), + new SecondFactorId($this->UUID()), new SecondFactorType('sms'), new PhoneNumber('+0 (0) 000000000'), - new IdentityId(static::UUID()) + new IdentityId($this->UUID()) ) ], 'CompliedWithVerifiedSecondFactorRevocationEvent:yubikey' => [ new CompliedWithVerifiedSecondFactorRevocationEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), - new SecondFactorId(static::UUID()), + new SecondFactorId($this->UUID()), new SecondFactorType('yubikey'), new YubikeyPublicId('01906382'), - new IdentityId(static::UUID()) + new IdentityId($this->UUID()) ) ], 'CompliedWithVerifiedSecondFactorRevocationEvent:tiqr' => [ new CompliedWithVerifiedSecondFactorRevocationEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), - new SecondFactorId(static::UUID()), + new SecondFactorId($this->UUID()), new SecondFactorType('tiqr'), new GssfId('bleep-blorp'), - new IdentityId(static::UUID()) + new IdentityId($this->UUID()) ) ], 'CompliedWithVettedSecondFactorRevocationEvent:sms' => [ new CompliedWithVettedSecondFactorRevocationEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), - new SecondFactorId(static::UUID()), + new SecondFactorId($this->UUID()), new SecondFactorType('sms'), new PhoneNumber('+0 (0) 000000000'), - new IdentityId(static::UUID()) + new IdentityId($this->UUID()) ) ], 'CompliedWithVettedSecondFactorRevocationEvent:yubikey' => [ new CompliedWithVettedSecondFactorRevocationEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), - new SecondFactorId(static::UUID()), + new SecondFactorId($this->UUID()), new SecondFactorType('yubikey'), new YubikeyPublicId('01906382'), - new IdentityId(static::UUID()) + new IdentityId($this->UUID()) ) ], 'CompliedWithVettedSecondFactorRevocationEvent:tiqr' => [ new CompliedWithVettedSecondFactorRevocationEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), - new SecondFactorId(static::UUID()), + new SecondFactorId($this->UUID()), new SecondFactorType('tiqr'), new GssfId('bleep-blorp'), - new IdentityId(static::UUID()) + new IdentityId($this->UUID()) ) ], 'EmailVerifiedEvent:sms' => [ new EmailVerifiedEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Babelfish Inc'), - new SecondFactorId(static::UUID()), + new SecondFactorId($this->UUID()), new SecondFactorType('sms'), new PhoneNumber('+0 (0) 000000000'), new DateTime(new CoreDateTime('@1000')), @@ -252,9 +252,9 @@ public function eventProvider(): array ], 'EmailVerifiedEvent:yubikey' => [ new EmailVerifiedEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Babelfish Inc'), - new SecondFactorId(static::UUID()), + new SecondFactorId($this->UUID()), new SecondFactorType('yubikey'), new YubikeyPublicId('01906382'), new DateTime(new CoreDateTime('@1000')), @@ -266,9 +266,9 @@ public function eventProvider(): array ], 'EmailVerifiedEvent:tiqr' => [ new EmailVerifiedEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Babelfish Inc'), - new SecondFactorId(static::UUID()), + new SecondFactorId($this->UUID()), new SecondFactorType('tiqr'), new GssfId('bleep-blorp'), new DateTime(new CoreDateTime('@1000')), @@ -280,7 +280,7 @@ public function eventProvider(): array ], 'IdentityCreatedEvent' => [ new IdentityCreatedEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('BabelFish Inc'), new NameId('42'), new CommonName('Henk Westbroek'), @@ -290,23 +290,23 @@ public function eventProvider(): array ], 'IdentityEmailChangedEvent' => [ new IdentityEmailChangedEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), new Email('info@example.invalid') ) ], 'IdentityRenamedEvent' => [ new IdentityRenamedEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), new CommonName('Henk Westbroek') ) ], 'PhonePossessionProvenEvent' => [ new PhonePossessionProvenEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), - new SecondFactorId(static::UUID()), + new SecondFactorId($this->UUID()), new PhoneNumber('+31 (0) 612345678'), true, EmailVerificationWindow::createFromTimeFrameStartingAt(TimeFrame::ofSeconds(3), new DateTime(new CoreDateTime('@1000'))), @@ -318,90 +318,90 @@ public function eventProvider(): array ], 'UnverifiedSecondFactorRevokedEvent:sms' => [ new UnverifiedSecondFactorRevokedEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), - new SecondFactorId(static::UUID()), + new SecondFactorId($this->UUID()), new SecondFactorType('sms'), new PhoneNumber('+31 (0) 612345678') ) ], 'UnverifiedSecondFactorRevokedEvent:yubikey' => [ new UnverifiedSecondFactorRevokedEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), - new SecondFactorId(static::UUID()), + new SecondFactorId($this->UUID()), new SecondFactorType('yubikey'), new YubikeyPublicId('01906382') ) ], 'UnverifiedSecondFactorRevokedEvent:tiqr' => [ new UnverifiedSecondFactorRevokedEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), - new SecondFactorId(static::UUID()), + new SecondFactorId($this->UUID()), new SecondFactorType('tiqr'), new GssfId('bleep-blorp') ) ], 'VerifiedSecondFactorRevokedEvent:sms' => [ new VerifiedSecondFactorRevokedEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), - new SecondFactorId(static::UUID()), + new SecondFactorId($this->UUID()), new SecondFactorType('sms'), PhoneNumber::unknown() ) ], 'VerifiedSecondFactorRevokedEvent:yubikey' => [ new VerifiedSecondFactorRevokedEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), - new SecondFactorId(static::UUID()), + new SecondFactorId($this->UUID()), new SecondFactorType('yubikey'), new YubikeyPublicId('01906382') ) ], 'VerifiedSecondFactorRevokedEvent:tiqr' => [ new VerifiedSecondFactorRevokedEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), - new SecondFactorId(static::UUID()), + new SecondFactorId($this->UUID()), new SecondFactorType('tiqr'), new GssfId('bleep-blorp') ) ], 'VettedSecondFactorRevokedEvent:sms' => [ new VettedSecondFactorRevokedEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), - new SecondFactorId(static::UUID()), + new SecondFactorId($this->UUID()), new SecondFactorType('sms'), new PhoneNumber('+1 (0) 5155550100') ) ], 'VettedSecondFactorRevokedEvent:yubikey' => [ new VettedSecondFactorRevokedEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), - new SecondFactorId(static::UUID()), + new SecondFactorId($this->UUID()), new SecondFactorType('yubikey'), new YubikeyPublicId('01906382') ) ], 'VettedSecondFactorRevokedEvent:tiqr' => [ new VettedSecondFactorRevokedEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), - new SecondFactorId(static::UUID()), + new SecondFactorId($this->UUID()), new SecondFactorType('tiqr'), new GssfId('bleep-blorp') ) ], 'YubikeyPossessionProvenEvent' => [ new YubikeyPossessionProvenEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), - new SecondFactorId(static::UUID()), + new SecondFactorId($this->UUID()), new YubikeyPublicId('19382933'), true, EmailVerificationWindow::createFromTimeFrameStartingAt(TimeFrame::ofSeconds(3), new DateTime(new CoreDateTime('@1000'))), @@ -413,9 +413,9 @@ public function eventProvider(): array ], 'GssfPossessionProvenEvent' => [ new GssfPossessionProvenEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), - new SecondFactorId(static::UUID()), + new SecondFactorId($this->UUID()), new StepupProvider('tiqr'), new GssfId('_' . md5('Tiqr')), true, @@ -428,7 +428,7 @@ public function eventProvider(): array ], 'IdentityAccreditedAsRaEvent' => [ new IdentityAccreditedAsRaEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new NameId(md5('someNameId')), new Institution('Babelfish Inc.'), new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RA), @@ -438,7 +438,7 @@ public function eventProvider(): array ], 'IdentityAccreditedAsRaaEvent' => [ new IdentityAccreditedAsRaaEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new NameId(md5('someNameId')), new Institution('Babelfish Inc.'), new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RAA), @@ -448,7 +448,7 @@ public function eventProvider(): array ], 'RegistrationAuthorityInformationAmendedEvent' => [ new RegistrationAuthorityInformationAmendedEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Blue Note'), new NameId(md5('Coleman Hawkins')), new Location('New York'), @@ -457,21 +457,21 @@ public function eventProvider(): array ], 'AppointedAsRaaEvent' => [ new AppointedAsRaaEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), new NameId(md5('someNameId')) ) ], 'AppointedAsRaEvent' => [ new AppointedAsRaEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), new NameId(md5('someNameId')) ) ], 'RegistrationAuthorityRetractedEvent' => [ new RegistrationAuthorityRetractedEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), new NameId(md5('someNameId')), new CommonName('Henk Westbroek'), @@ -480,14 +480,14 @@ public function eventProvider(): array ], 'LocalePreferenceExpressedEvent' => [ new LocalePreferenceExpressedEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), new Locale('fi_FI') ) ], 'AppointedAsRaaForInstitutionEvent' => [ new AppointedAsRaaForInstitutionEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), new NameId(md5('someNameId')), new Institution('Babelfish BV.') @@ -495,7 +495,7 @@ public function eventProvider(): array ], 'AppointedAsRaForInstitutionEvent' => [ new AppointedAsRaForInstitutionEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), new NameId(md5('someNameId')), new Institution('Babelfish BV.') @@ -503,7 +503,7 @@ public function eventProvider(): array ], 'IdentityAccreditedAsRaForInstitutionEvent' => [ new IdentityAccreditedAsRaForInstitutionEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new NameId(md5('someNameId')), new Institution('Babelfish Inc.'), new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RA), @@ -514,7 +514,7 @@ public function eventProvider(): array ], 'IdentityAccreditedAsRaaForInstitutionEvent' => [ new IdentityAccreditedAsRaaForInstitutionEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new NameId(md5('someNameId')), new Institution('Babelfish Inc.'), new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RAA), @@ -525,7 +525,7 @@ public function eventProvider(): array ], 'RegistrationAuthorityInformationAmendedForInstitutionEvent' => [ new RegistrationAuthorityInformationAmendedForInstitutionEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Blue Note'), new NameId(md5('Coleman Hawkins')), new Location('New York'), @@ -535,7 +535,7 @@ public function eventProvider(): array ], 'RegistrationAuthorityRetractedForInstitutionEvent' => [ new RegistrationAuthorityRetractedForInstitutionEvent( - new IdentityId(static::UUID()), + new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), new NameId(md5('someNameId')), new CommonName('Henk Westbroek'), @@ -616,7 +616,7 @@ public function serializedDataProvider(): array{ ]; } - private static function UUID(): string + private function UUID(): string { return (string) Uuid::uuid4(); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/AuthorizationContextService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/AuthorizationContextService.php index 3577b4c5e..288657439 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/AuthorizationContextService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/AuthorizationContextService.php @@ -25,6 +25,7 @@ use Surfnet\StepupMiddleware\ApiBundle\Authorization\Value\InstitutionAuthorizationContext; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository\ConfiguredInstitutionRepository; use Surfnet\StepupMiddleware\ApiBundle\Exception\InvalidArgumentException; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Identity; use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\AuthorizationRepository; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\IdentityService; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\SraaService; @@ -93,7 +94,7 @@ public function buildInstitutionAuthorizationContext( private function isSraa(IdentityId $actorId): bool { $identity = $this->identityService->find((string)$actorId); - if (!$identity) { + if (!$identity instanceof Identity) { throw new InvalidArgumentException('The provided id is not associated with any known identity'); } $sraa = $this->sraaService->findByNameId($identity->nameId); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/AuthorizationService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/AuthorizationService.php index c26e648ed..afb577d76 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/AuthorizationService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/AuthorizationService.php @@ -70,12 +70,12 @@ public function __construct( public function assertRegistrationOfSelfAssertedTokensIsAllowed(IdentityId $identityId): AuthorizationDecision { $identity = $this->findIdentity($identityId); - if (!$identity) { + if (!$identity instanceof Identity) { return $this->deny('Identity not found'); } $institutionConfiguration = $this->findInstitutionConfiguration($identity); - if (!$institutionConfiguration) { + if (!$institutionConfiguration instanceof InstitutionConfigurationOptions) { return $this->deny('Institution configuration could not be found, unable to ascertain if self-asserted tokens feature is enabled'); } @@ -119,12 +119,12 @@ public function assertRegistrationOfSelfAssertedTokensIsAllowed(IdentityId $iden public function assertSelfVetUsingSelfAssertedTokenIsAllowed(IdentityId $identityId): AuthorizationDecision { $identity = $this->findIdentity($identityId); - if (!$identity) { + if (!$identity instanceof Identity) { return $this->deny('Identity not found'); } $institutionConfiguration = $this->findInstitutionConfiguration($identity); - if (!$institutionConfiguration) { + if (!$institutionConfiguration instanceof InstitutionConfigurationOptions) { return $this->deny('Institution configuration could not be found, unable to ascertain if self-asserted tokens feature is enabled'); } @@ -155,12 +155,12 @@ public function assertSelfVetUsingSelfAssertedTokenIsAllowed(IdentityId $identit public function assertRecoveryTokensAreAllowed(IdentityId $identityId): AuthorizationDecision { $identity = $this->findIdentity($identityId); - if (!$identity) { + if (!$identity instanceof Identity) { return $this->deny('Identity not found'); } $institutionConfiguration = $this->findInstitutionConfiguration($identity); - if (!$institutionConfiguration) { + if (!$institutionConfiguration instanceof InstitutionConfigurationOptions) { return $this->deny('Institution configuration could not be found, unable to ascertain if self-asserted tokens feature is enabled'); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/CommandAuthorizationService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/CommandAuthorizationService.php index 6b2b584f3..924aab817 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/CommandAuthorizationService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/CommandAuthorizationService.php @@ -21,6 +21,7 @@ use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\Stepup\Identity\Value\RegistrationAuthorityRole; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Identity; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\IdentityService; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\WhitelistService; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; @@ -84,18 +85,13 @@ public function isInstitutionWhitelisted(Institution $institution, IdentityId $a if (!is_null($actorId) && $this->isSraa($actorId)) { return true; } - - if ($this->whitelistService->isWhitelisted($institution->getInstitution())) { - return true; - } - - return false; + return (bool) $this->whitelistService->isWhitelisted($institution->getInstitution()); } public function maySelfServiceCommandBeExecutedOnBehalfOf(Command $command, IdentityId $actorId = null): bool { $commandName = get_class($command); - $identityId = $actorId ? $actorId->getIdentityId() : null; + $identityId = $actorId instanceof IdentityId ? $actorId->getIdentityId() : null; // Assert Self Service command could be executed if ($command instanceof SelfServiceExecutable) { @@ -158,7 +154,7 @@ public function mayRaCommandBeExecutedOnBehalfOf( Institution $actorInstitution = null ): bool { $commandName = get_class($command); - $identityId = $actorId ? $actorId->getIdentityId() : null; + $identityId = $actorId instanceof IdentityId ? $actorId->getIdentityId() : null; $this->logger->notice('Running the mayRaCommandBeExecutedOnBehalfOf sequence'); // Assert RA(A) specific authorizations @@ -217,7 +213,7 @@ public function mayRaCommandBeExecutedOnBehalfOf( $roleRequirement = RegistrationAuthorityRole::ra(); // Use the institution of the identity (the user vetting or having his token revoked). $identity = $this->identityService->find($command->identityId); - if (!$identity) { + if (!$identity instanceof Identity) { $this->logDenyRA( 'Unable to find the identity of the user that is being vetted, or revoked', $commandName, @@ -278,11 +274,7 @@ private function isSraa(IdentityId $actorId = null): bool if (!$registrationAuthorityCredentials) { return false; } - - if (!$registrationAuthorityCredentials->isSraa()) { - return false; - } - return true; + return $registrationAuthorityCredentials->isSraa(); } private function logAllowSelfService(string $message, string $commandName, ?string $identityId): void diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php index bd61e7867..93e702c85 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php @@ -141,8 +141,8 @@ private function handleAuthorization(Command $command, Metadata $metadata): void // Be aware that these values could be null when executing commands where we shouldn't log in for // - CreateIdentityCommand // - UpdateIdentityCommand - $actorId = !is_null($metadata->actorId) ? new IdentityId($metadata->actorId) : null; - $actorInstitution = !is_null($metadata->actorInstitution) ? new Institution($metadata->actorInstitution) : null; + $actorId = is_null($metadata->actorId) ? null : new IdentityId($metadata->actorId); + $actorInstitution = is_null($metadata->actorInstitution) ? null : new Institution($metadata->actorInstitution); // The institution of an actor should be whitelisted or the actor should be SRAA // Be aware that the actor metadata is not always present, see self::resolveInstitution diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/DeprovisionController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/DeprovisionController.php index 37ad5034c..044f36359 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/DeprovisionController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/DeprovisionController.php @@ -45,7 +45,7 @@ public function deprovisionAction(string $collabPersonId): JsonResponse $errors = []; try { $userData = $this->deprovisionService->readUserData($collabPersonId); - if (!empty($userData)) { + if ($userData !== []) { $this->deprovisionService->deprovision($collabPersonId); } } catch (DomainException $e) { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php index e3a99c18b..bf73772c3 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php @@ -21,6 +21,7 @@ use Surfnet\Stepup\Configuration\Value\InstitutionRole; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Authorization\Value\InstitutionRoleSet; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Identity; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\IdentityQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\IdentityService; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonCollectionResponse; @@ -53,7 +54,7 @@ public function getAction($id): JsonResponse $identity = $this->identityService->find($id); - if ($identity === null) { + if (!$identity instanceof Identity) { throw new NotFoundHttpException(sprintf("Identity '%s' does not exist", $id)); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ProfileController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ProfileController.php index b154d8270..183831e53 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ProfileController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ProfileController.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Controller; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\ProfileService; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Value\Profile; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; @@ -46,7 +47,7 @@ public function getAction(Request $request, $identityId): JsonResponse } $profile = $this->profileService->createProfile($identityId); - if (!$profile) { + if (!$profile instanceof Profile) { throw new NotFoundHttpException("The profile cannot be created, the identity id did not match an identity."); } return new JsonResponse($profile); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php index ca0432c34..8d3cd7f8b 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Controller; use Surfnet\Stepup\Identity\Value\SecondFactorId; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\UnverifiedSecondFactor; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\UnverifiedSecondFactorQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\SecondFactorService; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonCollectionResponse; @@ -42,7 +43,7 @@ public function getAction($id): JsonResponse $secondFactor = $this->secondFactorService->findUnverified(new SecondFactorId($id)); - if ($secondFactor === null) { + if (!$secondFactor instanceof UnverifiedSecondFactor) { throw new NotFoundHttpException(sprintf("Unverified second factor '%s' does not exist", $id)); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VerifiedSecondFactorController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VerifiedSecondFactorController.php index 168956735..63bf6ef0b 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VerifiedSecondFactorController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VerifiedSecondFactorController.php @@ -25,6 +25,7 @@ use Surfnet\Stepup\Identity\Value\SecondFactorId; use Surfnet\StepupBundle\Value\SecondFactorType; use Surfnet\StepupMiddleware\ApiBundle\Authorization\Service\AuthorizationContextService; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\VerifiedSecondFactor; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\VerifiedSecondFactorOfIdentityQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\VerifiedSecondFactorQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\SecondFactorService; @@ -62,7 +63,7 @@ public function getAction($id): JsonResponse $secondFactor = $this->secondFactorService->findVerified(new SecondFactorId($id)); - if ($secondFactor === null) { + if (!$secondFactor instanceof VerifiedSecondFactor) { throw new NotFoundHttpException(sprintf("Verified second factor '%s' does not exist", $id)); } @@ -116,7 +117,7 @@ public function getCanSkipProvePossessionAction($id): JsonResponse $secondFactor = $this->secondFactorService->findVerified(new SecondFactorId($id)); - if ($secondFactor === null) { + if (!$secondFactor instanceof VerifiedSecondFactor) { throw new NotFoundHttpException(sprintf("Verified second factor '%s' does not exist", $id)); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php index c200a80ed..5fbd07574 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Controller; use Surfnet\Stepup\Identity\Value\SecondFactorId; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\VettedSecondFactor; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\VettedSecondFactorQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\SecondFactorService; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonCollectionResponse; @@ -42,7 +43,7 @@ public function getAction($id): JsonResponse $secondFactor = $this->secondFactorService->findVetted(new SecondFactorId($id)); - if ($secondFactor === null) { + if (!$secondFactor instanceof VettedSecondFactor) { throw new NotFoundHttpException(sprintf("Vetted second factor '%s' does not exist", $id)); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadCommandRequestException.php b/src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadCommandRequestException.php index ab75c22a0..222fdcc9c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadCommandRequestException.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadCommandRequestException.php @@ -38,7 +38,7 @@ class BadCommandRequestException extends RuntimeException public static function withViolations($message, ConstraintViolationListInterface $violations): self { $violationStrings = self::convertViolationsToStrings($violations); - $message = sprintf('%s (%s)', $message, join('; ', $violationStrings)); + $message = sprintf('%s (%s)', $message, implode('; ', $violationStrings)); return new self($violationStrings, $message); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/AuditLogProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/AuditLogProjector.php index e7e20e7ae..974682f04 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/AuditLogProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/AuditLogProjector.php @@ -29,20 +29,13 @@ use Surfnet\Stepup\Identity\Event\IdentityForgottenEvent; use Surfnet\Stepup\Identity\Event\RecoveryTokenRevokedEvent; use Surfnet\Stepup\Identity\Value\CommonName; -use Surfnet\Stepup\Identity\Value\RecoveryTokenIdentifier; use Surfnet\Stepup\Identity\Value\RecoveryTokenIdentifierFactory; use Surfnet\Stepup\Identity\Value\RecoveryTokenType; -use Surfnet\Stepup\Identity\Value\SecondFactorIdentifier; -use Surfnet\Stepup\Identity\Value\SecondFactorIdentifierFactory; -use Surfnet\StepupBundle\Value\SecondFactorType; use Surfnet\StepupMiddleware\ApiBundle\Exception\RuntimeException; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\AuditLogEntry; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Identity; use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\AuditLogRepository; use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\IdentityRepository; -use function get_class; -use function is_null; -use function property_exists; -use function sprintf; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) @@ -97,7 +90,7 @@ private function applyAuditableEvent(AuditableEvent $event, DomainMessage $domai if (isset($metadata['actorId'])) { $actor = $this->identityRepository->find($metadata['actorId']); - if (!$actor) { + if (!$actor instanceof Identity) { throw new RuntimeException(sprintf( 'Cannot create AuditLogEntry, given Actor Identity "%s" does not exist', $metadata['actorId'] diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/IdentityProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/IdentityProjector.php index 3d768605f..7f4ef65e3 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/IdentityProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/IdentityProjector.php @@ -47,8 +47,7 @@ public function applyIdentityCreatedEvent(IdentityCreatedEvent $event): void $event->nameId, $event->email, $event->commonName, - $event->preferredLocale, - false + $event->preferredLocale )); } @@ -90,7 +89,7 @@ private function determinePossessionOfSelfAssertedToken(VettingType $vettingType { if ($vettingType->type() === VettingType::TYPE_SELF_ASSERTED_REGISTRATION) { $identity = $this->identityRepository->find($identityId); - if ($identity) { + if ($identity instanceof Identity) { $identity->possessedSelfAssertedToken = true; $this->identityRepository->save($identity); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/IdentitySelfAssertedTokenOptionsProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/IdentitySelfAssertedTokenOptionsProjector.php index 968816476..e9ce85960 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/IdentitySelfAssertedTokenOptionsProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/IdentitySelfAssertedTokenOptionsProjector.php @@ -66,7 +66,7 @@ private function determinePossessionOfToken(VettingType $vettingType, IdentityId $identitySelfAssertedTokenOptions = $this->repository->find($identityId); // Scenario 1: A new token is registered, we have no sat options yet, // create them. These are identities from the pre SAT era. - if (!$identitySelfAssertedTokenOptions) { + if (!$identitySelfAssertedTokenOptions instanceof IdentitySelfAssertedTokenOptions) { $identitySelfAssertedTokenOptions = IdentitySelfAssertedTokenOptions::create( $identityId, true, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaSecondFactorProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaSecondFactorProjector.php index 8ed7041e0..5c4aebf45 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaSecondFactorProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaSecondFactorProjector.php @@ -74,7 +74,7 @@ public function applyIdentityRenamedEvent(IdentityRenamedEvent $event): void { $secondFactors = $this->raSecondFactorRepository->findByIdentityId((string) $event->identityId); - if (count($secondFactors) === 0) { + if ($secondFactors === []) { return; } @@ -91,7 +91,7 @@ public function applyIdentityEmailChangedEvent(IdentityEmailChangedEvent $event) { $secondFactors = $this->raSecondFactorRepository->findByIdentityId((string) $event->identityId); - if (count($secondFactors) === 0) { + if ($secondFactors === []) { return; } @@ -257,7 +257,7 @@ private function saveRaSecondFactor( $documentNumber ); - if ($status !== null) { + if ($status instanceof SecondFactorStatus) { $secondFactor->status = $status; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php index 3fc9f0863..3afcf801b 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php @@ -188,11 +188,11 @@ private function getAllowedIdentityRoles(RegistrationAuthorityRole $role): array private function getInstitutionRoleByRaRole(RegistrationAuthorityRole $role): string { - switch (true) { - case $role->equals(RegistrationAuthorityRole::ra()): - return AuthorityRole::ROLE_RA; - case $role->equals(RegistrationAuthorityRole::raa()): - return AuthorityRole::ROLE_RAA; + if ($role->equals(RegistrationAuthorityRole::ra())) { + return AuthorityRole::ROLE_RA; + } + if ($role->equals(RegistrationAuthorityRole::raa())) { + return AuthorityRole::ROLE_RAA; } } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php index 23405e0bb..4e0a086a7 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php @@ -58,7 +58,7 @@ public function saveAll(array $sraaList): void } } - if (count($invalid)) { + if ($invalid !== []) { $invalidIndications = []; foreach ($invalid as $index => $value) { $invalidIndications[] = sprintf( diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AuditLogService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AuditLogService.php index 5979a974f..ba5a42054 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AuditLogService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AuditLogService.php @@ -39,8 +39,6 @@ public function searchSecondFactorAuditLog(SecondFactorAuditLogQuery $query) { $doctrineQuery = $this->repository->createSecondFactorSearchQuery($query); - $paginator = $this->createPaginatorFrom($doctrineQuery, $query); - - return $paginator; + return $this->createPaginatorFrom($doctrineQuery, $query); } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/IdentityService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/IdentityService.php index d8a9346e1..8037adebb 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/IdentityService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/IdentityService.php @@ -76,9 +76,7 @@ public function search(IdentityQuery $query) { $searchQuery = $this->repository->createSearchQuery($query); - $paginator = $this->createPaginatorFrom($searchQuery, $query); - - return $paginator; + return $this->createPaginatorFrom($searchQuery, $query); } /** @@ -89,7 +87,7 @@ public function findRegistrationAuthorityCredentialsOf($identityId) { $identity = $this->find($identityId); - if (!$identity) { + if (!$identity instanceof Identity) { return null; } @@ -139,17 +137,17 @@ private function findRegistrationAuthorityCredentialsByIdentity(Identity $identi $raListing = $this->raListingRepository->findByIdentityId(new IdentityId($identity->id)); $sraa = $this->sraaRepository->findByNameId($identity->nameId); - if (!empty($raListing)) { + if ($raListing !== []) { $credentials = RegistrationAuthorityCredentials::fromRaListings($raListing); - if ($sraa) { + if ($sraa !== null) { $credentials = $credentials->grantSraa(); } return $credentials; } - if ($sraa) { + if ($sraa !== null) { return RegistrationAuthorityCredentials::fromSraa($sraa, $identity); } @@ -162,7 +160,7 @@ public function getSelfAssertedTokenRegistrationOptions( ): IdentitySelfAssertedTokenOptions { $options = $this->identitySelfAssertedTokensOptionsRepository->find($identity->id); // Backward compatibility for Identities from the pre SAT era - if (!$options) { + if (!$options instanceof IdentitySelfAssertedTokenOptions) { $options = new IdentitySelfAssertedTokenOptions(); // Safe to say they did not have a SAT $options->possessedSelfAssertedToken = false; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/ProfileService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/ProfileService.php index c855eba1d..a6fed0828 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/ProfileService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/ProfileService.php @@ -21,6 +21,7 @@ use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\RegistrationAuthorityRole; use Surfnet\StepupMiddleware\ApiBundle\Authorization\Service\AuthorizationContextService; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Identity; use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RaListingRepository; use Surfnet\StepupMiddleware\ApiBundle\Identity\Value\AuthorizedInstitutionCollection; use Surfnet\StepupMiddleware\ApiBundle\Identity\Value\Profile; @@ -62,7 +63,7 @@ public function __construct( public function createProfile($identityId): ?Profile { $identity = $this->identityService->find($identityId); - if ($identity === null) { + if (!$identity instanceof Identity) { return null; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaCandidateService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaCandidateService.php index 9c82107c5..bbe81d9f5 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaCandidateService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaCandidateService.php @@ -44,9 +44,7 @@ public function search(RaCandidateQuery $query) { $doctrineQuery = $this->raCandidateRepository->createSearchQuery($query); - $paginator = $this->createPaginatorFrom($doctrineQuery, $query, false); - - return $paginator; + return $this->createPaginatorFrom($doctrineQuery, $query, false); } /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaListingService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaListingService.php index d5f4e0b3d..38a5c31b2 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaListingService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaListingService.php @@ -58,9 +58,7 @@ public function search(RaListingQuery $query) { $doctrineQuery = $this->raListingRepository->createSearchQuery($query); - $paginator = $this->createPaginatorFrom($doctrineQuery, $query); - - return $paginator; + return $this->createPaginatorFrom($doctrineQuery, $query); } /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaSecondFactorService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaSecondFactorService.php index 6681680d9..ada5eeee9 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaSecondFactorService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaSecondFactorService.php @@ -42,9 +42,7 @@ public function search(RaSecondFactorQuery $query) { $doctrineQuery = $this->repository->createSearchQuery($query); - $paginator = $this->createPaginatorFrom($doctrineQuery, $query); - - return $paginator; + return $this->createPaginatorFrom($doctrineQuery, $query); } /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RecoveryTokenService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RecoveryTokenService.php index ef74c0d40..1f6723418 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RecoveryTokenService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RecoveryTokenService.php @@ -66,6 +66,6 @@ public function identityHasActiveRecoveryToken(Identity $identity): bool ] ); - return count($recoveryTokens) > 0; + return $recoveryTokens !== []; } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SecondFactorService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SecondFactorService.php index c4fc3122d..9aaff914a 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SecondFactorService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SecondFactorService.php @@ -67,9 +67,7 @@ public function searchUnverifiedSecondFactors(UnverifiedSecondFactorQuery $query { $doctrineQuery = $this->unverifiedRepository->createSearchQuery($query); - $paginator = $this->createPaginatorFrom($doctrineQuery, $query); - - return $paginator; + return $this->createPaginatorFrom($doctrineQuery, $query); } /** @@ -80,9 +78,7 @@ public function searchVerifiedSecondFactors(VerifiedSecondFactorQuery $query) { $doctrineQuery = $this->verifiedRepository->createSearchQuery($query); - $paginator = $this->createPaginatorFrom($doctrineQuery, $query); - - return $paginator; + return $this->createPaginatorFrom($doctrineQuery, $query); } @@ -94,9 +90,7 @@ public function searchVerifiedSecondFactorsOfIdentity(VerifiedSecondFactorOfIden { $doctrineQuery = $this->verifiedRepository->createSearchForIdentityQuery($query); - $paginator = $this->createPaginatorFrom($doctrineQuery, $query); - - return $paginator; + return $this->createPaginatorFrom($doctrineQuery, $query); } /** @@ -107,9 +101,7 @@ public function searchVettedSecondFactors(VettedSecondFactorQuery $query) { $doctrineQuery = $this->vettedRepository->createSearchQuery($query); - $paginator = $this->createPaginatorFrom($doctrineQuery, $query); - - return $paginator; + return $this->createPaginatorFrom($doctrineQuery, $query); } /** @@ -144,6 +136,6 @@ public function findVetted(SecondFactorId $id): ?VettedSecondFactor public function hasVettedByIdentity(IdentityId $id): bool { $vettedSecondFactors = $this->vettedRepository->findBy(['identityId' => (string) $id]); - return count($vettedSecondFactors) > 0; + return $vettedSecondFactors !== []; } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorizedInstitutionCollection.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorizedInstitutionCollection.php index 61dcf3fb6..93c59c2fb 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorizedInstitutionCollection.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorizedInstitutionCollection.php @@ -43,7 +43,7 @@ public static function from(InstitutionCollection $raInstitutions, ?InstitutionC foreach ($raInstitutions as $institution) { $collection->authorizations[(string) $institution][] = (string) AuthorityRole::ROLE_RA; } - if ($raaInstitutions) { + if ($raaInstitutions instanceof InstitutionCollection) { foreach ($raaInstitutions as $institution) { // Override existing lower role if (isset($collection->authorizations[(string) $institution]) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/VerifiedTokenInformation.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/VerifiedTokenInformation.php index 3e63d6456..30201953a 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/VerifiedTokenInformation.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/VerifiedTokenInformation.php @@ -71,7 +71,7 @@ public function __construct( public static function fromEntity(VerifiedSecondFactor $token, Identity $identity): self { - $tokenInformation = new self( + return new self( (string) $identity->email, $token->id, $token->type, @@ -81,8 +81,6 @@ public static function fromEntity(VerifiedSecondFactor $token, Identity $identit $identity->institution, $token->registrationCode ); - - return $tokenInformation; } public function getEmail() diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionParamConverter.php b/src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionParamConverter.php index acde5057e..b9773aefb 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionParamConverter.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionParamConverter.php @@ -48,14 +48,14 @@ private function getInstitutionFromRequest(Request $request) $institution = $request->attributes->get(self::INSTITUTION, false); $request->attributes->remove(self::INSTITUTION); - if (is_string($institution) && !empty($institution)) { + if (is_string($institution) && ($institution !== '' && $institution !== '0')) { return $institution; } $institution = $request->query->get(self::INSTITUTION, false); $request->query->remove(self::INSTITUTION); - if (is_string($institution) && !empty($institution)) { + if (is_string($institution) && ($institution !== '' && $institution !== '0')) { return $institution; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonAuthorizationResponse.php b/src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonAuthorizationResponse.php index 19c906290..936884344 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonAuthorizationResponse.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonAuthorizationResponse.php @@ -32,7 +32,7 @@ public function __construct(int $code, array $errors = []) $data = [ 'code' => $code ]; - if ($errors) { + if ($errors !== []) { $data['errors'] = $errors; } // Don't confuse the HTTP status code with the authorization status code diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Security/Http/EntryPoint/JsonBasicAuthenticationEntryPoint.php b/src/Surfnet/StepupMiddleware/ApiBundle/Security/Http/EntryPoint/JsonBasicAuthenticationEntryPoint.php index 7424799ee..d6881febd 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Security/Http/EntryPoint/JsonBasicAuthenticationEntryPoint.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Security/Http/EntryPoint/JsonBasicAuthenticationEntryPoint.php @@ -40,15 +40,13 @@ public function __construct($realmName) */ public function start(Request $request, AuthenticationException $authException = null) { - $authExceptionMessage = $authException ? $authException->getMessage() : ''; + $authExceptionMessage = $authException instanceof AuthenticationException ? $authException->getMessage() : ''; $error = sprintf('You are required to authorise before accessing this API (%s).', $authExceptionMessage); - $response = new JsonResponse( + return new JsonResponse( ['errors' => [$error]], 401, ['WWW-Authenticate' => sprintf('Basic realm="%s"', $this->realmName)] ); - - return $response; } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Service/DeprovisionService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Service/DeprovisionService.php index c774b1380..49eee9f27 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Service/DeprovisionService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Service/DeprovisionService.php @@ -90,7 +90,7 @@ public function deprovision(string $collabPersonId): void private function getIdentityByNameId(string $collabPersonId): Identity { $user = $this->apiRepository->findOneByNameId($collabPersonId); - if (!$user) { + if (!$user instanceof Identity) { throw new UserNotFoundException( sprintf( 'User identified by: %s was not found. Unable to provide deprovision data.', diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/AuditLogProjectorTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/AuditLogProjectorTest.php index 0c21859c1..3676bd3c0 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/AuditLogProjectorTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/AuditLogProjectorTest.php @@ -60,15 +60,15 @@ public function auditable_events(): array BroadwayDateTime::fromString('1970-01-01H00:00:00.000') ), $this->createExpectedAuditLogEntry( - null, - null, new IdentityId('abcd'), new Institution('efgh'), + 'Surfnet\StepupMiddleware\ApiBundle\Tests\Identity\Projector\Event\EventStub', + new StepupDateTime(new CoreDateTime('1970-01-01H00:00:00.000')), + null, + null, new SecondFactorId('ijkl'), new SecondFactorType('yubikey'), - new YubikeyPublicId('99992222'), - 'Surfnet\StepupMiddleware\ApiBundle\Tests\Identity\Projector\Event\EventStub', - new StepupDateTime(new CoreDateTime('1970-01-01H00:00:00.000')) + new YubikeyPublicId('99992222') ) ], 'no actor, without second factor' => [ @@ -85,15 +85,15 @@ public function auditable_events(): array BroadwayDateTime::fromString('1970-01-01H00:00:00.000') ), $this->createExpectedAuditLogEntry( - null, - null, new IdentityId('abcd'), new Institution('efgh'), + 'Surfnet\StepupMiddleware\ApiBundle\Tests\Identity\Projector\Event\EventStub', + new StepupDateTime(new CoreDateTime('1970-01-01H00:00:00.000')), null, null, null, - 'Surfnet\StepupMiddleware\ApiBundle\Tests\Identity\Projector\Event\EventStub', - new StepupDateTime(new CoreDateTime('1970-01-01H00:00:00.000')) + null, + null ) ], 'with actor, with second factor' => [ @@ -114,15 +114,15 @@ public function auditable_events(): array BroadwayDateTime::fromString('1970-01-01H00:00:00.000') ), $this->createExpectedAuditLogEntry( - new IdentityId('0123'), - new Institution('4567'), new IdentityId('abcd'), new Institution('efgh'), + 'Surfnet\StepupMiddleware\ApiBundle\Tests\Identity\Projector\Event\EventStub', + new StepupDateTime(new CoreDateTime('1970-01-01H00:00:00.000')), + new IdentityId('0123'), + new Institution('4567'), new SecondFactorId('ijkl'), new SecondFactorType('yubikey'), new YubikeyPublicId('99992222'), - 'Surfnet\StepupMiddleware\ApiBundle\Tests\Identity\Projector\Event\EventStub', - new StepupDateTime(new CoreDateTime('1970-01-01H00:00:00.000')), self::$actorCommonName ) ], @@ -140,7 +140,7 @@ public function auditable_events(): array public function it_creates_entries_for_auditable_events(DomainMessage $message, AuditLogEntry $expectedEntry): void { $repository = m::mock('Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\AuditLogRepository'); - $repository->shouldReceive('save')->once()->with(self::spy($actualEntry)); + $repository->shouldReceive('save')->once()->with($this->spy($actualEntry)); $identityRepository = m::mock('Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\IdentityRepository'); @@ -177,25 +177,25 @@ private function createAuditLogMetadata( } private function createExpectedAuditLogEntry( - IdentityId $actorId = null, - Institution $actorInstitution = null, IdentityId $identityId, Institution $identityInstitution, + string $event, + StepupDateTime $recordedOn, + IdentityId $actorId = null, + Institution $actorInstitution = null, SecondFactorId $secondFactorId = null, SecondFactorType $secondFactorType = null, ?YubikeyPublicId $secondFactorIdentifier = null, - string $event, - StepupDateTime $recordedOn, $actorCommonName = null ): AuditLogEntry { $entry = new AuditLogEntry(); - $entry->actorId = $actorId ? (string) $actorId : null; - $entry->actorInstitution = $actorInstitution ? (string) $actorInstitution : null; + $entry->actorId = $actorId instanceof IdentityId ? (string) $actorId : null; + $entry->actorInstitution = $actorInstitution instanceof Institution ? (string) $actorInstitution : null; $entry->identityId = (string) $identityId; $entry->identityInstitution = $identityInstitution; - $entry->secondFactorId = $secondFactorId ? (string) $secondFactorId : null; - $entry->secondFactorType = $secondFactorType ? (string) $secondFactorType : null; - $entry->secondFactorIdentifier = $secondFactorIdentifier ? (string) $secondFactorIdentifier : null; + $entry->secondFactorId = $secondFactorId instanceof SecondFactorId ? (string) $secondFactorId : null; + $entry->secondFactorType = $secondFactorType instanceof SecondFactorType ? (string) $secondFactorType : null; + $entry->secondFactorIdentifier = $secondFactorIdentifier instanceof YubikeyPublicId ? (string) $secondFactorIdentifier : null; $entry->event = $event; $entry->recordedOn = $recordedOn; $entry->actorCommonName = $actorCommonName; @@ -207,7 +207,7 @@ private function createExpectedAuditLogEntry( * @param mixed &$spy * @return MatcherAbstract */ - private static function spy(&$spy) + private function spy(&$spy) { return m::on( function ($value) use (&$spy): bool { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php index 0a58b9149..a2ba8b99c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php @@ -83,7 +83,7 @@ public function it_sets_uuid(): void ->shouldReceive('getContent')->with()->andReturn(json_encode($command)) ->getMock(); $request->attributes = m::mock() - ->shouldReceive('set')->with('command', self::spy($spiedCommand)) + ->shouldReceive('set')->with('command', $this->spy($spiedCommand)) ->getMock(); $configuration = m::mock('Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter'); @@ -105,7 +105,7 @@ public function it_sets_payload(): void ->shouldReceive('getContent')->with()->andReturn(json_encode($command)) ->getMock(); $request->attributes = m::mock() - ->shouldReceive('set')->with('command', self::spy($spiedCommand)) + ->shouldReceive('set')->with('command', $this->spy($spiedCommand)) ->getMock(); $configuration = m::mock('Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter'); @@ -163,7 +163,7 @@ public function convertibleCommandNames(): array * @param mixed &$spy * @return MatcherAbstract */ - private static function spy(&$spy) + private function spy(&$spy) { return m::on( function ($value) use (&$spy): bool { diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php index e5f80b943..ca8daafd3 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php @@ -102,7 +102,7 @@ public function flush(): void unset($buffer); // if during the handling of events new events have been queued, we need to flush them - if (!empty($this->buffer)) { + if ($this->buffer !== []) { $this->flush(); } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventSourcing/MetadataEnrichingEventStreamDecorator.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventSourcing/MetadataEnrichingEventStreamDecorator.php index b00e1b30b..7be81c86a 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventSourcing/MetadataEnrichingEventStreamDecorator.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventSourcing/MetadataEnrichingEventStreamDecorator.php @@ -38,7 +38,7 @@ public function decorateForWrite( $aggregateIdentifier, DomainEventStream $eventStream ): DomainEventStream { - if (!$this->metadata) { + if (!$this->metadata instanceof Metadata) { return $eventStream; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php index 28c51379d..fffc647a5 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php @@ -42,6 +42,7 @@ */ class RegistrationMailService { + public $institutionConfigurationOptionsService; /** * @var Mailer */ diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/VettingTypeHintService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/VettingTypeHintService.php index 9acaa566b..2c65e635c 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/VettingTypeHintService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/VettingTypeHintService.php @@ -51,8 +51,7 @@ public function collectionFrom(array $hints): VettingTypeHintCollection if ($this->unknownLocale($locale)) { $this->logger->warning( sprintf( - 'Received unsupported locale %s while processing the vetting type hints. ' . - 'Allowed locales are: %s.', + 'Received unsupported locale %s while processing the vetting type hints. Allowed locales are: %s.', $locale, implode(', ', $this->locales) ) diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/AuthorizingStage.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/AuthorizingStage.php index a1140409b..022d0be23 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/AuthorizingStage.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/AuthorizingStage.php @@ -64,7 +64,7 @@ public function process(Command $command): Command $allowedRoles[] = 'ROLE_DEPROVISION'; } - if (empty($allowedRoles)) { + if ($allowedRoles === []) { $this->logger->debug(sprintf('No authorization required for command "%s"', $command)); return $command; diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Exception/InvalidCommandException.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Exception/InvalidCommandException.php index a0ce7153c..08a6d68c0 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Exception/InvalidCommandException.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Exception/InvalidCommandException.php @@ -37,7 +37,7 @@ public static function createFromViolations(ConstraintViolationListInterface $vi public function __construct(array $errors, $code = 0, Exception $previous = null) { - parent::__construct(sprintf('Command is invalid: %s', join('; ', $errors)), $code, $previous); + parent::__construct(sprintf('Command is invalid: %s', implode('; ', $errors)), $code, $previous); $this->errors = $errors; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/RecoveryTokenEmailProcessor.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/RecoveryTokenEmailProcessor.php index a01683d9a..99966d71c 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/RecoveryTokenEmailProcessor.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/RecoveryTokenEmailProcessor.php @@ -23,6 +23,7 @@ use Surfnet\Stepup\Identity\Event\PhoneRecoveryTokenPossessionProvenEvent; use Surfnet\Stepup\Identity\Event\RecoveryTokenRevokedEvent; use Surfnet\Stepup\Identity\Event\SafeStoreSecretRecoveryTokenPossessionPromisedEvent; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Identity; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\IdentityService; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Service\RecoveryTokenMailService; @@ -45,7 +46,7 @@ public function handleCompliedWithRecoveryCodeRevocationEvent( ): void { $identity = $this->identityService->find($event->identityId->getIdentityId()); - if ($identity === null) { + if (!$identity instanceof Identity) { return; } @@ -63,7 +64,7 @@ public function handleRecoveryTokenRevokedEvent(RecoveryTokenRevokedEvent $event { $identity = $this->identityService->find($event->identityId->getIdentityId()); - if ($identity === null) { + if (!$identity instanceof Identity) { return; } @@ -81,7 +82,7 @@ public function handlePhoneRecoveryTokenPossessionProvenEvent(PhoneRecoveryToken { $identity = $this->identityService->find($event->identityId->getIdentityId()); - if ($identity === null) { + if (!$identity instanceof Identity) { return; } $this->mailService->sendCreated( @@ -96,7 +97,7 @@ public function handleSafeStoreSecretRecoveryTokenPossessionPromisedEvent( ): void { $identity = $this->identityService->find($event->identityId->getIdentityId()); - if ($identity === null) { + if (!$identity instanceof Identity) { return; } $this->mailService->sendCreated( diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/SecondFactorRevocationEmailProcessor.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/SecondFactorRevocationEmailProcessor.php index 745baea88..b3151bbc4 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/SecondFactorRevocationEmailProcessor.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/SecondFactorRevocationEmailProcessor.php @@ -21,6 +21,7 @@ use Broadway\Processor\Processor; use Surfnet\Stepup\Identity\Event\CompliedWithVettedSecondFactorRevocationEvent; use Surfnet\Stepup\Identity\Event\SecondFactorRevokedEvent; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Identity; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\IdentityService; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Service\SecondFactorRevocationMailService; @@ -47,7 +48,7 @@ public function handleCompliedWithVettedSecondFactorRevocationEvent( ): void { $identity = $this->identityService->find($event->identityId->getIdentityId()); - if ($identity === null) { + if (!$identity instanceof Identity) { return; } @@ -64,7 +65,7 @@ public function handleVettedSecondFactorRevokedEvent(SecondFactorRevokedEvent $e { $identity = $this->identityService->find($event->identityId->getIdentityId()); - if ($identity === null) { + if (!$identity instanceof Identity) { return; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessageStream.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessageStream.php index 71088464f..5ee41434b 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessageStream.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessageStream.php @@ -51,7 +51,7 @@ public function applyToDomainEventStream(DomainEventStream $domainEventStream): $this->setSensitiveData($domainMessage, $sensitiveDataMessage); } - if (count($sensitiveDataMap) > 0) { + if ($sensitiveDataMap !== []) { throw new SensitiveDataApplicationException(sprintf( '%d sensitive data messages are still to be matched to events', count($sensitiveDataMap) diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/SensitiveData.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/SensitiveData.php index b44c49bce..4329a7708 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/SensitiveData.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/SensitiveData.php @@ -149,10 +149,10 @@ public function getSecondFactorIdentifier() public function getRecoveryTokenIdentifier(): ?RecoveryTokenIdentifier { - if ($this->recoveryTokenIdentifier) { + if ($this->recoveryTokenIdentifier instanceof RecoveryTokenIdentifier) { return $this->recoveryTokenIdentifier; } - if ($this->recoveryTokenType) { + if ($this->recoveryTokenType instanceof RecoveryTokenType) { return RecoveryTokenIdentifierFactory::unknownForType($this->recoveryTokenType); } return null; @@ -206,7 +206,7 @@ public static function deserialize(array $data) public function serialize(): array { - $vettingType = (!is_null($this->vettingType)) ? $this->vettingType->jsonSerialize() : null; + $vettingType = (is_null($this->vettingType)) ? null : $this->vettingType->jsonSerialize(); return array_filter([ 'common_name' => $this->commonName, 'email' => $this->email, diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Value/Institution.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Value/Institution.php index 4ae94338d..b7f87681b 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Value/Institution.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Value/Institution.php @@ -29,7 +29,7 @@ final class Institution */ public function __construct($institution) { - if (!is_string($institution) || strlen(trim($institution)) === 0) { + if (!is_string($institution) || trim($institution) === '') { throw InvalidArgumentException::invalidType('non-empty string', 'institution', $institution); } diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/DependencyInjection/Configuration.php b/src/Surfnet/StepupMiddleware/GatewayBundle/DependencyInjection/Configuration.php index 9bf8b9648..c923ebf4c 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/DependencyInjection/Configuration.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/DependencyInjection/Configuration.php @@ -25,7 +25,6 @@ class Configuration implements ConfigurationInterface { public function getConfigTreeBuilder(): TreeBuilder { - $treeBuilder = new TreeBuilder('surfnet_stepup_gateway_gateway'); - return $treeBuilder; + return new TreeBuilder('surfnet_stepup_gateway_gateway'); } } diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/InstitutionConfigurationProjector.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/InstitutionConfigurationProjector.php index 53a0f14a6..62e442c7e 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/InstitutionConfigurationProjector.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/InstitutionConfigurationProjector.php @@ -52,7 +52,7 @@ public function applyNewInstitutionConfigurationCreatedEvent(NewInstitutionConfi public function applySsoOn2faOptionChangedEvent(SsoOn2faOptionChangedEvent $event): void { $institutionConfiguration = $this->repository->findByInstitution((string) $event->institution); - if ($institutionConfiguration) { + if ($institutionConfiguration instanceof InstitutionConfiguration) { $institutionConfiguration->ssoOn2faEnabled = $event->ssoOn2faOption->isEnabled(); $this->repository->save($institutionConfiguration); return; diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/SecondFactorRepository.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/SecondFactorRepository.php index 0735ef774..91f4fac33 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/SecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/SecondFactorRepository.php @@ -25,6 +25,7 @@ class SecondFactorRepository extends EntityRepository { + public $_entityName; /** * @param SecondFactor $secondFactor */ diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php index cd46341a0..f4d81512d 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php @@ -58,12 +58,11 @@ private function handleCommand(Request $request, Command $command): JsonResponse $this->pipeline->process($command); $serverName = $request->server->get('SERVER_NAME') ?: $request->server->get('SERVER_ADDR'); - $response = new JsonResponse([ + + return new JsonResponse([ 'status' => 'OK', 'processed_by' => $serverName, 'applied_at' => (new DateTime())->format(DateTime::ISO8601) ]); - - return $response; } } diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php index e49d79653..a218516fe 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php @@ -147,7 +147,7 @@ public function reconfigureAction(Request $request): JsonResponse } if (empty($configuration)) { - $this->logger->notice(sprintf('No institutions to reconfigure: empty configuration received')); + $this->logger->notice('No institutions to reconfigure: empty configuration received'); return new JsonResponse([ 'status' => 'OK', diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php index 66746b82c..5eac2ec2c 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php @@ -85,13 +85,12 @@ private function handleCommand(Request $request, Command $command): JsonResponse $this->pipeline->process($command); $serverName = $request->server->get('SERVER_NAME') ?: $request->server->get('SERVER_ADDR'); - $response = new JsonResponse([ + + return new JsonResponse([ 'status' => 'OK', 'processed_by' => $serverName, 'applied_at' => (new DateTime())->format(DateTime::ISO8601) ]); - - return $response; } /** @@ -115,11 +114,7 @@ private function assertMayForget(NameId $nameId, Institution $institution): void ); } - if ($credentials->isRaa()) { - $role = 'RAA'; - } else { - $role = 'RA'; - } + $role = $credentials->isRaa() ? 'RAA' : 'RA'; throw new ConflictHttpException(sprintf( 'Identity is currently accredited as an %s. Retract the accreditation and try again.', diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php index 0cbf0122d..dcb6a7287 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php @@ -109,13 +109,12 @@ private function handleCommand(Request $request, Command $command): JsonResponse } $serverName = $request->server->get('SERVER_NAME') ?: $request->server->get('SERVER_ADDR'); - $response = new JsonResponse([ + + return new JsonResponse([ 'status' => 'OK', 'processed_by' => $serverName, 'applied_at' => (new DateTime())->format(DateTime::ISO8601), ]); - - return $response; } /** diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ConfigurationValidationTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ConfigurationValidationTest.php index a9cad81fc..d11560b5f 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ConfigurationValidationTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ConfigurationValidationTest.php @@ -59,10 +59,10 @@ public function it_rejects_invalid_configuration($configuration, $expectedProper { $builder = m::mock('Symfony\Component\Validator\Violation\ConstraintViolationBuilderInterface'); $builder->shouldReceive('addViolation')->with()->once(); - $builder->shouldReceive('atPath')->with(self::spy($actualPropertyPath))->once(); + $builder->shouldReceive('atPath')->with($this->spy($actualPropertyPath))->once(); $context = m::mock('Symfony\Component\Validator\Context\ExecutionContextInterface'); - $context->shouldReceive('buildViolation')->with(self::spy($errorMessage))->once()->andReturn($builder); + $context->shouldReceive('buildViolation')->with($this->spy($errorMessage))->once()->andReturn($builder); $validator = new ConfigurationStructureValidator( new GatewayConfigurationValidator( @@ -86,7 +86,7 @@ public function it_rejects_invalid_configuration($configuration, $expectedProper * @param mixed &$spy * @return MatcherAbstract */ - private static function spy(&$spy) + private function spy(&$spy) { return m::on( function ($value) use (&$spy): bool { diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ReconfigureInstitutionRequestValidatorTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ReconfigureInstitutionRequestValidatorTest.php index b990a9f3f..06fef08c0 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ReconfigureInstitutionRequestValidatorTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ReconfigureInstitutionRequestValidatorTest.php @@ -81,10 +81,10 @@ public function it_rejects_invalid_configuration( $builder = Mockery::mock(ConstraintViolationBuilderInterface::class); $builder->shouldReceive('addViolation')->with()->once(); - $builder->shouldReceive('atPath')->with(self::spy($actualPropertyPath))->once(); + $builder->shouldReceive('atPath')->with($this->spy($actualPropertyPath))->once(); $context = Mockery::mock(ExecutionContextInterface::class); - $context->shouldReceive('buildViolation')->with(self::spy($actualErrorMessage))->once()->andReturn($builder); + $context->shouldReceive('buildViolation')->with($this->spy($actualErrorMessage))->once()->andReturn($builder); $secondFactorTypeServiceMock = Mockery::mock(SecondFactorTypeService::class); $secondFactorTypeServiceMock->shouldReceive('getAvailableSecondFactorTypes')->andReturn(['yubikey', 'sms']); @@ -134,7 +134,7 @@ public function reconfigure_institution_request_cannot_contain_institutions_that $builder->shouldReceive('addViolation')->with()->once(); $context = Mockery::mock(ExecutionContextInterface::class); - $context->shouldReceive('buildViolation')->once()->with(self::spy($errorMessage))->andReturn($builder); + $context->shouldReceive('buildViolation')->once()->with($this->spy($errorMessage))->andReturn($builder); $configuredInstitutionServiceMock = Mockery::mock(ConfiguredInstitutionService::class); $configuredInstitutionServiceMock @@ -258,7 +258,7 @@ public function valid_reconfigure_institution_requests_do_not_cause_any_violatio * @param mixed &$spy * @return MatcherAbstract */ - private static function spy(&$spy) + private function spy(&$spy) { return Mockery::on( function ($value) use (&$spy): bool { diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Assert.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Assert.php index 4e5712ea3..00e6cafa1 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Assert.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Assert.php @@ -28,7 +28,7 @@ public static function keysMatch(array $value, array $keys, $message = null, $pr $extraKeys = array_diff($keysOfValue, $keys); $missingKeys = array_diff($keys, $keysOfValue); - if (count($extraKeys) === 0 && count($missingKeys) === 0) { + if ($extraKeys === [] && $missingKeys === []) { return; } @@ -53,7 +53,7 @@ public static function requiredAndOptionalOptions(array $value, array $required, $keysOfValue = array_keys($value); $extraKeys = array_diff($keysOfValue, array_merge($optional, $required)); - if (count($extraKeys) === 0) { + if ($extraKeys === []) { return; } diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationStructureValidator.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationStructureValidator.php index 4a1fb9c76..396d070cc 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationStructureValidator.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationStructureValidator.php @@ -80,7 +80,7 @@ public function validateRoot($configuration): void StepupAssert::keysMatch( $configuration, $acceptedProperties, - sprintf("Expected only properties '%s'", join(',', $acceptedProperties)), + sprintf("Expected only properties '%s'", implode(',', $acceptedProperties)), '(root)' ); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/EmailTemplatesConfigurationValidator.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/EmailTemplatesConfigurationValidator.php index 42c502845..2045a994c 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/EmailTemplatesConfigurationValidator.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/EmailTemplatesConfigurationValidator.php @@ -55,7 +55,7 @@ public function validate(array $configuration, $propertyPath): void StepupAssert::keysMatch( $configuration, $templateNames, - sprintf("Expected only templates '%s'", join(',', $templateNames)), + sprintf("Expected only templates '%s'", implode(',', $templateNames)), $propertyPath ); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/IdentityProviderConfigurationValidator.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/IdentityProviderConfigurationValidator.php index bb18afab9..0ca6fa23b 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/IdentityProviderConfigurationValidator.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/IdentityProviderConfigurationValidator.php @@ -42,7 +42,7 @@ public function validate(array $configuration, $propertyPath): void $requiredProperties, sprintf( "The following properties must be present: '%s'; other properties are not supported", - join("', '", $requiredProperties) + implode("', '", $requiredProperties) ), $propertyPath ); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php index 6ebf8eb08..63f4e2499 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php @@ -100,7 +100,7 @@ public function validateInstitutionsExist(array $institutions): void $nonExistentInstitutions = $this->determineNonExistentInstitutions($institutions, $configuredInstitutions); - if (!empty($nonExistentInstitutions)) { + if ($nonExistentInstitutions !== []) { throw new InvalidArgumentException( sprintf('Cannot reconfigure non-existent institution(s): %s', implode(', ', $nonExistentInstitutions)) ); @@ -133,8 +133,8 @@ public function validateInstitutionConfigurationOptions(array $options, string $ sprintf( 'Invalid option(s) for "%s". Required options: "%s"; Optional options: "%s"', $institution, - join(', ', $requiredOptions), - join(', ', $optionalOptions) + implode(', ', $requiredOptions), + implode(', ', $optionalOptions) ), $propertyPath ); @@ -211,7 +211,7 @@ public function validateInstitutionConfigurationOptions(array $options, string $ */ private function getConfiguredInstitutions() { - if (!empty($this->configuredInstitutions)) { + if ($this->configuredInstitutions !== null && $this->configuredInstitutions !== []) { return $this->configuredInstitutions; } @@ -232,7 +232,7 @@ function (ConfiguredInstitution $configuredInstitution) { */ private function getWhitelistedInstitutions() { - if (!empty($this->whitelistedInstitutions)) { + if ($this->whitelistedInstitutions !== null && $this->whitelistedInstitutions !== []) { return $this->whitelistedInstitutions; } diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php index 08ea89a3a..54058ce0d 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php @@ -58,7 +58,7 @@ public function validate(array $configuration, $propertyPath): void $requiredProperties, sprintf( "The following properties must be present: '%s'; other properties are not supported", - join("', '", $requiredProperties) + implode("', '", $requiredProperties) ), $propertyPath ); @@ -130,7 +130,7 @@ private function validateBooleanValue(array $configuration, string $name, string private function validateAssertionConsumerUrls(array $configuration, $propertyPath): void { $value = $configuration['acs']; - $propertyPath = $propertyPath . '.acs'; + $propertyPath .= '.acs'; Assertion::isArray($value, 'must contain a non-empty array of strings', $propertyPath); Assertion::true(count($value) >= 1, 'array must contain at least one value', $propertyPath); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php index c85f27a0c..b3b91a510 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php @@ -80,7 +80,7 @@ protected function execute(InputInterface $input, OutputInterface $output): void $this->transactionHelper->beginTransaction(); // Check if target identity should be created - if ($targetIdentity === null) { + if (!$targetIdentity instanceof Identity) { $output->writeln( sprintf('Target with NameID %s does not exist, creating new identity', $targetNameId) ); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplaySpecificEventsCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplaySpecificEventsCommand.php index 7e39f9c3f..a1a66b46f 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplaySpecificEventsCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplaySpecificEventsCommand.php @@ -80,19 +80,19 @@ protected function execute(InputInterface $input, OutputInterface $output) if ($input->getOption(self::OPTION_LIST_EVENTS)) { $output->writeln('The following events can be replayed:'); - $output->writeln(!empty($availableEvents) ? $availableEvents : 'None.'); + $output->writeln(empty($availableEvents) ? 'None.' : $availableEvents); return; } if ($input->getOption(self::OPTION_LIST_PROJECTORS)) { $output->writeln('Events can be replayed for the following projectors:'); - $output->writeln(!empty($availableProjectors) ? $availableProjectors : 'None.'); + $output->writeln($availableProjectors === [] ? 'None.' : $availableProjectors); return; } - if (count($availableProjectors) === 0) { + if ($availableProjectors === []) { $output->writeln('There are no projectors configured to reply events for'); return; diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/EventCollection.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/EventCollection.php index fa5eddf7f..a26f41123 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/EventCollection.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/EventCollection.php @@ -73,7 +73,7 @@ public function select(array $subset): self { $nonAvailableEventNames = array_diff($subset, $this->eventNames); - if (!empty($nonAvailableEventNames)) { + if ($nonAvailableEventNames !== []) { throw new InvalidArgumentException( sprintf( 'Subset of event names contains event names not present in collection: %s', diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderService.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderService.php index bd4eb5a8f..a25dbe793 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderService.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderService.php @@ -75,15 +75,11 @@ public function sendReminders(DateTime $date, $dryRun): void $tokenInformationCollection = $this->buildCollection($date); - if (!empty($tokenInformationCollection)) { + if ($tokenInformationCollection !== []) { $this->logger->info(sprintf('%d token reminder(s) will be sent', count($tokenInformationCollection))); foreach ($tokenInformationCollection as $tokenInformation) { - if (!$dryRun) { - $numberSent = $this->mailService->sendReminder($tokenInformation); - } else { - $numberSent = 1; - } + $numberSent = $dryRun ? 1 : $this->mailService->sendReminder($tokenInformation); $this->logger->info( sprintf( From aec34cc927bae2ab218ca83ca30ff896f1890c96 Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Tue, 27 Feb 2024 09:28:00 +0100 Subject: [PATCH 15/89] Apply Symfony 6 code changes As performed by Rectors SYMFONY_CODE_QUALITY set list --- src/Surfnet/Migrations/Version20141031133057.php | 2 +- src/Surfnet/Migrations/Version20141031144721.php | 2 +- src/Surfnet/Migrations/Version20141031163549.php | 2 +- src/Surfnet/Migrations/Version20141031164140.php | 2 +- src/Surfnet/Migrations/Version20141112093720.php | 2 +- src/Surfnet/Migrations/Version20141112094457.php | 2 +- src/Surfnet/Migrations/Version20141114095245.php | 2 +- src/Surfnet/Migrations/Version20141117230116.php | 2 +- src/Surfnet/Migrations/Version20141118114026.php | 2 +- src/Surfnet/Migrations/Version20141119093423.php | 2 +- src/Surfnet/Migrations/Version20141119113444.php | 2 +- src/Surfnet/Migrations/Version20141119113553.php | 2 +- src/Surfnet/Migrations/Version20141120150430.php | 2 +- src/Surfnet/Migrations/Version20141120152310.php | 2 +- .../Event/SelectRaaOptionChangedEvent.php | 2 +- .../Configuration/Event/UseRaOptionChangedEvent.php | 3 +-- .../Event/UseRaaOptionChangedEvent.php | 2 +- .../EventSourcing/ConfigurationRepository.php | 2 +- .../InstitutionConfigurationRepository.php | 2 +- .../Stepup/Configuration/Value/RaLocationList.php | 2 +- .../Identity/Entity/InstitutionCollection.php | 2 +- .../Stepup/Identity/Entity/RecoveryToken.php | 2 +- ...reSecretRecoveryTokenPossessionPromisedEvent.php | 12 ++++++------ src/Surfnet/Stepup/Identity/Identity.php | 2 -- .../Identity/Value/EmailVerificationWindowTest.php | 2 +- .../ApiBundle/Controller/AuditLogController.php | 2 +- .../Controller/AuthorizationController.php | 6 +++--- .../ApiBundle/Controller/CommandController.php | 2 +- .../Controller/ConfiguredInstitutionController.php | 2 +- .../ApiBundle/Controller/DeprovisionController.php | 4 ++-- .../ApiBundle/Controller/IdentityController.php | 5 ++--- .../InstitutionConfigurationOptionsController.php | 2 +- .../ApiBundle/Controller/RaCandidateController.php | 2 +- .../ApiBundle/Controller/RaController.php | 2 +- .../ApiBundle/Controller/RaListingController.php | 2 +- .../ApiBundle/Controller/RaLocationController.php | 2 +- .../Controller/RaSecondFactorController.php | 4 ++-- .../Controller/RecoveryTokenController.php | 2 +- .../ApiBundle/Controller/SraaController.php | 2 +- .../Controller/UnverifiedSecondFactorController.php | 2 +- .../Controller/VerifiedSecondFactorController.php | 6 +++--- .../Controller/VettedSecondFactorController.php | 2 +- .../Controller/VettingTypeHintController.php | 2 +- .../JsonBasicAuthenticationEntryPoint.php | 3 ++- .../ConfiguredInstitutionControllerTest.php | 7 ++++--- .../ApiBundle/Tests/Endpoint/SraaControllerTest.php | 7 ++++--- .../Response/JsonAuthorizationResponseTest.php | 7 ++++--- .../ProcessingAbortedExceptionListener.php | 3 ++- .../Controller/ConfigurationController.php | 2 +- .../InstitutionConfigurationController.php | 4 ++-- .../Controller/RightToBeForgottenController.php | 2 +- .../Controller/WhitelistController.php | 8 ++++---- .../Controller/ConfigurationControllerTest.php | 9 +++++---- .../InstitutionConfigurationControllerTest.php | 13 +++++++------ ...tstrapIdentityWithYubikeySecondFactorCommand.php | 2 +- .../EmailVerifiedSecondFactorRemindersCommand.php | 2 +- .../Console/Command/ReplayEventsCommand.php | 2 +- .../Console/Command/ReplaySpecificEventsCommand.php | 2 +- 58 files changed, 94 insertions(+), 91 deletions(-) diff --git a/src/Surfnet/Migrations/Version20141031133057.php b/src/Surfnet/Migrations/Version20141031133057.php index 8fecc0274..6578ec390 100644 --- a/src/Surfnet/Migrations/Version20141031133057.php +++ b/src/Surfnet/Migrations/Version20141031133057.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! diff --git a/src/Surfnet/Migrations/Version20141031144721.php b/src/Surfnet/Migrations/Version20141031144721.php index 16edeba26..04243e514 100644 --- a/src/Surfnet/Migrations/Version20141031144721.php +++ b/src/Surfnet/Migrations/Version20141031144721.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! diff --git a/src/Surfnet/Migrations/Version20141031163549.php b/src/Surfnet/Migrations/Version20141031163549.php index a14bf1fa5..badc2b480 100644 --- a/src/Surfnet/Migrations/Version20141031163549.php +++ b/src/Surfnet/Migrations/Version20141031163549.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! diff --git a/src/Surfnet/Migrations/Version20141031164140.php b/src/Surfnet/Migrations/Version20141031164140.php index b6309a7b5..f10c5cb99 100644 --- a/src/Surfnet/Migrations/Version20141031164140.php +++ b/src/Surfnet/Migrations/Version20141031164140.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! diff --git a/src/Surfnet/Migrations/Version20141112093720.php b/src/Surfnet/Migrations/Version20141112093720.php index 086076a35..52d5032d0 100644 --- a/src/Surfnet/Migrations/Version20141112093720.php +++ b/src/Surfnet/Migrations/Version20141112093720.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! diff --git a/src/Surfnet/Migrations/Version20141112094457.php b/src/Surfnet/Migrations/Version20141112094457.php index 6b0a081df..e033c7e26 100644 --- a/src/Surfnet/Migrations/Version20141112094457.php +++ b/src/Surfnet/Migrations/Version20141112094457.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Drops the UUID primary key, removes the UNIQUE constraint on (uuid, playhead) and make (uuid, playhead) the primary diff --git a/src/Surfnet/Migrations/Version20141114095245.php b/src/Surfnet/Migrations/Version20141114095245.php index d62409999..531ff9b94 100644 --- a/src/Surfnet/Migrations/Version20141114095245.php +++ b/src/Surfnet/Migrations/Version20141114095245.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! diff --git a/src/Surfnet/Migrations/Version20141117230116.php b/src/Surfnet/Migrations/Version20141117230116.php index 3407915ad..5f8542f71 100644 --- a/src/Surfnet/Migrations/Version20141117230116.php +++ b/src/Surfnet/Migrations/Version20141117230116.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! diff --git a/src/Surfnet/Migrations/Version20141118114026.php b/src/Surfnet/Migrations/Version20141118114026.php index aaca16129..24d30bcf0 100644 --- a/src/Surfnet/Migrations/Version20141118114026.php +++ b/src/Surfnet/Migrations/Version20141118114026.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! diff --git a/src/Surfnet/Migrations/Version20141119093423.php b/src/Surfnet/Migrations/Version20141119093423.php index d20eb3c7e..b608e7440 100644 --- a/src/Surfnet/Migrations/Version20141119093423.php +++ b/src/Surfnet/Migrations/Version20141119093423.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! diff --git a/src/Surfnet/Migrations/Version20141119113444.php b/src/Surfnet/Migrations/Version20141119113444.php index 1e445ca3f..a0cf4cc05 100644 --- a/src/Surfnet/Migrations/Version20141119113444.php +++ b/src/Surfnet/Migrations/Version20141119113444.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! diff --git a/src/Surfnet/Migrations/Version20141119113553.php b/src/Surfnet/Migrations/Version20141119113553.php index 3cbcc192f..c1d742d18 100644 --- a/src/Surfnet/Migrations/Version20141119113553.php +++ b/src/Surfnet/Migrations/Version20141119113553.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! diff --git a/src/Surfnet/Migrations/Version20141120150430.php b/src/Surfnet/Migrations/Version20141120150430.php index b14d9c800..760d37d2b 100644 --- a/src/Surfnet/Migrations/Version20141120150430.php +++ b/src/Surfnet/Migrations/Version20141120150430.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! diff --git a/src/Surfnet/Migrations/Version20141120152310.php b/src/Surfnet/Migrations/Version20141120152310.php index 322f2d0fa..1079c3e09 100644 --- a/src/Surfnet/Migrations/Version20141120152310.php +++ b/src/Surfnet/Migrations/Version20141120152310.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! diff --git a/src/Surfnet/Stepup/Configuration/Event/SelectRaaOptionChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/SelectRaaOptionChangedEvent.php index 3b37c8d08..5f20f557f 100644 --- a/src/Surfnet/Stepup/Configuration/Event/SelectRaaOptionChangedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/SelectRaaOptionChangedEvent.php @@ -20,8 +20,8 @@ use Broadway\Serializer\Serializable as SerializableInterface; use Surfnet\Stepup\Configuration\Value\Institution; -use Surfnet\Stepup\Configuration\Value\InstitutionConfigurationId; use Surfnet\Stepup\Configuration\Value\InstitutionAuthorizationOption; +use Surfnet\Stepup\Configuration\Value\InstitutionConfigurationId; use Surfnet\Stepup\Configuration\Value\InstitutionRole; final class SelectRaaOptionChangedEvent implements SerializableInterface diff --git a/src/Surfnet/Stepup/Configuration/Event/UseRaOptionChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/UseRaOptionChangedEvent.php index 3f4286c04..edbd53470 100644 --- a/src/Surfnet/Stepup/Configuration/Event/UseRaOptionChangedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/UseRaOptionChangedEvent.php @@ -20,10 +20,9 @@ use Broadway\Serializer\Serializable as SerializableInterface; use Surfnet\Stepup\Configuration\Value\Institution; -use Surfnet\Stepup\Configuration\Value\InstitutionConfigurationId; use Surfnet\Stepup\Configuration\Value\InstitutionAuthorizationOption; +use Surfnet\Stepup\Configuration\Value\InstitutionConfigurationId; use Surfnet\Stepup\Configuration\Value\InstitutionRole; -use Surfnet\Stepup\Configuration\Value\InstitutionSet; final class UseRaOptionChangedEvent implements SerializableInterface { diff --git a/src/Surfnet/Stepup/Configuration/Event/UseRaaOptionChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/UseRaaOptionChangedEvent.php index d5e59ec48..805d19c13 100644 --- a/src/Surfnet/Stepup/Configuration/Event/UseRaaOptionChangedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/UseRaaOptionChangedEvent.php @@ -20,8 +20,8 @@ use Broadway\Serializer\Serializable as SerializableInterface; use Surfnet\Stepup\Configuration\Value\Institution; -use Surfnet\Stepup\Configuration\Value\InstitutionConfigurationId; use Surfnet\Stepup\Configuration\Value\InstitutionAuthorizationOption; +use Surfnet\Stepup\Configuration\Value\InstitutionConfigurationId; use Surfnet\Stepup\Configuration\Value\InstitutionRole; final class UseRaaOptionChangedEvent implements SerializableInterface diff --git a/src/Surfnet/Stepup/Configuration/EventSourcing/ConfigurationRepository.php b/src/Surfnet/Stepup/Configuration/EventSourcing/ConfigurationRepository.php index 516eb370d..c141b1bfd 100644 --- a/src/Surfnet/Stepup/Configuration/EventSourcing/ConfigurationRepository.php +++ b/src/Surfnet/Stepup/Configuration/EventSourcing/ConfigurationRepository.php @@ -19,7 +19,7 @@ namespace Surfnet\Stepup\Configuration\EventSourcing; use Broadway\EventHandling\EventBus as EventBusInterface; -use Broadway\EventSourcing\AggregateFactory\AggregateFactory as AggregateFactoryInterface; +use Broadway\EventSourcing\AggregateFactory\AggregateFactory as AggregateFactoryInterface; use Broadway\EventSourcing\EventSourcingRepository; use Broadway\EventStore\EventStore as EventStoreInterface; use Surfnet\Stepup\Configuration\Configuration; diff --git a/src/Surfnet/Stepup/Configuration/EventSourcing/InstitutionConfigurationRepository.php b/src/Surfnet/Stepup/Configuration/EventSourcing/InstitutionConfigurationRepository.php index 6fa4d00d2..8053b497c 100644 --- a/src/Surfnet/Stepup/Configuration/EventSourcing/InstitutionConfigurationRepository.php +++ b/src/Surfnet/Stepup/Configuration/EventSourcing/InstitutionConfigurationRepository.php @@ -19,7 +19,7 @@ namespace Surfnet\Stepup\Configuration\EventSourcing; use Broadway\EventHandling\EventBus as EventBusInterface; -use Broadway\EventSourcing\AggregateFactory\AggregateFactory as AggregateFactoryInterface; +use Broadway\EventSourcing\AggregateFactory\AggregateFactory as AggregateFactoryInterface; use Broadway\EventSourcing\EventSourcingRepository; use Broadway\EventStore\EventStore as EventStoreInterface; use Surfnet\Stepup\Configuration\InstitutionConfiguration; diff --git a/src/Surfnet/Stepup/Configuration/Value/RaLocationList.php b/src/Surfnet/Stepup/Configuration/Value/RaLocationList.php index ce986dfd4..054dc29ff 100644 --- a/src/Surfnet/Stepup/Configuration/Value/RaLocationList.php +++ b/src/Surfnet/Stepup/Configuration/Value/RaLocationList.php @@ -20,8 +20,8 @@ use ArrayIterator; use IteratorAggregate; -use Surfnet\Stepup\Exception\LogicException; use Surfnet\Stepup\Configuration\Entity\RaLocation; +use Surfnet\Stepup\Exception\LogicException; final class RaLocationList implements IteratorAggregate { diff --git a/src/Surfnet/Stepup/Identity/Entity/InstitutionCollection.php b/src/Surfnet/Stepup/Identity/Entity/InstitutionCollection.php index 306cb8d80..10597adb9 100644 --- a/src/Surfnet/Stepup/Identity/Entity/InstitutionCollection.php +++ b/src/Surfnet/Stepup/Identity/Entity/InstitutionCollection.php @@ -19,8 +19,8 @@ namespace Surfnet\Stepup\Identity\Entity; use Surfnet\Stepup\Configuration\Value\InstitutionRole; -use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\Stepup\Identity\Collection\InstitutionCollection as Institutions; +use Surfnet\Stepup\Identity\Value\Institution; final class InstitutionCollection { diff --git a/src/Surfnet/Stepup/Identity/Entity/RecoveryToken.php b/src/Surfnet/Stepup/Identity/Entity/RecoveryToken.php index be1e47cd2..0f5042e58 100644 --- a/src/Surfnet/Stepup/Identity/Entity/RecoveryToken.php +++ b/src/Surfnet/Stepup/Identity/Entity/RecoveryToken.php @@ -19,9 +19,9 @@ namespace Surfnet\Stepup\Identity\Entity; use Broadway\EventSourcing\SimpleEventSourcedEntity; +use Surfnet\Stepup\Identity\Api\Identity; use Surfnet\Stepup\Identity\Event\CompliedWithRecoveryCodeRevocationEvent; use Surfnet\Stepup\Identity\Event\RecoveryTokenRevokedEvent; -use Surfnet\Stepup\Identity\Api\Identity; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\RecoveryTokenId; use Surfnet\Stepup\Identity\Value\RecoveryTokenType; diff --git a/src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php b/src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php index ab89dfa73..308fd24c9 100644 --- a/src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php @@ -18,19 +18,19 @@ namespace Surfnet\Stepup\Identity\Event; -use Surfnet\Stepup\Identity\Value\HashableSecret; -use Surfnet\Stepup\Identity\Value\RecoveryTokenId; -use Surfnet\Stepup\Identity\Value\RecoveryTokenIdentifier; -use Surfnet\Stepup\Identity\Value\RecoveryTokenType; -use Surfnet\Stepup\Identity\Value\SafeStore; -use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\RightToObtainDataInterface; use Surfnet\Stepup\Identity\AuditLog\Metadata; use Surfnet\Stepup\Identity\Value\CommonName; use Surfnet\Stepup\Identity\Value\Email; +use Surfnet\Stepup\Identity\Value\HashableSecret; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\Stepup\Identity\Value\Locale; +use Surfnet\Stepup\Identity\Value\RecoveryTokenId; +use Surfnet\Stepup\Identity\Value\RecoveryTokenIdentifier; +use Surfnet\Stepup\Identity\Value\RecoveryTokenType; +use Surfnet\Stepup\Identity\Value\SafeStore; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Forgettable; +use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\RightToObtainDataInterface; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\SensitiveData; /** diff --git a/src/Surfnet/Stepup/Identity/Identity.php b/src/Surfnet/Stepup/Identity/Identity.php index 835d60159..52ddd0181 100644 --- a/src/Surfnet/Stepup/Identity/Identity.php +++ b/src/Surfnet/Stepup/Identity/Identity.php @@ -108,8 +108,6 @@ use Surfnet\StepupBundle\Service\SecondFactorTypeService; use Surfnet\StepupBundle\Value\Loa; use Surfnet\StepupBundle\Value\SecondFactorType; -use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\RecoveryToken; -use function sprintf; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/EmailVerificationWindowTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/EmailVerificationWindowTest.php index cdc1b6796..cc775ef01 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/EmailVerificationWindowTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/EmailVerificationWindowTest.php @@ -122,7 +122,7 @@ private function newEmailVerificationWindow(int $timeFrameSeconds, $startTimeOff { $start = DateTime::now(); if ($startTimeOffset) { - if (substr($startTimeOffset, 0, 1) === '-') { + if (str_starts_with($startTimeOffset, '-')) { $offset = substr($startTimeOffset, 1); $start = $start->sub(new DateInterval($offset)); } else { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuditLogController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuditLogController.php index 7f60a86ec..64716a3e7 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuditLogController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuditLogController.php @@ -36,7 +36,7 @@ public function __construct(AuditLogService $service) $this->auditLogService = $service; } - public function secondFactorAuditLogAction(Request $request, Institution $institution) + public function secondFactorAuditLog(Request $request, Institution $institution) { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuthorizationController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuthorizationController.php index eb4ff0ae2..bd05febd1 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuthorizationController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuthorizationController.php @@ -32,19 +32,19 @@ public function __construct(AuthorizationService $authorizationService) $this->authorizationService = $authorizationService; } - public function mayRegisterSelfAssertedTokensAction(string $identityId) + public function mayRegisterSelfAssertedTokens(string $identityId) { $decision = $this->authorizationService->assertRegistrationOfSelfAssertedTokensIsAllowed(new IdentityId($identityId)); return JsonAuthorizationResponse::from($decision); } - public function mayRegisterRecoveryTokensAction(string $identityId) + public function mayRegisterRecoveryTokens(string $identityId) { $decision = $this->authorizationService->assertRecoveryTokensAreAllowed(new IdentityId($identityId)); return JsonAuthorizationResponse::from($decision); } - public function maySelfVetSelfAssertedTokenAction(string $identityId) + public function maySelfVetSelfAssertedToken(string $identityId) { $decision = $this->authorizationService->assertSelfVetUsingSelfAssertedTokenIsAllowed(new IdentityId($identityId)); return JsonAuthorizationResponse::from($decision); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php index 93e702c85..37b59025a 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php @@ -74,7 +74,7 @@ public function __construct( $this->commandAuthorizationService = $commandAuthorizationService; } - public function handleAction(Command $command, Metadata $metadata, Request $request): JsonResponse + public function handle(Command $command, Metadata $metadata, Request $request): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS']); $this->logger->notice(sprintf('Received request to process Command "%s"', $command)); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ConfiguredInstitutionController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ConfiguredInstitutionController.php index ae5f3a0d5..02e214230 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ConfiguredInstitutionController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ConfiguredInstitutionController.php @@ -31,7 +31,7 @@ public function __construct(ConfiguredInstitutionService $allListings) $this->configuredInstitutionService = $allListings; } - public function collectionAction(): JsonResponse + public function collection(): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/DeprovisionController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/DeprovisionController.php index 044f36359..902652d45 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/DeprovisionController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/DeprovisionController.php @@ -39,7 +39,7 @@ public function __construct( $this->formatHelper = $formatHelper; } - public function deprovisionAction(string $collabPersonId): JsonResponse + public function deprovision(string $collabPersonId): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_DEPROVISION']); $errors = []; @@ -61,7 +61,7 @@ public function deprovisionAction(string $collabPersonId): JsonResponse return new JsonResponse($this->formatHelper->format($userData, $errors)); } - public function dryRunAction(string $collabPersonId): JsonResponse + public function dryRun(string $collabPersonId): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_DEPROVISION']); $errors = []; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php index bf73772c3..615dd07b9 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php @@ -61,7 +61,7 @@ public function getAction($id): JsonResponse return new JsonResponse($identity); } - public function collectionAction(Request $request, Institution $institution) + public function collection(Request $request, Institution $institution) { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); @@ -79,9 +79,8 @@ public function collectionAction(Request $request, Institution $institution) /** * @param string $identityId - * @return Response */ - public function getRegistrationAuthorityCredentialsAction($identityId): JsonResponse + public function getRegistrationAuthorityCredentials($identityId): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/InstitutionConfigurationOptionsController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/InstitutionConfigurationOptionsController.php index a77e36dbb..d6a65ca79 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/InstitutionConfigurationOptionsController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/InstitutionConfigurationOptionsController.php @@ -48,7 +48,7 @@ public function __construct( $this->allowedSecondFactorListService = $allowedSecondFactorListService; } - public function getForInstitutionAction($institutionName): JsonResponse + public function getForInstitution($institutionName): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_SS', 'ROLE_RA', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php index 6dfcba021..f847c5429 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php @@ -49,7 +49,7 @@ public function __construct( * @param Request $request * @return JsonCollectionResponse */ - public function searchAction(Request $request) + public function search(Request $request) { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaController.php index dc4bc4e8f..c62a01329 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaController.php @@ -32,7 +32,7 @@ public function __construct(RaListingService $raListingService) $this->raListingService = $raListingService; } - public function listAction(Institution $institution): JsonCollectionResponse + public function list(Institution $institution): JsonCollectionResponse { $this->denyAccessUnlessGranted(['ROLE_SS', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php index 0497297ac..dcdd80db0 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php @@ -73,7 +73,7 @@ public function getAction(Request $request, $identityId): JsonResponse * @param Request $request * @return JsonCollectionResponse */ - public function searchAction(Request $request) + public function search(Request $request) { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaLocationController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaLocationController.php index ddea42de1..45d4a4108 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaLocationController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaLocationController.php @@ -39,7 +39,7 @@ public function __construct(RaLocationService $raLocationService) $this->raLocationService = $raLocationService; } - public function searchAction(Request $request, Institution $institution): JsonCollectionResponse + public function search(Request $request, Institution $institution): JsonCollectionResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php index cd6de7fd0..7549d61f2 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php @@ -42,7 +42,7 @@ public function __construct( $this->authorizationService = $authorizationService; } - public function collectionAction(Request $request) + public function collection(Request $request) { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); @@ -55,7 +55,7 @@ public function collectionAction(Request $request) return JsonCollectionResponse::fromPaginator($paginator, $filters); } - public function exportAction(Request $request): JsonResponse + public function export(Request $request): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php index 65edfcaca..3546a6761 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php @@ -67,7 +67,7 @@ public function getAction($id): JsonResponse return new JsonResponse($recoveryToken); } - public function collectionAction(Request $request) + public function collection(Request $request) { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); $this->logger->info(sprintf('Received search request for recovery tokens with params: %s', $request->getQueryString())); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/SraaController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/SraaController.php index 028f611de..3f9180407 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/SraaController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/SraaController.php @@ -51,7 +51,7 @@ public function getAction($nameId): JsonResponse return new JsonResponse($sraa); } - public function listAction() : JsonResponse + public function list() : JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php index 8d3cd7f8b..d2c76beca 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php @@ -50,7 +50,7 @@ public function getAction($id): JsonResponse return new JsonResponse($secondFactor); } - public function collectionAction(Request $request) + public function collection(Request $request) { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VerifiedSecondFactorController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VerifiedSecondFactorController.php index 63bf6ef0b..66f348623 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VerifiedSecondFactorController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VerifiedSecondFactorController.php @@ -70,7 +70,7 @@ public function getAction($id): JsonResponse return new JsonResponse($secondFactor); } - public function collectionAction(Request $request) + public function collection(Request $request) { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); @@ -98,7 +98,7 @@ public function collectionAction(Request $request) return JsonCollectionResponse::fromPaginator($paginator); } - public function collectionOfIdentityAction(Request $request) + public function collectionOfIdentity(Request $request) { $this->denyAccessUnlessGranted(['ROLE_SS', 'ROLE_READ']); $query = new VerifiedSecondFactorOfIdentityQuery(); @@ -111,7 +111,7 @@ public function collectionOfIdentityAction(Request $request) return JsonCollectionResponse::fromPaginator($paginator); } - public function getCanSkipProvePossessionAction($id): JsonResponse + public function getCanSkipProvePossession($id): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php index 5fbd07574..b157abdd3 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php @@ -50,7 +50,7 @@ public function getAction($id): JsonResponse return new JsonResponse($secondFactor); } - public function collectionAction(Request $request) + public function collection(Request $request) { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettingTypeHintController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettingTypeHintController.php index 7c81ebe5e..e6ca2ce19 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettingTypeHintController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettingTypeHintController.php @@ -63,7 +63,7 @@ public function getAction($institution): JsonResponse return new JsonResponse($recoveryToken); } - public function collectionAction(Request $request) + public function collection(Request $request) { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); $this->logger->info(sprintf('Received search request for recovery tokens with params: %s', $request->getQueryString())); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Security/Http/EntryPoint/JsonBasicAuthenticationEntryPoint.php b/src/Surfnet/StepupMiddleware/ApiBundle/Security/Http/EntryPoint/JsonBasicAuthenticationEntryPoint.php index d6881febd..4e32a996d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Security/Http/EntryPoint/JsonBasicAuthenticationEntryPoint.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Security/Http/EntryPoint/JsonBasicAuthenticationEntryPoint.php @@ -20,6 +20,7 @@ use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Security\Core\Exception\AuthenticationException; use Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface; @@ -45,7 +46,7 @@ public function start(Request $request, AuthenticationException $authException = return new JsonResponse( ['errors' => [$error]], - 401, + Response::HTTP_UNAUTHORIZED, ['WWW-Authenticate' => sprintf('Basic realm="%s"', $this->realmName)] ); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php index 7735bd917..b87579d60 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php @@ -23,6 +23,7 @@ use Symfony\Bundle\FrameworkBundle\Client; use Symfony\Bundle\FrameworkBundle\KernelBrowser; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; +use Symfony\Component\HttpFoundation\Response; class ConfiguredInstitutionControllerTest extends WebTestCase { @@ -85,7 +86,7 @@ public function only_get_requests_are_accepted(string $invalidHttpMethod): void json_encode([]) ); - $this->assertEquals('405', $this->client->getResponse()->getStatusCode()); + $this->assertEquals(Response::HTTP_METHOD_NOT_ALLOWED, $this->client->getResponse()->getStatusCode()); } /** @@ -109,7 +110,7 @@ public function no_access_for_not_allowed_account(string $account): void json_encode([]) ); - $this->assertEquals('403', $this->client->getResponse()->getStatusCode()); + $this->assertEquals(Response::HTTP_FORBIDDEN, $this->client->getResponse()->getStatusCode()); } /** @@ -161,7 +162,7 @@ public function correct_institutions_are_returned(string $account): void json_encode([]) ); - $this->assertEquals('200', $this->client->getResponse()->getStatusCode()); + $this->assertEquals(Response::HTTP_OK, $this->client->getResponse()->getStatusCode()); $response = json_decode($this->client->getResponse()->getContent()); $this->assertEquals([], $response); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php index 3a0ae1c91..9b1d0ed1d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php @@ -24,6 +24,7 @@ use Symfony\Bundle\FrameworkBundle\Client; use Symfony\Bundle\FrameworkBundle\KernelBrowser; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; +use Symfony\Component\HttpFoundation\Response; class SraaControllerTest extends WebTestCase { @@ -87,7 +88,7 @@ public function only_get_requests_are_accepted(string $invalidHttpMethod): void json_encode([]) ); - $this->assertEquals('405', $this->client->getResponse()->getStatusCode()); + $this->assertEquals(Response::HTTP_METHOD_NOT_ALLOWED, $this->client->getResponse()->getStatusCode()); } /** @@ -111,7 +112,7 @@ public function no_access_for_not_allowed_account(string $account): void json_encode([]) ); - $this->assertEquals('403', $this->client->getResponse()->getStatusCode()); + $this->assertEquals(Response::HTTP_FORBIDDEN, $this->client->getResponse()->getStatusCode()); } /** @@ -163,7 +164,7 @@ public function correct_institutions_are_returned(string $account): void json_encode([]) ); - $this->assertEquals('200', $this->client->getResponse()->getStatusCode()); + $this->assertEquals(Response::HTTP_OK, $this->client->getResponse()->getStatusCode()); $response = json_decode($this->client->getResponse()->getContent()); $this->assertEquals([], $response); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Response/JsonAuthorizationResponseTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Response/JsonAuthorizationResponseTest.php index dfaec3c68..0c2fe18c8 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Response/JsonAuthorizationResponseTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Response/JsonAuthorizationResponseTest.php @@ -21,25 +21,26 @@ use Assert\InvalidArgumentException; use PHPUnit\Framework\TestCase; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonAuthorizationResponse; +use Symfony\Component\HttpFoundation\Response; class JsonAuthorizationResponseTest extends TestCase { public function test_happy_flow(): void { $response = new JsonAuthorizationResponse(200); $this->assertEquals('{"code":200}',$response->getContent()); - $this->assertEquals(200, $response->getStatusCode()); + $this->assertEquals(Response::HTTP_OK, $response->getStatusCode()); } public function test_happy_flow_error_response(): void { $response = new JsonAuthorizationResponse(403); $this->assertEquals('{"code":403}',$response->getContent()); - $this->assertEquals(200, $response->getStatusCode()); + $this->assertEquals(Response::HTTP_OK, $response->getStatusCode()); } public function test_happy_flow_error_response_with_error_message(): void { $response = new JsonAuthorizationResponse(403, ['Not allowed']); $this->assertEquals('{"code":403,"errors":["Not allowed"]}',$response->getContent()); - $this->assertEquals(200, $response->getStatusCode()); + $this->assertEquals(Response::HTTP_OK, $response->getStatusCode()); } public function test_response_code_can_be_one_of_200_or_403(): void { diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventListener/ProcessingAbortedExceptionListener.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventListener/ProcessingAbortedExceptionListener.php index c19b4ca50..7b8811bd5 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventListener/ProcessingAbortedExceptionListener.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventListener/ProcessingAbortedExceptionListener.php @@ -21,6 +21,7 @@ use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\Exception\ProcessingAbortedException; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpFoundation\JsonResponse; +use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Event\ExceptionEvent; use Symfony\Component\HttpKernel\KernelEvents; @@ -44,7 +45,7 @@ public function onKernelException(ExceptionEvent $event): void 'exception' => get_class($throwable), 'errors' => $throwable->getErrors(), ], - 400 + Response::HTTP_BAD_REQUEST )); } } diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php index f4d81512d..d7bc13dbd 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php @@ -39,7 +39,7 @@ public function __construct(TransactionAwarePipeline $pipeline) $this->pipeline = $pipeline; } - public function updateAction(Request $request) + public function update(Request $request) { $command = new UpdateConfigurationCommand(); $command->UUID = (string) Uuid::uuid4(); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php index a218516fe..38f325662 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php @@ -96,7 +96,7 @@ public function __construct( $this->connectionHelper = $dbalConnectionHelper; } - public function showAction(): JsonResponse + public function show(): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_MANAGEMENT']); @@ -135,7 +135,7 @@ public function showAction(): JsonResponse return new JsonResponse($overview); } - public function reconfigureAction(Request $request): JsonResponse + public function reconfigure(Request $request): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_MANAGEMENT']); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php index 5eac2ec2c..b95c4c76b 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php @@ -51,7 +51,7 @@ public function __construct(TransactionAwarePipeline $pipeline, IdentityService $this->identityService = $identityService; } - public function forgetIdentityAction(Request $request) + public function forgetIdentity(Request $request) { $this->denyAccessUnlessGranted(['ROLE_MANAGEMENT']); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php index dcb6a7287..1ccaead05 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php @@ -52,7 +52,7 @@ public function __construct(TransactionAwarePipeline $pipeline, WhitelistService $this->whitelistService = $whitelistService; } - public function replaceWhitelistAction(Request $request) + public function replaceWhitelist(Request $request) { $this->denyAccessUnlessGranted(['ROLE_MANAGEMENT']); @@ -63,7 +63,7 @@ public function replaceWhitelistAction(Request $request) return $this->handleCommand($request, $command); } - public function addToWhitelistAction(Request $request) + public function addToWhitelist(Request $request) { $this->denyAccessUnlessGranted(['ROLE_MANAGEMENT']); @@ -74,7 +74,7 @@ public function addToWhitelistAction(Request $request) return $this->handleCommand($request, $command); } - public function removeFromWhitelistAction(Request $request) + public function removeFromWhitelist(Request $request) { $this->denyAccessUnlessGranted(['ROLE_MANAGEMENT']); @@ -85,7 +85,7 @@ public function removeFromWhitelistAction(Request $request) return $this->handleCommand($request, $command); } - public function showWhitelistAction(): JsonResponse + public function showWhitelist(): JsonResponse { $entries = $this->whitelistService->getAllEntries(); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php index 539788ab3..15f8e1a89 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php @@ -22,6 +22,7 @@ use Symfony\Bundle\FrameworkBundle\Client; use Symfony\Bundle\FrameworkBundle\KernelBrowser; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; +use Symfony\Component\HttpFoundation\Response; class ConfigurationControllerTest extends WebTestCase { @@ -79,7 +80,7 @@ public function requests_with_invalid_content_are_bad_requests(): void json_encode([]) ); - $this->assertSame(400, $this->client->getResponse()->getStatusCode()); + $this->assertSame(Response::HTTP_BAD_REQUEST, $this->client->getResponse()->getStatusCode(), $this->client->getResponse()->getContent()); } /** @@ -100,7 +101,7 @@ public function authorization_is_required(): void json_encode([]) ); - $this->assertEquals('401', $this->client->getResponse()->getStatusCode()); + $this->assertEquals(Response::HTTP_UNAUTHORIZED, $this->client->getResponse()->getStatusCode()); } /** @@ -123,7 +124,7 @@ public function readonly_user_cannot_modify_configuration(): void json_encode([]) ); - $this->assertEquals('403', $this->client->getResponse()->getStatusCode()); + $this->assertEquals(Response::HTTP_FORBIDDEN, $this->client->getResponse()->getStatusCode()); } /** @@ -146,7 +147,7 @@ public function only_post_requests_are_accepted(string $invalidHttpMethod): void json_encode([]) ); - $this->assertEquals('405', $this->client->getResponse()->getStatusCode()); + $this->assertEquals(Response::HTTP_METHOD_NOT_ALLOWED, $this->client->getResponse()->getStatusCode()); } /** diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php index a9149bb6e..58f615682 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php @@ -22,6 +22,7 @@ use Symfony\Bundle\FrameworkBundle\Client; use Symfony\Bundle\FrameworkBundle\KernelBrowser; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; +use Symfony\Component\HttpFoundation\Response; class InstitutionConfigurationControllerTest extends WebTestCase { @@ -76,7 +77,7 @@ public function authorization_is_required_for_reconfiguring_institution_configur json_encode([]) ); - $this->assertEquals('401', $this->client->getResponse()->getStatusCode()); + $this->assertEquals(Response::HTTP_UNAUTHORIZED, $this->client->getResponse()->getStatusCode()); } /** @@ -99,7 +100,7 @@ public function readonly_user_cannot_reconfigure_institution_configuration_optio json_encode([]) ); - $this->assertEquals('403', $this->client->getResponse()->getStatusCode()); + $this->assertEquals(Response::HTTP_FORBIDDEN, $this->client->getResponse()->getStatusCode()); } /** @@ -120,7 +121,7 @@ public function authorization_is_required_for_querying_institution_configuration json_encode([]) ); - $this->assertEquals('401', $this->client->getResponse()->getStatusCode()); + $this->assertEquals(Response::HTTP_UNAUTHORIZED, $this->client->getResponse()->getStatusCode()); } /** @@ -143,7 +144,7 @@ public function requests_with_invalid_content_are_bad_requests(): void json_encode(['non-existing.organisation.test' => []]) ); - $this->assertEquals('400', $this->client->getResponse()->getStatusCode()); + $this->assertEquals(Response::HTTP_BAD_REQUEST, $this->client->getResponse()->getStatusCode()); } /** @@ -167,7 +168,7 @@ public function only_post_and_get_requests_are_accepted(string $invalidHttpMetho json_encode([]) ); - $this->assertEquals('405', $this->client->getResponse()->getStatusCode()); + $this->assertEquals(Response::HTTP_METHOD_NOT_ALLOWED, $this->client->getResponse()->getStatusCode()); } /** @@ -190,7 +191,7 @@ public function a_get_request_without_content_is_valid(): void json_encode([]) ); - $this->assertEquals('200', $this->client->getResponse()->getStatusCode()); + $this->assertEquals(Response::HTTP_OK, $this->client->getResponse()->getStatusCode()); } /** diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php index c99159c7f..8babbd3c2 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php @@ -39,6 +39,7 @@ */ final class BootstrapIdentityWithYubikeySecondFactorCommand extends Command { + protected static $defaultName = 'middleware:bootstrap:identity-with-yubikey'; private BootstrapCommandService $bootstrapService; private TransactionHelper $transactionHelper; @@ -51,7 +52,6 @@ final class BootstrapIdentityWithYubikeySecondFactorCommand extends Command protected function configure(): void { $this - ->setName('middleware:bootstrap:identity-with-yubikey') ->setDescription('Creates an identity with a vetted Yubikey second factor') ->addArgument('name-id', InputArgument::REQUIRED, 'The NameID of the identity to create') ->addArgument('institution', InputArgument::REQUIRED, 'The institution of the identity to create') diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/EmailVerifiedSecondFactorRemindersCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/EmailVerifiedSecondFactorRemindersCommand.php index 88d2227b3..8c8c54085 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/EmailVerifiedSecondFactorRemindersCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/EmailVerifiedSecondFactorRemindersCommand.php @@ -44,6 +44,7 @@ */ final class EmailVerifiedSecondFactorRemindersCommand extends Command { + protected static $defaultName = 'middleware:cron:email-reminder'; private TransactionAwarePipeline $pipeline; private BufferedEventBus $eventBus; @@ -55,7 +56,6 @@ final class EmailVerifiedSecondFactorRemindersCommand extends Command protected function configure(): void { $this - ->setName('middleware:cron:email-reminder') ->setDescription('Sends email reminders to identities with verified tokens more than 7 days old.') ->addOption( 'dry-run', diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplayEventsCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplayEventsCommand.php index 48c382aa6..47e2143a8 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplayEventsCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplayEventsCommand.php @@ -30,6 +30,7 @@ class ReplayEventsCommand extends Command { + protected static $defaultName = 'middleware:event:replay'; private EventStreamReplayer $replayer; public function __construct(EventStreamReplayer $eventStreamReplayer) @@ -41,7 +42,6 @@ public function __construct(EventStreamReplayer $eventStreamReplayer) protected function configure() { $this - ->setName('middleware:event:replay') ->setDescription( 'Wipes all read models and repopulates the tables from the event store. Use the --no-interaction option to perform the event replay without the additional confirmation question.' diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplaySpecificEventsCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplaySpecificEventsCommand.php index a1a66b46f..3ecc0fdbe 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplaySpecificEventsCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplaySpecificEventsCommand.php @@ -31,6 +31,7 @@ class ReplaySpecificEventsCommand extends Command { + protected static $defaultName = 'stepup:event:replay'; const OPTION_LIST_EVENTS = 'list-events'; const OPTION_LIST_PROJECTORS = 'list-projectors'; @@ -44,7 +45,6 @@ class ReplaySpecificEventsCommand extends Command protected function configure() { $this - ->setName('stepup:event:replay') ->setDescription('replay specified events for specified projectors') ->addOption( self::OPTION_LIST_EVENTS, From ce33d582dda805c504fa9d53a132139c5bb98436 Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Tue, 27 Feb 2024 10:44:56 +0100 Subject: [PATCH 16/89] Implement PHP 8 conde constructs And clean up the code accordingly --- config/packages/doctrine.yaml | 2 +- src/Kernel.php | 24 +- .../Migrations/Version20141031133057.php | 10 +- .../Migrations/Version20141031144721.php | 18 +- .../Migrations/Version20141031163549.php | 14 +- .../Migrations/Version20141031164140.php | 10 +- .../Migrations/Version20141112093720.php | 22 +- .../Migrations/Version20141112094457.php | 6 +- .../Migrations/Version20141114095245.php | 22 +- .../Migrations/Version20141117230116.php | 10 +- .../Migrations/Version20141118114026.php | 14 +- .../Migrations/Version20141119093423.php | 18 +- .../Migrations/Version20141119113444.php | 22 +- .../Migrations/Version20141119113553.php | 22 +- .../Migrations/Version20141120150430.php | 22 +- .../Migrations/Version20141120152310.php | 14 +- .../Migrations/Version20141125154133.php | 16 +- .../Migrations/Version20141125154214.php | 20 +- .../Migrations/Version20141125155001.php | 16 +- .../Migrations/Version20141125173004.php | 29 +- .../Migrations/Version20141128143908.php | 28 +- .../Migrations/Version20141128143946.php | 20 +- .../Migrations/Version20141202121811.php | 24 +- .../Migrations/Version20141204140639.php | 16 +- .../Migrations/Version20141205112641.php | 16 +- .../Migrations/Version20141208121040.php | 16 +- .../Migrations/Version20141208162045.php | 24 +- .../Migrations/Version20141208172438.php | 16 +- .../Migrations/Version20141209150426.php | 50 +- .../Migrations/Version20141210174213.php | 22 +- .../Migrations/Version20141215150518.php | 16 +- .../Migrations/Version20150217122017.php | 12 +- .../Migrations/Version20150225155343.php | 20 +- .../Migrations/Version20150305114932.php | 16 +- .../Migrations/Version20150305115030.php | 16 +- .../Migrations/Version20150305134846.php | 24 +- .../Migrations/Version20150312134629.php | 40 +- .../Migrations/Version20150312162849.php | 32 +- .../Migrations/Version20150330160809.php | 20 +- .../Migrations/Version20150407103950.php | 16 +- .../Migrations/Version20150408122247.php | 16 +- .../Migrations/Version20150409142404.php | 20 +- .../Migrations/Version20150422162952.php | 16 +- .../Migrations/Version20150428153351.php | 16 +- .../Migrations/Version20150428174400.php | 16 +- .../Migrations/Version20150501123735.php | 12 +- .../Migrations/Version20150504102420.php | 12 +- .../Migrations/Version20150507124421.php | 28 +- .../Migrations/Version20150508085838.php | 12 +- .../Migrations/Version20150518152006.php | 16 +- .../Migrations/Version20150522163053.php | 12 +- .../Migrations/Version20150522164907.php | 21 +- .../Migrations/Version20150526152956.php | 12 +- .../Migrations/Version20150528154959.php | 12 +- .../Migrations/Version20150601154557.php | 16 +- .../Migrations/Version20150601154942.php | 16 +- .../Migrations/Version20150604143755.php | 18 +- .../Migrations/Version20150604143756.php | 24 +- .../Migrations/Version20150604143757.php | 12 +- .../Migrations/Version20150604143758.php | 16 +- .../Migrations/Version20150611105956.php | 36 +- .../Migrations/Version20150611163038.php | 32 +- .../Migrations/Version20150615114646.php | 64 +- .../Migrations/Version20150617141129.php | 16 +- .../Migrations/Version20150618121907.php | 12 +- .../Migrations/Version20160219133522.php | 5 +- .../Migrations/Version20160607142244.php | 7 +- .../Migrations/Version20160617163830.php | 84 +- .../Migrations/Version20160620090507.php | 3 +- .../Migrations/Version20160620153812.php | 76 +- .../Migrations/Version20160621112027.php | 16 +- .../Migrations/Version20160622100140.php | 20 +- .../Migrations/Version20160622160146.php | 20 +- .../Migrations/Version20160719090050.php | 16 +- .../Migrations/Version20160719090051.php | 16 +- .../Migrations/Version20160719090052.php | 2 +- .../Migrations/Version20170210140051.php | 11 +- .../Migrations/Version20170216085513.php | 12 +- .../Migrations/Version20171113123232.php | 12 +- .../Migrations/Version20180116091349.php | 16 +- .../Migrations/Version20180131150800.php | 12 +- .../Migrations/Version20180330094402.php | 20 +- .../Migrations/Version20180409100948.php | 18 +- .../Migrations/Version20180926144517.php | 16 +- .../Migrations/Version20181001082254.php | 6 +- .../Migrations/Version20181023151546.php | 32 +- .../Migrations/Version20181101103348.php | 12 +- .../Migrations/Version20190211163604.php | 16 +- .../Migrations/Version20200114161618.php | 4 +- .../Migrations/Version20200416135127.php | 11 +- .../Migrations/Version20210308092347.php | 17 +- .../Migrations/Version20210610131957.php | 10 +- .../Migrations/Version20220519134637.php | 46 +- .../Migrations/Version20221102143350.php | 26 +- .../Api/InstitutionConfiguration.php | 19 +- .../Stepup/Configuration/Configuration.php | 34 +- .../Configuration/Entity/RaLocation.php | 36 +- .../AllowedSecondFactorListUpdatedEvent.php | 30 +- .../Event/ConfigurationUpdatedEvent.php | 6 +- .../Event/EmailTemplatesUpdatedEvent.php | 2 +- .../Event/IdentityProvidersUpdatedEvent.php | 2 +- .../InstitutionConfigurationRemovedEvent.php | 6 +- ...ewInstitutionConfigurationCreatedEvent.php | 23 +- ...rOfTokensPerIdentityOptionChangedEvent.php | 31 +- .../Event/RaLocationAddedEvent.php | 24 +- ...LocationContactInformationChangedEvent.php | 12 +- .../Event/RaLocationRelocatedEvent.php | 12 +- .../Event/RaLocationRemovedEvent.php | 8 +- .../Event/RaLocationRenamedEvent.php | 12 +- .../Event/SelectRaaOptionChangedEvent.php | 29 +- .../SelfAssertedTokensOptionChangedEvent.php | 26 +- .../Event/SelfVetOptionChangedEvent.php | 30 +- .../Event/ServiceProvidersUpdatedEvent.php | 2 +- ...aaContactInformationOptionChangedEvent.php | 30 +- .../Configuration/Event/SraaUpdatedEvent.php | 2 +- .../Event/SsoOn2faOptionChangedEvent.php | 26 +- .../UseRaLocationsOptionChangedEvent.php | 30 +- .../Event/UseRaOptionChangedEvent.php | 26 +- .../Event/UseRaaOptionChangedEvent.php | 26 +- .../Event/VerifyEmailOptionChangedEvent.php | 30 +- .../EventSourcing/ConfigurationRepository.php | 2 +- .../InstitutionConfigurationRepository.php | 4 +- .../InstitutionConfiguration.php | 227 ++-- .../Value/AllowedSecondFactorList.php | 20 +- .../Value/ContactInformation.php | 9 +- .../Configuration/Value/Institution.php | 6 +- .../Value/InstitutionAuthorizationOption.php | 40 +- .../Value/InstitutionConfigurationId.php | 20 +- .../Configuration/Value/InstitutionRole.php | 10 +- .../Configuration/Value/InstitutionSet.php | 12 +- .../Stepup/Configuration/Value/Location.php | 6 +- .../Value/NumberOfTokensPerIdentityOption.php | 7 +- .../Configuration/Value/RaLocationId.php | 10 +- .../Configuration/Value/RaLocationList.php | 38 +- .../Configuration/Value/RaLocationName.php | 6 +- .../Value/SelfAssertedTokensOption.php | 7 +- .../Configuration/Value/SelfVetOption.php | 7 +- .../Value/ShowRaaContactInformationOption.php | 5 +- .../Configuration/Value/SsoOn2faOption.php | 7 +- .../Value/UseRaLocationsOption.php | 5 +- .../Configuration/Value/VerifyEmailOption.php | 5 +- src/Surfnet/Stepup/DateTime/DateTime.php | 23 +- .../Exception/InvalidArgumentException.php | 6 +- src/Surfnet/Stepup/Helper/JsonHelper.php | 10 +- .../SecondFactorProvePossessionHelper.php | 11 +- .../Stepup/Helper/UserDataFormatter.php | 13 +- src/Surfnet/Stepup/Identity/Api/Id.php | 4 +- src/Surfnet/Stepup/Identity/Api/Identity.php | 107 +- src/Surfnet/Stepup/Identity/Api/Whitelist.php | 4 - .../Collection/InstitutionCollection.php | 38 +- .../Collection/VettingTypeHintCollection.php | 41 +- .../Identity/Entity/ConfigurableSettings.php | 36 +- .../Identity/Entity/InstitutionCollection.php | 11 - .../Stepup/Identity/Entity/RecoveryToken.php | 10 +- .../Identity/Entity/RegistrationAuthority.php | 20 +- .../RegistrationAuthorityCollection.php | 9 - .../Stepup/Identity/Entity/SecondFactor.php | 5 +- .../Entity/SecondFactorCollection.php | 10 +- .../Entity/UnverifiedSecondFactor.php | 29 +- .../Identity/Entity/VerifiedSecondFactor.php | 38 +- .../Identity/Entity/VettedSecondFactor.php | 12 +- .../Identity/Event/AppointedAsRaEvent.php | 10 +- .../AppointedAsRaForInstitutionEvent.php | 14 +- .../Identity/Event/AppointedAsRaaEvent.php | 10 +- .../AppointedAsRaaForInstitutionEvent.php | 14 +- ...ompliedWithRecoveryCodeRevocationEvent.php | 10 +- .../Event/CompliedWithRevocationEvent.php | 31 +- .../Identity/Event/EmailVerifiedEvent.php | 71 +- .../GssfPossessionProvenAndVerifiedEvent.php | 67 +- .../Event/GssfPossessionProvenEvent.php | 78 +- .../Event/IdentityAccreditedAsRaEvent.php | 24 +- ...ntityAccreditedAsRaForInstitutionEvent.php | 32 +- .../Event/IdentityAccreditedAsRaaEvent.php | 24 +- ...tityAccreditedAsRaaForInstitutionEvent.php | 32 +- .../Identity/Event/IdentityCreatedEvent.php | 16 +- .../Event/IdentityEmailChangedEvent.php | 8 +- .../Identity/Event/IdentityForgottenEvent.php | 6 +- .../Identity/Event/IdentityRenamedEvent.php | 6 +- .../Event/LocalePreferenceExpressedEvent.php | 12 +- .../PhonePossessionProvenAndVerifiedEvent.php | 37 +- .../Event/PhonePossessionProvenEvent.php | 46 +- ...honeRecoveryTokenPossessionProvenEvent.php | 14 +- .../Event/RecoveryTokenRevokedEvent.php | 4 +- ...rationAuthorityInformationAmendedEvent.php | 14 +- ...yInformationAmendedForInstitutionEvent.php | 21 +- .../RegistrationAuthorityRetractedEvent.php | 22 +- ...nAuthorityRetractedForInstitutionEvent.php | 28 +- ...etRecoveryTokenPossessionPromisedEvent.php | 18 +- .../Event/SecondFactorMigratedEvent.php | 15 +- .../Event/SecondFactorMigratedToEvent.php | 6 +- .../Event/SecondFactorRevokedEvent.php | 26 +- .../Event/SecondFactorVettedEvent.php | 42 +- ...torVettedWithoutTokenProofOfPossession.php | 46 +- ...DevicePossessionProvenAndVerifiedEvent.php | 43 +- .../Event/U2fDevicePossessionProvenEvent.php | 50 +- .../VettedSecondFactorsAllRevokedEvent.php | 14 +- .../Event/VettingTypeHintsSavedEvent.php | 13 +- ...ubikeyPossessionProvenAndVerifiedEvent.php | 67 +- .../Event/YubikeyPossessionProvenEvent.php | 71 +- .../YubikeySecondFactorBootstrappedEvent.php | 67 +- .../EventSourcing/IdentityRepository.php | 21 +- .../EventSourcing/WhitelistRepository.php | 10 +- src/Surfnet/Stepup/Identity/Identity.php | 391 +++---- .../Stepup/Identity/Value/CommonName.php | 5 +- .../Identity/Value/ContactInformation.php | 6 +- .../Stepup/Identity/Value/DocumentNumber.php | 5 +- src/Surfnet/Stepup/Identity/Value/Email.php | 15 +- .../Value/EmailVerificationWindow.php | 38 +- src/Surfnet/Stepup/Identity/Value/GssfId.php | 2 +- .../Stepup/Identity/Value/HashedSecret.php | 8 +- .../Stepup/Identity/Value/IdentityId.php | 2 +- .../Stepup/Identity/Value/Institution.php | 6 +- src/Surfnet/Stepup/Identity/Value/Locale.php | 6 +- .../Stepup/Identity/Value/Location.php | 6 +- src/Surfnet/Stepup/Identity/Value/NameId.php | 7 +- .../Identity/Value/OnPremiseVettingType.php | 7 +- .../Stepup/Identity/Value/PhoneNumber.php | 14 +- .../Stepup/Identity/Value/RecoveryTokenId.php | 2 +- .../Value/RecoveryTokenIdentifierFactory.php | 6 +- .../Identity/Value/RecoveryTokenType.php | 13 +- .../Value/RegistrationAuthorityRole.php | 16 +- .../Stepup/Identity/Value/SafeStore.php | 8 +- .../Stepup/Identity/Value/SecondFactorId.php | 2 +- .../SelfAssertedRegistrationVettingType.php | 5 +- .../Identity/Value/SelfVetVettingType.php | 11 +- .../Stepup/Identity/Value/StepupProvider.php | 5 +- .../Stepup/Identity/Value/TimeFrame.php | 13 +- .../Stepup/Identity/Value/U2fKeyHandle.php | 2 +- .../Stepup/Identity/Value/UnhashedSecret.php | 7 +- .../Stepup/Identity/Value/VettingTypeHint.php | 18 +- .../Stepup/Identity/Value/YubikeyPublicId.php | 4 +- src/Surfnet/Stepup/Identity/Whitelist.php | 22 +- ...entSerializationAndDeserializationTest.php | 87 +- .../InstitutionConfigurationTest.php | 178 ++-- .../Value/AllowedSecondFactorListTest.php | 49 +- .../Value/ContactInformationTest.php | 14 +- .../InstitutionAuthorizationOptionTest.php | 46 +- .../Value/InstitutionConfigurationIdTest.php | 17 +- .../Value/InstitutionSetTest.php | 12 +- .../Configuration/Value/InstitutionTest.php | 19 +- .../Configuration/Value/LocationTest.php | 18 +- .../Configuration/Value/RaLocationIdTest.php | 23 +- .../Value/RaLocationListTest.php | 10 +- .../Value/RaLocationNameTest.php | 17 +- .../ShowRaaContactInformationOptionTest.php | 19 +- .../Value/UseRaLocationsOptionTest.php | 18 +- .../Stepup/Tests/DateTime/DateTimeTest.php | 32 +- .../Stepup/Tests/Helper/JsonHelperTest.php | 8 +- .../Tests/Helper/UserDataFilterTest.php | 16 +- .../Tests/Helper/UserDataFormatterTest.php | 13 +- .../Collection/InstitutionCollectionTest.php | 2 +- .../Entity/ConfigurableSettingsTest.php | 17 +- .../Entity/SecondFactorCollectionTest.php | 5 +- ...entSerializationAndDeserializationTest.php | 213 ++-- .../Identity/Event/ForgettableEventsTest.php | 102 +- ...entSerializationAndDeserializationTest.php | 13 +- .../Tests/Identity/Value/CommonNameTest.php | 16 +- .../Identity/Value/ContactInformationTest.php | 14 +- .../Identity/Value/DocumentNumberTest.php | 14 +- .../Stepup/Tests/Identity/Value/EmailTest.php | 20 +- .../Value/EmailVerificationWindowTest.php | 19 +- .../Tests/Identity/Value/GssfIdTest.php | 21 +- .../Tests/Identity/Value/InstitutionTest.php | 19 +- .../Tests/Identity/Value/LocationTest.php | 16 +- .../Tests/Identity/Value/PhoneNumberTest.php | 21 +- .../RecoveryTokenIdentifierFactoryTest.php | 8 +- .../Value/RegistrationAuthorityRoleTest.php | 12 +- .../Tests/Identity/Value/SafeStoreTest.php | 1 + .../SecondFactorIdentifierFactoryTest.php | 12 +- .../Identity/Value/StepupProviderTest.php | 17 +- .../Tests/Identity/Value/TimeFrameTest.php | 16 +- .../Identity/Value/YubikeyPublicIdTest.php | 30 +- ...stitutionAuthorizationRepositoryFilter.php | 6 +- .../Service/AuthorizationContextService.php | 22 +- .../Service/AuthorizationService.php | 58 +- .../Service/CommandAuthorizationService.php | 83 +- .../Value/AuthorizationDecision.php | 14 +- .../Value/InstitutionAuthorizationContext.php | 10 +- .../Value/InstitutionRoleSet.php | 4 +- .../Value/InstitutionRoleSetInterface.php | 3 - .../Entity/AllowedSecondFactor.php | 9 +- .../Entity/ConfiguredInstitution.php | 4 - .../Entity/InstitutionAuthorization.php | 5 +- .../InstitutionConfigurationOptions.php | 8 +- .../Configuration/Entity/RaLocation.php | 20 +- .../AllowedSecondFactorListProjector.php | 11 +- .../ConfiguredInstitutionProjector.php | 8 +- .../InstitutionAuthorizationProjector.php | 17 +- ...stitutionConfigurationOptionsProjector.php | 44 +- .../Projector/RaLocationProjector.php | 12 +- .../AllowedSecondFactorRepository.php | 3 +- .../ConfiguredInstitutionRepository.php | 7 - .../InstitutionAuthorizationRepository.php | 53 +- ...titutionConfigurationOptionsRepository.php | 7 - .../Repository/RaLocationRepository.php | 16 +- .../AllowedSecondFactorListService.php | 17 +- .../Service/AllowedSecondFactorMap.php | 5 - .../Service/ConfiguredInstitutionService.php | 8 +- .../InstitutionAuthorizationOptionMap.php | 15 +- .../InstitutionAuthorizationService.php | 20 +- ...InstitutionConfigurationOptionsService.php | 16 +- .../Service/RaLocationService.php | 8 +- .../Controller/AuditLogController.php | 18 +- .../Controller/AuthorizationController.php | 16 +- .../Controller/CommandController.php | 91 +- .../ConfiguredInstitutionController.php | 8 +- .../Controller/DeprovisionController.php | 12 +- .../Controller/IdentityController.php | 13 +- ...titutionConfigurationOptionsController.php | 40 +- .../Controller/ProfileController.php | 15 +- .../Controller/RaCandidateController.php | 32 +- .../ApiBundle/Controller/RaController.php | 8 +- .../Controller/RaListingController.php | 19 +- .../Controller/RaLocationController.php | 23 +- .../Controller/RaSecondFactorController.php | 13 +- .../Controller/RecoveryTokenController.php | 25 +- .../ApiBundle/Controller/SraaController.php | 9 +- .../UnverifiedSecondFactorController.php | 16 +- .../VerifiedSecondFactorController.php | 25 +- .../VettedSecondFactorController.php | 14 +- .../Controller/VettingTypeHintController.php | 30 +- .../DependencyInjection/Configuration.php | 16 +- .../Doctrine/Type/AuthorityRoleType.php | 6 +- .../Doctrine/Type/CommonNameType.php | 6 +- .../ConfigurationContactInformationType.php | 12 +- .../Type/ConfigurationInstitutionType.php | 10 +- .../Type/ConfigurationLocationType.php | 12 +- .../Doctrine/Type/ContactInformationType.php | 6 +- .../ApiBundle/Doctrine/Type/DateTimeType.php | 16 +- .../Doctrine/Type/DocumentNumberType.php | 12 +- .../ApiBundle/Doctrine/Type/EmailType.php | 6 +- .../Doctrine/Type/InstitutionRoleType.php | 11 +- .../Doctrine/Type/InstitutionType.php | 8 +- .../ApiBundle/Doctrine/Type/LocaleType.php | 6 +- .../ApiBundle/Doctrine/Type/LocationType.php | 6 +- .../ApiBundle/Doctrine/Type/NameIdType.php | 6 +- .../Type/NumberOfTokensPerIdentityType.php | 12 +- .../Doctrine/Type/RaLocationNameType.php | 10 +- .../Doctrine/Type/RecoveryTokenStatusType.php | 16 +- .../Doctrine/Type/SecondFactorStatusType.php | 22 +- .../Doctrine/Type/SecondFactorTypeType.php | 6 +- .../Type/SelfAssertedTokensOptionType.php | 14 +- .../Doctrine/Type/SelfVetOptionType.php | 14 +- .../ShowRaaContactInformationOptionType.php | 14 +- .../Doctrine/Type/SsoOn2faOptionType.php | 14 +- .../Type/UseRaLocationsOptionType.php | 12 +- .../Doctrine/Type/VerifyEmailOptionType.php | 12 +- .../Doctrine/Type/VettingTypeHintsType.php | 6 +- .../EventListener/ExceptionListener.php | 17 +- .../Exception/BadApiRequestException.php | 13 +- .../Exception/BadCommandRequestException.php | 12 +- .../Exception/InvalidArgumentException.php | 6 +- .../Identity/Entity/AuditLogEntry.php | 107 +- .../ApiBundle/Identity/Entity/Identity.php | 3 +- .../IdentitySelfAssertedTokenOptions.php | 4 +- .../ApiBundle/Identity/Entity/RaCandidate.php | 24 +- .../ApiBundle/Identity/Entity/RaListing.php | 35 +- .../Identity/Entity/RaSecondFactor.php | 64 +- .../Identity/Entity/RecoveryToken.php | 4 +- .../ApiBundle/Identity/Entity/Sraa.php | 12 +- .../Entity/UnverifiedSecondFactor.php | 6 +- .../Identity/Entity/VerifiedSecondFactor.php | 2 +- .../Identity/Entity/VettedSecondFactor.php | 3 +- .../Identity/Projector/AuditLogProjector.php | 46 +- .../Identity/Projector/IdentityProjector.php | 42 +- ...ntitySelfAssertedTokenOptionsProjector.php | 17 +- .../Projector/InstitutionListingProjector.php | 5 +- .../Identity/Projector/RaListingProjector.php | 97 +- .../Projector/RaSecondFactorProjector.php | 132 ++- .../Projector/RecoveryTokenProjector.php | 17 +- .../Projector/SecondFactorProjector.php | 34 +- .../SecondFactorRevocationProjector.php | 13 +- .../Identity/Projector/SraaProjector.php | 8 +- .../Projector/VettingTypeHintProjector.php | 6 +- .../Identity/Projector/WhitelistProjector.php | 20 +- .../Repository/AuditLogRepository.php | 121 ++- .../Repository/AuthorizationRepository.php | 36 +- .../Repository/IdentityRepository.php | 36 +- ...titySelfAssertedTokenOptionsRepository.php | 9 +- .../Repository/RaCandidateRepository.php | 21 +- .../Repository/RaListingRepository.php | 56 +- .../Repository/RaSecondFactorRepository.php | 48 +- .../Repository/RecoveryTokenRepository.php | 40 +- .../SecondFactorRevocationRepository.php | 3 - .../Identity/Repository/SraaRepository.php | 14 +- .../UnverifiedSecondFactorRepository.php | 6 +- .../VerifiedSecondFactorRepository.php | 23 +- .../VettedSecondFactorRepository.php | 9 +- .../Repository/WhitelistEntryRepository.php | 2 +- .../Service/AbstractSearchService.php | 21 +- .../Identity/Service/AuditLogService.php | 6 +- .../Identity/Service/IdentityService.php | 40 +- .../Identity/Service/ProfileService.php | 23 +- .../Identity/Service/RaCandidateService.php | 11 +- .../Identity/Service/RaListingService.php | 23 +- .../Service/RaSecondFactorService.php | 11 +- .../Identity/Service/RecoveryTokenService.php | 9 +- .../Identity/Service/SecondFactorService.php | 29 +- .../Identity/Service/SraaService.php | 7 +- .../Identity/Service/WhitelistService.php | 5 +- .../Specification/SpecificationInterface.php | 1 - .../Identity/Value/AuthorityRole.php | 23 +- .../Value/AuthorizedInstitutionCollection.php | 16 +- .../ApiBundle/Identity/Value/Profile.php | 21 +- .../Identity/Value/RecoveryTokenStatus.php | 9 +- .../RegistrationAuthorityCredentials.php | 66 +- .../Identity/Value/SecondFactorStatus.php | 13 +- .../Value/VerifiedTokenInformation.php | 48 +- .../Request/CommandParamConverter.php | 14 +- ...ConfigurationInstitutionParamConverter.php | 7 +- .../Request/InstitutionParamConverter.php | 2 +- .../Request/MetadataParamConverter.php | 18 +- .../ApiBundle/Resources/config/projection.yml | 218 ++-- .../ApiBundle/Resources/config/routing.yml | 348 +++---- .../ApiBundle/Resources/config/services.yml | 366 +++---- .../Response/JsonAuthorizationResponse.php | 2 +- .../Response/JsonCollectionResponse.php | 24 +- .../Response/JsonNotFoundResponse.php | 2 +- .../JsonBasicAuthenticationEntryPoint.php | 7 +- .../ApiBundle/Service/DeprovisionService.php | 32 +- ...utionAuthorizationRepositoryFilterTest.php | 31 +- .../AuthorizationContextServiceTest.php | 16 +- .../Service/AuthorizationServiceTest.php | 29 +- .../CommandAuthorizationServiceTest.php | 157 +-- .../Entity/ConfiguredInstitutionTest.php | 4 +- .../Configuration/Entity/RaLocationTest.php | 14 +- .../InstitutionAuthorizationOptionMapTest.php | 59 +- .../InstitutionAuthorizationServiceTest.php | 2 +- ...itutionConfigurationOptionsServiceTest.php | 2 +- .../Doctrine/Type/AuthorityRoleTypeTest.php | 6 +- .../Doctrine/Type/CommonNameTypeTest.php | 8 +- ...onfigurationContactInformationTypeTest.php | 8 +- .../Type/ConfigurationInstitutionTypeTest.php | 10 +- .../Type/ConfigurationLocationTypeTest.php | 8 +- .../Type/ContactInformationTypeTest.php | 6 +- .../Tests/Doctrine/Type/DateTimeTypeTest.php | 10 +- .../Doctrine/Type/DocumentNumberTypeTest.php | 4 +- .../Tests/Doctrine/Type/EmailTypeTest.php | 6 +- .../Doctrine/Type/InstitutionRoleTypeTest.php | 9 +- .../Doctrine/Type/InstitutionTypeTest.php | 8 +- .../Tests/Doctrine/Type/LocaleTypeTest.php | 6 +- .../Tests/Doctrine/Type/LocationTypeTest.php | 8 +- .../Tests/Doctrine/Type/NameIdTypeTest.php | 6 +- .../NumberOfTokensPerIdentityTypeTest.php | 9 +- .../Doctrine/Type/RaLocationNameTypeTest.php | 8 +- .../Type/RecoveryTokenStatusTypeTest.php | 25 +- .../Type/SecondFactorStatusTypeTest.php | 24 +- .../Doctrine/Type/SelfVetOptionTypeTest.php | 8 +- ...howRaaContactInformationOptionTypeTest.php | 14 +- .../Type/UseRaLocationsOptionTypeTest.php | 10 +- .../Type/VerifyEmailOptionTypeTest.php | 8 +- .../ConfiguredInstitutionControllerTest.php | 36 +- .../Tests/Endpoint/SraaControllerTest.php | 36 +- .../Projector/AuditLogProjectorTest.php | 119 +-- .../Identity/Projector/Event/EventStub.php | 10 +- .../AuthorizedInstitutionCollectionTest.php | 4 +- .../Request/CommandParamConverterTest.php | 34 +- .../Request/InstitutionParamConverterTest.php | 5 +- .../ApiBundle/Tests/Request/commands.php | 8 +- .../JsonAuthorizationResponseTest.php | 21 +- .../Tests/Service/DeprovisionServiceTest.php | 3 +- .../Command/AbstractCommand.php | 2 +- .../ConfigurationCommandHandler.php | 13 +- ...InstitutionConfigurationCommandHandler.php | 82 +- .../InstitutionConfigurationProcessor.php | 20 +- .../AddEventBusListenersCompilerPass.php | 15 +- .../AddPipelineStagesCompilerPass.php | 16 +- .../DependencyInjection/Configuration.php | 98 +- ...epupMiddlewareCommandHandlingExtension.php | 2 +- .../Dto/VettingLocation.php | 22 +- .../EventHandling/BufferedEventBus.php | 8 +- .../ProcessingAbortedExceptionListener.php | 16 +- .../MetadataEnrichingEventStreamDecorator.php | 8 +- .../Exception/InvalidArgumentException.php | 6 +- .../Command/SaveVettingTypeHintCommand.php | 2 +- .../Command/SelfVetSecondFactorCommand.php | 1 - .../Exception/DuplicateIdentityException.php | 6 +- .../CommandHandler/IdentityCommandHandler.php | 155 +-- .../RegistrationAuthorityCommandHandler.php | 58 +- .../ReminderEmailCommandHandler.php | 15 +- .../RightToBeForgottenCommandHandler.php | 31 +- .../WhitelistCommandHandler.php | 31 +- .../Service/EmailVerificationMailService.php | 41 +- .../Service/RecoveryTokenMailService.php | 47 +- .../Service/RegistrationMailService.php | 86 +- .../SecondFactorRevocationMailService.php | 44 +- .../Service/SecondFactorVettedMailService.php | 32 +- .../Service/VettingTypeHintService.php | 21 +- .../Pipeline/AuthorizingStage.php | 29 +- .../Pipeline/DispatchStage.php | 16 +- .../Pipeline/EventDispatchingStage.php | 12 +- .../Exception/InvalidCommandException.php | 3 +- .../Pipeline/Pipeline.php | 1 - .../CommandHandlingBundle/Pipeline/Stage.php | 1 - .../Pipeline/StagedPipeline.php | 11 +- .../Pipeline/TransactionAwarePipeline.php | 54 +- .../Pipeline/ValidationStage.php | 16 +- .../EmailVerificationEmailProcessor.php | 32 +- .../Processor/RecoveryTokenEmailProcessor.php | 22 +- .../SecondFactorRevocationEmailProcessor.php | 20 +- .../SecondFactorVettedEmailProcessor.php | 24 +- .../Resources/config/command_handlers.yml | 110 +- .../Resources/config/event_sourcing.yml | 178 ++-- .../Resources/config/pipeline.yml | 108 +- .../Resources/config/processors.yml | 186 ++-- .../EventSourcing/SensitiveDataMessage.php | 13 +- .../SensitiveDataMessageStream.php | 62 +- .../SensitiveDataEventStoreDecorator.php | 26 +- .../SensitiveData/Forgettable.php | 1 - .../SensitiveDataMessageRepository.php | 36 +- .../SensitiveData/SensitiveData.php | 21 +- .../Service/SensitiveDataService.php | 5 +- .../Tests/Command/AbstractCommandTest.php | 4 +- .../Tests/CommandHandlerTest.php | 2 +- .../ConfigurationCommandHandlerTest.php | 51 +- ...itutionConfigurationCommandHandlerTest.php | 492 ++++----- .../InstitutionConfigurationProcessorTest.php | 59 +- .../Tests/DateTimeHelper.php | 2 +- .../EventHandling/BufferedEventBusTest.php | 5 +- ...ndPublishToBusOnFirstCallEventListener.php | 16 +- .../IdentityCommandHandlerMoveTokenTest.php | 110 +- ...tyCommandHandlerSelfAssertedTokensTest.php | 185 ++-- .../IdentityCommandHandlerTest.php | 970 +++++++++--------- ...IdentityIdEnforcingEventStoreDecorator.php | 18 +- ...egistrationAuthorityCommandHandlerTest.php | 577 ++++++----- .../RightToBeForgottenCommandHandlerTest.php | 109 +- .../SecondFactorRevocationTest.php | 365 +++---- .../WhitelistCommandHandlerTest.php | 37 +- .../Tests/Mockery/HasInstitutionMatcher.php | 2 +- .../Mockery/HasInstitutionMatcherTest.php | 37 +- .../ObjectWithInstitutionAccessor.php | 5 +- .../ObjectWithInstitutionProperty.php | 5 +- .../Tests/Pipeline/AuthorizingStageTest.php | 38 +- .../Tests/Pipeline/DispatchStageTest.php | 3 +- .../Pipeline/EventDispatchingStageTest.php | 8 +- .../Tests/Pipeline/StagedPipelineTest.php | 20 +- .../Tests/Pipeline/ValidationStageTest.php | 15 +- .../RecoveryTokenEmailProcessorTest.php | 27 +- .../SensitiveDataMessageStreamTest.php | 48 +- .../Tests/SensitiveData/SensitiveDataTest.php | 11 +- .../Service/SensitiveDataServiceTest.php | 10 +- .../Tests/Value/InstitutionTest.php | 19 +- .../Value/Institution.php | 6 +- .../CommandHandlingBundle/Value/Sender.php | 9 +- .../GatewayBundle/Entity/SamlEntity.php | 44 +- .../Entity/SamlEntityRepository.php | 9 +- .../GatewayBundle/Entity/SecondFactor.php | 107 +- .../GatewayBundle/Entity/WhitelistEntry.php | 2 +- .../InstitutionConfigurationProjector.php | 14 +- .../Projector/SamlEntityProjector.php | 17 +- .../Projector/SecondFactorProjector.php | 95 +- .../Projector/WhitelistProjector.php | 20 +- .../Repository/SecondFactorRepository.php | 13 +- .../Resources/config/projection.yml | 40 +- .../Resources/config/repositories.yml | 40 +- .../InstitutionConfigurationProjectorTest.php | 20 +- .../Configuration/Entity/EmailTemplate.php | 4 +- .../Projector/EmailTemplatesProjector.php | 8 +- .../Repository/EmailTemplateRepository.php | 2 +- .../Service/EmailTemplateService.php | 7 +- .../Controller/ConfigurationController.php | 21 +- .../InstitutionConfigurationController.php | 101 +- .../RightToBeForgottenController.php | 42 +- .../Controller/WhitelistController.php | 41 +- .../DependencyInjection/Configuration.php | 2 +- .../Exception/InvalidArgumentException.php | 6 +- .../Resources/config/routing.yml | 64 +- .../Resources/config/services.yml | 109 +- .../Service/DBALConnectionHelper.php | 2 +- .../ConfigurationControllerTest.php | 48 +- ...InstitutionConfigurationControllerTest.php | 56 +- .../Validator/ConfigurationValidationTest.php | 21 +- .../invalid_configuration/empty_idp_loas.php | 32 +- .../invalid_configuration/empty_sp_acs.php | 30 +- .../invalid_configuration/empty_sp_loas.php | 30 +- ...valid_blacklisted_encryption_algorithm.php | 30 +- ...alid_blacklisted_encryption_algorithms.php | 30 +- .../invalid_email_template_locale.php | 30 +- .../invalid_configuration/invalid_idp.php | 30 +- .../invalid_idp_entity_id.php | 32 +- .../invalid_configuration/invalid_idp_loa.php | 32 +- .../invalid_configuration/invalid_idps.php | 30 +- .../invalid_configuration/invalid_sp.php | 16 +- .../invalid_configuration/invalid_sp_acs.php | 30 +- ...nvalid_sp_assertion_encryption_enabled.php | 30 +- .../invalid_sp_entity_id.php | 30 +- .../invalid_configuration/invalid_sp_loa.php | 30 +- ...valid_sp_loa_uppercase_institution_sho.php | 32 +- .../invalid_sp_public_key.php | 30 +- .../invalid_sp_second_factor_only.php | 32 +- ..._sp_second_factor_only_nameid_patterns.php | 32 +- .../invalid_configuration/invalid_sps.php | 18 +- .../invalid_configuration/invalid_sraa.php | 32 +- .../invalid_configuration/invalid_sraas.php | 32 +- .../missing_email_template_confirm_email.php | 30 +- .../missing_email_template_locale.php | 28 +- ...ssing_email_template_registration_code.php | 26 +- ...g_email_template_second_factor_revoked.php | 28 +- .../invalid_configuration/missing_sps.php | 10 +- .../no_email_templates.php | 4 +- .../invalid_configuration/no_gateway.php | 2 +- .../invalid_configuration/no_sp_acs.php | 20 +- .../no_sp_assertion_encryption_enabled.php | 20 +- ...o_sp_blacklisted_encryption_algorithms.php | 20 +- .../invalid_configuration/no_sp_entity_id.php | 20 +- .../invalid_configuration/no_sp_loas.php | 20 +- .../no_sp_public_key.php | 22 +- .../Fixtures/invalid_configuration/no_sps.php | 10 +- .../invalid_configuration/no_sraa.php | 4 +- .../no_superfluous_keys_email_template.php | 24 +- .../no_superfluous_keys_gateway.php | 22 +- .../no_superfluous_keys_gateway_sp.php | 22 +- .../no_superfluous_keys_root.php | 22 +- .../not_array_email_templates.php | 14 +- .../not_array_gateway.php | 8 +- .../invalid_configuration/not_array_sraa.php | 14 +- .../not_strings_sraa.php | 16 +- .../Fixtures/invalid_configuration/null.php | 2 +- ...o_number_of_tokens_per_identity_option.php | 4 +- .../missing_allowed_second_factors_option.php | 4 +- ...ng_show_raa_contact_information_option.php | 4 +- .../missing_use_ra_locations_option.php | 4 +- ...ot_array_allowed_second_factors_option.php | 4 +- .../not_array_use_raa.php | 4 +- ...lean_allow_self_asserted_tokens_option.php | 4 +- .../not_boolean_self_vet_option.php | 4 +- ...an_show_raa_contact_information_option.php | 2 +- .../not_boolean_sso_on_2fa_option.php | 4 +- .../not_boolean_use_ra_locations_option.php | 4 +- ...i_number_of_tokens_per_identity_option.php | 4 +- ...r_number_of_tokens_per_identity_option.php | 4 +- ..._strings_allowed_second_factors_option.php | 6 +- ...or_types_allowed_second_factors_option.php | 6 +- .../not_whitelisted_institution_use_raa.php | 4 +- .../with_extra_options.php | 4 +- ...nfigureInstitutionRequestValidatorTest.php | 44 +- .../ManagementBundle/Validator/Assert.php | 13 +- .../ConfigurationStructureValidator.php | 18 +- .../ConfigurationValidatorInterface.php | 1 - .../EmailTemplatesConfigurationValidator.php | 12 +- .../GatewayConfigurationValidator.php | 24 +- ...IdentityProviderConfigurationValidator.php | 29 +- ...ReconfigureInstitutionRequestValidator.php | 85 +- .../ServiceProviderConfigurationValidator.php | 60 +- .../BootstrapGsspSecondFactorCommand.php | 63 +- .../Command/BootstrapIdentityCommand.php | 31 +- ...IdentityWithYubikeySecondFactorCommand.php | 67 +- .../BootstrapSmsSecondFactorCommand.php | 35 +- .../BootstrapYubikeySecondFactorCommand.php | 35 +- ...ilVerifiedSecondFactorRemindersCommand.php | 29 +- .../Command/MigrateSecondFactorCommand.php | 41 +- .../Console/Command/ReplayEventsCommand.php | 36 +- .../Command/ReplaySpecificEventsCommand.php | 37 +- .../DependencyInjection/Configuration.php | 44 +- ...netStepupMiddlewareMiddlewareExtension.php | 5 +- .../EventSourcing/DBALEventHydrator.php | 54 +- .../EventSourcing/EventCollection.php | 21 +- .../EventSourcing/ProjectorCollection.php | 19 +- .../Exception/InvalidArgumentException.php | 10 +- .../InstitutionConfigurationProvider.php | 24 +- .../InstitutionConfigurationState.php | 37 +- .../MappedInstitutionConfiguration.php | 84 +- .../Resources/config/console_commands.yml | 146 +-- .../Resources/config/event_replaying.yml | 66 +- .../Resources/config/services.yml | 79 +- .../Service/BootstrapCommandService.php | 66 +- .../Service/DBALConnectionHelper.php | 2 +- .../Service/EventStreamReplayer.php | 53 +- .../Service/PastEventsService.php | 8 +- ...SecondFactorDisplayNameResolverService.php | 12 +- .../TransactionAwareEventDispatcher.php | 14 +- .../Service/TransactionHelper.php | 17 +- ...erifiedSecondFactorReminderMailService.php | 62 +- .../VerifiedSecondFactorReminderService.php | 44 +- ...urfnetStepupMiddlewareMiddlewareBundle.php | 5 - .../EventSourcing/EventCollectionTest.php | 17 +- .../EventSourcing/ProjectorCollectionTest.php | 24 +- .../MappedInstitutionConfigurationTest.php | 58 +- ...ndFactorDisplayNameResolverServiceTest.php | 1 - ...erifiedSecondFactorReminderServiceTest.php | 32 +- 680 files changed, 9536 insertions(+), 10206 deletions(-) diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml index 9d54a276c..458a1c083 100644 --- a/config/packages/doctrine.yaml +++ b/config/packages/doctrine.yaml @@ -147,7 +147,7 @@ doctrine: connection: gateway naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware mappings: - Surfnet\StepupMiddleware\GatewayBundle\SurfnetStepupMiddlewareGatewayBundle: + SurfnetStepupMiddlewareGatewayBundle: mapping: true type: attribute is_bundle: true diff --git a/src/Kernel.php b/src/Kernel.php index 10e367d70..15434da3b 100644 --- a/src/Kernel.php +++ b/src/Kernel.php @@ -8,7 +8,9 @@ use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Kernel as BaseKernel; use Symfony\Component\Routing\RouteCollectionBuilder; + use function dirname; + use const PHP_VERSION_ID; class Kernel extends BaseKernel @@ -19,7 +21,7 @@ class Kernel extends BaseKernel public function registerBundles(): iterable { - $contents = require $this->getProjectDir().'/config/bundles.php'; + $contents = require $this->getProjectDir() . '/config/bundles.php'; foreach ($contents as $class => $envs) { if ($envs[$this->environment] ?? $envs['all'] ?? false) { yield new $class(); @@ -34,23 +36,23 @@ public function getProjectDir(): string protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void { - $container->addResource(new FileResource($this->getProjectDir().'/config/bundles.php')); + $container->addResource(new FileResource($this->getProjectDir() . '/config/bundles.php')); $container->setParameter('container.dumper.inline_class_loader', PHP_VERSION_ID < 70400 || $this->debug); $container->setParameter('container.dumper.inline_factories', true); - $confDir = $this->getProjectDir().'/config'; + $confDir = $this->getProjectDir() . '/config'; - $loader->load($confDir.'/{packages}/*'.self::CONFIG_EXTS, 'glob'); - $loader->load($confDir.'/{packages}/'.$this->environment.'/*'.self::CONFIG_EXTS, 'glob'); - $loader->load($confDir.'/{services}'.self::CONFIG_EXTS, 'glob'); - $loader->load($confDir.'/{services}_'.$this->environment.self::CONFIG_EXTS, 'glob'); + $loader->load($confDir . '/{packages}/*' . self::CONFIG_EXTS, 'glob'); + $loader->load($confDir . '/{packages}/' . $this->environment . '/*' . self::CONFIG_EXTS, 'glob'); + $loader->load($confDir . '/{services}' . self::CONFIG_EXTS, 'glob'); + $loader->load($confDir . '/{services}_' . $this->environment . self::CONFIG_EXTS, 'glob'); } protected function configureRoutes(RouteCollectionBuilder $routes): void { - $confDir = $this->getProjectDir().'/config'; + $confDir = $this->getProjectDir() . '/config'; - $routes->import($confDir.'/{routes}/'.$this->environment.'/*'.self::CONFIG_EXTS, '/', 'glob'); - $routes->import($confDir.'/{routes}/*'.self::CONFIG_EXTS, '/', 'glob'); - $routes->import($confDir.'/{routes}'.self::CONFIG_EXTS, '/', 'glob'); + $routes->import($confDir . '/{routes}/' . $this->environment . '/*' . self::CONFIG_EXTS, '/', 'glob'); + $routes->import($confDir . '/{routes}/*' . self::CONFIG_EXTS, '/', 'glob'); + $routes->import($confDir . '/{routes}' . self::CONFIG_EXTS, '/', 'glob'); } } diff --git a/src/Surfnet/Migrations/Version20141031133057.php b/src/Surfnet/Migrations/Version20141031133057.php index 6578ec390..ddd742321 100644 --- a/src/Surfnet/Migrations/Version20141031133057.php +++ b/src/Surfnet/Migrations/Version20141031133057.php @@ -12,7 +12,10 @@ class Version20141031133057 extends AbstractMigration { public function up(Schema $schema): void { - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $sql = <<abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('DROP TABLE event_stream'); } diff --git a/src/Surfnet/Migrations/Version20141031144721.php b/src/Surfnet/Migrations/Version20141031144721.php index 04243e514..1e490ff0d 100644 --- a/src/Surfnet/Migrations/Version20141031144721.php +++ b/src/Surfnet/Migrations/Version20141031144721.php @@ -13,16 +13,24 @@ class Version20141031144721 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - - $this->addSql('CREATE TABLE identity (name_id VARCHAR(255) NOT NULL, PRIMARY KEY(name_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + + $this->addSql( + 'CREATE TABLE identity (name_id VARCHAR(255) NOT NULL, PRIMARY KEY(name_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', + ); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + $this->addSql('DROP TABLE identity'); } } diff --git a/src/Surfnet/Migrations/Version20141031163549.php b/src/Surfnet/Migrations/Version20141031163549.php index badc2b480..8795cc089 100644 --- a/src/Surfnet/Migrations/Version20141031163549.php +++ b/src/Surfnet/Migrations/Version20141031163549.php @@ -13,8 +13,11 @@ class Version20141031163549 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + $this->addSql('ALTER TABLE identity DROP PRIMARY KEY'); $this->addSql('ALTER TABLE identity ADD id VARCHAR(36) NOT NULL FIRST'); $this->addSql('ALTER TABLE identity ADD PRIMARY KEY (id)'); @@ -23,8 +26,11 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + $this->addSql('ALTER TABLE identity DROP PRIMARY KEY'); $this->addSql('ALTER TABLE identity DROP id'); $this->addSql('ALTER TABLE identity ADD PRIMARY KEY (name_id)'); diff --git a/src/Surfnet/Migrations/Version20141031164140.php b/src/Surfnet/Migrations/Version20141031164140.php index f10c5cb99..7607a5b6a 100644 --- a/src/Surfnet/Migrations/Version20141031164140.php +++ b/src/Surfnet/Migrations/Version20141031164140.php @@ -13,7 +13,10 @@ class Version20141031164140 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql("ALTER TABLE event_stream CHANGE type type varchar(255)"); $this->addSql("ALTER TABLE event_stream DROP INDEX unique_playhead"); @@ -24,7 +27,10 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql("ALTER TABLE event_stream CHANGE type type varchar(150)"); $this->addSql("ALTER TABLE event_stream DROP INDEX type"); diff --git a/src/Surfnet/Migrations/Version20141112093720.php b/src/Surfnet/Migrations/Version20141112093720.php index 52d5032d0..4e127454c 100644 --- a/src/Surfnet/Migrations/Version20141112093720.php +++ b/src/Surfnet/Migrations/Version20141112093720.php @@ -13,17 +13,27 @@ class Version20141112093720 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - - $this->addSql('CREATE TABLE second_factor (id VARCHAR(36) NOT NULL, identity_id VARCHAR(36) DEFAULT NULL, type VARCHAR(16) NOT NULL, second_factor_identifier VARCHAR(32) NOT NULL, INDEX IDX_1806C29EFF3ED4A8 (identity_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'); - $this->addSql('ALTER TABLE second_factor ADD CONSTRAINT FK_1806C29EFF3ED4A8 FOREIGN KEY (identity_id) REFERENCES identity (id)'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + + $this->addSql( + 'CREATE TABLE second_factor (id VARCHAR(36) NOT NULL, identity_id VARCHAR(36) DEFAULT NULL, type VARCHAR(16) NOT NULL, second_factor_identifier VARCHAR(32) NOT NULL, INDEX IDX_1806C29EFF3ED4A8 (identity_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', + ); + $this->addSql( + 'ALTER TABLE second_factor ADD CONSTRAINT FK_1806C29EFF3ED4A8 FOREIGN KEY (identity_id) REFERENCES identity (id)', + ); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + $this->addSql('DROP TABLE second_factor'); } } diff --git a/src/Surfnet/Migrations/Version20141112094457.php b/src/Surfnet/Migrations/Version20141112094457.php index e033c7e26..6081d609a 100644 --- a/src/Surfnet/Migrations/Version20141112094457.php +++ b/src/Surfnet/Migrations/Version20141112094457.php @@ -16,13 +16,13 @@ public function up(Schema $schema): void // this up() migration is auto-generated, please modify it to your needs $this->abortIf( $this->connection->getDatabasePlatform()->getName() != 'mysql', - 'Migration can only be executed safely on \'mysql\'.' + 'Migration can only be executed safely on \'mysql\'.', ); $this->addSql('ALTER TABLE event_stream DROP PRIMARY KEY'); $this->addSql('ALTER TABLE event_stream DROP INDEX unique_uuid_playhead'); $this->addSql( - 'ALTER TABLE event_stream ADD CONSTRAINT pk_event_stream_uuid_playhead PRIMARY KEY (uuid, playhead)' + 'ALTER TABLE event_stream ADD CONSTRAINT pk_event_stream_uuid_playhead PRIMARY KEY (uuid, playhead)', ); } @@ -31,7 +31,7 @@ public function down(Schema $schema): void // this down() migration is auto-generated, please modify it to your needs $this->abortIf( $this->connection->getDatabasePlatform()->getName() != 'mysql', - 'Migration can only be executed safely on \'mysql\'.' + 'Migration can only be executed safely on \'mysql\'.', ); $this->addSql('ALTER TABLE event_stream DROP PRIMARY KEY'); diff --git a/src/Surfnet/Migrations/Version20141114095245.php b/src/Surfnet/Migrations/Version20141114095245.php index 531ff9b94..8a5c772d0 100644 --- a/src/Surfnet/Migrations/Version20141114095245.php +++ b/src/Surfnet/Migrations/Version20141114095245.php @@ -13,17 +13,27 @@ class Version20141114095245 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - - $this->addSql('CREATE TABLE unverified_second_factor (id VARCHAR(36) NOT NULL, identity_id VARCHAR(36) DEFAULT NULL, type VARCHAR(16) NOT NULL, second_factor_identifier VARCHAR(32) NOT NULL, INDEX IDX_D79226A2FF3ED4A8 (identity_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'); - $this->addSql('ALTER TABLE unverified_second_factor ADD CONSTRAINT FK_D79226A2FF3ED4A8 FOREIGN KEY (identity_id) REFERENCES identity (id)'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + + $this->addSql( + 'CREATE TABLE unverified_second_factor (id VARCHAR(36) NOT NULL, identity_id VARCHAR(36) DEFAULT NULL, type VARCHAR(16) NOT NULL, second_factor_identifier VARCHAR(32) NOT NULL, INDEX IDX_D79226A2FF3ED4A8 (identity_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', + ); + $this->addSql( + 'ALTER TABLE unverified_second_factor ADD CONSTRAINT FK_D79226A2FF3ED4A8 FOREIGN KEY (identity_id) REFERENCES identity (id)', + ); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + $this->addSql('DROP TABLE unverified_second_factor'); } } diff --git a/src/Surfnet/Migrations/Version20141117230116.php b/src/Surfnet/Migrations/Version20141117230116.php index 5f8542f71..6271a64b7 100644 --- a/src/Surfnet/Migrations/Version20141117230116.php +++ b/src/Surfnet/Migrations/Version20141117230116.php @@ -13,7 +13,10 @@ class Version20141117230116 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE identity ADD institution VARCHAR(255) NOT NULL, ADD email VARCHAR(255) NOT NULL'); $this->addSql('CREATE INDEX idx_identity_institution ON identity (institution)'); @@ -23,7 +26,10 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('DROP INDEX idxft_identity_email ON identity'); $this->addSql('DROP INDEX idx_identity_institution ON identity'); diff --git a/src/Surfnet/Migrations/Version20141118114026.php b/src/Surfnet/Migrations/Version20141118114026.php index 24d30bcf0..cf39cb69d 100644 --- a/src/Surfnet/Migrations/Version20141118114026.php +++ b/src/Surfnet/Migrations/Version20141118114026.php @@ -13,7 +13,10 @@ class Version20141118114026 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE identity ADD common_name VARCHAR(255) NOT NULL'); $this->addSql('CREATE FULLTEXT INDEX idxft_identity_commonname ON identity (common_name)'); @@ -22,9 +25,14 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('DROP INDEX idxft_identity_commonname ON identity'); - $this->addSql('ALTER TABLE identity DROP common_name, CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci'); + $this->addSql( + 'ALTER TABLE identity DROP common_name, CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci', + ); } } diff --git a/src/Surfnet/Migrations/Version20141119093423.php b/src/Surfnet/Migrations/Version20141119093423.php index b608e7440..d1e1c77e3 100644 --- a/src/Surfnet/Migrations/Version20141119093423.php +++ b/src/Surfnet/Migrations/Version20141119093423.php @@ -13,16 +13,24 @@ class Version20141119093423 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - - $this->addSql('ALTER TABLE unverified_second_factor ADD verification_code_nonce VARCHAR(64) NOT NULL, ADD email_verified TINYINT(1) NOT NULL'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + + $this->addSql( + 'ALTER TABLE unverified_second_factor ADD verification_code_nonce VARCHAR(64) NOT NULL, ADD email_verified TINYINT(1) NOT NULL', + ); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + $this->addSql('ALTER TABLE unverified_second_factor DROP verification_code_nonce, DROP email_verified'); } } diff --git a/src/Surfnet/Migrations/Version20141119113444.php b/src/Surfnet/Migrations/Version20141119113444.php index a0cf4cc05..d21f7bf0b 100644 --- a/src/Surfnet/Migrations/Version20141119113444.php +++ b/src/Surfnet/Migrations/Version20141119113444.php @@ -13,16 +13,26 @@ class Version20141119113444 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - - $this->addSql('ALTER TABLE unverified_second_factor CHANGE verification_code_nonce email_verification_code_nonce VARCHAR(64) NOT NULL'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + + $this->addSql( + 'ALTER TABLE unverified_second_factor CHANGE verification_code_nonce email_verification_code_nonce VARCHAR(64) NOT NULL', + ); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - - $this->addSql('ALTER TABLE unverified_second_factor CHANGE email_verification_code_nonce verification_code_nonce VARCHAR(64) NOT NULL'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + + $this->addSql( + 'ALTER TABLE unverified_second_factor CHANGE email_verification_code_nonce verification_code_nonce VARCHAR(64) NOT NULL', + ); } } diff --git a/src/Surfnet/Migrations/Version20141119113553.php b/src/Surfnet/Migrations/Version20141119113553.php index c1d742d18..2abb24909 100644 --- a/src/Surfnet/Migrations/Version20141119113553.php +++ b/src/Surfnet/Migrations/Version20141119113553.php @@ -13,16 +13,26 @@ class Version20141119113553 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - - $this->addSql('ALTER TABLE unverified_second_factor CHANGE email_verification_code_nonce email_verification_code_nonce VARCHAR(64) DEFAULT NULL'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + + $this->addSql( + 'ALTER TABLE unverified_second_factor CHANGE email_verification_code_nonce email_verification_code_nonce VARCHAR(64) DEFAULT NULL', + ); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - - $this->addSql('ALTER TABLE unverified_second_factor CHANGE email_verification_code_nonce email_verification_code_nonce VARCHAR(64) NOT NULL'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + + $this->addSql( + 'ALTER TABLE unverified_second_factor CHANGE email_verification_code_nonce email_verification_code_nonce VARCHAR(64) NOT NULL', + ); } } diff --git a/src/Surfnet/Migrations/Version20141120150430.php b/src/Surfnet/Migrations/Version20141120150430.php index 760d37d2b..f8d40b496 100644 --- a/src/Surfnet/Migrations/Version20141120150430.php +++ b/src/Surfnet/Migrations/Version20141120150430.php @@ -13,16 +13,26 @@ class Version20141120150430 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - - $this->addSql('ALTER TABLE unverified_second_factor CHANGE email_verification_code_nonce email_verification_nonce VARCHAR(64) DEFAULT NULL'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + + $this->addSql( + 'ALTER TABLE unverified_second_factor CHANGE email_verification_code_nonce email_verification_nonce VARCHAR(64) DEFAULT NULL', + ); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - - $this->addSql('ALTER TABLE unverified_second_factor CHANGE email_verification_nonce email_verification_code_nonce VARCHAR(64) DEFAULT NULL'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + + $this->addSql( + 'ALTER TABLE unverified_second_factor CHANGE email_verification_nonce email_verification_code_nonce VARCHAR(64) DEFAULT NULL', + ); } } diff --git a/src/Surfnet/Migrations/Version20141120152310.php b/src/Surfnet/Migrations/Version20141120152310.php index 1079c3e09..7247e34db 100644 --- a/src/Surfnet/Migrations/Version20141120152310.php +++ b/src/Surfnet/Migrations/Version20141120152310.php @@ -13,16 +13,22 @@ class Version20141120152310 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + $this->addSql('ALTER TABLE unverified_second_factor DROP email_verification_nonce'); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + $this->addSql('ALTER TABLE unverified_second_factor ADD email_verification_nonce VARCHAR(64) DEFAULT NULL'); } } diff --git a/src/Surfnet/Migrations/Version20141125154133.php b/src/Surfnet/Migrations/Version20141125154133.php index d4f9b2944..ee4dcc58b 100644 --- a/src/Surfnet/Migrations/Version20141125154133.php +++ b/src/Surfnet/Migrations/Version20141125154133.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -13,16 +13,22 @@ class Version20141125154133 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + $this->addSql('ALTER TABLE unverified_second_factor ADD email_verification_nonce VARCHAR(32) NOT NULL'); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + $this->addSql('ALTER TABLE unverified_second_factor DROP email_verification_nonce'); } } diff --git a/src/Surfnet/Migrations/Version20141125154214.php b/src/Surfnet/Migrations/Version20141125154214.php index 399e2b0fb..e1ed50c30 100644 --- a/src/Surfnet/Migrations/Version20141125154214.php +++ b/src/Surfnet/Migrations/Version20141125154214.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -13,16 +13,24 @@ class Version20141125154214 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + $this->addSql('ALTER TABLE identity CHANGE institution institution VARCHAR(255) NOT NULL'); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - - $this->addSql('ALTER TABLE identity CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + + $this->addSql( + 'ALTER TABLE identity CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci', + ); } } diff --git a/src/Surfnet/Migrations/Version20141125155001.php b/src/Surfnet/Migrations/Version20141125155001.php index e29a5e1e1..a89fa95ad 100644 --- a/src/Surfnet/Migrations/Version20141125155001.php +++ b/src/Surfnet/Migrations/Version20141125155001.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -13,16 +13,22 @@ class Version20141125155001 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + $this->addSql('ALTER TABLE unverified_second_factor DROP email_verified'); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + $this->addSql('ALTER TABLE unverified_second_factor ADD email_verified TINYINT(1) NOT NULL'); } } diff --git a/src/Surfnet/Migrations/Version20141125173004.php b/src/Surfnet/Migrations/Version20141125173004.php index a9d32be17..2167a800a 100644 --- a/src/Surfnet/Migrations/Version20141125173004.php +++ b/src/Surfnet/Migrations/Version20141125173004.php @@ -18,8 +18,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; use Symfony\Component\DependencyInjection\ContainerAwareInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -41,21 +41,36 @@ public function up(Schema $schema): void $middlewareUser = $this->getMiddlewareUser(); // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql(sprintf('CREATE TABLE %s.saml_entity (entity_id VARCHAR(255) NOT NULL, type VARCHAR(255) NOT NULL, configuration LONGTEXT NOT NULL, PRIMARY KEY(entity_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', $gatewaySchema)); - $this->addSql(sprintf("GRANT DELETE,INSERT,SELECT,UPDATE ON %s.saml_entity TO %s", $gatewaySchema, $middlewareUser)); + $this->addSql( + sprintf( + 'CREATE TABLE %s.saml_entity (entity_id VARCHAR(255) NOT NULL, type VARCHAR(255) NOT NULL, configuration LONGTEXT NOT NULL, PRIMARY KEY(entity_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', + $gatewaySchema, + ), + ); + $this->addSql( + sprintf("GRANT DELETE,INSERT,SELECT,UPDATE ON %s.saml_entity TO %s", $gatewaySchema, $middlewareUser), + ); } public function down(Schema $schema): void { - $gatewaySchema = $this->getGatewaySchema(); + $gatewaySchema = $this->getGatewaySchema(); $middlewareUser = $this->getMiddlewareUser(); // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql(sprintf("REVOKE DELETE,INSERT,SELECT,UPDATE ON %s.saml_entity FROM %s", $gatewaySchema, $middlewareUser)); + $this->addSql( + sprintf("REVOKE DELETE,INSERT,SELECT,UPDATE ON %s.saml_entity FROM %s", $gatewaySchema, $middlewareUser), + ); $this->addSql(sprintf('DROP TABLE %s.saml_entity', $gatewaySchema)); } diff --git a/src/Surfnet/Migrations/Version20141128143908.php b/src/Surfnet/Migrations/Version20141128143908.php index 0c59c46f9..b669bf28e 100644 --- a/src/Surfnet/Migrations/Version20141128143908.php +++ b/src/Surfnet/Migrations/Version20141128143908.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -13,19 +13,31 @@ class Version20141128143908 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - - $this->addSql('CREATE TABLE verified_second_factor (id VARCHAR(36) NOT NULL, identity_id VARCHAR(36) DEFAULT NULL, type VARCHAR(16) NOT NULL, second_factor_identifier VARCHAR(32) NOT NULL, INDEX IDX_7964F91CFF3ED4A8 (identity_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'); - $this->addSql('ALTER TABLE verified_second_factor ADD CONSTRAINT FK_7964F91CFF3ED4A8 FOREIGN KEY (identity_id) REFERENCES identity (id)'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + + $this->addSql( + 'CREATE TABLE verified_second_factor (id VARCHAR(36) NOT NULL, identity_id VARCHAR(36) DEFAULT NULL, type VARCHAR(16) NOT NULL, second_factor_identifier VARCHAR(32) NOT NULL, INDEX IDX_7964F91CFF3ED4A8 (identity_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', + ); + $this->addSql( + 'ALTER TABLE verified_second_factor ADD CONSTRAINT FK_7964F91CFF3ED4A8 FOREIGN KEY (identity_id) REFERENCES identity (id)', + ); $this->addSql('ALTER TABLE unverified_second_factor DROP email_verification_nonce'); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + $this->addSql('DROP TABLE verified_second_factor'); - $this->addSql('ALTER TABLE unverified_second_factor ADD email_verification_nonce VARCHAR(32) NOT NULL COLLATE utf8_unicode_ci'); + $this->addSql( + 'ALTER TABLE unverified_second_factor ADD email_verification_nonce VARCHAR(32) NOT NULL COLLATE utf8_unicode_ci', + ); } } diff --git a/src/Surfnet/Migrations/Version20141128143946.php b/src/Surfnet/Migrations/Version20141128143946.php index abfc0f4b2..378843668 100644 --- a/src/Surfnet/Migrations/Version20141128143946.php +++ b/src/Surfnet/Migrations/Version20141128143946.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -13,16 +13,24 @@ class Version20141128143946 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + $this->addSql('ALTER TABLE identity CHANGE institution institution VARCHAR(255) NOT NULL'); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - - $this->addSql('ALTER TABLE identity CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + + $this->addSql( + 'ALTER TABLE identity CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci', + ); } } diff --git a/src/Surfnet/Migrations/Version20141202121811.php b/src/Surfnet/Migrations/Version20141202121811.php index deb04e016..19f65662e 100644 --- a/src/Surfnet/Migrations/Version20141202121811.php +++ b/src/Surfnet/Migrations/Version20141202121811.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -13,17 +13,27 @@ class Version20141202121811 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + $this->addSql('DROP TABLE second_factor'); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - - $this->addSql('CREATE TABLE second_factor (id VARCHAR(36) NOT NULL COLLATE utf8_unicode_ci, identity_id VARCHAR(36) DEFAULT NULL COLLATE utf8_unicode_ci, type VARCHAR(16) NOT NULL COLLATE utf8_unicode_ci, second_factor_identifier VARCHAR(32) NOT NULL COLLATE utf8_unicode_ci, INDEX IDX_1806C29EFF3ED4A8 (identity_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'); - $this->addSql('ALTER TABLE second_factor ADD CONSTRAINT FK_1806C29EFF3ED4A8 FOREIGN KEY (identity_id) REFERENCES identity (id)'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + + $this->addSql( + 'CREATE TABLE second_factor (id VARCHAR(36) NOT NULL COLLATE utf8_unicode_ci, identity_id VARCHAR(36) DEFAULT NULL COLLATE utf8_unicode_ci, type VARCHAR(16) NOT NULL COLLATE utf8_unicode_ci, second_factor_identifier VARCHAR(32) NOT NULL COLLATE utf8_unicode_ci, INDEX IDX_1806C29EFF3ED4A8 (identity_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', + ); + $this->addSql( + 'ALTER TABLE second_factor ADD CONSTRAINT FK_1806C29EFF3ED4A8 FOREIGN KEY (identity_id) REFERENCES identity (id)', + ); } } diff --git a/src/Surfnet/Migrations/Version20141204140639.php b/src/Surfnet/Migrations/Version20141204140639.php index 69082e89b..5eeeafc5e 100644 --- a/src/Surfnet/Migrations/Version20141204140639.php +++ b/src/Surfnet/Migrations/Version20141204140639.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -13,16 +13,22 @@ class Version20141204140639 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + $this->addSql('ALTER TABLE verified_second_factor ADD registration_code VARCHAR(8) NOT NULL'); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + $this->addSql('ALTER TABLE verified_second_factor DROP registration_code'); } } diff --git a/src/Surfnet/Migrations/Version20141205112641.php b/src/Surfnet/Migrations/Version20141205112641.php index bb879c9e3..c25a1b22d 100644 --- a/src/Surfnet/Migrations/Version20141205112641.php +++ b/src/Surfnet/Migrations/Version20141205112641.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -13,15 +13,23 @@ class Version20141205112641 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql('CREATE TABLE raa (id INT AUTO_INCREMENT NOT NULL, institution VARCHAR(150) NOT NULL, name_id VARCHAR(150) NOT NULL, location LONGTEXT DEFAULT NULL, contact_information LONGTEXT DEFAULT NULL, INDEX idx_raa_institution (institution), INDEX idx_raa_institution_nameid (institution, name_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'); + $this->addSql( + 'CREATE TABLE raa (id INT AUTO_INCREMENT NOT NULL, institution VARCHAR(150) NOT NULL, name_id VARCHAR(150) NOT NULL, location LONGTEXT DEFAULT NULL, contact_information LONGTEXT DEFAULT NULL, INDEX idx_raa_institution (institution), INDEX idx_raa_institution_nameid (institution, name_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', + ); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('DROP TABLE raa'); } diff --git a/src/Surfnet/Migrations/Version20141208121040.php b/src/Surfnet/Migrations/Version20141208121040.php index 90fbc1363..9f5240d68 100644 --- a/src/Surfnet/Migrations/Version20141208121040.php +++ b/src/Surfnet/Migrations/Version20141208121040.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -13,15 +13,23 @@ class Version20141208121040 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql('CREATE TABLE sraa (name_id VARCHAR(200) NOT NULL, PRIMARY KEY(name_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'); + $this->addSql( + 'CREATE TABLE sraa (name_id VARCHAR(200) NOT NULL, PRIMARY KEY(name_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', + ); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('DROP TABLE sraa'); } diff --git a/src/Surfnet/Migrations/Version20141208162045.php b/src/Surfnet/Migrations/Version20141208162045.php index 965523040..4ec41c7e2 100644 --- a/src/Surfnet/Migrations/Version20141208162045.php +++ b/src/Surfnet/Migrations/Version20141208162045.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -13,17 +13,27 @@ class Version20141208162045 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - - $this->addSql('CREATE TABLE vetted_second_factor (id VARCHAR(36) NOT NULL, identity_id VARCHAR(36) DEFAULT NULL, type VARCHAR(16) NOT NULL, second_factor_identifier VARCHAR(32) NOT NULL, INDEX IDX_29F96B72FF3ED4A8 (identity_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'); - $this->addSql('ALTER TABLE vetted_second_factor ADD CONSTRAINT FK_29F96B72FF3ED4A8 FOREIGN KEY (identity_id) REFERENCES identity (id)'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + + $this->addSql( + 'CREATE TABLE vetted_second_factor (id VARCHAR(36) NOT NULL, identity_id VARCHAR(36) DEFAULT NULL, type VARCHAR(16) NOT NULL, second_factor_identifier VARCHAR(32) NOT NULL, INDEX IDX_29F96B72FF3ED4A8 (identity_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', + ); + $this->addSql( + 'ALTER TABLE vetted_second_factor ADD CONSTRAINT FK_29F96B72FF3ED4A8 FOREIGN KEY (identity_id) REFERENCES identity (id)', + ); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + $this->addSql('DROP TABLE vetted_second_factor'); } } diff --git a/src/Surfnet/Migrations/Version20141208172438.php b/src/Surfnet/Migrations/Version20141208172438.php index 3df379086..71e008651 100644 --- a/src/Surfnet/Migrations/Version20141208172438.php +++ b/src/Surfnet/Migrations/Version20141208172438.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -13,15 +13,23 @@ class Version20141208172438 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql('CREATE TABLE ra (id INT AUTO_INCREMENT NOT NULL, institution VARCHAR(150) NOT NULL, name_id VARCHAR(150) NOT NULL, location LONGTEXT DEFAULT NULL, contact_information LONGTEXT DEFAULT NULL, INDEX idx_ra_institution (institution), INDEX idx_ra_institution_nameid (institution, name_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'); + $this->addSql( + 'CREATE TABLE ra (id INT AUTO_INCREMENT NOT NULL, institution VARCHAR(150) NOT NULL, name_id VARCHAR(150) NOT NULL, location LONGTEXT DEFAULT NULL, contact_information LONGTEXT DEFAULT NULL, INDEX idx_ra_institution (institution), INDEX idx_ra_institution_nameid (institution, name_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', + ); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('DROP TABLE ra'); } diff --git a/src/Surfnet/Migrations/Version20141209150426.php b/src/Surfnet/Migrations/Version20141209150426.php index 3ae0a6e3e..810f65b95 100644 --- a/src/Surfnet/Migrations/Version20141209150426.php +++ b/src/Surfnet/Migrations/Version20141209150426.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; use Symfony\Component\DependencyInjection\ContainerAwareInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -21,34 +21,46 @@ public function setContainer(ContainerInterface $container = null): void public function up(Schema $schema): void { - $gatewaySchema = $this->getGatewaySchema(); + $gatewaySchema = $this->getGatewaySchema(); $middlewareUser = $this->getMiddlewareUser(); - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql(sprintf( - 'CREATE TABLE %s.second_factor (identity_id VARCHAR(36) NOT NULL, name_id VARCHAR(200) NOT NULL, institution VARCHAR(200) NOT NULL, second_factor_id VARCHAR(36) NOT NULL, second_factor_type VARCHAR(50) NOT NULL, second_factor_identifier VARCHAR(100) NOT NULL, INDEX idx_secondfactor_nameid (name_id), PRIMARY KEY(identity_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', - $gatewaySchema - )); - $this->addSql(sprintf( - 'GRANT DELETE,INSERT,SELECT,UPDATE ON %s.second_factor TO %s', - $gatewaySchema, - $middlewareUser - )); + $this->addSql( + sprintf( + 'CREATE TABLE %s.second_factor (identity_id VARCHAR(36) NOT NULL, name_id VARCHAR(200) NOT NULL, institution VARCHAR(200) NOT NULL, second_factor_id VARCHAR(36) NOT NULL, second_factor_type VARCHAR(50) NOT NULL, second_factor_identifier VARCHAR(100) NOT NULL, INDEX idx_secondfactor_nameid (name_id), PRIMARY KEY(identity_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', + $gatewaySchema, + ), + ); + $this->addSql( + sprintf( + 'GRANT DELETE,INSERT,SELECT,UPDATE ON %s.second_factor TO %s', + $gatewaySchema, + $middlewareUser, + ), + ); } public function down(Schema $schema): void { - $gatewaySchema = $this->getGatewaySchema(); + $gatewaySchema = $this->getGatewaySchema(); $middlewareUser = $this->getMiddlewareUser(); - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql(sprintf( - 'REVOKE DELETE,INSERT,SELECT,UPDATE ON %s.second_factor FROM %s', - $gatewaySchema, - $middlewareUser - )); + $this->addSql( + sprintf( + 'REVOKE DELETE,INSERT,SELECT,UPDATE ON %s.second_factor FROM %s', + $gatewaySchema, + $middlewareUser, + ), + ); $this->addSql('DROP TABLE second_factor'); } diff --git a/src/Surfnet/Migrations/Version20141210174213.php b/src/Surfnet/Migrations/Version20141210174213.php index 640a61fc8..3739d3db7 100644 --- a/src/Surfnet/Migrations/Version20141210174213.php +++ b/src/Surfnet/Migrations/Version20141210174213.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; use Symfony\Component\DependencyInjection\ContainerAwareInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -16,23 +16,31 @@ class Version20141210174213 extends AbstractMigration implements ContainerAwareI public function up(Schema $schema): void { - $gatewaySchema = $this->getGatewaySchema(); + $gatewaySchema = $this->getGatewaySchema(); // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + $this->addSql(sprintf('ALTER TABLE %s.second_factor DROP PRIMARY KEY', $gatewaySchema)); $this->addSql(sprintf('ALTER TABLE %s.second_factor ADD id INT NOT NULL FIRST', $gatewaySchema)); $this->addSql(sprintf('ALTER TABLE %s.second_factor ADD PRIMARY KEY (id)', $gatewaySchema)); - $this->addSql(sprintf('ALTER TABLE %s.second_factor CHANGE id id INT AUTO_INCREMENT NOT NULL FIRST', $gatewaySchema)); + $this->addSql( + sprintf('ALTER TABLE %s.second_factor CHANGE id id INT AUTO_INCREMENT NOT NULL FIRST', $gatewaySchema), + ); } public function down(Schema $schema): void { - $gatewaySchema = $this->getGatewaySchema(); + $gatewaySchema = $this->getGatewaySchema(); // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql(sprintf('ALTER TABLE %s.second_factor DROP PRIMARY KEY', $gatewaySchema)); $this->addSql(sprintf('ALTER TABLE %s.second_factor DROP id', $gatewaySchema)); diff --git a/src/Surfnet/Migrations/Version20141215150518.php b/src/Surfnet/Migrations/Version20141215150518.php index 3974a3855..734876ee0 100644 --- a/src/Surfnet/Migrations/Version20141215150518.php +++ b/src/Surfnet/Migrations/Version20141215150518.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -13,16 +13,22 @@ class Version20141215150518 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + $this->addSql('ALTER TABLE unverified_second_factor ADD verification_nonce VARCHAR(32) NOT NULL'); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + $this->addSql('ALTER TABLE unverified_second_factor DROP verification_nonce'); } } diff --git a/src/Surfnet/Migrations/Version20150217122017.php b/src/Surfnet/Migrations/Version20150217122017.php index 878a85844..66c1bb02a 100644 --- a/src/Surfnet/Migrations/Version20150217122017.php +++ b/src/Surfnet/Migrations/Version20150217122017.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -13,7 +13,10 @@ class Version20150217122017 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE unverified_second_factor ADD verification_nonce_valid_until DATETIME NOT NULL'); } @@ -21,7 +24,10 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE unverified_second_factor DROP verification_nonce_valid_until'); } diff --git a/src/Surfnet/Migrations/Version20150225155343.php b/src/Surfnet/Migrations/Version20150225155343.php index b93b57747..d0100c2a2 100644 --- a/src/Surfnet/Migrations/Version20150225155343.php +++ b/src/Surfnet/Migrations/Version20150225155343.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -13,16 +13,24 @@ class Version20150225155343 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - - $this->addSql('CREATE TABLE ra_second_factor (id VARCHAR(36) NOT NULL, type VARCHAR(16) NOT NULL, second_factor_id VARCHAR(36) NOT NULL, status VARCHAR(10) NOT NULL, identity_id VARCHAR(36) NOT NULL, institution VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL, email VARCHAR(255) NOT NULL, INDEX idx_ra_second_factor_type (type), INDEX idx_ra_second_factor_second_factor_id (second_factor_id), INDEX idx_ra_second_factor_status (status), INDEX idx_ra_second_factor_identity_id (identity_id), INDEX idx_ra_second_factor_institution (institution), INDEX idx_ra_second_factor_name (name), INDEX idx_ra_second_factor_email (email), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + + $this->addSql( + 'CREATE TABLE ra_second_factor (id VARCHAR(36) NOT NULL, type VARCHAR(16) NOT NULL, second_factor_id VARCHAR(36) NOT NULL, status VARCHAR(10) NOT NULL, identity_id VARCHAR(36) NOT NULL, institution VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL, email VARCHAR(255) NOT NULL, INDEX idx_ra_second_factor_type (type), INDEX idx_ra_second_factor_second_factor_id (second_factor_id), INDEX idx_ra_second_factor_status (status), INDEX idx_ra_second_factor_identity_id (identity_id), INDEX idx_ra_second_factor_institution (institution), INDEX idx_ra_second_factor_name (name), INDEX idx_ra_second_factor_email (email), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', + ); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + $this->addSql('DROP TABLE ra_second_factor'); } } diff --git a/src/Surfnet/Migrations/Version20150305114932.php b/src/Surfnet/Migrations/Version20150305114932.php index 6c4b83f9c..0d3c3e2d6 100644 --- a/src/Surfnet/Migrations/Version20150305114932.php +++ b/src/Surfnet/Migrations/Version20150305114932.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -13,8 +13,11 @@ class Version20150305114932 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + $this->addSql('DROP INDEX idx_ra_second_factor_type ON ra_second_factor'); $this->addSql('DROP INDEX idx_ra_second_factor_status ON ra_second_factor'); $this->addSql('DROP INDEX idx_ra_second_factor_name ON ra_second_factor'); @@ -24,8 +27,11 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + $this->addSql('CREATE INDEX idx_ra_second_factor_type ON ra_second_factor (type)'); $this->addSql('CREATE INDEX idx_ra_second_factor_status ON ra_second_factor (status)'); $this->addSql('CREATE INDEX idx_ra_second_factor_name ON ra_second_factor (name)'); diff --git a/src/Surfnet/Migrations/Version20150305115030.php b/src/Surfnet/Migrations/Version20150305115030.php index b695f0ec7..432e80635 100644 --- a/src/Surfnet/Migrations/Version20150305115030.php +++ b/src/Surfnet/Migrations/Version20150305115030.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -13,8 +13,11 @@ class Version20150305115030 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + $this->addSql('CREATE FULLTEXT INDEX idx_ra_second_factor_name ON ra_second_factor (name)'); $this->addSql('CREATE FULLTEXT INDEX idx_ra_second_factor_email ON ra_second_factor (email)'); } @@ -22,8 +25,11 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + $this->addSql('DROP INDEX idx_ra_second_factor_name ON ra_second_factor'); $this->addSql('DROP INDEX idx_ra_second_factor_email ON ra_second_factor'); } diff --git a/src/Surfnet/Migrations/Version20150305134846.php b/src/Surfnet/Migrations/Version20150305134846.php index a7dffdd5f..62eb596cb 100644 --- a/src/Surfnet/Migrations/Version20150305134846.php +++ b/src/Surfnet/Migrations/Version20150305134846.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -13,8 +13,11 @@ class Version20150305134846 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + $this->addSql('ALTER TABLE ra_second_factor ADD status_int INT NOT NULL'); $this->addSql('UPDATE ra_second_factor SET status_int=0 WHERE `status`="unverified"'); $this->addSql('UPDATE ra_second_factor SET status_int=10 WHERE `status`="verified"'); @@ -27,9 +30,14 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - - $this->addSql('ALTER TABLE ra_second_factor CHANGE `status` `status` VARCHAR(10) NOT NULL COLLATE utf8_unicode_ci'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + + $this->addSql( + 'ALTER TABLE ra_second_factor CHANGE `status` `status` VARCHAR(10) NOT NULL COLLATE utf8_unicode_ci', + ); $this->addSql('ALTER TABLE ra_second_factor ADD status_string VARCHAR(10) NOT NULL COLLATE utf8_unicode_ci'); $this->addSql('UPDATE ra_second_factor SET status_string="unverified" WHERE `status`=0'); @@ -37,6 +45,8 @@ public function down(Schema $schema): void $this->addSql('UPDATE ra_second_factor SET status_string="vetted" WHERE `status`=20'); $this->addSql('UPDATE ra_second_factor SET status_string="revoked" WHERE `status`=30'); $this->addSql('ALTER TABLE ra_second_factor DROP `status`'); - $this->addSql('ALTER TABLE ra_second_factor CHANGE status_string `status` VARCHAR(10) NOT NULL COLLATE utf8_unicode_ci'); + $this->addSql( + 'ALTER TABLE ra_second_factor CHANGE status_string `status` VARCHAR(10) NOT NULL COLLATE utf8_unicode_ci', + ); } } diff --git a/src/Surfnet/Migrations/Version20150312134629.php b/src/Surfnet/Migrations/Version20150312134629.php index 4a9e21420..2f4601fcb 100644 --- a/src/Surfnet/Migrations/Version20150312134629.php +++ b/src/Surfnet/Migrations/Version20150312134629.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -13,22 +13,42 @@ class Version20150312134629 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE ra_second_factor CHANGE second_factor_id second_factor_id VARCHAR(255) NOT NULL'); - $this->addSql('ALTER TABLE verified_second_factor CHANGE second_factor_identifier second_factor_identifier VARCHAR(255) NOT NULL'); - $this->addSql('ALTER TABLE unverified_second_factor CHANGE second_factor_identifier second_factor_identifier VARCHAR(255) NOT NULL'); - $this->addSql('ALTER TABLE vetted_second_factor CHANGE second_factor_identifier second_factor_identifier VARCHAR(255) NOT NULL'); + $this->addSql( + 'ALTER TABLE verified_second_factor CHANGE second_factor_identifier second_factor_identifier VARCHAR(255) NOT NULL', + ); + $this->addSql( + 'ALTER TABLE unverified_second_factor CHANGE second_factor_identifier second_factor_identifier VARCHAR(255) NOT NULL', + ); + $this->addSql( + 'ALTER TABLE vetted_second_factor CHANGE second_factor_identifier second_factor_identifier VARCHAR(255) NOT NULL', + ); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql('ALTER TABLE ra_second_factor CHANGE second_factor_id second_factor_id VARCHAR(36) NOT NULL COLLATE utf8_unicode_ci'); - $this->addSql('ALTER TABLE unverified_second_factor CHANGE second_factor_identifier second_factor_identifier VARCHAR(32) NOT NULL COLLATE utf8_unicode_ci'); - $this->addSql('ALTER TABLE verified_second_factor CHANGE second_factor_identifier second_factor_identifier VARCHAR(32) NOT NULL COLLATE utf8_unicode_ci'); - $this->addSql('ALTER TABLE vetted_second_factor CHANGE second_factor_identifier second_factor_identifier VARCHAR(32) NOT NULL COLLATE utf8_unicode_ci'); + $this->addSql( + 'ALTER TABLE ra_second_factor CHANGE second_factor_id second_factor_id VARCHAR(36) NOT NULL COLLATE utf8_unicode_ci', + ); + $this->addSql( + 'ALTER TABLE unverified_second_factor CHANGE second_factor_identifier second_factor_identifier VARCHAR(32) NOT NULL COLLATE utf8_unicode_ci', + ); + $this->addSql( + 'ALTER TABLE verified_second_factor CHANGE second_factor_identifier second_factor_identifier VARCHAR(32) NOT NULL COLLATE utf8_unicode_ci', + ); + $this->addSql( + 'ALTER TABLE vetted_second_factor CHANGE second_factor_identifier second_factor_identifier VARCHAR(32) NOT NULL COLLATE utf8_unicode_ci', + ); } } diff --git a/src/Surfnet/Migrations/Version20150312162849.php b/src/Surfnet/Migrations/Version20150312162849.php index 7b8766f84..f41af1541 100644 --- a/src/Surfnet/Migrations/Version20150312162849.php +++ b/src/Surfnet/Migrations/Version20150312162849.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; use Symfony\Component\DependencyInjection\ContainerAwareInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -17,25 +17,35 @@ class Version20150312162849 extends AbstractMigration implements ContainerAwareI public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $gatewaySchema = $this->container->getParameter('database_gateway_name'); - $this->addSql(sprintf( - 'ALTER TABLE %s.second_factor CHANGE second_factor_identifier second_factor_identifier VARCHAR(255) NOT NULL', - $gatewaySchema - )); + $this->addSql( + sprintf( + 'ALTER TABLE %s.second_factor CHANGE second_factor_identifier second_factor_identifier VARCHAR(255) NOT NULL', + $gatewaySchema, + ), + ); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $gatewaySchema = $this->container->getParameter('database_gateway_name'); - $this->addSql(sprintf( - 'ALTER TABLE %s.second_factor CHANGE second_factor_identifier second_factor_identifier VARCHAR(36) NOT NULL COLLATE utf8_unicode_ci', - $gatewaySchema - )); + $this->addSql( + sprintf( + 'ALTER TABLE %s.second_factor CHANGE second_factor_identifier second_factor_identifier VARCHAR(36) NOT NULL COLLATE utf8_unicode_ci', + $gatewaySchema, + ), + ); } public function setContainer(ContainerInterface $container = null): void diff --git a/src/Surfnet/Migrations/Version20150330160809.php b/src/Surfnet/Migrations/Version20150330160809.php index 860e24ea7..c3b017e05 100644 --- a/src/Surfnet/Migrations/Version20150330160809.php +++ b/src/Surfnet/Migrations/Version20150330160809.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -13,16 +13,24 @@ class Version20150330160809 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - - $this->addSql('CREATE TABLE audit_log (id INT AUTO_INCREMENT NOT NULL, actor_id VARCHAR(36) DEFAULT NULL, actor_institution VARCHAR(255) DEFAULT NULL, identity_id VARCHAR(36) NOT NULL, identity_institution VARCHAR(255) NOT NULL, second_factor_id VARCHAR(36) DEFAULT NULL, second_factor_type VARCHAR(36) DEFAULT NULL, action VARCHAR(255) NOT NULL, recorded_on DATETIME NOT NULL, INDEX idx_auditlog_actorid (actor_id), INDEX idx_auditlog_identityid (identity_id), INDEX idx_auditlog_identityinstitution (identity_institution), INDEX idx_auditlog_secondfactorid (second_factor_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + + $this->addSql( + 'CREATE TABLE audit_log (id INT AUTO_INCREMENT NOT NULL, actor_id VARCHAR(36) DEFAULT NULL, actor_institution VARCHAR(255) DEFAULT NULL, identity_id VARCHAR(36) NOT NULL, identity_institution VARCHAR(255) NOT NULL, second_factor_id VARCHAR(36) DEFAULT NULL, second_factor_type VARCHAR(36) DEFAULT NULL, action VARCHAR(255) NOT NULL, recorded_on DATETIME NOT NULL, INDEX idx_auditlog_actorid (actor_id), INDEX idx_auditlog_identityid (identity_id), INDEX idx_auditlog_identityinstitution (identity_institution), INDEX idx_auditlog_secondfactorid (second_factor_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', + ); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + $this->addSql('DROP TABLE audit_log'); } } diff --git a/src/Surfnet/Migrations/Version20150407103950.php b/src/Surfnet/Migrations/Version20150407103950.php index 43c12e88f..dd0ab7bb9 100644 --- a/src/Surfnet/Migrations/Version20150407103950.php +++ b/src/Surfnet/Migrations/Version20150407103950.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -13,16 +13,22 @@ class Version20150407103950 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + $this->addSql('ALTER TABLE audit_log CHANGE action event VARCHAR(255) NOT NULL'); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + $this->addSql('ALTER TABLE audit_log CHANGE event action VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci'); } } diff --git a/src/Surfnet/Migrations/Version20150408122247.php b/src/Surfnet/Migrations/Version20150408122247.php index f4246dd90..7ab72d36d 100644 --- a/src/Surfnet/Migrations/Version20150408122247.php +++ b/src/Surfnet/Migrations/Version20150408122247.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -13,15 +13,23 @@ class Version20150408122247 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql('CREATE TABLE identity_identifying_data (id VARCHAR(36) NOT NULL, common_name VARCHAR(255) NOT NULL, email VARCHAR(255) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'); + $this->addSql( + 'CREATE TABLE identity_identifying_data (id VARCHAR(36) NOT NULL, common_name VARCHAR(255) NOT NULL, email VARCHAR(255) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', + ); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('DROP TABLE identity_identifying_data'); } diff --git a/src/Surfnet/Migrations/Version20150409142404.php b/src/Surfnet/Migrations/Version20150409142404.php index 648242cbe..c0b014a92 100644 --- a/src/Surfnet/Migrations/Version20150409142404.php +++ b/src/Surfnet/Migrations/Version20150409142404.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -13,16 +13,24 @@ class Version20150409142404 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - - $this->addSql('CREATE TABLE email_templates (id VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL, locale VARCHAR(255) NOT NULL, html_content LONGTEXT NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + + $this->addSql( + 'CREATE TABLE email_templates (id VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL, locale VARCHAR(255) NOT NULL, html_content LONGTEXT NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', + ); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + $this->addSql('DROP TABLE email_templates'); } } diff --git a/src/Surfnet/Migrations/Version20150422162952.php b/src/Surfnet/Migrations/Version20150422162952.php index dafdf7a67..42535bfa3 100644 --- a/src/Surfnet/Migrations/Version20150422162952.php +++ b/src/Surfnet/Migrations/Version20150422162952.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -16,9 +16,14 @@ class Version20150422162952 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql('CREATE TABLE ra_listing (identity_id VARCHAR(36) NOT NULL, institution VARCHAR(255) NOT NULL, common_name VARCHAR(255) NOT NULL, email VARCHAR(255) NOT NULL, role VARCHAR(20) NOT NULL, location LONGTEXT DEFAULT NULL, contact_information LONGTEXT DEFAULT NULL, INDEX idx_ra_listing_institution (institution), PRIMARY KEY(identity_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'); + $this->addSql( + 'CREATE TABLE ra_listing (identity_id VARCHAR(36) NOT NULL, institution VARCHAR(255) NOT NULL, common_name VARCHAR(255) NOT NULL, email VARCHAR(255) NOT NULL, role VARCHAR(20) NOT NULL, location LONGTEXT DEFAULT NULL, contact_information LONGTEXT DEFAULT NULL, INDEX idx_ra_listing_institution (institution), PRIMARY KEY(identity_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', + ); } /** @@ -27,7 +32,10 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('DROP TABLE ra_listing'); } diff --git a/src/Surfnet/Migrations/Version20150428153351.php b/src/Surfnet/Migrations/Version20150428153351.php index 94951e476..0b0b20896 100644 --- a/src/Surfnet/Migrations/Version20150428153351.php +++ b/src/Surfnet/Migrations/Version20150428153351.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -16,9 +16,14 @@ class Version20150428153351 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql('CREATE TABLE ra_candidate (identity_id VARCHAR(36) NOT NULL, institution VARCHAR(255) NOT NULL, common_name VARCHAR(255) NOT NULL, email VARCHAR(255) NOT NULL, INDEX idx_ra_candidate_institution (institution), FULLTEXT INDEX idxft_ra_candidate_email (email), FULLTEXT INDEX idxft_ra_candidate_commonname (common_name), PRIMARY KEY(identity_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'); + $this->addSql( + 'CREATE TABLE ra_candidate (identity_id VARCHAR(36) NOT NULL, institution VARCHAR(255) NOT NULL, common_name VARCHAR(255) NOT NULL, email VARCHAR(255) NOT NULL, INDEX idx_ra_candidate_institution (institution), FULLTEXT INDEX idxft_ra_candidate_email (email), FULLTEXT INDEX idxft_ra_candidate_commonname (common_name), PRIMARY KEY(identity_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', + ); } /** @@ -27,7 +32,10 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('DROP TABLE ra_candidate'); } diff --git a/src/Surfnet/Migrations/Version20150428174400.php b/src/Surfnet/Migrations/Version20150428174400.php index b97ae1c11..9356856d7 100644 --- a/src/Surfnet/Migrations/Version20150428174400.php +++ b/src/Surfnet/Migrations/Version20150428174400.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -16,9 +16,14 @@ class Version20150428174400 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql('CREATE TABLE institution_listing (institution VARCHAR(255) NOT NULL, PRIMARY KEY(institution)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'); + $this->addSql( + 'CREATE TABLE institution_listing (institution VARCHAR(255) NOT NULL, PRIMARY KEY(institution)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', + ); } /** @@ -27,7 +32,10 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('DROP TABLE institution_listing'); } diff --git a/src/Surfnet/Migrations/Version20150501123735.php b/src/Surfnet/Migrations/Version20150501123735.php index 8de4fa345..e578bfe37 100644 --- a/src/Surfnet/Migrations/Version20150501123735.php +++ b/src/Surfnet/Migrations/Version20150501123735.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -16,7 +16,10 @@ class Version20150501123735 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE audit_log ADD COLUMN uuid VARCHAR(36) DEFAULT NULL'); $this->addSql('UPDATE audit_log set uuid = UUID() WHERE 1 = 1'); @@ -33,7 +36,10 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE audit_log DROP PRIMARY KEY'); $this->addSql('ALTER TABLE audit_log CHANGE id uuid VARCHAR(36)'); diff --git a/src/Surfnet/Migrations/Version20150504102420.php b/src/Surfnet/Migrations/Version20150504102420.php index 191d75e72..1c1e26562 100644 --- a/src/Surfnet/Migrations/Version20150504102420.php +++ b/src/Surfnet/Migrations/Version20150504102420.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -16,7 +16,10 @@ class Version20150504102420 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE ra_candidate ADD name_id VARCHAR(255) NOT NULL'); $this->addSql('CREATE INDEX idx_ra_candidate_name_id ON ra_candidate (name_id)'); @@ -28,7 +31,10 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('DROP INDEX idx_ra_candidate_name_id ON ra_candidate'); $this->addSql('ALTER TABLE ra_candidate DROP name_id'); diff --git a/src/Surfnet/Migrations/Version20150507124421.php b/src/Surfnet/Migrations/Version20150507124421.php index 2f9f754ac..d7a525ea9 100644 --- a/src/Surfnet/Migrations/Version20150507124421.php +++ b/src/Surfnet/Migrations/Version20150507124421.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -16,7 +16,10 @@ class Version20150507124421 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE raa ADD COLUMN uuid VARCHAR(36) DEFAULT NULL'); $this->addSql('UPDATE raa set uuid = UUID() WHERE 1 = 1'); @@ -34,8 +37,12 @@ public function up(Schema $schema): void $this->addSql('ALTER TABLE ra CHANGE uuid id VARCHAR(36) NOT NULL'); $this->addSql('ALTER TABLE ra ADD PRIMARY KEY (id)'); - $this->addSql('ALTER TABLE raa CHANGE institution institution VARCHAR(255) NOT NULL, CHANGE name_id name_id VARCHAR(255) NOT NULL'); - $this->addSql('ALTER TABLE ra CHANGE institution institution VARCHAR(255) NOT NULL, CHANGE name_id name_id VARCHAR(255) NOT NULL'); + $this->addSql( + 'ALTER TABLE raa CHANGE institution institution VARCHAR(255) NOT NULL, CHANGE name_id name_id VARCHAR(255) NOT NULL', + ); + $this->addSql( + 'ALTER TABLE ra CHANGE institution institution VARCHAR(255) NOT NULL, CHANGE name_id name_id VARCHAR(255) NOT NULL', + ); } /** @@ -44,7 +51,10 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE ra DROP PRIMARY KEY'); $this->addSql('ALTER TABLE ra CHANGE id uuid VARCHAR(36)'); @@ -56,7 +66,11 @@ public function down(Schema $schema): void $this->addSql('ALTER TABLE raa ADD id INT PRIMARY KEY AUTO_INCREMENT'); $this->addSql('ALTER TABLE raa DROP COLUMN uuid'); - $this->addSql('ALTER TABLE ra CHANGE institution institution VARCHAR(150) NOT NULL COLLATE utf8_unicode_ci, CHANGE name_id name_id VARCHAR(150) NOT NULL COLLATE utf8_unicode_ci'); - $this->addSql('ALTER TABLE raa CHANGE institution institution VARCHAR(150) NOT NULL COLLATE utf8_unicode_ci, CHANGE name_id name_id VARCHAR(150) NOT NULL COLLATE utf8_unicode_ci'); + $this->addSql( + 'ALTER TABLE ra CHANGE institution institution VARCHAR(150) NOT NULL COLLATE utf8_unicode_ci, CHANGE name_id name_id VARCHAR(150) NOT NULL COLLATE utf8_unicode_ci', + ); + $this->addSql( + 'ALTER TABLE raa CHANGE institution institution VARCHAR(150) NOT NULL COLLATE utf8_unicode_ci, CHANGE name_id name_id VARCHAR(150) NOT NULL COLLATE utf8_unicode_ci', + ); } } diff --git a/src/Surfnet/Migrations/Version20150508085838.php b/src/Surfnet/Migrations/Version20150508085838.php index 9f953cc99..6836d738f 100644 --- a/src/Surfnet/Migrations/Version20150508085838.php +++ b/src/Surfnet/Migrations/Version20150508085838.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; use Symfony\Component\DependencyInjection\ContainerAwareInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -25,7 +25,10 @@ public function setContainer(ContainerInterface $container = null): void public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $gatewaySchema = $this->getGatewaySchema(); @@ -44,7 +47,10 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $gatewaySchema = $this->getGatewaySchema(); diff --git a/src/Surfnet/Migrations/Version20150518152006.php b/src/Surfnet/Migrations/Version20150518152006.php index b170bf8f9..4081d093c 100644 --- a/src/Surfnet/Migrations/Version20150518152006.php +++ b/src/Surfnet/Migrations/Version20150518152006.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -16,9 +16,14 @@ class Version20150518152006 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql('ALTER TABLE audit_log ADD actor_common_name VARCHAR(255) DEFAULT NULL, ADD second_factor_identifier VARCHAR(255) DEFAULT NULL'); + $this->addSql( + 'ALTER TABLE audit_log ADD actor_common_name VARCHAR(255) DEFAULT NULL, ADD second_factor_identifier VARCHAR(255) DEFAULT NULL', + ); } /** @@ -27,7 +32,10 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE audit_log DROP actor_common_name, DROP second_factor_identifier'); } diff --git a/src/Surfnet/Migrations/Version20150522163053.php b/src/Surfnet/Migrations/Version20150522163053.php index 2b2f78b18..380eaedbe 100644 --- a/src/Surfnet/Migrations/Version20150522163053.php +++ b/src/Surfnet/Migrations/Version20150522163053.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; use Symfony\Component\DependencyInjection\ContainerAwareInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -27,7 +27,10 @@ public function up(Schema $schema): void $gatewaySchema = $this->getGatewaySchema(); // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql(sprintf('ALTER TABLE %s.saml_entity ADD id VARCHAR(36) DEFAULT NULL', $gatewaySchema)); $this->addSql(sprintf('UPDATE %s.saml_entity SET id = UUID() WHERE id IS NULL', $gatewaySchema)); @@ -44,7 +47,10 @@ public function down(Schema $schema): void $gatewaySchema = $this->getGatewaySchema(); // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql(sprintf('ALTER TABLE %s.saml_entity DROP PRIMARY KEY', $gatewaySchema)); $this->addSql(sprintf('ALTER TABLE %s.saml_entity DROP id', $gatewaySchema)); diff --git a/src/Surfnet/Migrations/Version20150522164907.php b/src/Surfnet/Migrations/Version20150522164907.php index f0d039fa5..dcb602be6 100644 --- a/src/Surfnet/Migrations/Version20150522164907.php +++ b/src/Surfnet/Migrations/Version20150522164907.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; use Symfony\Component\DependencyInjection\ContainerAwareInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -27,9 +27,17 @@ public function up(Schema $schema): void $gatewaySchema = $this->getGatewaySchema(); // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - - $this->addSql(sprintf('CREATE UNIQUE INDEX unq_saml_entity_entity_id_type ON %s.saml_entity (entity_id, type)', $gatewaySchema)); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + + $this->addSql( + sprintf( + 'CREATE UNIQUE INDEX unq_saml_entity_entity_id_type ON %s.saml_entity (entity_id, type)', + $gatewaySchema, + ), + ); } /** @@ -40,7 +48,10 @@ public function down(Schema $schema): void $gatewaySchema = $this->getGatewaySchema(); // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql(sprintf('DROP INDEX unq_saml_entity_entity_id_type ON %s.saml_entity', $gatewaySchema)); } diff --git a/src/Surfnet/Migrations/Version20150526152956.php b/src/Surfnet/Migrations/Version20150526152956.php index 5c1dbc57c..37b2f53e7 100644 --- a/src/Surfnet/Migrations/Version20150526152956.php +++ b/src/Surfnet/Migrations/Version20150526152956.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -16,7 +16,10 @@ class Version20150526152956 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE identity ADD preferred_locale VARCHAR(255) NOT NULL'); } @@ -27,7 +30,10 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE identity DROP preferred_locale'); } diff --git a/src/Surfnet/Migrations/Version20150528154959.php b/src/Surfnet/Migrations/Version20150528154959.php index baf56a248..bcc18022f 100644 --- a/src/Surfnet/Migrations/Version20150528154959.php +++ b/src/Surfnet/Migrations/Version20150528154959.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; use Symfony\Component\DependencyInjection\ContainerAwareInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -25,7 +25,10 @@ public function setContainer(ContainerInterface $container = null): void public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $gatewaySchema = $this->getGatewaySchema(); @@ -38,7 +41,10 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $gatewaySchema = $this->getGatewaySchema(); diff --git a/src/Surfnet/Migrations/Version20150601154557.php b/src/Surfnet/Migrations/Version20150601154557.php index f5b39cd64..536dbe442 100644 --- a/src/Surfnet/Migrations/Version20150601154557.php +++ b/src/Surfnet/Migrations/Version20150601154557.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -16,7 +16,10 @@ class Version20150601154557 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('DROP TABLE ra'); } @@ -27,8 +30,13 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql('CREATE TABLE ra (id VARCHAR(36) NOT NULL COLLATE utf8_unicode_ci, institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, name_id VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, location LONGTEXT DEFAULT NULL COLLATE utf8_unicode_ci, contact_information LONGTEXT DEFAULT NULL COLLATE utf8_unicode_ci, INDEX idx_ra_institution (institution), INDEX idx_ra_institution_nameid (institution, name_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'); + $this->addSql( + 'CREATE TABLE ra (id VARCHAR(36) NOT NULL COLLATE utf8_unicode_ci, institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, name_id VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, location LONGTEXT DEFAULT NULL COLLATE utf8_unicode_ci, contact_information LONGTEXT DEFAULT NULL COLLATE utf8_unicode_ci, INDEX idx_ra_institution (institution), INDEX idx_ra_institution_nameid (institution, name_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', + ); } } diff --git a/src/Surfnet/Migrations/Version20150601154942.php b/src/Surfnet/Migrations/Version20150601154942.php index 52f783270..fcfbc4d5b 100644 --- a/src/Surfnet/Migrations/Version20150601154942.php +++ b/src/Surfnet/Migrations/Version20150601154942.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -16,7 +16,10 @@ class Version20150601154942 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('DROP TABLE raa'); } @@ -27,8 +30,13 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql('CREATE TABLE raa (id VARCHAR(36) NOT NULL COLLATE utf8_unicode_ci, institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, name_id VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, location LONGTEXT DEFAULT NULL COLLATE utf8_unicode_ci, contact_information LONGTEXT DEFAULT NULL COLLATE utf8_unicode_ci, INDEX idx_raa_institution (institution), INDEX idx_raa_institution_nameid (institution, name_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'); + $this->addSql( + 'CREATE TABLE raa (id VARCHAR(36) NOT NULL COLLATE utf8_unicode_ci, institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, name_id VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, location LONGTEXT DEFAULT NULL COLLATE utf8_unicode_ci, contact_information LONGTEXT DEFAULT NULL COLLATE utf8_unicode_ci, INDEX idx_raa_institution (institution), INDEX idx_raa_institution_nameid (institution, name_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', + ); } } diff --git a/src/Surfnet/Migrations/Version20150604143755.php b/src/Surfnet/Migrations/Version20150604143755.php index a6a72a242..d131abf36 100644 --- a/src/Surfnet/Migrations/Version20150604143755.php +++ b/src/Surfnet/Migrations/Version20150604143755.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -16,9 +16,13 @@ class Version20150604143755 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql(' + $this->addSql( + ' CREATE TABLE sensitive_data_stream ( id VARCHAR(36) NOT NULL, identity_id VARCHAR(36) NOT NULL, @@ -26,7 +30,8 @@ public function up(Schema $schema): void sensitive_data LONGTEXT DEFAULT NULL, PRIMARY KEY(id) ) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB - '); + ', + ); } /** @@ -35,7 +40,10 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('DROP TABLE sensitive_data_stream'); } diff --git a/src/Surfnet/Migrations/Version20150604143756.php b/src/Surfnet/Migrations/Version20150604143756.php index c99d5ac8f..4e12efc14 100644 --- a/src/Surfnet/Migrations/Version20150604143756.php +++ b/src/Surfnet/Migrations/Version20150604143756.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -16,17 +16,22 @@ class Version20150604143756 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('DROP TABLE sensitive_data_stream'); - $this->addSql(' + $this->addSql( + ' CREATE TABLE event_stream_sensitive_data ( identity_id VARCHAR(36) NOT NULL, playhead INT NOT NULL, sensitive_data LONGTEXT NOT NULL, PRIMARY KEY (identity_id, playhead) ) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB - '); + ', + ); } /** @@ -35,10 +40,14 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('DROP TABLE event_stream_sensitive_data'); - $this->addSql(' + $this->addSql( + ' CREATE TABLE sensitive_data_stream ( id VARCHAR(36) NOT NULL, identity_id VARCHAR(36) NOT NULL, @@ -46,6 +55,7 @@ public function down(Schema $schema): void sensitive_data LONGTEXT DEFAULT NULL, PRIMARY KEY (id) ) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB - '); + ', + ); } } diff --git a/src/Surfnet/Migrations/Version20150604143757.php b/src/Surfnet/Migrations/Version20150604143757.php index b4a0068ef..b1cf9296c 100644 --- a/src/Surfnet/Migrations/Version20150604143757.php +++ b/src/Surfnet/Migrations/Version20150604143757.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -16,7 +16,10 @@ class Version20150604143757 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE event_stream CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci'); } @@ -27,7 +30,10 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE event_stream CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci'); } diff --git a/src/Surfnet/Migrations/Version20150604143758.php b/src/Surfnet/Migrations/Version20150604143758.php index 73d5f714a..7442b4e76 100644 --- a/src/Surfnet/Migrations/Version20150604143758.php +++ b/src/Surfnet/Migrations/Version20150604143758.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -16,7 +16,10 @@ class Version20150604143758 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('DROP TABLE identity_identifying_data'); } @@ -27,8 +30,13 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql('CREATE TABLE identity_identifying_data (id VARCHAR(36) NOT NULL, common_name VARCHAR(255) NOT NULL, email VARCHAR(255) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'); + $this->addSql( + 'CREATE TABLE identity_identifying_data (id VARCHAR(36) NOT NULL, common_name VARCHAR(255) NOT NULL, email VARCHAR(255) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', + ); } } diff --git a/src/Surfnet/Migrations/Version20150611105956.php b/src/Surfnet/Migrations/Version20150611105956.php index 5715427a4..4f47cd8d7 100644 --- a/src/Surfnet/Migrations/Version20150611105956.php +++ b/src/Surfnet/Migrations/Version20150611105956.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -16,14 +16,23 @@ class Version20150611105956 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE unverified_second_factor DROP FOREIGN KEY FK_D79226A2FF3ED4A8'); $this->addSql('ALTER TABLE verified_second_factor DROP FOREIGN KEY FK_7964F91CFF3ED4A8'); $this->addSql('ALTER TABLE vetted_second_factor DROP FOREIGN KEY FK_29F96B72FF3ED4A8'); - $this->addSql('ALTER TABLE unverified_second_factor ADD CONSTRAINT fk_unverified_second_factor_identity FOREIGN KEY (identity_id) REFERENCES identity (id) ON DELETE CASCADE'); - $this->addSql('ALTER TABLE verified_second_factor ADD CONSTRAINT fk_verified_second_factor_identity FOREIGN KEY (identity_id) REFERENCES identity (id) ON DELETE CASCADE'); - $this->addSql('ALTER TABLE vetted_second_factor ADD CONSTRAINT fk_vetted_second_factor_identity FOREIGN KEY (identity_id) REFERENCES identity (id) ON DELETE CASCADE'); + $this->addSql( + 'ALTER TABLE unverified_second_factor ADD CONSTRAINT fk_unverified_second_factor_identity FOREIGN KEY (identity_id) REFERENCES identity (id) ON DELETE CASCADE', + ); + $this->addSql( + 'ALTER TABLE verified_second_factor ADD CONSTRAINT fk_verified_second_factor_identity FOREIGN KEY (identity_id) REFERENCES identity (id) ON DELETE CASCADE', + ); + $this->addSql( + 'ALTER TABLE vetted_second_factor ADD CONSTRAINT fk_vetted_second_factor_identity FOREIGN KEY (identity_id) REFERENCES identity (id) ON DELETE CASCADE', + ); } /** @@ -32,13 +41,22 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE unverified_second_factor DROP FOREIGN KEY fk_unverified_second_factor_identity'); $this->addSql('ALTER TABLE verified_second_factor DROP FOREIGN KEY fk_verified_second_factor_identity'); $this->addSql('ALTER TABLE vetted_second_factor DROP FOREIGN KEY fk_vetted_second_factor_identity'); - $this->addSql('ALTER TABLE unverified_second_factor ADD CONSTRAINT FK_D79226A2FF3ED4A8 FOREIGN KEY (identity_id) REFERENCES identity (id)'); - $this->addSql('ALTER TABLE verified_second_factor ADD CONSTRAINT FK_7964F91CFF3ED4A8 FOREIGN KEY (identity_id) REFERENCES identity (id)'); - $this->addSql('ALTER TABLE vetted_second_factor ADD CONSTRAINT FK_29F96B72FF3ED4A8 FOREIGN KEY (identity_id) REFERENCES identity (id)'); + $this->addSql( + 'ALTER TABLE unverified_second_factor ADD CONSTRAINT FK_D79226A2FF3ED4A8 FOREIGN KEY (identity_id) REFERENCES identity (id)', + ); + $this->addSql( + 'ALTER TABLE verified_second_factor ADD CONSTRAINT FK_7964F91CFF3ED4A8 FOREIGN KEY (identity_id) REFERENCES identity (id)', + ); + $this->addSql( + 'ALTER TABLE vetted_second_factor ADD CONSTRAINT FK_29F96B72FF3ED4A8 FOREIGN KEY (identity_id) REFERENCES identity (id)', + ); } } diff --git a/src/Surfnet/Migrations/Version20150611163038.php b/src/Surfnet/Migrations/Version20150611163038.php index 1a6d05f86..756dfb825 100644 --- a/src/Surfnet/Migrations/Version20150611163038.php +++ b/src/Surfnet/Migrations/Version20150611163038.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -16,11 +16,16 @@ class Version20150611163038 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE verified_second_factor DROP FOREIGN KEY fk_verified_second_factor_identity'); $this->addSql('DROP INDEX IDX_7964F91CFF3ED4A8 ON verified_second_factor'); - $this->addSql('ALTER TABLE verified_second_factor ADD institution VARCHAR(255) NOT NULL, ADD common_name VARCHAR(255) NOT NULL, CHANGE identity_id identity_id VARCHAR(36) NOT NULL'); + $this->addSql( + 'ALTER TABLE verified_second_factor ADD institution VARCHAR(255) NOT NULL, ADD common_name VARCHAR(255) NOT NULL, CHANGE identity_id identity_id VARCHAR(36) NOT NULL', + ); $this->addSql('ALTER TABLE vetted_second_factor DROP FOREIGN KEY fk_vetted_second_factor_identity'); $this->addSql('DROP INDEX IDX_29F96B72FF3ED4A8 ON vetted_second_factor'); $this->addSql('ALTER TABLE unverified_second_factor DROP FOREIGN KEY fk_unverified_second_factor_identity'); @@ -33,14 +38,25 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql('ALTER TABLE unverified_second_factor ADD CONSTRAINT fk_unverified_second_factor_identity FOREIGN KEY (identity_id) REFERENCES identity (id) ON DELETE CASCADE'); + $this->addSql( + 'ALTER TABLE unverified_second_factor ADD CONSTRAINT fk_unverified_second_factor_identity FOREIGN KEY (identity_id) REFERENCES identity (id) ON DELETE CASCADE', + ); $this->addSql('CREATE INDEX IDX_D79226A2FF3ED4A8 ON unverified_second_factor (identity_id)'); - $this->addSql('ALTER TABLE verified_second_factor DROP institution, DROP common_name, CHANGE identity_id identity_id VARCHAR(36) DEFAULT NULL COLLATE utf8_unicode_ci'); - $this->addSql('ALTER TABLE verified_second_factor ADD CONSTRAINT fk_verified_second_factor_identity FOREIGN KEY (identity_id) REFERENCES identity (id) ON DELETE CASCADE'); + $this->addSql( + 'ALTER TABLE verified_second_factor DROP institution, DROP common_name, CHANGE identity_id identity_id VARCHAR(36) DEFAULT NULL COLLATE utf8_unicode_ci', + ); + $this->addSql( + 'ALTER TABLE verified_second_factor ADD CONSTRAINT fk_verified_second_factor_identity FOREIGN KEY (identity_id) REFERENCES identity (id) ON DELETE CASCADE', + ); $this->addSql('CREATE INDEX IDX_7964F91CFF3ED4A8 ON verified_second_factor (identity_id)'); - $this->addSql('ALTER TABLE vetted_second_factor ADD CONSTRAINT fk_vetted_second_factor_identity FOREIGN KEY (identity_id) REFERENCES identity (id) ON DELETE CASCADE'); + $this->addSql( + 'ALTER TABLE vetted_second_factor ADD CONSTRAINT fk_vetted_second_factor_identity FOREIGN KEY (identity_id) REFERENCES identity (id) ON DELETE CASCADE', + ); $this->addSql('CREATE INDEX IDX_29F96B72FF3ED4A8 ON vetted_second_factor (identity_id)'); } } diff --git a/src/Surfnet/Migrations/Version20150615114646.php b/src/Surfnet/Migrations/Version20150615114646.php index f31f1fbd5..1d505a301 100644 --- a/src/Surfnet/Migrations/Version20150615114646.php +++ b/src/Surfnet/Migrations/Version20150615114646.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; use Symfony\Component\DependencyInjection\ContainerAwareInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -21,42 +21,56 @@ public function setContainer(ContainerInterface $container = null): void public function up(Schema $schema): void { - $gatewaySchema = $this->getGatewaySchema(); + $gatewaySchema = $this->getGatewaySchema(); $middlewareSchema = $this->getMiddlewareSchema(); - $middlewareUser = $this->getMiddlewareUser(); + $middlewareUser = $this->getMiddlewareUser(); // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql(sprintf( - 'CREATE TABLE %s.whitelist_entry (institution VARCHAR(255) NOT NULL, PRIMARY KEY(institution)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', - $middlewareSchema - )); - $this->addSql(sprintf( - 'CREATE TABLE %s.whitelist_entry (institution VARCHAR(255) NOT NULL, PRIMARY KEY(institution)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', - $gatewaySchema - )); - $this->addSql(sprintf( - 'GRANT DELETE,INSERT,SELECT,UPDATE ON %s.whitelist_entry TO %s', - $gatewaySchema, - $middlewareUser - )); + $this->addSql( + sprintf( + 'CREATE TABLE %s.whitelist_entry (institution VARCHAR(255) NOT NULL, PRIMARY KEY(institution)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', + $middlewareSchema, + ), + ); + $this->addSql( + sprintf( + 'CREATE TABLE %s.whitelist_entry (institution VARCHAR(255) NOT NULL, PRIMARY KEY(institution)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', + $gatewaySchema, + ), + ); + $this->addSql( + sprintf( + 'GRANT DELETE,INSERT,SELECT,UPDATE ON %s.whitelist_entry TO %s', + $gatewaySchema, + $middlewareUser, + ), + ); } public function down(Schema $schema): void { - $gatewaySchema = $this->getGatewaySchema(); + $gatewaySchema = $this->getGatewaySchema(); $middlewareSchema = $this->getMiddlewareSchema(); - $middlewareUser = $this->getMiddlewareUser(); + $middlewareUser = $this->getMiddlewareUser(); // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql(sprintf( - 'REVOKE DELETE,INSERT,SELECT,UPDATE ON %s.whitelist_entry FROM %s', - $gatewaySchema, - $middlewareUser - )); + $this->addSql( + sprintf( + 'REVOKE DELETE,INSERT,SELECT,UPDATE ON %s.whitelist_entry FROM %s', + $gatewaySchema, + $middlewareUser, + ), + ); $this->addSql(sprintf('DROP TABLE %s.saml_entity', $middlewareSchema)); $this->addSql(sprintf('DROP TABLE %s.saml_entity', $gatewaySchema)); } diff --git a/src/Surfnet/Migrations/Version20150617141129.php b/src/Surfnet/Migrations/Version20150617141129.php index 75ab1812e..24d089a2c 100644 --- a/src/Surfnet/Migrations/Version20150617141129.php +++ b/src/Surfnet/Migrations/Version20150617141129.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -16,9 +16,14 @@ class Version20150617141129 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql('CREATE TABLE second_factor_revocation (id VARCHAR(36) NOT NULL, institution VARCHAR(255) NOT NULL, second_factor_type VARCHAR(36) DEFAULT NULL, recorded_on DATETIME NOT NULL, INDEX idx_secondfactorrevocation_recordedon (recorded_on), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'); + $this->addSql( + 'CREATE TABLE second_factor_revocation (id VARCHAR(36) NOT NULL, institution VARCHAR(255) NOT NULL, second_factor_type VARCHAR(36) DEFAULT NULL, recorded_on DATETIME NOT NULL, INDEX idx_secondfactorrevocation_recordedon (recorded_on), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', + ); } /** @@ -27,7 +32,10 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('DROP TABLE second_factor_revocation'); } diff --git a/src/Surfnet/Migrations/Version20150618121907.php b/src/Surfnet/Migrations/Version20150618121907.php index a3a460d61..5f79d3731 100644 --- a/src/Surfnet/Migrations/Version20150618121907.php +++ b/src/Surfnet/Migrations/Version20150618121907.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -16,7 +16,10 @@ class Version20150618121907 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE second_factor_revocation ADD revoked_by VARCHAR(255) NOT NULL'); } @@ -27,7 +30,10 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE second_factor_revocation DROP revoked_by'); } diff --git a/src/Surfnet/Migrations/Version20160219133522.php b/src/Surfnet/Migrations/Version20160219133522.php index a57bc3e02..81afa7dc7 100644 --- a/src/Surfnet/Migrations/Version20160219133522.php +++ b/src/Surfnet/Migrations/Version20160219133522.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -15,7 +15,8 @@ class Version20160219133522 extends AbstractMigration */ public function up(Schema $schema): void { - $this->addSql('ALTER TABLE event_stream CHANGE payload payload LONGTEXT NOT NULL'); } + $this->addSql('ALTER TABLE event_stream CHANGE payload payload LONGTEXT NOT NULL'); + } /** * @param Schema $schema diff --git a/src/Surfnet/Migrations/Version20160607142244.php b/src/Surfnet/Migrations/Version20160607142244.php index 58e7425a7..ae48797c3 100644 --- a/src/Surfnet/Migrations/Version20160607142244.php +++ b/src/Surfnet/Migrations/Version20160607142244.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -16,7 +16,10 @@ class Version20160607142244 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE ra_second_factor ADD document_number VARCHAR(255)'); } diff --git a/src/Surfnet/Migrations/Version20160617163830.php b/src/Surfnet/Migrations/Version20160617163830.php index 837e6ace6..dc2989485 100644 --- a/src/Surfnet/Migrations/Version20160617163830.php +++ b/src/Surfnet/Migrations/Version20160617163830.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -16,18 +16,37 @@ class Version20160617163830 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql('CREATE TABLE ra_location (ra_location_id VARCHAR(36) NOT NULL, institution VARCHAR(255) NOT NULL, ra_location_name VARCHAR(255) NOT NULL, location LONGTEXT NOT NULL, contact_information LONGTEXT NOT NULL, INDEX idx_ra_location_institution (institution), PRIMARY KEY(ra_location_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'); - $this->addSql('ALTER TABLE audit_log CHANGE actor_institution actor_institution VARCHAR(255) DEFAULT NULL, CHANGE identity_institution identity_institution VARCHAR(255) NOT NULL, CHANGE recorded_on recorded_on DATETIME NOT NULL, CHANGE actor_common_name actor_common_name VARCHAR(255) DEFAULT NULL'); - $this->addSql('ALTER TABLE identity CHANGE name_id name_id VARCHAR(255) NOT NULL, CHANGE institution institution VARCHAR(255) NOT NULL, CHANGE email email VARCHAR(255) NOT NULL, CHANGE common_name common_name VARCHAR(255) NOT NULL, CHANGE preferred_locale preferred_locale VARCHAR(255) NOT NULL'); + $this->addSql( + 'CREATE TABLE ra_location (ra_location_id VARCHAR(36) NOT NULL, institution VARCHAR(255) NOT NULL, ra_location_name VARCHAR(255) NOT NULL, location LONGTEXT NOT NULL, contact_information LONGTEXT NOT NULL, INDEX idx_ra_location_institution (institution), PRIMARY KEY(ra_location_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', + ); + $this->addSql( + 'ALTER TABLE audit_log CHANGE actor_institution actor_institution VARCHAR(255) DEFAULT NULL, CHANGE identity_institution identity_institution VARCHAR(255) NOT NULL, CHANGE recorded_on recorded_on DATETIME NOT NULL, CHANGE actor_common_name actor_common_name VARCHAR(255) DEFAULT NULL', + ); + $this->addSql( + 'ALTER TABLE identity CHANGE name_id name_id VARCHAR(255) NOT NULL, CHANGE institution institution VARCHAR(255) NOT NULL, CHANGE email email VARCHAR(255) NOT NULL, CHANGE common_name common_name VARCHAR(255) NOT NULL, CHANGE preferred_locale preferred_locale VARCHAR(255) NOT NULL', + ); $this->addSql('ALTER TABLE institution_listing CHANGE institution institution VARCHAR(255) NOT NULL'); - $this->addSql('ALTER TABLE ra_candidate CHANGE institution institution VARCHAR(255) NOT NULL, CHANGE common_name common_name VARCHAR(255) NOT NULL, CHANGE email email VARCHAR(255) NOT NULL, CHANGE name_id name_id VARCHAR(255) NOT NULL'); - $this->addSql('ALTER TABLE ra_listing CHANGE institution institution VARCHAR(255) NOT NULL, CHANGE common_name common_name VARCHAR(255) NOT NULL, CHANGE email email VARCHAR(255) NOT NULL, CHANGE role role VARCHAR(20) NOT NULL, CHANGE location location LONGTEXT DEFAULT NULL, CHANGE contact_information contact_information LONGTEXT DEFAULT NULL'); - $this->addSql('ALTER TABLE ra_second_factor CHANGE institution institution VARCHAR(255) NOT NULL, CHANGE name name VARCHAR(255) NOT NULL, CHANGE email email VARCHAR(255) NOT NULL, CHANGE status status INT NOT NULL, CHANGE document_number document_number VARCHAR(255) NOT NULL'); - $this->addSql('ALTER TABLE second_factor_revocation CHANGE institution institution VARCHAR(255) NOT NULL, CHANGE recorded_on recorded_on DATETIME NOT NULL'); + $this->addSql( + 'ALTER TABLE ra_candidate CHANGE institution institution VARCHAR(255) NOT NULL, CHANGE common_name common_name VARCHAR(255) NOT NULL, CHANGE email email VARCHAR(255) NOT NULL, CHANGE name_id name_id VARCHAR(255) NOT NULL', + ); + $this->addSql( + 'ALTER TABLE ra_listing CHANGE institution institution VARCHAR(255) NOT NULL, CHANGE common_name common_name VARCHAR(255) NOT NULL, CHANGE email email VARCHAR(255) NOT NULL, CHANGE role role VARCHAR(20) NOT NULL, CHANGE location location LONGTEXT DEFAULT NULL, CHANGE contact_information contact_information LONGTEXT DEFAULT NULL', + ); + $this->addSql( + 'ALTER TABLE ra_second_factor CHANGE institution institution VARCHAR(255) NOT NULL, CHANGE name name VARCHAR(255) NOT NULL, CHANGE email email VARCHAR(255) NOT NULL, CHANGE status status INT NOT NULL, CHANGE document_number document_number VARCHAR(255) NOT NULL', + ); + $this->addSql( + 'ALTER TABLE second_factor_revocation CHANGE institution institution VARCHAR(255) NOT NULL, CHANGE recorded_on recorded_on DATETIME NOT NULL', + ); $this->addSql('ALTER TABLE sraa CHANGE name_id name_id VARCHAR(200) NOT NULL'); - $this->addSql('ALTER TABLE unverified_second_factor CHANGE identity_id identity_id VARCHAR(36) NOT NULL, CHANGE verification_nonce_valid_until verification_nonce_valid_until DATETIME NOT NULL'); + $this->addSql( + 'ALTER TABLE unverified_second_factor CHANGE identity_id identity_id VARCHAR(36) NOT NULL, CHANGE verification_nonce_valid_until verification_nonce_valid_until DATETIME NOT NULL', + ); $this->addSql('ALTER TABLE vetted_second_factor CHANGE identity_id identity_id VARCHAR(36) NOT NULL'); $this->addSql('ALTER TABLE whitelist_entry CHANGE institution institution VARCHAR(255) NOT NULL'); } @@ -38,19 +57,42 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('DROP TABLE ra_location'); - $this->addSql('ALTER TABLE audit_log CHANGE actor_common_name actor_common_name VARCHAR(255) DEFAULT NULL COLLATE utf8_unicode_ci, CHANGE actor_institution actor_institution VARCHAR(255) DEFAULT NULL COLLATE utf8_unicode_ci, CHANGE identity_institution identity_institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE recorded_on recorded_on DATETIME NOT NULL'); - $this->addSql('ALTER TABLE identity CHANGE name_id name_id VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE common_name common_name VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE email email VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE preferred_locale preferred_locale VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci'); - $this->addSql('ALTER TABLE institution_listing CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci'); - $this->addSql('ALTER TABLE ra_candidate CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE name_id name_id VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE common_name common_name VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE email email VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci'); - $this->addSql('ALTER TABLE ra_listing CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE common_name common_name VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE email email VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE role role VARCHAR(20) NOT NULL COLLATE utf8_unicode_ci, CHANGE location location LONGTEXT DEFAULT NULL COLLATE utf8_unicode_ci, CHANGE contact_information contact_information LONGTEXT DEFAULT NULL COLLATE utf8_unicode_ci'); - $this->addSql('ALTER TABLE ra_second_factor CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE name name VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE email email VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE document_number document_number VARCHAR(255) DEFAULT NULL COLLATE utf8_unicode_ci, CHANGE status status INT NOT NULL'); - $this->addSql('ALTER TABLE second_factor_revocation CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE recorded_on recorded_on DATETIME NOT NULL'); + $this->addSql( + 'ALTER TABLE audit_log CHANGE actor_common_name actor_common_name VARCHAR(255) DEFAULT NULL COLLATE utf8_unicode_ci, CHANGE actor_institution actor_institution VARCHAR(255) DEFAULT NULL COLLATE utf8_unicode_ci, CHANGE identity_institution identity_institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE recorded_on recorded_on DATETIME NOT NULL', + ); + $this->addSql( + 'ALTER TABLE identity CHANGE name_id name_id VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE common_name common_name VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE email email VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE preferred_locale preferred_locale VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci', + ); + $this->addSql( + 'ALTER TABLE institution_listing CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci', + ); + $this->addSql( + 'ALTER TABLE ra_candidate CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE name_id name_id VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE common_name common_name VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE email email VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci', + ); + $this->addSql( + 'ALTER TABLE ra_listing CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE common_name common_name VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE email email VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE role role VARCHAR(20) NOT NULL COLLATE utf8_unicode_ci, CHANGE location location LONGTEXT DEFAULT NULL COLLATE utf8_unicode_ci, CHANGE contact_information contact_information LONGTEXT DEFAULT NULL COLLATE utf8_unicode_ci', + ); + $this->addSql( + 'ALTER TABLE ra_second_factor CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE name name VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE email email VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE document_number document_number VARCHAR(255) DEFAULT NULL COLLATE utf8_unicode_ci, CHANGE status status INT NOT NULL', + ); + $this->addSql( + 'ALTER TABLE second_factor_revocation CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE recorded_on recorded_on DATETIME NOT NULL', + ); $this->addSql('ALTER TABLE sraa CHANGE name_id name_id VARCHAR(200) NOT NULL COLLATE utf8_unicode_ci'); - $this->addSql('ALTER TABLE unverified_second_factor CHANGE identity_id identity_id VARCHAR(36) DEFAULT NULL COLLATE utf8_unicode_ci, CHANGE verification_nonce_valid_until verification_nonce_valid_until DATETIME NOT NULL'); - $this->addSql('ALTER TABLE vetted_second_factor CHANGE identity_id identity_id VARCHAR(36) DEFAULT NULL COLLATE utf8_unicode_ci'); - $this->addSql('ALTER TABLE whitelist_entry CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci'); + $this->addSql( + 'ALTER TABLE unverified_second_factor CHANGE identity_id identity_id VARCHAR(36) DEFAULT NULL COLLATE utf8_unicode_ci, CHANGE verification_nonce_valid_until verification_nonce_valid_until DATETIME NOT NULL', + ); + $this->addSql( + 'ALTER TABLE vetted_second_factor CHANGE identity_id identity_id VARCHAR(36) DEFAULT NULL COLLATE utf8_unicode_ci', + ); + $this->addSql( + 'ALTER TABLE whitelist_entry CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci', + ); } } diff --git a/src/Surfnet/Migrations/Version20160620090507.php b/src/Surfnet/Migrations/Version20160620090507.php index b7ea9d7ef..5da1f1d87 100644 --- a/src/Surfnet/Migrations/Version20160620090507.php +++ b/src/Surfnet/Migrations/Version20160620090507.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; class Version20160620090507 extends AbstractMigration { @@ -21,6 +21,5 @@ public function up(Schema $schema): void public function down(Schema $schema): void { $this->addSql('ALTER TABLE unverified_second_factor ADD verification_nonce_valid_until DATETIME'); - } } diff --git a/src/Surfnet/Migrations/Version20160620153812.php b/src/Surfnet/Migrations/Version20160620153812.php index 1e6af7e95..0ec7e2317 100644 --- a/src/Surfnet/Migrations/Version20160620153812.php +++ b/src/Surfnet/Migrations/Version20160620153812.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -16,18 +16,35 @@ class Version20160620153812 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE ra_location DROP PRIMARY KEY'); - $this->addSql('ALTER TABLE ra_location ADD name VARCHAR(255) NOT NULL, DROP ra_location_name, CHANGE institution institution VARCHAR(255) NOT NULL, CHANGE location location LONGTEXT NOT NULL, CHANGE contact_information contact_information LONGTEXT NOT NULL, CHANGE ra_location_id id VARCHAR(36) NOT NULL'); + $this->addSql( + 'ALTER TABLE ra_location ADD name VARCHAR(255) NOT NULL, DROP ra_location_name, CHANGE institution institution VARCHAR(255) NOT NULL, CHANGE location location LONGTEXT NOT NULL, CHANGE contact_information contact_information LONGTEXT NOT NULL, CHANGE ra_location_id id VARCHAR(36) NOT NULL', + ); $this->addSql('ALTER TABLE ra_location ADD PRIMARY KEY (id)'); - $this->addSql('ALTER TABLE audit_log CHANGE actor_institution actor_institution VARCHAR(255) DEFAULT NULL, CHANGE identity_institution identity_institution VARCHAR(255) NOT NULL, CHANGE recorded_on recorded_on DATETIME NOT NULL, CHANGE actor_common_name actor_common_name VARCHAR(255) DEFAULT NULL'); - $this->addSql('ALTER TABLE identity CHANGE name_id name_id VARCHAR(255) NOT NULL, CHANGE institution institution VARCHAR(255) NOT NULL, CHANGE email email VARCHAR(255) NOT NULL, CHANGE common_name common_name VARCHAR(255) NOT NULL, CHANGE preferred_locale preferred_locale VARCHAR(255) NOT NULL'); + $this->addSql( + 'ALTER TABLE audit_log CHANGE actor_institution actor_institution VARCHAR(255) DEFAULT NULL, CHANGE identity_institution identity_institution VARCHAR(255) NOT NULL, CHANGE recorded_on recorded_on DATETIME NOT NULL, CHANGE actor_common_name actor_common_name VARCHAR(255) DEFAULT NULL', + ); + $this->addSql( + 'ALTER TABLE identity CHANGE name_id name_id VARCHAR(255) NOT NULL, CHANGE institution institution VARCHAR(255) NOT NULL, CHANGE email email VARCHAR(255) NOT NULL, CHANGE common_name common_name VARCHAR(255) NOT NULL, CHANGE preferred_locale preferred_locale VARCHAR(255) NOT NULL', + ); $this->addSql('ALTER TABLE institution_listing CHANGE institution institution VARCHAR(255) NOT NULL'); - $this->addSql('ALTER TABLE ra_candidate CHANGE institution institution VARCHAR(255) NOT NULL, CHANGE common_name common_name VARCHAR(255) NOT NULL, CHANGE email email VARCHAR(255) NOT NULL, CHANGE name_id name_id VARCHAR(255) NOT NULL'); - $this->addSql('ALTER TABLE ra_listing CHANGE institution institution VARCHAR(255) NOT NULL, CHANGE common_name common_name VARCHAR(255) NOT NULL, CHANGE email email VARCHAR(255) NOT NULL, CHANGE role role VARCHAR(20) NOT NULL, CHANGE location location LONGTEXT DEFAULT NULL, CHANGE contact_information contact_information LONGTEXT DEFAULT NULL'); - $this->addSql('ALTER TABLE ra_second_factor CHANGE institution institution VARCHAR(255) NOT NULL, CHANGE name name VARCHAR(255) NOT NULL, CHANGE email email VARCHAR(255) NOT NULL, CHANGE status status INT NOT NULL, CHANGE document_number document_number VARCHAR(255) NOT NULL'); - $this->addSql('ALTER TABLE second_factor_revocation CHANGE institution institution VARCHAR(255) NOT NULL, CHANGE recorded_on recorded_on DATETIME NOT NULL'); + $this->addSql( + 'ALTER TABLE ra_candidate CHANGE institution institution VARCHAR(255) NOT NULL, CHANGE common_name common_name VARCHAR(255) NOT NULL, CHANGE email email VARCHAR(255) NOT NULL, CHANGE name_id name_id VARCHAR(255) NOT NULL', + ); + $this->addSql( + 'ALTER TABLE ra_listing CHANGE institution institution VARCHAR(255) NOT NULL, CHANGE common_name common_name VARCHAR(255) NOT NULL, CHANGE email email VARCHAR(255) NOT NULL, CHANGE role role VARCHAR(20) NOT NULL, CHANGE location location LONGTEXT DEFAULT NULL, CHANGE contact_information contact_information LONGTEXT DEFAULT NULL', + ); + $this->addSql( + 'ALTER TABLE ra_second_factor CHANGE institution institution VARCHAR(255) NOT NULL, CHANGE name name VARCHAR(255) NOT NULL, CHANGE email email VARCHAR(255) NOT NULL, CHANGE status status INT NOT NULL, CHANGE document_number document_number VARCHAR(255) NOT NULL', + ); + $this->addSql( + 'ALTER TABLE second_factor_revocation CHANGE institution institution VARCHAR(255) NOT NULL, CHANGE recorded_on recorded_on DATETIME NOT NULL', + ); $this->addSql('ALTER TABLE sraa CHANGE name_id name_id VARCHAR(200) NOT NULL'); $this->addSql('ALTER TABLE whitelist_entry CHANGE institution institution VARCHAR(255) NOT NULL'); } @@ -38,19 +55,40 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql('ALTER TABLE audit_log CHANGE actor_common_name actor_common_name VARCHAR(255) DEFAULT NULL COLLATE utf8_unicode_ci, CHANGE actor_institution actor_institution VARCHAR(255) DEFAULT NULL COLLATE utf8_unicode_ci, CHANGE identity_institution identity_institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE recorded_on recorded_on DATETIME NOT NULL'); - $this->addSql('ALTER TABLE identity CHANGE name_id name_id VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE common_name common_name VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE email email VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE preferred_locale preferred_locale VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci'); - $this->addSql('ALTER TABLE institution_listing CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci'); - $this->addSql('ALTER TABLE ra_candidate CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE name_id name_id VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE common_name common_name VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE email email VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci'); - $this->addSql('ALTER TABLE ra_listing CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE common_name common_name VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE email email VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE role role VARCHAR(20) NOT NULL COLLATE utf8_unicode_ci, CHANGE location location LONGTEXT DEFAULT NULL COLLATE utf8_unicode_ci, CHANGE contact_information contact_information LONGTEXT DEFAULT NULL COLLATE utf8_unicode_ci'); + $this->addSql( + 'ALTER TABLE audit_log CHANGE actor_common_name actor_common_name VARCHAR(255) DEFAULT NULL COLLATE utf8_unicode_ci, CHANGE actor_institution actor_institution VARCHAR(255) DEFAULT NULL COLLATE utf8_unicode_ci, CHANGE identity_institution identity_institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE recorded_on recorded_on DATETIME NOT NULL', + ); + $this->addSql( + 'ALTER TABLE identity CHANGE name_id name_id VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE common_name common_name VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE email email VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE preferred_locale preferred_locale VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci', + ); + $this->addSql( + 'ALTER TABLE institution_listing CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci', + ); + $this->addSql( + 'ALTER TABLE ra_candidate CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE name_id name_id VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE common_name common_name VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE email email VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci', + ); + $this->addSql( + 'ALTER TABLE ra_listing CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE common_name common_name VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE email email VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE role role VARCHAR(20) NOT NULL COLLATE utf8_unicode_ci, CHANGE location location LONGTEXT DEFAULT NULL COLLATE utf8_unicode_ci, CHANGE contact_information contact_information LONGTEXT DEFAULT NULL COLLATE utf8_unicode_ci', + ); $this->addSql('ALTER TABLE ra_location DROP PRIMARY KEY'); - $this->addSql('ALTER TABLE ra_location ADD ra_location_name VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, DROP name, CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE location location LONGTEXT NOT NULL COLLATE utf8_unicode_ci, CHANGE contact_information contact_information LONGTEXT NOT NULL COLLATE utf8_unicode_ci, CHANGE id ra_location_id VARCHAR(36) NOT NULL COLLATE utf8_unicode_ci'); + $this->addSql( + 'ALTER TABLE ra_location ADD ra_location_name VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, DROP name, CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE location location LONGTEXT NOT NULL COLLATE utf8_unicode_ci, CHANGE contact_information contact_information LONGTEXT NOT NULL COLLATE utf8_unicode_ci, CHANGE id ra_location_id VARCHAR(36) NOT NULL COLLATE utf8_unicode_ci', + ); $this->addSql('ALTER TABLE ra_location ADD PRIMARY KEY (ra_location_id)'); - $this->addSql('ALTER TABLE ra_second_factor CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE name name VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE email email VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE document_number document_number VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE status status INT NOT NULL'); - $this->addSql('ALTER TABLE second_factor_revocation CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE recorded_on recorded_on DATETIME NOT NULL'); + $this->addSql( + 'ALTER TABLE ra_second_factor CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE name name VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE email email VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE document_number document_number VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE status status INT NOT NULL', + ); + $this->addSql( + 'ALTER TABLE second_factor_revocation CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE recorded_on recorded_on DATETIME NOT NULL', + ); $this->addSql('ALTER TABLE sraa CHANGE name_id name_id VARCHAR(200) NOT NULL COLLATE utf8_unicode_ci'); - $this->addSql('ALTER TABLE whitelist_entry CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci'); + $this->addSql( + 'ALTER TABLE whitelist_entry CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci', + ); } } diff --git a/src/Surfnet/Migrations/Version20160621112027.php b/src/Surfnet/Migrations/Version20160621112027.php index 51a4276e7..c124e13ea 100644 --- a/src/Surfnet/Migrations/Version20160621112027.php +++ b/src/Surfnet/Migrations/Version20160621112027.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -16,9 +16,14 @@ class Version20160621112027 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql('CREATE TABLE institution_with_personal_ra_details (institution VARCHAR(255) NOT NULL, PRIMARY KEY(institution)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'); + $this->addSql( + 'CREATE TABLE institution_with_personal_ra_details (institution VARCHAR(255) NOT NULL, PRIMARY KEY(institution)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', + ); } /** @@ -27,7 +32,10 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('DROP TABLE institution_with_personal_ra_details'); } diff --git a/src/Surfnet/Migrations/Version20160622100140.php b/src/Surfnet/Migrations/Version20160622100140.php index 18db5b037..40b3e9a85 100644 --- a/src/Surfnet/Migrations/Version20160622100140.php +++ b/src/Surfnet/Migrations/Version20160622100140.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -16,9 +16,14 @@ class Version20160622100140 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql('ALTER TABLE ra_second_factor CHANGE institution institution VARCHAR(255) NOT NULL, CHANGE name name VARCHAR(255) NOT NULL, CHANGE email email VARCHAR(255) NOT NULL, CHANGE status status INT NOT NULL, CHANGE document_number document_number VARCHAR(255) DEFAULT NULL'); + $this->addSql( + 'ALTER TABLE ra_second_factor CHANGE institution institution VARCHAR(255) NOT NULL, CHANGE name name VARCHAR(255) NOT NULL, CHANGE email email VARCHAR(255) NOT NULL, CHANGE status status INT NOT NULL, CHANGE document_number document_number VARCHAR(255) DEFAULT NULL', + ); } /** @@ -27,8 +32,13 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql('ALTER TABLE ra_second_factor CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE name name VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE email email VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE document_number document_number VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE status status INT NOT NULL'); + $this->addSql( + 'ALTER TABLE ra_second_factor CHANGE institution institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE name name VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE email email VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE document_number document_number VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, CHANGE status status INT NOT NULL', + ); } } diff --git a/src/Surfnet/Migrations/Version20160622160146.php b/src/Surfnet/Migrations/Version20160622160146.php index 265713225..b69b764fd 100644 --- a/src/Surfnet/Migrations/Version20160622160146.php +++ b/src/Surfnet/Migrations/Version20160622160146.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -16,9 +16,14 @@ class Version20160622160146 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql('CREATE TABLE institution_with_ra_locations (institution VARCHAR(255) NOT NULL, PRIMARY KEY(institution)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'); + $this->addSql( + 'CREATE TABLE institution_with_ra_locations (institution VARCHAR(255) NOT NULL, PRIMARY KEY(institution)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', + ); $this->addSql('DROP TABLE institution_with_personal_ra_details'); } @@ -28,9 +33,14 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql('CREATE TABLE institution_with_personal_ra_details (institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, PRIMARY KEY(institution)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'); + $this->addSql( + 'CREATE TABLE institution_with_personal_ra_details (institution VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, PRIMARY KEY(institution)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', + ); $this->addSql('DROP TABLE institution_with_ra_locations'); } } diff --git a/src/Surfnet/Migrations/Version20160719090050.php b/src/Surfnet/Migrations/Version20160719090050.php index 64568f612..f53acea96 100644 --- a/src/Surfnet/Migrations/Version20160719090050.php +++ b/src/Surfnet/Migrations/Version20160719090050.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -16,9 +16,14 @@ class Version20160719090050 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql('CREATE TABLE configured_institution (institution VARCHAR(255) NOT NULL, PRIMARY KEY(institution)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'); + $this->addSql( + 'CREATE TABLE configured_institution (institution VARCHAR(255) NOT NULL, PRIMARY KEY(institution)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', + ); } /** @@ -27,7 +32,10 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('DROP TABLE configured_institution'); } diff --git a/src/Surfnet/Migrations/Version20160719090051.php b/src/Surfnet/Migrations/Version20160719090051.php index 85ba5369b..7c0dbad41 100644 --- a/src/Surfnet/Migrations/Version20160719090051.php +++ b/src/Surfnet/Migrations/Version20160719090051.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -16,9 +16,14 @@ class Version20160719090051 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql('CREATE TABLE institution_configuration_options (institution VARCHAR(255) NOT NULL, use_ra_locations_option TINYINT(1) NOT NULL, show_raa_contact_information_option TINYINT(1) NOT NULL, PRIMARY KEY(institution)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'); + $this->addSql( + 'CREATE TABLE institution_configuration_options (institution VARCHAR(255) NOT NULL, use_ra_locations_option TINYINT(1) NOT NULL, show_raa_contact_information_option TINYINT(1) NOT NULL, PRIMARY KEY(institution)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', + ); } /** @@ -27,7 +32,10 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('DROP TABLE institution_configuration_options'); } diff --git a/src/Surfnet/Migrations/Version20160719090052.php b/src/Surfnet/Migrations/Version20160719090052.php index 3f2fc9fd5..f9a3c5cdb 100644 --- a/src/Surfnet/Migrations/Version20160719090052.php +++ b/src/Surfnet/Migrations/Version20160719090052.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; class Version20160719090052 extends AbstractMigration { diff --git a/src/Surfnet/Migrations/Version20170210140051.php b/src/Surfnet/Migrations/Version20170210140051.php index 44a6a9925..14dd23c2b 100644 --- a/src/Surfnet/Migrations/Version20170210140051.php +++ b/src/Surfnet/Migrations/Version20170210140051.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -18,11 +18,11 @@ public function up(Schema $schema): void // this up() migration is auto-generated, please modify it to your needs $this->abortIf( $this->connection->getDatabasePlatform()->getName() != 'mysql', - 'Migration can only be executed safely on \'mysql\'.' + 'Migration can only be executed safely on \'mysql\'.', ); $this->addSql( - 'CREATE TABLE allowed_second_factor (institution VARCHAR(255) NOT NULL, second_factor_type VARCHAR(255) NOT NULL, PRIMARY KEY(institution)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB' + 'CREATE TABLE allowed_second_factor (institution VARCHAR(255) NOT NULL, second_factor_type VARCHAR(255) NOT NULL, PRIMARY KEY(institution)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', ); } @@ -32,7 +32,10 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('DROP TABLE allowed_second_factor'); } diff --git a/src/Surfnet/Migrations/Version20170216085513.php b/src/Surfnet/Migrations/Version20170216085513.php index d008abdac..3b4f8fb44 100644 --- a/src/Surfnet/Migrations/Version20170216085513.php +++ b/src/Surfnet/Migrations/Version20170216085513.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -16,7 +16,10 @@ class Version20170216085513 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE allowed_second_factor DROP PRIMARY KEY'); $this->addSql('ALTER TABLE allowed_second_factor ADD PRIMARY KEY (institution, second_factor_type)'); @@ -28,7 +31,10 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE allowed_second_factor DROP PRIMARY KEY'); $this->addSql('ALTER TABLE allowed_second_factor ADD PRIMARY KEY (institution)'); diff --git a/src/Surfnet/Migrations/Version20171113123232.php b/src/Surfnet/Migrations/Version20171113123232.php index 27b68ef44..6e7fd9890 100644 --- a/src/Surfnet/Migrations/Version20171113123232.php +++ b/src/Surfnet/Migrations/Version20171113123232.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -16,7 +16,10 @@ class Version20171113123232 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE verified_second_factor ADD registration_requested_at DATETIME NOT NULL'); $this->addSql('UPDATE verified_second_factor SET registration_requested_at = NOW()'); @@ -28,7 +31,10 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE verified_second_factor DROP registration_requested_at'); } diff --git a/src/Surfnet/Migrations/Version20180116091349.php b/src/Surfnet/Migrations/Version20180116091349.php index d55626103..9d464520c 100644 --- a/src/Surfnet/Migrations/Version20180116091349.php +++ b/src/Surfnet/Migrations/Version20180116091349.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -16,9 +16,14 @@ class Version20180116091349 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql('ALTER TABLE institution_configuration_options ADD verify_email_option TINYINT(1) NOT NULL COLLATE utf8_unicode_ci'); + $this->addSql( + 'ALTER TABLE institution_configuration_options ADD verify_email_option TINYINT(1) NOT NULL COLLATE utf8_unicode_ci', + ); } /** @@ -27,7 +32,10 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE institution_configuration_options DROP verify_email_option'); } diff --git a/src/Surfnet/Migrations/Version20180131150800.php b/src/Surfnet/Migrations/Version20180131150800.php index 80e3fa468..7a01fd1b3 100644 --- a/src/Surfnet/Migrations/Version20180131150800.php +++ b/src/Surfnet/Migrations/Version20180131150800.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; use Symfony\Component\DependencyInjection\ContainerAwareInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -25,7 +25,10 @@ public function setContainer(ContainerInterface $container = null): void public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $gatewaySchema = $this->getGatewaySchema(); @@ -39,7 +42,10 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $gatewaySchema = $this->getGatewaySchema(); diff --git a/src/Surfnet/Migrations/Version20180330094402.php b/src/Surfnet/Migrations/Version20180330094402.php index befc5c315..caa594318 100644 --- a/src/Surfnet/Migrations/Version20180330094402.php +++ b/src/Surfnet/Migrations/Version20180330094402.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -16,9 +16,14 @@ class Version20180330094402 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql('ALTER TABLE institution_configuration_options CHANGE verify_email_option verify_email_option TINYINT(1) DEFAULT \'1\' NOT NULL'); + $this->addSql( + 'ALTER TABLE institution_configuration_options CHANGE verify_email_option verify_email_option TINYINT(1) DEFAULT \'1\' NOT NULL', + ); } /** @@ -27,8 +32,13 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql('ALTER TABLE institution_configuration_options CHANGE verify_email_option verify_email_option TINYINT(1) NOT NULL'); + $this->addSql( + 'ALTER TABLE institution_configuration_options CHANGE verify_email_option verify_email_option TINYINT(1) NOT NULL', + ); } } diff --git a/src/Surfnet/Migrations/Version20180409100948.php b/src/Surfnet/Migrations/Version20180409100948.php index e8d906780..7d4058611 100644 --- a/src/Surfnet/Migrations/Version20180409100948.php +++ b/src/Surfnet/Migrations/Version20180409100948.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; use Surfnet\Stepup\Configuration\Value\NumberOfTokensPerIdentityOption; /** @@ -17,13 +17,16 @@ class Version20180409100948 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql( sprintf( - "ALTER TABLE institution_configuration_options ADD number_of_tokens_per_identity_option TINYINT(1) DEFAULT '%d' NOT NULL", - NumberOfTokensPerIdentityOption::DISABLED - ) + "ALTER TABLE institution_configuration_options ADD number_of_tokens_per_identity_option TINYINT(1) DEFAULT '%d' NOT NULL", + NumberOfTokensPerIdentityOption::DISABLED, + ), ); } @@ -33,7 +36,10 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() != 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE institution_configuration_options DROP number_of_tokens_per_identity_option'); } } diff --git a/src/Surfnet/Migrations/Version20180926144517.php b/src/Surfnet/Migrations/Version20180926144517.php index 1687d889d..d3b62f8d3 100644 --- a/src/Surfnet/Migrations/Version20180926144517.php +++ b/src/Surfnet/Migrations/Version20180926144517.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -16,9 +16,14 @@ class Version20180926144517 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() !== 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); - $this->addSql('CREATE TABLE institution_authorization (institution VARCHAR(255) NOT NULL COMMENT \'(DC2Type:stepup_configuration_institution)\', institution_relation VARCHAR(255) NOT NULL COMMENT \'(DC2Type:stepup_configuration_institution)\', institution_role VARCHAR(10) NOT NULL COMMENT \'(DC2Type:stepup_institution_role)\', PRIMARY KEY(institution, institution_relation, institution_role)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'); + $this->addSql( + 'CREATE TABLE institution_authorization (institution VARCHAR(255) NOT NULL COMMENT \'(DC2Type:stepup_configuration_institution)\', institution_relation VARCHAR(255) NOT NULL COMMENT \'(DC2Type:stepup_configuration_institution)\', institution_role VARCHAR(10) NOT NULL COMMENT \'(DC2Type:stepup_institution_role)\', PRIMARY KEY(institution, institution_relation, institution_role)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB', + ); } /** @@ -27,7 +32,10 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() !== 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('DROP TABLE institution_authorization'); } diff --git a/src/Surfnet/Migrations/Version20181001082254.php b/src/Surfnet/Migrations/Version20181001082254.php index 9edbfccbf..e62382bfe 100644 --- a/src/Surfnet/Migrations/Version20181001082254.php +++ b/src/Surfnet/Migrations/Version20181001082254.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -24,12 +24,12 @@ public function up(Schema $schema): void foreach ($authorizationRoles as $roleType) { $this->addSql( "INSERT IGNORE INTO institution_authorization(institution, institution_relation, institution_role) - SELECT institution, institution, '{$roleType}' FROM institution_configuration_options;" + SELECT institution, institution, '{$roleType}' FROM institution_configuration_options;", ); $this->addSql( "INSERT IGNORE INTO institution_authorization(institution, institution_relation, institution_role) - SELECT institution, institution, '{$roleType}' FROM whitelist_entry;" + SELECT institution, institution, '{$roleType}' FROM whitelist_entry;", ); } } diff --git a/src/Surfnet/Migrations/Version20181023151546.php b/src/Surfnet/Migrations/Version20181023151546.php index df13ed45c..3e3393792 100644 --- a/src/Surfnet/Migrations/Version20181023151546.php +++ b/src/Surfnet/Migrations/Version20181023151546.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -16,14 +16,25 @@ class Version20181023151546 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() !== 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE ra_listing DROP PRIMARY KEY'); - $this->addSql('ALTER TABLE ra_listing ADD id INT AUTO_INCREMENT PRIMARY KEY NOT NULL FIRST, ADD ra_institution VARCHAR(255) NOT NULL COMMENT \'(DC2Type:institution)\''); - $this->addSql('CREATE UNIQUE INDEX idx_ra_listing_unique_identity_institution ON ra_listing (identity_id, ra_institution)'); + $this->addSql( + 'ALTER TABLE ra_listing ADD id INT AUTO_INCREMENT PRIMARY KEY NOT NULL FIRST, ADD ra_institution VARCHAR(255) NOT NULL COMMENT \'(DC2Type:institution)\'', + ); + $this->addSql( + 'CREATE UNIQUE INDEX idx_ra_listing_unique_identity_institution ON ra_listing (identity_id, ra_institution)', + ); $this->addSql('ALTER TABLE ra_candidate DROP PRIMARY KEY'); - $this->addSql('ALTER TABLE ra_candidate ADD ra_institution VARCHAR(255) NOT NULL COMMENT \'(DC2Type:institution)\''); - $this->addSql('CREATE UNIQUE INDEX idx_ra_candidate_unique_identity_institution ON ra_candidate (identity_id, ra_institution)'); + $this->addSql( + 'ALTER TABLE ra_candidate ADD ra_institution VARCHAR(255) NOT NULL COMMENT \'(DC2Type:institution)\'', + ); + $this->addSql( + 'CREATE UNIQUE INDEX idx_ra_candidate_unique_identity_institution ON ra_candidate (identity_id, ra_institution)', + ); $this->addSql('ALTER TABLE ra_candidate ADD id INT FIRST'); $this->addSql('ALTER TABLE ra_candidate ADD INDEX(`id`)'); $this->addSql('ALTER TABLE ra_candidate CHANGE id id INT NOT NULL AUTO_INCREMENT'); @@ -35,10 +46,15 @@ public function up(Schema $schema): void */ public function down(Schema $schema): void { - $this->throwIrreversibleMigrationException('This migration is irreversible and cannot be reverted due to Fine Grained Authorization BC changes.'); + $this->throwIrreversibleMigrationException( + 'This migration is irreversible and cannot be reverted due to Fine Grained Authorization BC changes.', + ); // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() !== 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE ra_candidate MODIFY id INT NOT NULL'); $this->addSql('DROP INDEX idx_ra_candidate_unique_identity_institution ON ra_candidate'); diff --git a/src/Surfnet/Migrations/Version20181101103348.php b/src/Surfnet/Migrations/Version20181101103348.php index abee72335..f509fb419 100644 --- a/src/Surfnet/Migrations/Version20181101103348.php +++ b/src/Surfnet/Migrations/Version20181101103348.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Add the ra_institution column to the audit_log @@ -21,7 +21,10 @@ class Version20181101103348 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() !== 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE audit_log ADD ra_institution VARCHAR(255) DEFAULT NULL'); } @@ -32,7 +35,10 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() !== 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE audit_log DROP ra_institution;'); } diff --git a/src/Surfnet/Migrations/Version20190211163604.php b/src/Surfnet/Migrations/Version20190211163604.php index 3fa26e205..f065d8c14 100644 --- a/src/Surfnet/Migrations/Version20190211163604.php +++ b/src/Surfnet/Migrations/Version20190211163604.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! @@ -16,14 +16,19 @@ class Version20190211163604 extends AbstractMigration public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() !== 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('CREATE INDEX idx_ra_listing_ra_institution ON ra_listing (ra_institution)'); $this->addSql('CREATE INDEX idx_auditlog_ra_institution ON audit_log (ra_institution)'); $this->addSql('CREATE INDEX idx_institution ON verified_second_factor (institution)'); $this->addSql('DROP INDEX id ON ra_candidate'); $this->addSql('CREATE INDEX idx_ra_institution ON ra_candidate (ra_institution)'); - $this->addSql('CREATE INDEX idx_authorization ON institution_authorization (institution, institution_relation, institution_role)'); + $this->addSql( + 'CREATE INDEX idx_authorization ON institution_authorization (institution, institution_relation, institution_role)', + ); } /** @@ -32,7 +37,10 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() !== 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('DROP INDEX idx_auditlog_ra_institution ON audit_log'); $this->addSql('DROP INDEX idx_authorization ON institution_authorization'); diff --git a/src/Surfnet/Migrations/Version20200114161618.php b/src/Surfnet/Migrations/Version20200114161618.php index 8010b4129..c9a891dd5 100644 --- a/src/Surfnet/Migrations/Version20200114161618.php +++ b/src/Surfnet/Migrations/Version20200114161618.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; use Symfony\Component\DependencyInjection\ContainerAwareInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -48,7 +48,7 @@ public function up(Schema $schema): void $this->addSql('UPDATE ra_location SET institution=LOWER(institution)'); // Convert all GW institutions to lowercase - $gatewaySchema = $this->getGatewaySchema(); + $gatewaySchema = $this->getGatewaySchema(); $this->addSql(sprintf('UPDATE %s.whitelist_entry SET institution=LOWER(institution)', $gatewaySchema)); $this->addSql(sprintf('UPDATE %s.second_factor SET institution=LOWER(institution)', $gatewaySchema)); } diff --git a/src/Surfnet/Migrations/Version20200416135127.php b/src/Surfnet/Migrations/Version20200416135127.php index bb9d5decd..ff569ebd5 100644 --- a/src/Surfnet/Migrations/Version20200416135127.php +++ b/src/Surfnet/Migrations/Version20200416135127.php @@ -2,8 +2,8 @@ namespace Surfnet\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; class Version20200416135127 extends AbstractMigration { @@ -12,7 +12,10 @@ class Version20200416135127 extends AbstractMigration */ public function up(Schema $schema): void { - $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() !== 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('CREATE INDEX idx_vetted_second_factor_type ON vetted_second_factor (type)'); $this->addSql('DROP TABLE ra_candidate'); @@ -23,6 +26,8 @@ public function up(Schema $schema): void */ public function down(Schema $schema): void { - $this->throwIrreversibleMigrationException('This migration is irreversible and cannot be reverted because it will need a replay on the RACandidateProjector.'); + $this->throwIrreversibleMigrationException( + 'This migration is irreversible and cannot be reverted because it will need a replay on the RACandidateProjector.', + ); } } diff --git a/src/Surfnet/Migrations/Version20210308092347.php b/src/Surfnet/Migrations/Version20210308092347.php index b75c51fd4..b359f8a7e 100644 --- a/src/Surfnet/Migrations/Version20210308092347.php +++ b/src/Surfnet/Migrations/Version20210308092347.php @@ -1,4 +1,5 @@ -abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() !== 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE institution_configuration_options ADD self_vet_option INT DEFAULT \'0\' NOT NULL'); } - public function down(Schema $schema) : void + public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() !== 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE institution_configuration_options DROP self_vet_option'); } } diff --git a/src/Surfnet/Migrations/Version20210610131957.php b/src/Surfnet/Migrations/Version20210610131957.php index b39261ab1..076c92f7b 100644 --- a/src/Surfnet/Migrations/Version20210610131957.php +++ b/src/Surfnet/Migrations/Version20210610131957.php @@ -1,9 +1,11 @@ -addSql('# Updating entities.'); @@ -57,12 +59,12 @@ public function up(Schema $schema) : void 'payload' => $payload, 'uuid' => $uuid, 'playhead' => $playhead, - ] + ], ); } } - public function down(Schema $schema) : void + public function down(Schema $schema): void { // This migration can not be undone. } diff --git a/src/Surfnet/Migrations/Version20220519134637.php b/src/Surfnet/Migrations/Version20220519134637.php index 68bc60505..527b41dfe 100644 --- a/src/Surfnet/Migrations/Version20220519134637.php +++ b/src/Surfnet/Migrations/Version20220519134637.php @@ -1,4 +1,5 @@ -container = $container; } - public function up(Schema $schema) : void + public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.'); - $this->addSql('ALTER TABLE institution_configuration_options ADD self_asserted_tokens_option INT DEFAULT \'0\' NOT NULL'); - $this->addSql('CREATE TABLE recovery_token (id VARCHAR(36) NOT NULL, identity_id VARCHAR(36) NOT NULL, type VARCHAR(16) NOT NULL, recovery_method_identifier VARCHAR(255) NOT NULL, INDEX idx_recovery_method_type (type), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE `utf8_unicode_ci` ENGINE = InnoDB'); - $this->addSql('CREATE TABLE identity_self_asserted_token_options (identity_id VARCHAR(36) NOT NULL, possessed_token TINYINT(1) NOT NULL, possessed_self_asserted_token TINYINT(1) NOT NULL, PRIMARY KEY(identity_id)) DEFAULT CHARACTER SET utf8 COLLATE `utf8_unicode_ci` ENGINE = InnoDB'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() !== 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); + $this->addSql( + 'ALTER TABLE institution_configuration_options ADD self_asserted_tokens_option INT DEFAULT \'0\' NOT NULL', + ); + $this->addSql( + 'CREATE TABLE recovery_token (id VARCHAR(36) NOT NULL, identity_id VARCHAR(36) NOT NULL, type VARCHAR(16) NOT NULL, recovery_method_identifier VARCHAR(255) NOT NULL, INDEX idx_recovery_method_type (type), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE `utf8_unicode_ci` ENGINE = InnoDB', + ); + $this->addSql( + 'CREATE TABLE identity_self_asserted_token_options (identity_id VARCHAR(36) NOT NULL, possessed_token TINYINT(1) NOT NULL, possessed_self_asserted_token TINYINT(1) NOT NULL, PRIMARY KEY(identity_id)) DEFAULT CHARACTER SET utf8 COLLATE `utf8_unicode_ci` ENGINE = InnoDB', + ); // The unknown vetting type is set on the vetted_second_factor::vetting_type column for the existing second // factors. This to inform consumers of the projection, that the vetting type was recorded at a time before we // tracked the vetting type of the vetted second factors. It is safe to assume the vetting type is either // on-premise or self-vetted (both vetting types where the identity of the user was verified at the service desk // at some point). $this->addSql('ALTER TABLE vetted_second_factor ADD vetting_type VARCHAR(255) DEFAULT \'unknown\''); - $this->addSql('ALTER TABLE recovery_token ADD institution VARCHAR(255) NOT NULL, ADD name VARCHAR(255) NOT NULL, ADD email VARCHAR(255) NOT NULL, ADD status INT NOT NULL'); - $this->addSql('ALTER TABLE audit_log ADD recovery_token_identifier VARCHAR(255) DEFAULT NULL, ADD recovery_token_type VARCHAR(36) DEFAULT NULL'); - $this->addSql('CREATE TABLE vetting_type_hint (institution VARCHAR(36) NOT NULL, hints LONGTEXT NOT NULL, PRIMARY KEY(institution)) DEFAULT CHARACTER SET utf8 COLLATE `utf8_unicode_ci` ENGINE = InnoDB'); + $this->addSql( + 'ALTER TABLE recovery_token ADD institution VARCHAR(255) NOT NULL, ADD name VARCHAR(255) NOT NULL, ADD email VARCHAR(255) NOT NULL, ADD status INT NOT NULL', + ); + $this->addSql( + 'ALTER TABLE audit_log ADD recovery_token_identifier VARCHAR(255) DEFAULT NULL, ADD recovery_token_type VARCHAR(36) DEFAULT NULL', + ); + $this->addSql( + 'CREATE TABLE vetting_type_hint (institution VARCHAR(36) NOT NULL, hints LONGTEXT NOT NULL, PRIMARY KEY(institution)) DEFAULT CHARACTER SET utf8 COLLATE `utf8_unicode_ci` ENGINE = InnoDB', + ); $gatewaySchema = $this->getGatewaySchema(); $this->addSql( sprintf( 'ALTER TABLE %s.second_factor ADD identity_vetted TINYINT(1) DEFAULT \'1\'', - $gatewaySchema - ) + $gatewaySchema, + ), ); - } - public function down(Schema $schema) : void + public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() !== 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); $this->addSql('ALTER TABLE institution_configuration_options DROP self_asserted_tokens_option'); $this->addSql('DROP TABLE recovery_token'); $this->addSql('DROP TABLE identity_self_asserted_token_options'); diff --git a/src/Surfnet/Migrations/Version20221102143350.php b/src/Surfnet/Migrations/Version20221102143350.php index 623a297ff..c4fc668ae 100644 --- a/src/Surfnet/Migrations/Version20221102143350.php +++ b/src/Surfnet/Migrations/Version20221102143350.php @@ -1,4 +1,5 @@ -container = $container; } - public function up(Schema $schema) : void + public function up(Schema $schema): void { - $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() !== 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); // Create the new sso_on_2fa option, note the name conversion 'error' made by doctrine. $this->addSql('ALTER TABLE institution_configuration_options ADD sso_on2fa_option INT DEFAULT \'0\' NOT NULL'); // Create the institution_configuration gateway schema $gatewaySchema = $this->getGatewaySchema(); - $this->addSql(sprintf('CREATE TABLE %s.institution_configuration (institution VARCHAR(255) NOT NULL, sso_on2fa_enabled TINYINT(1) NOT NULL, PRIMARY KEY(institution)) DEFAULT CHARACTER SET utf8 COLLATE `utf8_unicode_ci` ENGINE = InnoDB', $gatewaySchema)); + $this->addSql( + sprintf( + 'CREATE TABLE %s.institution_configuration (institution VARCHAR(255) NOT NULL, sso_on2fa_enabled TINYINT(1) NOT NULL, PRIMARY KEY(institution)) DEFAULT CHARACTER SET utf8 COLLATE `utf8_unicode_ci` ENGINE = InnoDB', + $gatewaySchema, + ), + ); } - public function down(Schema $schema) : void + public function down(Schema $schema): void { - $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + $this->abortIf( + $this->connection->getDatabasePlatform()->getName() !== 'mysql', + 'Migration can only be executed safely on \'mysql\'.', + ); // Down the Middleware schema change $this->addSql('ALTER TABLE institution_configuration_options DROP sso_on2fa_option'); // Gateway schema change (remove the institution_configuration) diff --git a/src/Surfnet/Stepup/Configuration/Api/InstitutionConfiguration.php b/src/Surfnet/Stepup/Configuration/Api/InstitutionConfiguration.php index 0d3635402..a0dd6a12a 100644 --- a/src/Surfnet/Stepup/Configuration/Api/InstitutionConfiguration.php +++ b/src/Surfnet/Stepup/Configuration/Api/InstitutionConfiguration.php @@ -31,56 +31,43 @@ interface InstitutionConfiguration extends AggregateRoot { /** - * @param InstitutionConfigurationId $institutionConfigurationId - * @param Institution $institution * @return InstitutionConfiguration */ public static function create(InstitutionConfigurationId $institutionConfigurationId, Institution $institution); /** - * @param UseRaLocationsOption $useRaLocationsOption * @return void */ public function configureUseRaLocationsOption(UseRaLocationsOption $useRaLocationsOption); /** - * @param ShowRaaContactInformationOption $showRaaContactInformationOption * @return void */ public function configureShowRaaContactInformationOption( - ShowRaaContactInformationOption $showRaaContactInformationOption + ShowRaaContactInformationOption $showRaaContactInformationOption, ); /** - * @param RaLocationId $raLocationId - * @param RaLocationName $raLocationName - * @param Location $location - * @param ContactInformation $contactInformation * @return void */ public function addRaLocation( RaLocationId $raLocationId, RaLocationName $raLocationName, Location $location, - ContactInformation $contactInformation + ContactInformation $contactInformation, ); /** - * @param RaLocationId $raLocationId - * @param RaLocationName $raLocationName - * @param Location $location - * @param ContactInformation $contactInformation * @return void */ public function changeRaLocation( RaLocationId $raLocationId, RaLocationName $raLocationName, Location $location, - ContactInformation $contactInformation + ContactInformation $contactInformation, ); /** - * @param RaLocationId $raLocationId * @return void */ public function removeRaLocation(RaLocationId $raLocationId); diff --git a/src/Surfnet/Stepup/Configuration/Configuration.php b/src/Surfnet/Stepup/Configuration/Configuration.php index 51e14f0e7..98fb67b94 100644 --- a/src/Surfnet/Stepup/Configuration/Configuration.php +++ b/src/Surfnet/Stepup/Configuration/Configuration.php @@ -33,7 +33,7 @@ class Configuration extends EventSourcedAggregateRoot implements ConfigurationIn /** * There can ever be only one configuration, so using a fixed UUIDv4 */ - const CONFIGURATION_ID = '12345678-abcd-4321-abcd-123456789012'; + public const CONFIGURATION_ID = '12345678-abcd-4321-abcd-123456789012'; /** * @var array @@ -52,20 +52,26 @@ public function update($configurationAsJson): void { $decodedConfiguration = JsonHelper::decode($configurationAsJson); - $this->apply(new ConfigurationUpdatedEvent( - self::CONFIGURATION_ID, - $decodedConfiguration, - $this->configuration - )); + $this->apply( + new ConfigurationUpdatedEvent( + self::CONFIGURATION_ID, + $decodedConfiguration, + $this->configuration, + ), + ); - $this->apply(new ServiceProvidersUpdatedEvent( - self::CONFIGURATION_ID, - $decodedConfiguration['gateway']['service_providers'] - )); - $this->apply(new IdentityProvidersUpdatedEvent( - self::CONFIGURATION_ID, - $decodedConfiguration['gateway']['identity_providers'] - )); + $this->apply( + new ServiceProvidersUpdatedEvent( + self::CONFIGURATION_ID, + $decodedConfiguration['gateway']['service_providers'], + ), + ); + $this->apply( + new IdentityProvidersUpdatedEvent( + self::CONFIGURATION_ID, + $decodedConfiguration['gateway']['identity_providers'], + ), + ); $this->apply(new SraaUpdatedEvent(self::CONFIGURATION_ID, $decodedConfiguration['sraa'])); $this->apply(new EmailTemplatesUpdatedEvent(self::CONFIGURATION_ID, $decodedConfiguration['email_templates'])); } diff --git a/src/Surfnet/Stepup/Configuration/Entity/RaLocation.php b/src/Surfnet/Stepup/Configuration/Entity/RaLocation.php index 8200feab9..e1714b094 100644 --- a/src/Surfnet/Stepup/Configuration/Entity/RaLocation.php +++ b/src/Surfnet/Stepup/Configuration/Entity/RaLocation.php @@ -25,68 +25,42 @@ class RaLocation { - private RaLocationId $id; - - private RaLocationName $name; - - private Location $location; - - private ContactInformation $contactInformation; - /** - * @param RaLocationId $id - * @param RaLocationName $name - * @param Location $location - * @param ContactInformation $contactInformation * @return RaLocation */ public static function create( RaLocationId $id, RaLocationName $name, Location $location, - ContactInformation $contactInformation + ContactInformation $contactInformation, ): self { return new self($id, $name, $location, $contactInformation); } private function __construct( - RaLocationId $id, - RaLocationName $name, - Location $location, - ContactInformation $contactInformation + private readonly RaLocationId $id, + private RaLocationName $name, + private Location $location, + private ContactInformation $contactInformation, ) { - $this->id = $id; - $this->name = $name; - $this->location = $location; - $this->contactInformation = $contactInformation; } - /** - * @param RaLocationName $name - */ public function rename(RaLocationName $name): void { $this->name = $name; } - /** - * @param Location $location - */ public function relocate(Location $location): void { $this->location = $location; } - /** - * @param ContactInformation $contactInformation - */ public function changeContactInformation(ContactInformation $contactInformation): void { $this->contactInformation = $contactInformation; } /** - * @param RaLocationId $otherId * @return bool */ public function hasId(RaLocationId $otherId) diff --git a/src/Surfnet/Stepup/Configuration/Event/AllowedSecondFactorListUpdatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/AllowedSecondFactorListUpdatedEvent.php index 1b6d4d098..4131d2883 100644 --- a/src/Surfnet/Stepup/Configuration/Event/AllowedSecondFactorListUpdatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/AllowedSecondFactorListUpdatedEvent.php @@ -25,29 +25,11 @@ final class AllowedSecondFactorListUpdatedEvent implements SerializableInterface { - /** - * @var InstitutionConfigurationId - */ - public $institutionConfigurationId; - - /** - * @var Institution - */ - public $institution; - - /** - * @var AllowedSecondFactorList - */ - public $allowedSecondFactorList; - public function __construct( - InstitutionConfigurationId $institutionConfigurationId, - Institution $institution, - AllowedSecondFactorList $allowedSecondFactorList + public InstitutionConfigurationId $institutionConfigurationId, + public Institution $institution, + public AllowedSecondFactorList $allowedSecondFactorList, ) { - $this->institutionConfigurationId = $institutionConfigurationId; - $this->institution = $institution; - $this->allowedSecondFactorList = $allowedSecondFactorList; } public static function deserialize(array $data) @@ -55,7 +37,7 @@ public static function deserialize(array $data) return new self( new InstitutionConfigurationId($data['institution_configuration_id']), new Institution($data['institution']), - AllowedSecondFactorList::deserialize($data['allowed_second_factor_list']) + AllowedSecondFactorList::deserialize($data['allowed_second_factor_list']), ); } @@ -63,8 +45,8 @@ public function serialize(): array { return [ 'institution_configuration_id' => $this->institutionConfigurationId->getInstitutionConfigurationId(), - 'institution' => $this->institution->getInstitution(), - 'allowed_second_factor_list' => $this->allowedSecondFactorList->serialize(), + 'institution' => $this->institution->getInstitution(), + 'allowed_second_factor_list' => $this->allowedSecondFactorList->serialize(), ]; } } diff --git a/src/Surfnet/Stepup/Configuration/Event/ConfigurationUpdatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/ConfigurationUpdatedEvent.php index 12c21b665..7f233da74 100644 --- a/src/Surfnet/Stepup/Configuration/Event/ConfigurationUpdatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/ConfigurationUpdatedEvent.php @@ -48,16 +48,16 @@ public static function deserialize(array $data) return new self( $data['id'], $data['new_configuration'], - $data['old_configuration'] + $data['old_configuration'], ); } public function serialize(): array { return [ - 'id' => $this->id, + 'id' => $this->id, 'new_configuration' => $this->newConfiguration, - 'old_configuration' => $this->oldConfiguration + 'old_configuration' => $this->oldConfiguration, ]; } } diff --git a/src/Surfnet/Stepup/Configuration/Event/EmailTemplatesUpdatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/EmailTemplatesUpdatedEvent.php index 95b755e5e..be857b268 100644 --- a/src/Surfnet/Stepup/Configuration/Event/EmailTemplatesUpdatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/EmailTemplatesUpdatedEvent.php @@ -27,7 +27,7 @@ class EmailTemplatesUpdatedEvent extends ConfigurationEvent /** * @param string $configurationId - * @param array $emailTemplates + * @param array $emailTemplates */ public function __construct($configurationId, array $emailTemplates) { diff --git a/src/Surfnet/Stepup/Configuration/Event/IdentityProvidersUpdatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/IdentityProvidersUpdatedEvent.php index 760e3ce7a..f8d7f9300 100644 --- a/src/Surfnet/Stepup/Configuration/Event/IdentityProvidersUpdatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/IdentityProvidersUpdatedEvent.php @@ -27,7 +27,7 @@ class IdentityProvidersUpdatedEvent extends ConfigurationEvent /** * @param string $configurationId - * @param array $identityProviders + * @param array $identityProviders */ public function __construct($configurationId, array $identityProviders) { diff --git a/src/Surfnet/Stepup/Configuration/Event/InstitutionConfigurationRemovedEvent.php b/src/Surfnet/Stepup/Configuration/Event/InstitutionConfigurationRemovedEvent.php index eb7c8a6f2..b54e823b2 100644 --- a/src/Surfnet/Stepup/Configuration/Event/InstitutionConfigurationRemovedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/InstitutionConfigurationRemovedEvent.php @@ -37,7 +37,7 @@ class InstitutionConfigurationRemovedEvent implements SerializableInterface public function __construct(InstitutionConfigurationId $institutionConfigurationId, Institution $institution) { $this->institutionConfigurationId = $institutionConfigurationId; - $this->institution = $institution; + $this->institution = $institution; } /** @@ -48,7 +48,7 @@ public static function deserialize(array $data) { return new self( new InstitutionConfigurationId($data['institution_configuration_id']), - new Institution($data['institution']) + new Institution($data['institution']), ); } @@ -59,7 +59,7 @@ public function serialize(): array { return [ 'institution_configuration_id' => $this->institutionConfigurationId->getInstitutionConfigurationId(), - 'institution' => $this->institution->getInstitution() + 'institution' => $this->institution->getInstitution(), ]; } } diff --git a/src/Surfnet/Stepup/Configuration/Event/NewInstitutionConfigurationCreatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/NewInstitutionConfigurationCreatedEvent.php index 10535b1fc..515c12040 100644 --- a/src/Surfnet/Stepup/Configuration/Event/NewInstitutionConfigurationCreatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/NewInstitutionConfigurationCreatedEvent.php @@ -88,13 +88,13 @@ public function __construct( NumberOfTokensPerIdentityOption $numberOfTokensPerIdentityOption, SsoOn2faOption $ssoOn2faOption, SelfVetOption $selfVetOption, - SelfAssertedTokensOption $selfAssertedTokensOption + SelfAssertedTokensOption $selfAssertedTokensOption, ) { - $this->institutionConfigurationId = $institutionConfigurationId; - $this->institution = $institution; - $this->useRaLocationsOption = $useRaLocationsOption; + $this->institutionConfigurationId = $institutionConfigurationId; + $this->institution = $institution; + $this->useRaLocationsOption = $useRaLocationsOption; $this->showRaaContactInformationOption = $showRaaContactInformationOption; - $this->verifyEmailOption = $verifyEmailOption; + $this->verifyEmailOption = $verifyEmailOption; $this->numberOfTokensPerIdentityOption = $numberOfTokensPerIdentityOption; $this->ssoOn2faOption = $ssoOn2faOption; $this->selfVetOption = $selfVetOption; @@ -130,19 +130,20 @@ public static function deserialize(array $data) new NumberOfTokensPerIdentityOption($data['number_of_tokens_per_identity_option']), new SsoOn2faOption($data['sso_on_2fa_option']), new SelfVetOption($data['self_vet_option']), - new SelfAssertedTokensOption($data['self_asserted_tokens_option']) + new SelfAssertedTokensOption($data['self_asserted_tokens_option']), ); } public function serialize(): array { return [ - 'institution_configuration_id' => $this->institutionConfigurationId->getInstitutionConfigurationId(), - 'institution' => $this->institution->getInstitution(), - 'use_ra_locations_option' => $this->useRaLocationsOption->isEnabled(), + 'institution_configuration_id' => $this->institutionConfigurationId->getInstitutionConfigurationId(), + 'institution' => $this->institution->getInstitution(), + 'use_ra_locations_option' => $this->useRaLocationsOption->isEnabled(), 'show_raa_contact_information_option' => $this->showRaaContactInformationOption->isEnabled(), - 'verify_email_option' => $this->verifyEmailOption->isEnabled(), - 'number_of_tokens_per_identity_option' => $this->numberOfTokensPerIdentityOption->getNumberOfTokensPerIdentity(), + 'verify_email_option' => $this->verifyEmailOption->isEnabled(), + 'number_of_tokens_per_identity_option' => $this->numberOfTokensPerIdentityOption->getNumberOfTokensPerIdentity( + ), 'sso_on_2fa_option' => $this->ssoOn2faOption->isEnabled(), 'self_vet_option' => $this->selfVetOption->isEnabled(), 'self_asserted_tokens_option' => $this->selfAssertedTokensOption->isEnabled(), diff --git a/src/Surfnet/Stepup/Configuration/Event/NumberOfTokensPerIdentityOptionChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/NumberOfTokensPerIdentityOptionChangedEvent.php index c52527f9e..12b7a181e 100644 --- a/src/Surfnet/Stepup/Configuration/Event/NumberOfTokensPerIdentityOptionChangedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/NumberOfTokensPerIdentityOptionChangedEvent.php @@ -25,29 +25,11 @@ final class NumberOfTokensPerIdentityOptionChangedEvent implements SerializableInterface { - /** - * @var InstitutionConfigurationId - */ - public $institutionConfigurationId; - - /** - * @var Institution - */ - public $institution; - - /** - * @var NumberOfTokensPerIdentityOption - */ - public $numberOfTokensPerIdentityOption; - public function __construct( - InstitutionConfigurationId $institutionConfigurationId, - Institution $institution, - NumberOfTokensPerIdentityOption $numberOfTokensPerIdentityOption + public InstitutionConfigurationId $institutionConfigurationId, + public Institution $institution, + public NumberOfTokensPerIdentityOption $numberOfTokensPerIdentityOption, ) { - $this->institutionConfigurationId = $institutionConfigurationId; - $this->institution = $institution; - $this->numberOfTokensPerIdentityOption = $numberOfTokensPerIdentityOption; } public static function deserialize(array $data) @@ -55,7 +37,7 @@ public static function deserialize(array $data) return new self( new InstitutionConfigurationId($data['institution_configuration_id']), new Institution($data['institution']), - new NumberOfTokensPerIdentityOption($data['number_of_tokens_per_identity_option']) + new NumberOfTokensPerIdentityOption($data['number_of_tokens_per_identity_option']), ); } @@ -63,8 +45,9 @@ public function serialize(): array { return [ 'institution_configuration_id' => $this->institutionConfigurationId->getInstitutionConfigurationId(), - 'institution' => $this->institution->getInstitution(), - 'number_of_tokens_per_identity_option' => $this->numberOfTokensPerIdentityOption->getNumberOfTokensPerIdentity(), + 'institution' => $this->institution->getInstitution(), + 'number_of_tokens_per_identity_option' => $this->numberOfTokensPerIdentityOption->getNumberOfTokensPerIdentity( + ), ]; } } diff --git a/src/Surfnet/Stepup/Configuration/Event/RaLocationAddedEvent.php b/src/Surfnet/Stepup/Configuration/Event/RaLocationAddedEvent.php index f00452b06..73715a961 100644 --- a/src/Surfnet/Stepup/Configuration/Event/RaLocationAddedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/RaLocationAddedEvent.php @@ -63,14 +63,14 @@ public function __construct( RaLocationId $raLocationId, RaLocationName $raLocationName, Location $location, - ContactInformation $contactInformation + ContactInformation $contactInformation, ) { $this->institutionConfigurationId = $institutionConfigurationId; - $this->institution = $institution; - $this->raLocationId = $raLocationId; - $this->raLocationName = $raLocationName; - $this->location = $location; - $this->contactInformation = $contactInformation; + $this->institution = $institution; + $this->raLocationId = $raLocationId; + $this->raLocationName = $raLocationName; + $this->location = $location; + $this->contactInformation = $contactInformation; } public static function deserialize(array $data) @@ -81,7 +81,7 @@ public static function deserialize(array $data) new RaLocationId($data['ra_location_id']), new RaLocationName($data['ra_location_name']), new Location($data['location']), - new ContactInformation($data['contact_information']) + new ContactInformation($data['contact_information']), ); } @@ -89,11 +89,11 @@ public function serialize(): array { return [ 'institution_configuration_id' => $this->institutionConfigurationId->getInstitutionConfigurationId(), - 'institution' => $this->institution->getInstitution(), - 'ra_location_id' => $this->raLocationId->getRaLocationId(), - 'ra_location_name' => $this->raLocationName->getRaLocationName(), - 'location' => $this->location->getLocation(), - 'contact_information' => $this->contactInformation->getContactInformation(), + 'institution' => $this->institution->getInstitution(), + 'ra_location_id' => $this->raLocationId->getRaLocationId(), + 'ra_location_name' => $this->raLocationName->getRaLocationName(), + 'location' => $this->location->getLocation(), + 'contact_information' => $this->contactInformation->getContactInformation(), ]; } } diff --git a/src/Surfnet/Stepup/Configuration/Event/RaLocationContactInformationChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/RaLocationContactInformationChangedEvent.php index 425d6e1f0..de3dbcf37 100644 --- a/src/Surfnet/Stepup/Configuration/Event/RaLocationContactInformationChangedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/RaLocationContactInformationChangedEvent.php @@ -43,11 +43,11 @@ class RaLocationContactInformationChangedEvent implements SerializableInterface public function __construct( InstitutionConfigurationId $institutionConfigurationId, RaLocationId $raLocationId, - ContactInformation $contactInformation + ContactInformation $contactInformation, ) { $this->institutionConfigurationId = $institutionConfigurationId; - $this->raLocationId = $raLocationId; - $this->contactInformation = $contactInformation; + $this->raLocationId = $raLocationId; + $this->contactInformation = $contactInformation; } public static function deserialize(array $data) @@ -55,7 +55,7 @@ public static function deserialize(array $data) return new self( new InstitutionConfigurationId($data['institution_configuration_id']), new RaLocationId($data['ra_location_id']), - new ContactInformation($data['contact_information']) + new ContactInformation($data['contact_information']), ); } @@ -63,8 +63,8 @@ public function serialize(): array { return [ 'institution_configuration_id' => $this->institutionConfigurationId->getInstitutionConfigurationId(), - 'ra_location_id' => $this->raLocationId->getRaLocationId(), - 'contact_information' => $this->contactInformation->getContactInformation(), + 'ra_location_id' => $this->raLocationId->getRaLocationId(), + 'contact_information' => $this->contactInformation->getContactInformation(), ]; } } diff --git a/src/Surfnet/Stepup/Configuration/Event/RaLocationRelocatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/RaLocationRelocatedEvent.php index 904bf0be8..6e3c7db26 100644 --- a/src/Surfnet/Stepup/Configuration/Event/RaLocationRelocatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/RaLocationRelocatedEvent.php @@ -43,11 +43,11 @@ class RaLocationRelocatedEvent implements SerializableInterface public function __construct( InstitutionConfigurationId $institutionConfigurationId, RaLocationId $raLocationId, - Location $location + Location $location, ) { $this->institutionConfigurationId = $institutionConfigurationId; - $this->raLocationId = $raLocationId; - $this->location = $location; + $this->raLocationId = $raLocationId; + $this->location = $location; } public static function deserialize(array $data) @@ -55,7 +55,7 @@ public static function deserialize(array $data) return new self( new InstitutionConfigurationId($data['institution_configuration_id']), new RaLocationId($data['ra_location_id']), - new Location($data['location']) + new Location($data['location']), ); } @@ -63,8 +63,8 @@ public function serialize(): array { return [ 'institution_configuration_id' => $this->institutionConfigurationId->getInstitutionConfigurationId(), - 'ra_location_id' => $this->raLocationId->getRaLocationId(), - 'location' => $this->location->getLocation(), + 'ra_location_id' => $this->raLocationId->getRaLocationId(), + 'location' => $this->location->getLocation(), ]; } } diff --git a/src/Surfnet/Stepup/Configuration/Event/RaLocationRemovedEvent.php b/src/Surfnet/Stepup/Configuration/Event/RaLocationRemovedEvent.php index 956d39ddb..4587b2972 100644 --- a/src/Surfnet/Stepup/Configuration/Event/RaLocationRemovedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/RaLocationRemovedEvent.php @@ -42,17 +42,17 @@ class RaLocationRemovedEvent implements SerializableInterface public function __construct( InstitutionConfigurationId $institutionConfigurationId, - RaLocationId $raLocationId + RaLocationId $raLocationId, ) { $this->institutionConfigurationId = $institutionConfigurationId; - $this->raLocationId = $raLocationId; + $this->raLocationId = $raLocationId; } public static function deserialize(array $data) { return new self( new InstitutionConfigurationId($data['institution_configuration_id']), - new RaLocationId($data['ra_location_id']) + new RaLocationId($data['ra_location_id']), ); } @@ -60,7 +60,7 @@ public function serialize(): array { return [ 'institution_configuration_id' => $this->institutionConfigurationId->getInstitutionConfigurationId(), - 'ra_location_id' => $this->raLocationId->getRaLocationId(), + 'ra_location_id' => $this->raLocationId->getRaLocationId(), ]; } } diff --git a/src/Surfnet/Stepup/Configuration/Event/RaLocationRenamedEvent.php b/src/Surfnet/Stepup/Configuration/Event/RaLocationRenamedEvent.php index c76ab3829..8a4c4c3ea 100644 --- a/src/Surfnet/Stepup/Configuration/Event/RaLocationRenamedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/RaLocationRenamedEvent.php @@ -43,11 +43,11 @@ class RaLocationRenamedEvent implements SerializableInterface public function __construct( InstitutionConfigurationId $institutionConfigurationId, RaLocationId $raLocationId, - RaLocationName $raLocationName + RaLocationName $raLocationName, ) { $this->institutionConfigurationId = $institutionConfigurationId; - $this->raLocationId = $raLocationId; - $this->raLocationName = $raLocationName; + $this->raLocationId = $raLocationId; + $this->raLocationName = $raLocationName; } public static function deserialize(array $data) @@ -55,7 +55,7 @@ public static function deserialize(array $data) return new self( new InstitutionConfigurationId($data['institution_configuration_id']), new RaLocationId($data['ra_location_id']), - new RaLocationName($data['ra_location_name']) + new RaLocationName($data['ra_location_name']), ); } @@ -63,8 +63,8 @@ public function serialize(): array { return [ 'institution_configuration_id' => $this->institutionConfigurationId->getInstitutionConfigurationId(), - 'ra_location_id' => $this->raLocationId->getRaLocationId(), - 'ra_location_name' => $this->raLocationName->getRaLocationName(), + 'ra_location_id' => $this->raLocationId->getRaLocationId(), + 'ra_location_name' => $this->raLocationName->getRaLocationName(), ]; } } diff --git a/src/Surfnet/Stepup/Configuration/Event/SelectRaaOptionChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/SelectRaaOptionChangedEvent.php index 5f20f557f..e1a7a6a5b 100644 --- a/src/Surfnet/Stepup/Configuration/Event/SelectRaaOptionChangedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/SelectRaaOptionChangedEvent.php @@ -26,29 +26,11 @@ final class SelectRaaOptionChangedEvent implements SerializableInterface { - /** - * @var InstitutionConfigurationId - */ - public $institutionConfigurationId; - - /** - * @var Institution - */ - public $institution; - - /** - * @var InstitutionAuthorizationOption - */ - public $selectRaaOption; - public function __construct( - InstitutionConfigurationId $institutionConfigurationId, - Institution $institution, - InstitutionAuthorizationOption $selectRaaOption + public InstitutionConfigurationId $institutionConfigurationId, + public Institution $institution, + public InstitutionAuthorizationOption $selectRaaOption, ) { - $this->institutionConfigurationId = $institutionConfigurationId; - $this->institution = $institution; - $this->selectRaaOption = $selectRaaOption; } public static function deserialize(array $data) @@ -57,7 +39,10 @@ public static function deserialize(array $data) return new self( new InstitutionConfigurationId($data['institution_configuration_id']), $institution, - InstitutionAuthorizationOption::fromInstitutionConfig(InstitutionRole::selectRaa(), $data['select_raa_option']) + InstitutionAuthorizationOption::fromInstitutionConfig( + InstitutionRole::selectRaa(), + $data['select_raa_option'], + ), ); } diff --git a/src/Surfnet/Stepup/Configuration/Event/SelfAssertedTokensOptionChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/SelfAssertedTokensOptionChangedEvent.php index b8fa23128..2c790eb6a 100644 --- a/src/Surfnet/Stepup/Configuration/Event/SelfAssertedTokensOptionChangedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/SelfAssertedTokensOptionChangedEvent.php @@ -25,29 +25,11 @@ final class SelfAssertedTokensOptionChangedEvent implements SerializableInterface { - /** - * @var InstitutionConfigurationId - */ - public $institutionConfigurationId; - - /** - * @var Institution - */ - public $institution; - - /** - * @var SelfAssertedTokensOption - */ - public $selfAssertedTokensOption; - public function __construct( - InstitutionConfigurationId $institutionConfigurationId, - Institution $institution, - SelfAssertedTokensOption $selfVetOption + public InstitutionConfigurationId $institutionConfigurationId, + public Institution $institution, + public SelfAssertedTokensOption $selfAssertedTokensOption, ) { - $this->institutionConfigurationId = $institutionConfigurationId; - $this->institution = $institution; - $this->selfAssertedTokensOption = $selfVetOption; } public static function deserialize(array $data) @@ -55,7 +37,7 @@ public static function deserialize(array $data) return new self( new InstitutionConfigurationId($data['institution_configuration_id']), new Institution($data['institution']), - new SelfAssertedTokensOption($data['self_asserted_tokens_option']) + new SelfAssertedTokensOption($data['self_asserted_tokens_option']), ); } diff --git a/src/Surfnet/Stepup/Configuration/Event/SelfVetOptionChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/SelfVetOptionChangedEvent.php index 1d0251903..ed2870c78 100644 --- a/src/Surfnet/Stepup/Configuration/Event/SelfVetOptionChangedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/SelfVetOptionChangedEvent.php @@ -25,29 +25,11 @@ final class SelfVetOptionChangedEvent implements SerializableInterface { - /** - * @var InstitutionConfigurationId - */ - public $institutionConfigurationId; - - /** - * @var Institution - */ - public $institution; - - /** - * @var SelfVetOption - */ - public $selfVetOption; - public function __construct( - InstitutionConfigurationId $institutionConfigurationId, - Institution $institution, - SelfVetOption $selfVetOption + public InstitutionConfigurationId $institutionConfigurationId, + public Institution $institution, + public SelfVetOption $selfVetOption, ) { - $this->institutionConfigurationId = $institutionConfigurationId; - $this->institution = $institution; - $this->selfVetOption = $selfVetOption; } public static function deserialize(array $data) @@ -55,7 +37,7 @@ public static function deserialize(array $data) return new self( new InstitutionConfigurationId($data['institution_configuration_id']), new Institution($data['institution']), - new SelfVetOption($data['self_vet_option']) + new SelfVetOption($data['self_vet_option']), ); } @@ -63,8 +45,8 @@ public function serialize(): array { return [ 'institution_configuration_id' => $this->institutionConfigurationId->getInstitutionConfigurationId(), - 'institution' => $this->institution->getInstitution(), - 'self_vet_option' => $this->selfVetOption->isEnabled(), + 'institution' => $this->institution->getInstitution(), + 'self_vet_option' => $this->selfVetOption->isEnabled(), ]; } } diff --git a/src/Surfnet/Stepup/Configuration/Event/ServiceProvidersUpdatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/ServiceProvidersUpdatedEvent.php index f9b018d65..4966b279b 100644 --- a/src/Surfnet/Stepup/Configuration/Event/ServiceProvidersUpdatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/ServiceProvidersUpdatedEvent.php @@ -27,7 +27,7 @@ class ServiceProvidersUpdatedEvent extends ConfigurationEvent /** * @param string $configurationId - * @param array $serviceProviders + * @param array $serviceProviders */ public function __construct($configurationId, array $serviceProviders) { diff --git a/src/Surfnet/Stepup/Configuration/Event/ShowRaaContactInformationOptionChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/ShowRaaContactInformationOptionChangedEvent.php index 020f4681f..b0499fa42 100644 --- a/src/Surfnet/Stepup/Configuration/Event/ShowRaaContactInformationOptionChangedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/ShowRaaContactInformationOptionChangedEvent.php @@ -25,29 +25,11 @@ final class ShowRaaContactInformationOptionChangedEvent implements SerializableInterface { - /** - * @var InstitutionConfigurationId - */ - public $institutionConfigurationId; - - /** - * @var Institution - */ - public $institution; - - /** - * @var ShowRaaContactInformationOption - */ - public $showRaaContactInformationOption; - public function __construct( - InstitutionConfigurationId $institutionConfigurationId, - Institution $institution, - ShowRaaContactInformationOption $showRaaContactInformationOption + public InstitutionConfigurationId $institutionConfigurationId, + public Institution $institution, + public ShowRaaContactInformationOption $showRaaContactInformationOption, ) { - $this->institutionConfigurationId = $institutionConfigurationId; - $this->institution = $institution; - $this->showRaaContactInformationOption = $showRaaContactInformationOption; } public static function deserialize(array $data) @@ -55,15 +37,15 @@ public static function deserialize(array $data) return new self( new InstitutionConfigurationId($data['institution_configuration_id']), new Institution($data['institution']), - new ShowRaaContactInformationOption($data['show_raa_contact_information_option']) + new ShowRaaContactInformationOption($data['show_raa_contact_information_option']), ); } public function serialize(): array { return [ - 'institution_configuration_id' => $this->institutionConfigurationId->getInstitutionConfigurationId(), - 'institution' => $this->institution->getInstitution(), + 'institution_configuration_id' => $this->institutionConfigurationId->getInstitutionConfigurationId(), + 'institution' => $this->institution->getInstitution(), 'show_raa_contact_information_option' => $this->showRaaContactInformationOption->isEnabled(), ]; } diff --git a/src/Surfnet/Stepup/Configuration/Event/SraaUpdatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/SraaUpdatedEvent.php index 7bc991550..f383b4f6d 100644 --- a/src/Surfnet/Stepup/Configuration/Event/SraaUpdatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/SraaUpdatedEvent.php @@ -27,7 +27,7 @@ class SraaUpdatedEvent extends ConfigurationEvent /** * @param string $configurationId - * @param array $sraaList + * @param array $sraaList */ public function __construct($configurationId, array $sraaList) { diff --git a/src/Surfnet/Stepup/Configuration/Event/SsoOn2faOptionChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/SsoOn2faOptionChangedEvent.php index a096fdc86..c912a8631 100644 --- a/src/Surfnet/Stepup/Configuration/Event/SsoOn2faOptionChangedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/SsoOn2faOptionChangedEvent.php @@ -27,29 +27,11 @@ final class SsoOn2faOptionChangedEvent implements SerializableInterface { - /** - * @var InstitutionConfigurationId - */ - public $institutionConfigurationId; - - /** - * @var Institution - */ - public $institution; - - /** - * @var SsoOn2faOption - */ - public $ssoOn2faOption; - public function __construct( - InstitutionConfigurationId $institutionConfigurationId, - Institution $institution, - SsoOn2faOption $ssoOn2faOption + public InstitutionConfigurationId $institutionConfigurationId, + public Institution $institution, + public SsoOn2faOption $ssoOn2faOption, ) { - $this->institutionConfigurationId = $institutionConfigurationId; - $this->institution = $institution; - $this->ssoOn2faOption = $ssoOn2faOption; } public static function deserialize(array $data): self @@ -57,7 +39,7 @@ public static function deserialize(array $data): self return new self( new InstitutionConfigurationId($data['institution_configuration_id']), new Institution($data['institution']), - new SsoOn2faOption($data['sso_on_2fa_option']) + new SsoOn2faOption($data['sso_on_2fa_option']), ); } diff --git a/src/Surfnet/Stepup/Configuration/Event/UseRaLocationsOptionChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/UseRaLocationsOptionChangedEvent.php index fa73490cd..9a65c5841 100644 --- a/src/Surfnet/Stepup/Configuration/Event/UseRaLocationsOptionChangedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/UseRaLocationsOptionChangedEvent.php @@ -25,29 +25,11 @@ final class UseRaLocationsOptionChangedEvent implements SerializableInterface { - /** - * @var InstitutionConfigurationId - */ - public $institutionConfigurationId; - - /** - * @var Institution - */ - public $institution; - - /** - * @var UseRaLocationsOption - */ - public $useRaLocationsOption; - public function __construct( - InstitutionConfigurationId $institutionConfigurationId, - Institution $institution, - UseRaLocationsOption $useRaLocationsOption + public InstitutionConfigurationId $institutionConfigurationId, + public Institution $institution, + public UseRaLocationsOption $useRaLocationsOption, ) { - $this->institutionConfigurationId = $institutionConfigurationId; - $this->institution = $institution; - $this->useRaLocationsOption = $useRaLocationsOption; } public static function deserialize(array $data) @@ -55,7 +37,7 @@ public static function deserialize(array $data) return new self( new InstitutionConfigurationId($data['institution_configuration_id']), new Institution($data['institution']), - new UseRaLocationsOption($data['use_ra_locations_option']) + new UseRaLocationsOption($data['use_ra_locations_option']), ); } @@ -63,8 +45,8 @@ public function serialize(): array { return [ 'institution_configuration_id' => $this->institutionConfigurationId->getInstitutionConfigurationId(), - 'institution' => $this->institution->getInstitution(), - 'use_ra_locations_option' => $this->useRaLocationsOption->isEnabled(), + 'institution' => $this->institution->getInstitution(), + 'use_ra_locations_option' => $this->useRaLocationsOption->isEnabled(), ]; } } diff --git a/src/Surfnet/Stepup/Configuration/Event/UseRaOptionChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/UseRaOptionChangedEvent.php index edbd53470..ebb8ec5e2 100644 --- a/src/Surfnet/Stepup/Configuration/Event/UseRaOptionChangedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/UseRaOptionChangedEvent.php @@ -26,29 +26,11 @@ final class UseRaOptionChangedEvent implements SerializableInterface { - /** - * @var InstitutionConfigurationId - */ - public $institutionConfigurationId; - - /** - * @var Institution - */ - public $institution; - - /** - * @var InstitutionAuthorizationOption - */ - public $useRaOption; - public function __construct( - InstitutionConfigurationId $institutionConfigurationId, - Institution $institution, - InstitutionAuthorizationOption $useRaOption + public InstitutionConfigurationId $institutionConfigurationId, + public Institution $institution, + public InstitutionAuthorizationOption $useRaOption, ) { - $this->institutionConfigurationId = $institutionConfigurationId; - $this->institution = $institution; - $this->useRaOption = $useRaOption; } public static function deserialize(array $data) @@ -57,7 +39,7 @@ public static function deserialize(array $data) return new self( new InstitutionConfigurationId($data['institution_configuration_id']), $institution, - InstitutionAuthorizationOption::fromInstitutionConfig(InstitutionRole::useRa(), $data['use_ra_option']) + InstitutionAuthorizationOption::fromInstitutionConfig(InstitutionRole::useRa(), $data['use_ra_option']), ); } diff --git a/src/Surfnet/Stepup/Configuration/Event/UseRaaOptionChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/UseRaaOptionChangedEvent.php index 805d19c13..c7e3427e3 100644 --- a/src/Surfnet/Stepup/Configuration/Event/UseRaaOptionChangedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/UseRaaOptionChangedEvent.php @@ -26,29 +26,11 @@ final class UseRaaOptionChangedEvent implements SerializableInterface { - /** - * @var InstitutionConfigurationId - */ - public $institutionConfigurationId; - - /** - * @var Institution - */ - public $institution; - - /** - * @var InstitutionAuthorizationOption - */ - public $useRaaOption; - public function __construct( - InstitutionConfigurationId $institutionConfigurationId, - Institution $institution, - InstitutionAuthorizationOption $useRaaOption + public InstitutionConfigurationId $institutionConfigurationId, + public Institution $institution, + public InstitutionAuthorizationOption $useRaaOption, ) { - $this->institutionConfigurationId = $institutionConfigurationId; - $this->institution = $institution; - $this->useRaaOption = $useRaaOption; } public static function deserialize(array $data) @@ -57,7 +39,7 @@ public static function deserialize(array $data) return new self( new InstitutionConfigurationId($data['institution_configuration_id']), $institution, - InstitutionAuthorizationOption::fromInstitutionConfig(InstitutionRole::useRaa(), $data['use_raa_option']) + InstitutionAuthorizationOption::fromInstitutionConfig(InstitutionRole::useRaa(), $data['use_raa_option']), ); } diff --git a/src/Surfnet/Stepup/Configuration/Event/VerifyEmailOptionChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/VerifyEmailOptionChangedEvent.php index e90a31c8a..e41d6c7db 100644 --- a/src/Surfnet/Stepup/Configuration/Event/VerifyEmailOptionChangedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/VerifyEmailOptionChangedEvent.php @@ -25,29 +25,11 @@ final class VerifyEmailOptionChangedEvent implements SerializableInterface { - /** - * @var InstitutionConfigurationId - */ - public $institutionConfigurationId; - - /** - * @var Institution - */ - public $institution; - - /** - * @var VerifyEmailOption - */ - public $verifyEmailOption; - public function __construct( - InstitutionConfigurationId $institutionConfigurationId, - Institution $institution, - VerifyEmailOption $verifyEmailOption + public InstitutionConfigurationId $institutionConfigurationId, + public Institution $institution, + public VerifyEmailOption $verifyEmailOption, ) { - $this->institutionConfigurationId = $institutionConfigurationId; - $this->institution = $institution; - $this->verifyEmailOption = $verifyEmailOption; } public static function deserialize(array $data) @@ -55,7 +37,7 @@ public static function deserialize(array $data) return new self( new InstitutionConfigurationId($data['institution_configuration_id']), new Institution($data['institution']), - new VerifyEmailOption($data['verify_email_option']) + new VerifyEmailOption($data['verify_email_option']), ); } @@ -63,8 +45,8 @@ public function serialize(): array { return [ 'institution_configuration_id' => $this->institutionConfigurationId->getInstitutionConfigurationId(), - 'institution' => $this->institution->getInstitution(), - 'verify_email_option' => $this->verifyEmailOption->isEnabled(), + 'institution' => $this->institution->getInstitution(), + 'verify_email_option' => $this->verifyEmailOption->isEnabled(), ]; } } diff --git a/src/Surfnet/Stepup/Configuration/EventSourcing/ConfigurationRepository.php b/src/Surfnet/Stepup/Configuration/EventSourcing/ConfigurationRepository.php index c141b1bfd..61bd0e1f9 100644 --- a/src/Surfnet/Stepup/Configuration/EventSourcing/ConfigurationRepository.php +++ b/src/Surfnet/Stepup/Configuration/EventSourcing/ConfigurationRepository.php @@ -29,7 +29,7 @@ class ConfigurationRepository extends EventSourcingRepository public function __construct( EventStoreInterface $eventStore, EventBusInterface $eventBus, - AggregateFactoryInterface $aggregateFactory + AggregateFactoryInterface $aggregateFactory, ) { parent::__construct($eventStore, $eventBus, Configuration::class, $aggregateFactory); } diff --git a/src/Surfnet/Stepup/Configuration/EventSourcing/InstitutionConfigurationRepository.php b/src/Surfnet/Stepup/Configuration/EventSourcing/InstitutionConfigurationRepository.php index 8053b497c..846f6d827 100644 --- a/src/Surfnet/Stepup/Configuration/EventSourcing/InstitutionConfigurationRepository.php +++ b/src/Surfnet/Stepup/Configuration/EventSourcing/InstitutionConfigurationRepository.php @@ -29,13 +29,13 @@ class InstitutionConfigurationRepository extends EventSourcingRepository public function __construct( EventStoreInterface $eventStore, EventBusInterface $eventBus, - AggregateFactoryInterface $aggregateFactory + AggregateFactoryInterface $aggregateFactory, ) { parent::__construct( $eventStore, $eventBus, InstitutionConfiguration::class, - $aggregateFactory + $aggregateFactory, ); } } diff --git a/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php b/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php index 5a7d62533..06c74bb00 100644 --- a/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php +++ b/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php @@ -150,8 +150,10 @@ class InstitutionConfiguration extends EventSourcedAggregateRoot implements Inst * @param Institution $institution * @return InstitutionConfiguration */ - public static function create(InstitutionConfigurationId $institutionConfigurationId, Institution $institution): self - { + public static function create( + InstitutionConfigurationId $institutionConfigurationId, + Institution $institution, + ): self { $institutionConfiguration = new self; $institutionConfiguration->apply( new NewInstitutionConfigurationCreatedEvent( @@ -163,34 +165,36 @@ public static function create(InstitutionConfigurationId $institutionConfigurati NumberOfTokensPerIdentityOption::getDefault(), SsoOn2faOption::getDefault(), SelfVetOption::getDefault(), - SelfAssertedTokensOption::getDefault() - ) + SelfAssertedTokensOption::getDefault(), + ), + ); + $institutionConfiguration->apply( + new AllowedSecondFactorListUpdatedEvent( + $institutionConfigurationId, + $institution, + AllowedSecondFactorList::blank(), + ), ); - $institutionConfiguration->apply(new AllowedSecondFactorListUpdatedEvent( - $institutionConfigurationId, - $institution, - AllowedSecondFactorList::blank() - )); $institutionConfiguration->apply( new UseRaOptionChangedEvent( $institutionConfigurationId, $institution, - InstitutionAuthorizationOption::getDefault(InstitutionRole::useRa()) - ) + InstitutionAuthorizationOption::getDefault(InstitutionRole::useRa()), + ), ); $institutionConfiguration->apply( new UseRaaOptionChangedEvent( $institutionConfigurationId, $institution, - InstitutionAuthorizationOption::getDefault(InstitutionRole::useRaa()) - ) + InstitutionAuthorizationOption::getDefault(InstitutionRole::useRaa()), + ), ); $institutionConfiguration->apply( new SelectRaaOptionChangedEvent( $institutionConfigurationId, $institution, - InstitutionAuthorizationOption::getDefault(InstitutionRole::selectRaa()) - ) + InstitutionAuthorizationOption::getDefault(InstitutionRole::selectRaa()), + ), ); return $institutionConfiguration; @@ -215,34 +219,36 @@ public function rebuild(): static VerifyEmailOption::getDefault(), NumberOfTokensPerIdentityOption::getDefault(), SelfVetOption::getDefault(), - SelfAssertedTokensOption::getDefault() - ) + SelfAssertedTokensOption::getDefault(), + ), + ); + $this->apply( + new AllowedSecondFactorListUpdatedEvent( + $this->institutionConfigurationId, + $this->institution, + AllowedSecondFactorList::blank(), + ), ); - $this->apply(new AllowedSecondFactorListUpdatedEvent( - $this->institutionConfigurationId, - $this->institution, - AllowedSecondFactorList::blank() - )); $this->apply( new UseRaOptionChangedEvent( $this->institutionConfigurationId, $this->institution, - InstitutionAuthorizationOption::getDefault(InstitutionRole::useRa()) - ) + InstitutionAuthorizationOption::getDefault(InstitutionRole::useRa()), + ), ); $this->apply( new UseRaaOptionChangedEvent( $this->institutionConfigurationId, $this->institution, - InstitutionAuthorizationOption::getDefault(InstitutionRole::useRaa()) - ) + InstitutionAuthorizationOption::getDefault(InstitutionRole::useRaa()), + ), ); $this->apply( new SelectRaaOptionChangedEvent( $this->institutionConfigurationId, $this->institution, - InstitutionAuthorizationOption::getDefault(InstitutionRole::selectRaa()) - ) + InstitutionAuthorizationOption::getDefault(InstitutionRole::selectRaa()), + ), ); return $this; @@ -262,13 +268,14 @@ public function configureUseRaLocationsOption(UseRaLocationsOption $useRaLocatio new UseRaLocationsOptionChangedEvent( $this->institutionConfigurationId, $this->institution, - $useRaLocationsOption - ) + $useRaLocationsOption, + ), ); } - public function configureShowRaaContactInformationOption(ShowRaaContactInformationOption $showRaaContactInformationOption): void - { + public function configureShowRaaContactInformationOption( + ShowRaaContactInformationOption $showRaaContactInformationOption, + ): void { if ($this->showRaaContactInformationOption->equals($showRaaContactInformationOption)) { return; } @@ -277,8 +284,8 @@ public function configureShowRaaContactInformationOption(ShowRaaContactInformati new ShowRaaContactInformationOptionChangedEvent( $this->institutionConfigurationId, $this->institution, - $showRaaContactInformationOption - ) + $showRaaContactInformationOption, + ), ); } @@ -292,13 +299,13 @@ public function configureVerifyEmailOption(VerifyEmailOption $verifyEmailOption) new VerifyEmailOptionChangedEvent( $this->institutionConfigurationId, $this->institution, - $verifyEmailOption - ) + $verifyEmailOption, + ), ); } public function configureNumberOfTokensPerIdentityOption( - NumberOfTokensPerIdentityOption $numberOfTokensPerIdentityOption + NumberOfTokensPerIdentityOption $numberOfTokensPerIdentityOption, ): void { if ($this->numberOfTokensPerIdentityOption->equals($numberOfTokensPerIdentityOption)) { return; @@ -308,8 +315,8 @@ public function configureNumberOfTokensPerIdentityOption( new NumberOfTokensPerIdentityOptionChangedEvent( $this->institutionConfigurationId, $this->institution, - $numberOfTokensPerIdentityOption - ) + $numberOfTokensPerIdentityOption, + ), ); } @@ -323,8 +330,8 @@ public function configureSelfVetOption(SelfVetOption $selfVetOption): void new SelfVetOptionChangedEvent( $this->institutionConfigurationId, $this->institution, - $selfVetOption - ) + $selfVetOption, + ), ); } @@ -340,8 +347,8 @@ public function configureSelfAssertedTokensOption(SelfAssertedTokensOption $self new SelfAssertedTokensOptionChangedEvent( $this->institutionConfigurationId, $this->institution, - $selfAssertedTokensOption - ) + $selfAssertedTokensOption, + ), ); } @@ -355,8 +362,8 @@ public function configureSsoOn2faOption(SsoOn2faOption $ssoOn2faOption): void new SsoOn2faOptionChangedEvent( $this->institutionConfigurationId, $this->institution, - $ssoOn2faOption - ) + $ssoOn2faOption, + ), ); } @@ -372,8 +379,8 @@ public function updateUseRaOption(InstitutionAuthorizationOption $useRaOption): new UseRaOptionChangedEvent( $this->institutionConfigurationId, $this->institution, - $useRaOption - ) + $useRaOption, + ), ); } @@ -389,8 +396,8 @@ public function updateUseRaaOption(InstitutionAuthorizationOption $useRaaOption) new UseRaaOptionChangedEvent( $this->institutionConfigurationId, $this->institution, - $useRaaOption - ) + $useRaaOption, + ), ); } @@ -406,8 +413,8 @@ public function updateSelectRaaOption(InstitutionAuthorizationOption $selectRaaO new SelectRaaOptionChangedEvent( $this->institutionConfigurationId, $this->institution, - $selectRaaOption - ) + $selectRaaOption, + ), ); } @@ -424,8 +431,8 @@ public function updateAllowedSecondFactorList(AllowedSecondFactorList $allowedSe new AllowedSecondFactorListUpdatedEvent( $this->institutionConfigurationId, $this->institution, - $allowedSecondFactorList - ) + $allowedSecondFactorList, + ), ); } @@ -439,25 +446,29 @@ public function addRaLocation( RaLocationId $raLocationId, RaLocationName $raLocationName, Location $location, - ContactInformation $contactInformation + ContactInformation $contactInformation, ): void { if ($this->raLocations->containsWithId($raLocationId)) { - throw new DomainException(sprintf( - 'Cannot add RaLocation with RaLocationId "%s" to RaLocations of InstitutionConfiguration "%s":' - . ' it is already present', - $raLocationId, - $this->getAggregateRootId() - )); + throw new DomainException( + sprintf( + 'Cannot add RaLocation with RaLocationId "%s" to RaLocations of InstitutionConfiguration "%s":' + . ' it is already present', + $raLocationId, + $this->getAggregateRootId(), + ), + ); } - $this->apply(new RaLocationAddedEvent( - $this->institutionConfigurationId, - $this->institution, - $raLocationId, - $raLocationName, - $location, - $contactInformation - )); + $this->apply( + new RaLocationAddedEvent( + $this->institutionConfigurationId, + $this->institution, + $raLocationId, + $raLocationName, + $location, + $contactInformation, + ), + ); } /** @@ -470,27 +481,29 @@ public function changeRaLocation( RaLocationId $raLocationId, RaLocationName $raLocationName, Location $location, - ContactInformation $contactInformation + ContactInformation $contactInformation, ): void { if (!$this->raLocations->containsWithId($raLocationId)) { - throw new DomainException(sprintf( - 'Cannot change RaLocation with RaLocationId "%s" in RaLocations of InstitutionConfiguration "%s":' - . ' it is not present', - $raLocationId, - $this->getAggregateRootId() - )); + throw new DomainException( + sprintf( + 'Cannot change RaLocation with RaLocationId "%s" in RaLocations of InstitutionConfiguration "%s":' + . ' it is not present', + $raLocationId, + $this->getAggregateRootId(), + ), + ); } $raLocation = $this->raLocations->getById($raLocationId); if (!$raLocation->getName()->equals($raLocationName)) { $this->apply( - new RaLocationRenamedEvent($this->institutionConfigurationId, $raLocationId, $raLocationName) + new RaLocationRenamedEvent($this->institutionConfigurationId, $raLocationId, $raLocationName), ); } if (!$raLocation->getLocation()->equals($location)) { $this->apply( - new RaLocationRelocatedEvent($this->institutionConfigurationId, $raLocationId, $location) + new RaLocationRelocatedEvent($this->institutionConfigurationId, $raLocationId, $location), ); } if (!$raLocation->getContactInformation()->equals($contactInformation)) { @@ -498,8 +511,8 @@ public function changeRaLocation( new RaLocationContactInformationChangedEvent( $this->institutionConfigurationId, $raLocationId, - $contactInformation - ) + $contactInformation, + ), ); } } @@ -510,12 +523,14 @@ public function changeRaLocation( public function removeRaLocation(RaLocationId $raLocationId): void { if (!$this->raLocations->containsWithId($raLocationId)) { - throw new DomainException(sprintf( - 'Cannot remove RaLocation with RaLocationId "%s" in RaLocations of InstitutionConfiguration "%s":' - . ' it is not present', - $raLocationId, - $this->getAggregateRootId() - )); + throw new DomainException( + sprintf( + 'Cannot remove RaLocation with RaLocationId "%s" in RaLocations of InstitutionConfiguration "%s":' + . ' it is not present', + $raLocationId, + $this->getAggregateRootId(), + ), + ); } $this->apply(new RaLocationRemovedEvent($this->institutionConfigurationId, $raLocationId)); @@ -537,7 +552,6 @@ public function getAggregateRootId(): string /** * Check if role from institution is allowed to accredit roles * - * @param Institution $institution * @return bool */ public function isInstitutionAllowedToAccreditRoles(Institution $institution) @@ -553,17 +567,17 @@ public function isInstitutionAllowedToAccreditRoles(Institution $institution) protected function applyNewInstitutionConfigurationCreatedEvent(NewInstitutionConfigurationCreatedEvent $event) { - $this->institutionConfigurationId = $event->institutionConfigurationId; - $this->institution = $event->institution; - $this->useRaLocationsOption = $event->useRaLocationsOption; + $this->institutionConfigurationId = $event->institutionConfigurationId; + $this->institution = $event->institution; + $this->useRaLocationsOption = $event->useRaLocationsOption; $this->showRaaContactInformationOption = $event->showRaaContactInformationOption; - $this->verifyEmailOption = $event->verifyEmailOption; + $this->verifyEmailOption = $event->verifyEmailOption; $this->selfVetOption = $event->selfVetOption; $this->ssoOn2faOption = $event->ssoOn2faOption; $this->selfAssertedTokensOption = $event->selfAssertedTokensOption; $this->numberOfTokensPerIdentityOption = $event->numberOfTokensPerIdentityOption; - $this->raLocations = new RaLocationList([]); - $this->isMarkedAsDestroyed = false; + $this->raLocations = new RaLocationList([]); + $this->isMarkedAsDestroyed = false; } /** @@ -575,8 +589,6 @@ protected function applyNewInstitutionConfigurationCreatedEvent(NewInstitutionCo * the fields where null'ed (removed from configuration). * * This also applies for applyUseRaaOptionChangedEvent & applySelectRaaOptionChangedEvent - * - * @param UseRaOptionChangedEvent $event */ protected function applyUseRaOptionChangedEvent(UseRaOptionChangedEvent $event) { @@ -599,37 +611,37 @@ protected function applyUseRaLocationsOptionChangedEvent(UseRaLocationsOptionCha } protected function applyShowRaaContactInformationOptionChangedEvent( - ShowRaaContactInformationOptionChangedEvent $event + ShowRaaContactInformationOptionChangedEvent $event, ) { $this->showRaaContactInformationOption = $event->showRaaContactInformationOption; } protected function applyVerifyEmailOptionChangedEvent( - VerifyEmailOptionChangedEvent $event + VerifyEmailOptionChangedEvent $event, ) { $this->verifyEmailOption = $event->verifyEmailOption; } protected function applySelfVetOptionChangedEvent( - SelfVetOptionChangedEvent $event + SelfVetOptionChangedEvent $event, ) { $this->selfVetOption = $event->selfVetOption; } protected function applySelfAssertedTokensOptionChangedEvent( - SelfAssertedTokensOptionChangedEvent $event + SelfAssertedTokensOptionChangedEvent $event, ) { $this->selfAssertedTokensOption = $event->selfAssertedTokensOption; } protected function applySsoOn2faOptionChangedEvent( - SsoOn2faOptionChangedEvent $event + SsoOn2faOptionChangedEvent $event, ) { $this->ssoOn2faOption = $event->ssoOn2faOption; } protected function applyNumberOfTokensPerIdentityOptionChangedEvent( - NumberOfTokensPerIdentityOptionChangedEvent $event + NumberOfTokensPerIdentityOptionChangedEvent $event, ) { $this->numberOfTokensPerIdentityOption = $event->numberOfTokensPerIdentityOption; } @@ -646,8 +658,8 @@ protected function applyRaLocationAddedEvent(RaLocationAddedEvent $event) $event->raLocationId, $event->raLocationName, $event->location, - $event->contactInformation - ) + $event->contactInformation, + ), ); } @@ -676,21 +688,20 @@ protected function applyRaLocationRemovedEvent(RaLocationRemovedEvent $event) /** * @SuppressWarnings(PHPMD.UnusedFormalParameter) - * @param InstitutionConfigurationRemovedEvent $event */ protected function applyInstitutionConfigurationRemovedEvent(InstitutionConfigurationRemovedEvent $event) { // reset all configuration to defaults. This way, should it be rebuild, it seems like it is new again - $this->raLocations = new RaLocationList([]); - $this->useRaLocationsOption = UseRaLocationsOption::getDefault(); + $this->raLocations = new RaLocationList([]); + $this->useRaLocationsOption = UseRaLocationsOption::getDefault(); $this->showRaaContactInformationOption = ShowRaaContactInformationOption::getDefault(); - $this->verifyEmailOption = VerifyEmailOption::getDefault(); + $this->verifyEmailOption = VerifyEmailOption::getDefault(); $this->numberOfTokensPerIdentityOption = NumberOfTokensPerIdentityOption::getDefault(); - $this->allowedSecondFactorList = AllowedSecondFactorList::blank(); + $this->allowedSecondFactorList = AllowedSecondFactorList::blank(); $this->useRaOption = InstitutionAuthorizationOption::getDefault(InstitutionRole::useRa()); $this->useRaaOption = InstitutionAuthorizationOption::getDefault(InstitutionRole::useRaa()); $this->selectRaaOption = InstitutionAuthorizationOption::getDefault(InstitutionRole::selectRaa()); - $this->isMarkedAsDestroyed = true; + $this->isMarkedAsDestroyed = true; } } diff --git a/src/Surfnet/Stepup/Configuration/Value/AllowedSecondFactorList.php b/src/Surfnet/Stepup/Configuration/Value/AllowedSecondFactorList.php index 41fab6a92..c40892dcf 100644 --- a/src/Surfnet/Stepup/Configuration/Value/AllowedSecondFactorList.php +++ b/src/Surfnet/Stepup/Configuration/Value/AllowedSecondFactorList.php @@ -55,10 +55,6 @@ public static function ofTypes($allowedSecondFactors): self return new self($allowedSecondFactors); } - /** - * @param SecondFactorType $secondFactor - * @return bool - */ public function allows(SecondFactorType $secondFactor): bool { return $this->isBlank() || $this->contains($secondFactor); @@ -72,10 +68,6 @@ public function isBlank(): bool return $this->allowedSecondFactors === []; } - /** - * @param SecondFactorType $secondFactor - * @return bool - */ public function contains(SecondFactorType $secondFactor): bool { foreach ($this->allowedSecondFactors as $allowedSecondFactor) { @@ -105,10 +97,8 @@ public function equals(AllowedSecondFactorList $other): bool public static function deserialize(array $data) { $secondFactorTypes = array_map( - function ($secondFactorString): SecondFactorType { - return new SecondFactorType($secondFactorString); - }, - $data['allowed_second_factors'] + fn($secondFactorString): SecondFactorType => new SecondFactorType($secondFactorString), + $data['allowed_second_factors'], ); return new self($secondFactorTypes); @@ -117,10 +107,8 @@ function ($secondFactorString): SecondFactorType { public function serialize(): array { $allowedSecondFactors = array_map( - function (SecondFactorType $secondFactorType): string { - return $secondFactorType->getSecondFactorType(); - }, - $this->allowedSecondFactors + fn(SecondFactorType $secondFactorType): string => $secondFactorType->getSecondFactorType(), + $this->allowedSecondFactors, ); return [ diff --git a/src/Surfnet/Stepup/Configuration/Value/ContactInformation.php b/src/Surfnet/Stepup/Configuration/Value/ContactInformation.php index d0586a2be..02b0744d5 100644 --- a/src/Surfnet/Stepup/Configuration/Value/ContactInformation.php +++ b/src/Surfnet/Stepup/Configuration/Value/ContactInformation.php @@ -19,11 +19,12 @@ namespace Surfnet\Stepup\Configuration\Value; use JsonSerializable; +use Stringable; use Surfnet\Stepup\Exception\InvalidArgumentException; -final class ContactInformation implements JsonSerializable +final class ContactInformation implements JsonSerializable, Stringable { - private string $contactInformation; + private readonly string $contactInformation; /** * @param string $contactInformation @@ -37,10 +38,6 @@ public function __construct($contactInformation) $this->contactInformation = trim($contactInformation); } - /** - * @param ContactInformation $otherContactInformation - * @return bool - */ public function equals(ContactInformation $otherContactInformation): bool { return $this->contactInformation === $otherContactInformation->contactInformation; diff --git a/src/Surfnet/Stepup/Configuration/Value/Institution.php b/src/Surfnet/Stepup/Configuration/Value/Institution.php index 16a0ca37f..24581e11f 100644 --- a/src/Surfnet/Stepup/Configuration/Value/Institution.php +++ b/src/Surfnet/Stepup/Configuration/Value/Institution.php @@ -19,11 +19,12 @@ namespace Surfnet\Stepup\Configuration\Value; use JsonSerializable; +use Stringable; use Surfnet\Stepup\Exception\InvalidArgumentException; -final class Institution implements JsonSerializable +final class Institution implements JsonSerializable, Stringable { - private string $institution; + private readonly string $institution; /** * @param string $institution may not be an empty string @@ -46,7 +47,6 @@ public function getInstitution() } /** - * @param Institution $otherInstitution * @return bool */ public function equals(Institution $otherInstitution): bool diff --git a/src/Surfnet/Stepup/Configuration/Value/InstitutionAuthorizationOption.php b/src/Surfnet/Stepup/Configuration/Value/InstitutionAuthorizationOption.php index 984a69618..fa49bb621 100644 --- a/src/Surfnet/Stepup/Configuration/Value/InstitutionAuthorizationOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/InstitutionAuthorizationOption.php @@ -22,30 +22,24 @@ final class InstitutionAuthorizationOption implements JsonSerializable { - private InstitutionRole $institutionRole; - - private InstitutionSet $institutionSet; - - private bool $isDefault; + private readonly bool $isDefault; /** * If the default is set to true then the object will use the old default behaviour. That behaviour is that it * will take the current institution into account when returning institutions. * * AbstractRoleOption constructor. - * @param InstitutionRole $role - * @param InstitutionSet $institutionSet * @param bool $isDefault */ - private function __construct(InstitutionRole $role, InstitutionSet $institutionSet, $isDefault) - { - $this->institutionRole = $role; - $this->institutionSet = $institutionSet; + private function __construct( + private readonly InstitutionRole $institutionRole, + private readonly InstitutionSet $institutionSet, + $isDefault, + ) { $this->isDefault = (bool)$isDefault; } /** - * @param InstitutionRole $role * @param string[]|null * @return InstitutionAuthorizationOption */ @@ -59,21 +53,21 @@ public static function fromInstitutionConfig(InstitutionRole $role, $institution throw InvalidArgumentException::invalidType( 'array', 'institutions', - $institutions + $institutions, ); } array_walk( $institutions, function ($institution, $key) use ($institutions): void { - if (!is_string($institution) || trim($institution) === '') { + if (!is_string($institution) || trim($institution) === '') { throw InvalidArgumentException::invalidType( 'string', 'institutions', - $institutions[$key] + $institutions[$key], ); } - } + }, ); $set = []; @@ -87,8 +81,6 @@ function ($institution, $key) use ($institutions): void { } /** - * @param InstitutionRole $role - * @param Institution $institution * @param Institution[] $institutions * @return InstitutionAuthorizationOption */ @@ -101,7 +93,6 @@ public static function fromInstitutions(InstitutionRole $role, Institution $inst } /** - * @param InstitutionRole $role * @param string[]|null * @return InstitutionAuthorizationOption */ @@ -111,7 +102,6 @@ public static function getDefault(InstitutionRole $role): self } /** - * @param InstitutionRole $role * @param string[]|null * @return InstitutionAuthorizationOption */ @@ -129,7 +119,6 @@ public static function blank() } /** - * @param InstitutionAuthorizationOption $option * @return bool */ public function equals(InstitutionAuthorizationOption $option): bool @@ -160,7 +149,6 @@ public function getInstitutionSet() * If the default is set to true then the object will use the old default behaviour. That behaviour is that it * will take the current institution into account and this method will return the current institution. * - * @param Institution $institution * @return Institution[] */ public function getInstitutions(Institution $institution) @@ -172,18 +160,14 @@ public function getInstitutions(Institution $institution) } /** - * @param Institution $institution - * @param Institution $default * @return bool */ public function hasInstitution(Institution $institution, Institution $default): bool { $institutions = $this->getInstitutions($default); $list = array_map( - function (Institution $institution) { - return $institution->getInstitution(); - }, - $institutions + fn(Institution $institution) => $institution->getInstitution(), + $institutions, ); return in_array($institution->getInstitution(), $list); } diff --git a/src/Surfnet/Stepup/Configuration/Value/InstitutionConfigurationId.php b/src/Surfnet/Stepup/Configuration/Value/InstitutionConfigurationId.php index da6930325..c5c44bd0f 100644 --- a/src/Surfnet/Stepup/Configuration/Value/InstitutionConfigurationId.php +++ b/src/Surfnet/Stepup/Configuration/Value/InstitutionConfigurationId.php @@ -20,32 +20,31 @@ use JsonSerializable; use Ramsey\Uuid\Uuid; +use Stringable; use Surfnet\Stepup\Exception\InvalidArgumentException; -final class InstitutionConfigurationId implements JsonSerializable +final class InstitutionConfigurationId implements JsonSerializable, Stringable { - const UUID_NAMESPACE = '09876543-abcd-0987-abcd-098765432109'; + public const UUID_NAMESPACE = '09876543-abcd-0987-abcd-098765432109'; - private string $institutionConfigurationId; + private readonly string $institutionConfigurationId; /** + * @return InstitutionConfigurationId * @deprecated To be removed in next release; use normalizedFrom method to account for case-(in)sensitivity issues * - * @param Institution $institution - * @return InstitutionConfigurationId */ public static function from(Institution $institution): self { - return new self((string) Uuid::uuid5(self::UUID_NAMESPACE, $institution->getInstitution())); + return new self((string)Uuid::uuid5(self::UUID_NAMESPACE, $institution->getInstitution())); } /** - * @param Institution $institution * @return InstitutionConfigurationId */ public static function normalizedFrom(Institution $institution): self { - return new self((string) Uuid::uuid5(self::UUID_NAMESPACE, strtolower($institution->getInstitution()))); + return new self((string)Uuid::uuid5(self::UUID_NAMESPACE, strtolower($institution->getInstitution()))); } public function __construct($institutionConfigurationId) @@ -54,7 +53,7 @@ public function __construct($institutionConfigurationId) throw InvalidArgumentException::invalidType( 'non-empty string', 'institutionConfigurationId', - $institutionConfigurationId + $institutionConfigurationId, ); } @@ -62,7 +61,7 @@ public function __construct($institutionConfigurationId) throw InvalidArgumentException::invalidType( 'UUID', 'institutionConfigurationId', - $institutionConfigurationId + $institutionConfigurationId, ); } @@ -70,7 +69,6 @@ public function __construct($institutionConfigurationId) } /** - * @param InstitutionConfigurationId $otherInstitutionConfigurationId * @return bool */ public function equals(InstitutionConfigurationId $otherInstitutionConfigurationId): bool diff --git a/src/Surfnet/Stepup/Configuration/Value/InstitutionRole.php b/src/Surfnet/Stepup/Configuration/Value/InstitutionRole.php index 9a16c1535..235616096 100644 --- a/src/Surfnet/Stepup/Configuration/Value/InstitutionRole.php +++ b/src/Surfnet/Stepup/Configuration/Value/InstitutionRole.php @@ -18,13 +18,14 @@ namespace Surfnet\Stepup\Configuration\Value; use JsonSerializable; +use Stringable; use Surfnet\Stepup\Exception\InvalidArgumentException; -final class InstitutionRole implements JsonSerializable +final class InstitutionRole implements JsonSerializable, Stringable { - const ROLE_USE_RA = 'use_ra'; - const ROLE_USE_RAA = 'use_raa'; - const ROLE_SELECT_RAA = 'select_raa'; + public const ROLE_USE_RA = 'use_ra'; + public const ROLE_USE_RAA = 'use_raa'; + public const ROLE_SELECT_RAA = 'select_raa'; private static array $validRoles = [ self::ROLE_USE_RA, @@ -75,7 +76,6 @@ public static function selectRaa(): self } /** - * @param InstitutionRole $role * @return bool */ public function equals(InstitutionRole $role): bool diff --git a/src/Surfnet/Stepup/Configuration/Value/InstitutionSet.php b/src/Surfnet/Stepup/Configuration/Value/InstitutionSet.php index 77402084b..78b542583 100644 --- a/src/Surfnet/Stepup/Configuration/Value/InstitutionSet.php +++ b/src/Surfnet/Stepup/Configuration/Value/InstitutionSet.php @@ -55,10 +55,10 @@ function ($institution, $key) use ($institutions): void { throw InvalidArgumentException::invalidType( Institution::class, 'institutions', - $institutions[$key] + $institutions[$key], ); } - } + }, ); return new self($institutions); @@ -70,7 +70,6 @@ public function equals(InstitutionSet $other): bool } /** - * @param Institution $institution * @return bool */ public function isOption(Institution $institution): bool @@ -97,9 +96,10 @@ public function toScalarArray(): array */ private function sort(array $institutions): array { - usort($institutions, function (Institution $a, Institution $b): int { - return strcmp($a->getInstitution(), $b->getInstitution()); - }); + usort( + $institutions, + fn(Institution $a, Institution $b): int => strcmp($a->getInstitution(), $b->getInstitution()), + ); return $institutions; } diff --git a/src/Surfnet/Stepup/Configuration/Value/Location.php b/src/Surfnet/Stepup/Configuration/Value/Location.php index cb9433b80..b08126f90 100644 --- a/src/Surfnet/Stepup/Configuration/Value/Location.php +++ b/src/Surfnet/Stepup/Configuration/Value/Location.php @@ -19,11 +19,12 @@ namespace Surfnet\Stepup\Configuration\Value; use JsonSerializable; +use Stringable; use Surfnet\Stepup\Exception\InvalidArgumentException; -final class Location implements JsonSerializable +final class Location implements JsonSerializable, Stringable { - private string $location; + private readonly string $location; /** * @param string $location @@ -38,7 +39,6 @@ public function __construct($location) } /** - * @param Location $otherLocation * @return bool */ public function equals(Location $otherLocation): bool diff --git a/src/Surfnet/Stepup/Configuration/Value/NumberOfTokensPerIdentityOption.php b/src/Surfnet/Stepup/Configuration/Value/NumberOfTokensPerIdentityOption.php index 8534324c3..630677761 100644 --- a/src/Surfnet/Stepup/Configuration/Value/NumberOfTokensPerIdentityOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/NumberOfTokensPerIdentityOption.php @@ -23,8 +23,8 @@ class NumberOfTokensPerIdentityOption implements JsonSerializable { - const DISABLED = 0; - + public const DISABLED = 0; + /** * @var int */ @@ -41,7 +41,7 @@ public function __construct($numberOfTokensPerIdentity) throw InvalidArgumentException::invalidType( 'integer', 'numberOfTokensPerIdentity', - $numberOfTokensPerIdentity + $numberOfTokensPerIdentity, ); } @@ -49,7 +49,6 @@ public function __construct($numberOfTokensPerIdentity) } /** - * @param NumberOfTokensPerIdentityOption $other * @return bool */ public function equals(NumberOfTokensPerIdentityOption $other): bool diff --git a/src/Surfnet/Stepup/Configuration/Value/RaLocationId.php b/src/Surfnet/Stepup/Configuration/Value/RaLocationId.php index 972a20e0c..fea80723a 100644 --- a/src/Surfnet/Stepup/Configuration/Value/RaLocationId.php +++ b/src/Surfnet/Stepup/Configuration/Value/RaLocationId.php @@ -20,11 +20,12 @@ use JsonSerializable; use Ramsey\Uuid\Uuid; +use Stringable; use Surfnet\Stepup\Exception\InvalidArgumentException; -final class RaLocationId implements JsonSerializable +final class RaLocationId implements JsonSerializable, Stringable { - private string $raLocationId; + private readonly string $raLocationId; /** * @param string $raLocationId @@ -35,7 +36,7 @@ public function __construct($raLocationId) throw InvalidArgumentException::invalidType( 'non-empty string', 'raLocationId', - $raLocationId + $raLocationId, ); } @@ -43,7 +44,7 @@ public function __construct($raLocationId) throw InvalidArgumentException::invalidType( 'UUID', 'raLocationId', - $raLocationId + $raLocationId, ); } @@ -51,7 +52,6 @@ public function __construct($raLocationId) } /** - * @param RaLocationId $otherRaLocationId * @return bool */ public function equals(RaLocationId $otherRaLocationId): bool diff --git a/src/Surfnet/Stepup/Configuration/Value/RaLocationList.php b/src/Surfnet/Stepup/Configuration/Value/RaLocationList.php index 054dc29ff..eca5d9d51 100644 --- a/src/Surfnet/Stepup/Configuration/Value/RaLocationList.php +++ b/src/Surfnet/Stepup/Configuration/Value/RaLocationList.php @@ -38,7 +38,6 @@ public function __construct(array $raLocations) } /** - * @param RaLocationId $raLocationId * @return bool */ public function containsWithId(RaLocationId $raLocationId): bool @@ -52,24 +51,20 @@ public function containsWithId(RaLocationId $raLocationId): bool return false; } - /** - * @param RaLocation $raLocation - */ public function add(RaLocation $raLocation): void { if ($this->containsWithId($raLocation->getId())) { - throw new LogicException(sprintf( - 'Cannot add RaLocation with id "%s" to RaLocationList: it is already present', - $raLocation->getId() - )); + throw new LogicException( + sprintf( + 'Cannot add RaLocation with id "%s" to RaLocationList: it is already present', + $raLocation->getId(), + ), + ); } $this->raLocations[] = $raLocation; } - /** - * @param RaLocationId $raLocationId - */ public function removeWithId(RaLocationId $raLocationId): void { foreach ($this->raLocations as $key => $raLocation) { @@ -81,14 +76,15 @@ public function removeWithId(RaLocationId $raLocationId): void } } - throw new LogicException(sprintf( - 'Cannot remove RaLocation with id "%s" from RaLocationList: it is not present', - $raLocationId - )); + throw new LogicException( + sprintf( + 'Cannot remove RaLocation with id "%s" from RaLocationList: it is not present', + $raLocationId, + ), + ); } /** - * @param RaLocationId $raLocationId * @return RaLocation */ public function getById(RaLocationId $raLocationId) @@ -99,10 +95,12 @@ public function getById(RaLocationId $raLocationId) } } - throw new LogicException(sprintf( - 'Cannot get RaLocation by id "%s" from RaLocationList: RaLocationId not found', - $raLocationId - )); + throw new LogicException( + sprintf( + 'Cannot get RaLocation by id "%s" from RaLocationList: RaLocationId not found', + $raLocationId, + ), + ); } public function getIterator() diff --git a/src/Surfnet/Stepup/Configuration/Value/RaLocationName.php b/src/Surfnet/Stepup/Configuration/Value/RaLocationName.php index 06a85ca8e..079d34ca0 100644 --- a/src/Surfnet/Stepup/Configuration/Value/RaLocationName.php +++ b/src/Surfnet/Stepup/Configuration/Value/RaLocationName.php @@ -19,11 +19,12 @@ namespace Surfnet\Stepup\Configuration\Value; use JsonSerializable; +use Stringable; use Surfnet\Stepup\Exception\InvalidArgumentException; -final class RaLocationName implements JsonSerializable +final class RaLocationName implements JsonSerializable, Stringable { - private string $raLocationName; + private readonly string $raLocationName; /** * @param string $raLocationName @@ -38,7 +39,6 @@ public function __construct($raLocationName) } /** - * @param RaLocationName $otherRaLocationName * @return bool */ public function equals(RaLocationName $otherRaLocationName): bool diff --git a/src/Surfnet/Stepup/Configuration/Value/SelfAssertedTokensOption.php b/src/Surfnet/Stepup/Configuration/Value/SelfAssertedTokensOption.php index 16c8ded56..4165d131c 100644 --- a/src/Surfnet/Stepup/Configuration/Value/SelfAssertedTokensOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/SelfAssertedTokensOption.php @@ -20,18 +20,15 @@ use JsonSerializable; -final class SelfAssertedTokensOption implements JsonSerializable +final readonly class SelfAssertedTokensOption implements JsonSerializable { - private bool $allowed; - public static function getDefault(): self { return new self(false); } - public function __construct(bool $selfAssertedTokensAllowed) + public function __construct(private bool $allowed) { - $this->allowed = $selfAssertedTokensAllowed; } public function equals(SelfAssertedTokensOption $other): bool diff --git a/src/Surfnet/Stepup/Configuration/Value/SelfVetOption.php b/src/Surfnet/Stepup/Configuration/Value/SelfVetOption.php index 114020ff6..6f5048623 100644 --- a/src/Surfnet/Stepup/Configuration/Value/SelfVetOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/SelfVetOption.php @@ -20,18 +20,15 @@ use JsonSerializable; -final class SelfVetOption implements JsonSerializable +final readonly class SelfVetOption implements JsonSerializable { - private bool $selfVetOption; - public static function getDefault(): self { return new self(false); } - public function __construct(bool $selfVetOption) + public function __construct(private bool $selfVetOption) { - $this->selfVetOption = $selfVetOption; } public function equals(SelfVetOption $other): bool diff --git a/src/Surfnet/Stepup/Configuration/Value/ShowRaaContactInformationOption.php b/src/Surfnet/Stepup/Configuration/Value/ShowRaaContactInformationOption.php index 9873fea1a..8fb17a4f8 100644 --- a/src/Surfnet/Stepup/Configuration/Value/ShowRaaContactInformationOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/ShowRaaContactInformationOption.php @@ -23,7 +23,7 @@ final class ShowRaaContactInformationOption implements JsonSerializable { - private bool $showRaaContactInformationOption; + private readonly bool $showRaaContactInformationOption; public static function getDefault(): self { @@ -36,7 +36,7 @@ public function __construct($showRaaContactInformationOption) throw InvalidArgumentException::invalidType( 'boolean', 'showRaaContactInformationOption', - $showRaaContactInformationOption + $showRaaContactInformationOption, ); } @@ -44,7 +44,6 @@ public function __construct($showRaaContactInformationOption) } /** - * @param ShowRaaContactInformationOption $other * @return bool */ public function equals(ShowRaaContactInformationOption $other): bool diff --git a/src/Surfnet/Stepup/Configuration/Value/SsoOn2faOption.php b/src/Surfnet/Stepup/Configuration/Value/SsoOn2faOption.php index 8b7091a01..2b7e4eebf 100644 --- a/src/Surfnet/Stepup/Configuration/Value/SsoOn2faOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/SsoOn2faOption.php @@ -22,18 +22,15 @@ use JsonSerializable; -final class SsoOn2faOption implements JsonSerializable +final readonly class SsoOn2faOption implements JsonSerializable { - private bool $ssoOn2faOption; - public static function getDefault(): self { return new self(false); } - public function __construct(bool $ssoOn2faOption) + public function __construct(private bool $ssoOn2faOption) { - $this->ssoOn2faOption = $ssoOn2faOption; } public function equals(SsoOn2faOption $other): bool diff --git a/src/Surfnet/Stepup/Configuration/Value/UseRaLocationsOption.php b/src/Surfnet/Stepup/Configuration/Value/UseRaLocationsOption.php index 75cd1f947..a358460d7 100644 --- a/src/Surfnet/Stepup/Configuration/Value/UseRaLocationsOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/UseRaLocationsOption.php @@ -23,7 +23,7 @@ final class UseRaLocationsOption implements JsonSerializable { - private bool $useRaLocationsOption; + private readonly bool $useRaLocationsOption; /** * @return UseRaLocationsOption @@ -39,7 +39,7 @@ public function __construct($useRaLocationsOption) throw InvalidArgumentException::invalidType( 'boolean', 'useRaLocationsOption', - $useRaLocationsOption + $useRaLocationsOption, ); } @@ -47,7 +47,6 @@ public function __construct($useRaLocationsOption) } /** - * @param UseRaLocationsOption $other * @return bool */ public function equals(UseRaLocationsOption $other): bool diff --git a/src/Surfnet/Stepup/Configuration/Value/VerifyEmailOption.php b/src/Surfnet/Stepup/Configuration/Value/VerifyEmailOption.php index 8281969ad..634f09b46 100644 --- a/src/Surfnet/Stepup/Configuration/Value/VerifyEmailOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/VerifyEmailOption.php @@ -23,7 +23,7 @@ final class VerifyEmailOption implements JsonSerializable { - private bool $verifyEmailOption; + private readonly bool $verifyEmailOption; public static function getDefault(): self { @@ -36,7 +36,7 @@ public function __construct($verifyEmailOption) throw InvalidArgumentException::invalidType( 'boolean', 'verifyEmailOption', - $verifyEmailOption + $verifyEmailOption, ); } @@ -44,7 +44,6 @@ public function __construct($verifyEmailOption) } /** - * @param VerifyEmailOption $other * @return bool */ public function equals(VerifyEmailOption $other): bool diff --git a/src/Surfnet/Stepup/DateTime/DateTime.php b/src/Surfnet/Stepup/DateTime/DateTime.php index 71be680cc..6a049f7e1 100644 --- a/src/Surfnet/Stepup/DateTime/DateTime.php +++ b/src/Surfnet/Stepup/DateTime/DateTime.php @@ -20,19 +20,20 @@ use DateInterval; use DateTime as CoreDateTime; +use Stringable; use Surfnet\Stepup\Exception\InvalidArgumentException; /** * @SuppressWarnings(PHPMD.TooManyMethods) * @SuppressWarnings(PHPMD.TooManyPublicMethods) */ -class DateTime +class DateTime implements Stringable { /** * The 'c' format, expanded in separate format characters. This string can also be used with * `DateTime::createFromString()`. */ - const FORMAT = 'Y-m-d\\TH:i:sP'; + public const FORMAT = 'Y-m-d\\TH:i:sP'; /** * Allows for mocking of time. @@ -41,7 +42,7 @@ class DateTime */ private static $now; - private CoreDateTime $dateTime; + private readonly CoreDateTime $dateTime; /** * @return self @@ -79,7 +80,6 @@ public function __construct(CoreDateTime $dateTime = null) } /** - * @param DateInterval $interval * @return DateTime */ public function add(DateInterval $interval): self @@ -91,7 +91,6 @@ public function add(DateInterval $interval): self } /** - * @param DateInterval $interval * @return DateTime */ public function sub(DateInterval $interval): self @@ -114,7 +113,6 @@ public function endOfDay(): self } /** - * @param DateTime $dateTime * @return boolean */ public function comesBefore(DateTime $dateTime): bool @@ -123,7 +121,6 @@ public function comesBefore(DateTime $dateTime): bool } /** - * @param DateTime $dateTime * @return boolean */ public function comesBeforeOrIsEqual(DateTime $dateTime): bool @@ -132,7 +129,6 @@ public function comesBeforeOrIsEqual(DateTime $dateTime): bool } /** - * @param DateTime $dateTime * @return boolean */ public function comesAfter(DateTime $dateTime): bool @@ -141,7 +137,6 @@ public function comesAfter(DateTime $dateTime): bool } /** - * @param DateTime $dateTime * @return boolean */ public function comesAfterOrIsEqual(DateTime $dateTime): bool @@ -158,10 +153,12 @@ public function format($format) $formatted = $this->dateTime->format($format); if ($formatted === false) { - throw new InvalidArgumentException(sprintf( - 'Given format "%s" is not a valid format for DateTime', - $format - )); + throw new InvalidArgumentException( + sprintf( + 'Given format "%s" is not a valid format for DateTime', + $format, + ), + ); } return $formatted; diff --git a/src/Surfnet/Stepup/Exception/InvalidArgumentException.php b/src/Surfnet/Stepup/Exception/InvalidArgumentException.php index a5457279a..798e90c42 100644 --- a/src/Surfnet/Stepup/Exception/InvalidArgumentException.php +++ b/src/Surfnet/Stepup/Exception/InvalidArgumentException.php @@ -27,13 +27,13 @@ class InvalidArgumentException extends \InvalidArgumentException implements Exce * * @return self */ - public static function invalidType($expected, $parameterName, $parameter): self + public static function invalidType($expected, $parameterName, mixed $parameter): self { $message = sprintf( 'Invalid argument type: "%s" expected, "%s" given for "%s"', $expected, - is_object($parameter) ? get_class($parameter) : gettype($parameter), - $parameterName + get_debug_type($parameter), + $parameterName, ); return new self($message); diff --git a/src/Surfnet/Stepup/Helper/JsonHelper.php b/src/Surfnet/Stepup/Helper/JsonHelper.php index 5b735a80a..3e8cbf89b 100644 --- a/src/Surfnet/Stepup/Helper/JsonHelper.php +++ b/src/Surfnet/Stepup/Helper/JsonHelper.php @@ -24,11 +24,11 @@ final class JsonHelper { private static array $jsonErrors = [ - JSON_ERROR_DEPTH => 'JSON_ERROR_DEPTH - Maximum stack depth exceeded', + JSON_ERROR_DEPTH => 'JSON_ERROR_DEPTH - Maximum stack depth exceeded', JSON_ERROR_STATE_MISMATCH => 'JSON_ERROR_STATE_MISMATCH - Underflow or the modes mismatch', - JSON_ERROR_CTRL_CHAR => 'JSON_ERROR_CTRL_CHAR - Unexpected control character found', - JSON_ERROR_SYNTAX => 'JSON_ERROR_SYNTAX - Syntax error, malformed JSON', - JSON_ERROR_UTF8 => 'JSON_ERROR_UTF8 - Malformed UTF-8 characters, possibly incorrectly encoded', + JSON_ERROR_CTRL_CHAR => 'JSON_ERROR_CTRL_CHAR - Unexpected control character found', + JSON_ERROR_SYNTAX => 'JSON_ERROR_SYNTAX - Syntax error, malformed JSON', + JSON_ERROR_UTF8 => 'JSON_ERROR_UTF8 - Malformed UTF-8 characters, possibly incorrectly encoded', ]; public static function decode($json) @@ -40,7 +40,7 @@ public static function decode($json) $data = json_decode($json, true); if (JSON_ERROR_NONE !== json_last_error()) { - $last = json_last_error(); + $last = json_last_error(); $errorMessage = 'Unknown error'; if (array_key_exists($last, self::$jsonErrors)) { diff --git a/src/Surfnet/Stepup/Helper/SecondFactorProvePossessionHelper.php b/src/Surfnet/Stepup/Helper/SecondFactorProvePossessionHelper.php index 667c8edff..88dc162ea 100644 --- a/src/Surfnet/Stepup/Helper/SecondFactorProvePossessionHelper.php +++ b/src/Surfnet/Stepup/Helper/SecondFactorProvePossessionHelper.php @@ -23,27 +23,22 @@ class SecondFactorProvePossessionHelper { - private array $skipProvePossessionSecondFactorTypes; + private readonly array $skipProvePossessionSecondFactorTypes; - /** - * @param SecondFactorTypeService $secondFactorTypeService - * @param array $skipProvePossessionSecondFactorTypes - */ public function __construct( SecondFactorTypeService $secondFactorTypeService, - array $skipProvePossessionSecondFactorTypes + array $skipProvePossessionSecondFactorTypes, ) { Assert::allInArray( $skipProvePossessionSecondFactorTypes, $secondFactorTypeService->getAvailableSecondFactorTypes(), - 'Unsupported second factor type configured to skip prove possession' + 'Unsupported second factor type configured to skip prove possession', ); $this->skipProvePossessionSecondFactorTypes = $skipProvePossessionSecondFactorTypes; } /** - * @param SecondFactorType $secondFactorType * @return bool */ public function canSkipProvePossession(SecondFactorType $secondFactorType): bool diff --git a/src/Surfnet/Stepup/Helper/UserDataFormatter.php b/src/Surfnet/Stepup/Helper/UserDataFormatter.php index 8831ea4ec..4e2d978cb 100644 --- a/src/Surfnet/Stepup/Helper/UserDataFormatter.php +++ b/src/Surfnet/Stepup/Helper/UserDataFormatter.php @@ -19,11 +19,8 @@ class UserDataFormatter implements UserDataFormatterInterface { - private string $applicationName; - - public function __construct(string $applicationName) + public function __construct(private readonly string $applicationName) { - $this->applicationName = $applicationName; } public function format(array $userData, array $errors): array @@ -32,8 +29,8 @@ public function format(array $userData, array $errors): array foreach ($userData as $name => $event) { $name = explode('-', $name)[1]; $data[] = [ - 'name' => $name, - 'value' => $event + 'name' => $name, + 'value' => $event, ]; } return $this->formatResponse($data, $errors); @@ -43,8 +40,8 @@ private function formatResponse(array $userData, array $errors): array { $status = 'OK'; $data = [ - 'name' => $this->applicationName, - 'data' => $userData, + 'name' => $this->applicationName, + 'data' => $userData, ]; if (!empty($errors)) { diff --git a/src/Surfnet/Stepup/Identity/Api/Id.php b/src/Surfnet/Stepup/Identity/Api/Id.php index 88588e1ce..a499f933a 100644 --- a/src/Surfnet/Stepup/Identity/Api/Id.php +++ b/src/Surfnet/Stepup/Identity/Api/Id.php @@ -23,10 +23,9 @@ interface Id { /** - * @param mixed $value * @throws InvalidArgumentException */ - public function __construct($value); + public function __construct(mixed $value); /** * @return string @@ -34,7 +33,6 @@ public function __construct($value); public function __toString(); /** - * @param Id $other * @return bool */ public function equals(Id $other); diff --git a/src/Surfnet/Stepup/Identity/Api/Identity.php b/src/Surfnet/Stepup/Identity/Api/Identity.php index a0cfc2ed9..a4447b622 100644 --- a/src/Surfnet/Stepup/Identity/Api/Identity.php +++ b/src/Surfnet/Stepup/Identity/Api/Identity.php @@ -52,12 +52,6 @@ interface Identity extends AggregateRoot { /** - * @param IdentityId $id - * @param Institution $institution - * @param NameId $nameId - * @param CommonName $commonName - * @param Email $email - * @param Locale $preferredLocale * @return Identity */ public static function create( @@ -66,7 +60,7 @@ public static function create( NameId $nameId, CommonName $commonName, Email $email, - Locale $preferredLocale + Locale $preferredLocale, ); /** @@ -75,34 +69,27 @@ public static function create( public function __construct(); /** - * @param CommonName $commonName * @return void */ public function rename(CommonName $commonName); /** - * @param Email $email * @return void */ public function changeEmail(Email $email); /** - * @param SecondFactorId $secondFactorId - * @param YubikeyPublicId $yubikeyPublicId * @param int $maxNumberOfTokens * @return void */ public function bootstrapYubikeySecondFactor( SecondFactorId $secondFactorId, YubikeyPublicId $yubikeyPublicId, - $maxNumberOfTokens + $maxNumberOfTokens, ); /** - * @param SecondFactorId $secondFactorId - * @param YubikeyPublicId $yubikeyPublicId - * @param bool $emailVerificationRequired - * @param EmailVerificationWindow $emailVerificationWindow + * @param bool $emailVerificationRequired * @param int $maxNumberOfTokens * @return void */ @@ -111,14 +98,11 @@ public function provePossessionOfYubikey( YubikeyPublicId $yubikeyPublicId, $emailVerificationRequired, EmailVerificationWindow $emailVerificationWindow, - $maxNumberOfTokens + $maxNumberOfTokens, ); /** - * @param SecondFactorId $secondFactorId - * @param PhoneNumber $phoneNumber - * @param bool $emailVerificationRequired - * @param EmailVerificationWindow $emailVerificationWindow + * @param bool $emailVerificationRequired * @param int $maxNumberOfTokens * @return void */ @@ -127,15 +111,11 @@ public function provePossessionOfPhone( PhoneNumber $phoneNumber, $emailVerificationRequired, EmailVerificationWindow $emailVerificationWindow, - $maxNumberOfTokens + $maxNumberOfTokens, ); /** - * @param SecondFactorId $secondFactorId - * @param StepupProvider $provider - * @param GssfId $gssfId - * @param bool $emailVerificationRequired - * @param EmailVerificationWindow $emailVerificationWindow + * @param bool $emailVerificationRequired * @parame int $maxNumberOfTokens * @return void */ @@ -145,14 +125,11 @@ public function provePossessionOfGssf( GssfId $gssfId, $emailVerificationRequired, EmailVerificationWindow $emailVerificationWindow, - $maxNumberOfTokens + $maxNumberOfTokens, ); /** - * @param SecondFactorId $secondFactorId - * @param U2fKeyHandle $keyHandle - * @param bool $emailVerificationRequired - * @param EmailVerificationWindow $emailVerificationWindow + * @param bool $emailVerificationRequired * @parame int $maxNumberOfTokens * @return void * @deprecated Built in U2F support is dropped from StepUp, this was not removed to support event replay @@ -162,7 +139,7 @@ public function provePossessionOfU2fDevice( U2fKeyHandle $keyHandle, $emailVerificationRequired, EmailVerificationWindow $emailVerificationWindow, - $maxNumberOfTokens + $maxNumberOfTokens, ); /** @@ -174,15 +151,8 @@ public function verifyEmail($verificationNonce); /** * Attempts to vet another identity's verified second factor. * - * @param Identity $registrant - * @param SecondFactorId $registrantsSecondFactorId - * @param SecondFactorType $registrantsSecondFactorType - * @param SecondFactorIdentifier $registrantsSecondFactorIdentifier * @param string $registrationCode - * @param DocumentNumber $documentNumber * @param bool $identityVerified - * @param SecondFactorTypeService $secondFactorTypeService - * @param SecondFactorProvePossessionHelper $secondFactorProvePossessionHelper * @param bool $provePossessionSkipped * @return void * @@ -198,7 +168,7 @@ public function vetSecondFactor( $identityVerified, SecondFactorTypeService $secondFactorTypeService, SecondFactorProvePossessionHelper $secondFactorProvePossessionHelper, - $provePossessionSkipped + $provePossessionSkipped, ); /** @@ -216,13 +186,13 @@ public function selfVetSecondFactor( Loa $authoringSecondFactorLoa, string $registrationCode, SecondFactorIdentifier $secondFactorIdentifier, - SecondFactorTypeService $secondFactorTypeService + SecondFactorTypeService $secondFactorTypeService, ): void; public function registerSelfAssertedSecondFactor( SecondFactorIdentifier $secondFactorIdentifier, SecondFactorTypeService $secondFactorTypeService, - RecoveryTokenId $recoveryTokenId + RecoveryTokenId $recoveryTokenId, ): void; /** @@ -232,20 +202,16 @@ public function migrateVettedSecondFactor( Identity $sourceIdentity, SecondFactorId $secondFactorId, string $targetSecondFactorId, - int $maxNumberOfTokens + int $maxNumberOfTokens, ): void; /** * Makes the identity comply with an authority's vetting of a verified second factor. * - * @param SecondFactorId $secondFactorId - * @param SecondFactorType $secondFactorType - * @param SecondFactorIdentifier $secondFactorIdentifier - * @param string $registrationCode - * @param DocumentNumber $documentNumber - * @param bool $provePossessionSkipped - * @throws DomainException + * @param string $registrationCode + * @param bool $provePossessionSkipped * @return void + * @throws DomainException */ public function complyWithVettingOfSecondFactor( SecondFactorId $secondFactorId, @@ -253,18 +219,15 @@ public function complyWithVettingOfSecondFactor( SecondFactorIdentifier $secondFactorIdentifier, $registrationCode, DocumentNumber $documentNumber, - $provePossessionSkipped + $provePossessionSkipped, ); /** - * @param SecondFactorId $secondFactorId * @return void */ public function revokeSecondFactor(SecondFactorId $secondFactorId); /** - * @param SecondFactorId $secondFactorId - * @param IdentityId $authorityId * @return void */ public function complyWithSecondFactorRevocation(SecondFactorId $secondFactorId, IdentityId $authorityId); @@ -281,11 +244,6 @@ public function revokeRecoveryToken(RecoveryTokenId $recoveryTokenId): void; public function complyWithRecoveryTokenRevocation(RecoveryTokenId $recoveryTokenId, IdentityId $authorityId): void; /** - * @param RegistrationAuthorityRole $role - * @param Institution $institution - * @param Location $location - * @param ContactInformation $contactInformation - * @param InstitutionConfiguration $institutionConfiguration * @return void */ public function accreditWith( @@ -293,33 +251,33 @@ public function accreditWith( Institution $institution, Location $location, ContactInformation $contactInformation, - InstitutionConfiguration $institutionConfiguration + InstitutionConfiguration $institutionConfiguration, ); /** - * @param Institution $institution - * @param RegistrationAuthorityRole $role - * @param InstitutionConfiguration $institutionConfiguration * @return void */ - public function appointAs(Institution $institution, RegistrationAuthorityRole $role, InstitutionConfiguration $institutionConfiguration); + public function appointAs( + Institution $institution, + RegistrationAuthorityRole $role, + InstitutionConfiguration $institutionConfiguration, + ); /** - * @param Institution $institution - * @param Location $location - * @param ContactInformation $contactInformation * @return void */ - public function amendRegistrationAuthorityInformation(Institution $institution, Location $location, ContactInformation $contactInformation); + public function amendRegistrationAuthorityInformation( + Institution $institution, + Location $location, + ContactInformation $contactInformation, + ); /** - * @param Institution $institution * @return void */ public function retractRegistrationAuthority(Institution $institution); /** - * @param Locale $preferredLocale * @return void */ public function expressPreferredLocale(Locale $preferredLocale); @@ -360,13 +318,11 @@ public function getEmail(); public function getPreferredLocale(); /** - * @param SecondFactorId $secondFactorId * @return VerifiedSecondFactor|null */ public function getVerifiedSecondFactor(SecondFactorId $secondFactorId); /** - * @param SecondFactorId $secondFactorId * @return VettedSecondFactor|null */ public function getVettedSecondFactorById(SecondFactorId $secondFactorId): ?VettedSecondFactor; @@ -380,7 +336,10 @@ public function getAggregateRootId(): string; /** * Identity proved possession of a phone number by reproducing a secret sent to it via SMS */ - public function provePossessionOfPhoneRecoveryToken(RecoveryTokenId $recoveryTokenId, PhoneNumber $phoneNumber): void; + public function provePossessionOfPhoneRecoveryToken( + RecoveryTokenId $recoveryTokenId, + PhoneNumber $phoneNumber, + ): void; /** * Identity promises it stored the once printed on screen password in a safe location diff --git a/src/Surfnet/Stepup/Identity/Api/Whitelist.php b/src/Surfnet/Stepup/Identity/Api/Whitelist.php index 537d1aba4..a1098ac92 100644 --- a/src/Surfnet/Stepup/Identity/Api/Whitelist.php +++ b/src/Surfnet/Stepup/Identity/Api/Whitelist.php @@ -30,7 +30,6 @@ public function __construct(); /** * Create a new Whitelist instance with the institutions that are on the initial whitelist * - * @param InstitutionCollection $institutionCollection * @return Whitelist */ public static function create(InstitutionCollection $institutionCollection); @@ -38,7 +37,6 @@ public static function create(InstitutionCollection $institutionCollection); /** * Replace all institutions on the whitelist with the institutions in the given collection * - * @param InstitutionCollection $institutionCollection * @return void */ public function replaceAll(InstitutionCollection $institutionCollection); @@ -46,7 +44,6 @@ public function replaceAll(InstitutionCollection $institutionCollection); /** * Add the institutions in the given collection to the whitelist * - * @param InstitutionCollection $institutionCollection * @return void */ public function add(InstitutionCollection $institutionCollection); @@ -54,7 +51,6 @@ public function add(InstitutionCollection $institutionCollection); /** * Remove the institutions in the given collection from the whitelist * - * @param InstitutionCollection $institutionCollection * @return mixed */ public function remove(InstitutionCollection $institutionCollection); diff --git a/src/Surfnet/Stepup/Identity/Collection/InstitutionCollection.php b/src/Surfnet/Stepup/Identity/Collection/InstitutionCollection.php index 63ec69bb5..dc1903a33 100644 --- a/src/Surfnet/Stepup/Identity/Collection/InstitutionCollection.php +++ b/src/Surfnet/Stepup/Identity/Collection/InstitutionCollection.php @@ -44,16 +44,17 @@ public function contains(Institution $institution): bool /** * Adds the institution to this collection * - * @param Institution $institution * @throws RuntimeException when the institution already exists in this collection */ public function add(Institution $institution): void { if (in_array($institution, $this->elements)) { - throw new RuntimeException(sprintf( - 'Institution "%s" is already in this collection', - $institution - )); + throw new RuntimeException( + sprintf( + 'Institution "%s" is already in this collection', + $institution, + ), + ); } $this->elements[] = $institution; @@ -61,8 +62,6 @@ public function add(Institution $institution): void /** * Adds all institutions from the given collection to this collection - * - * @param InstitutionCollection $institutionCollection */ public function addAllFrom(InstitutionCollection $institutionCollection): void { @@ -74,28 +73,25 @@ public function addAllFrom(InstitutionCollection $institutionCollection): void /** * Removes an institution from this collection * - * @param Institution $institution * @throws RuntimeException when the institution to remove is not in this collection */ public function remove(Institution $institution): void { if (!in_array($institution, $this->elements)) { - throw new RuntimeException(sprintf( - 'Cannot remove Institution "%s" from the collection as it is not in the collection', - $institution - )); + throw new RuntimeException( + sprintf( + 'Cannot remove Institution "%s" from the collection as it is not in the collection', + $institution, + ), + ); } - $elements = array_filter($this->elements, function ($inst) use ($institution): bool { - return !$institution->equals($inst); - }); + $elements = array_filter($this->elements, fn($inst): bool => !$institution->equals($inst)); $this->elements = $elements; } /** * Removes all Institutions in the given collection from this collection - * - * @param InstitutionCollection $institutionCollection */ public function removeAllIn(InstitutionCollection $institutionCollection): void { @@ -111,18 +107,14 @@ public function jsonSerialize() public static function deserialize(array $data) { - $institutions = array_map(function ($institution): Institution { - return new Institution($institution); - }, $data); + $institutions = array_map(fn($institution): Institution => new Institution($institution), $data); return new self($institutions); } public function serialize(): array { - return array_map(function (Institution $institution): string { - return (string) $institution; - }, $this->elements); + return array_map(fn(Institution $institution): string => (string)$institution, $this->elements); } public function getIterator() diff --git a/src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php b/src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php index 71c571948..672c1e860 100644 --- a/src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php +++ b/src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php @@ -20,11 +20,11 @@ use Broadway\Serializer\Serializable as SerializableInterface; use JsonSerializable; +use Stringable; use Surfnet\Stepup\Exception\RuntimeException; use Surfnet\Stepup\Identity\Value\VettingTypeHint; -use function json_encode; -final class VettingTypeHintCollection implements JsonSerializable, SerializableInterface +final class VettingTypeHintCollection implements JsonSerializable, SerializableInterface, Stringable { private array $elements = []; @@ -38,10 +38,12 @@ public function __construct(array $hints = []) public function add(VettingTypeHint $hint): void { if (in_array($hint, $this->elements)) { - throw new RuntimeException(sprintf( - 'Vetting type hint "%s" is already in this collection', - $hint - )); + throw new RuntimeException( + sprintf( + 'Vetting type hint "%s" is already in this collection', + $hint, + ), + ); } $this->elements[] = $hint; @@ -50,15 +52,15 @@ public function add(VettingTypeHint $hint): void public function remove(VettingTypeHint $hint): void { if (!in_array($hint, $this->elements)) { - throw new RuntimeException(sprintf( - 'Cannot remove vetting type hint "%s" from the collection as it is not in the collection', - $hint - )); + throw new RuntimeException( + sprintf( + 'Cannot remove vetting type hint "%s" from the collection as it is not in the collection', + $hint, + ), + ); } - $elements = array_filter($this->elements, function ($inst) use ($hint): bool { - return !$hint->equals($inst); - }); + $elements = array_filter($this->elements, fn($inst): bool => !$hint->equals($inst)); $this->elements = $elements; } @@ -69,22 +71,21 @@ public function jsonSerialize() public static function deserialize(array $data) { - $institutions = array_map(function (array $hint): VettingTypeHint { - return new VettingTypeHint($hint['locale'], $hint['hint']); - }, $data); + $institutions = array_map( + fn(array $hint): VettingTypeHint => new VettingTypeHint($hint['locale'], $hint['hint']), + $data, + ); return new self($institutions); } public function __toString(): string { - return (string) json_encode($this->jsonSerialize()); + return (string)json_encode($this->jsonSerialize()); } public function serialize(): array { - return array_map(function (VettingTypeHint $hint) { - return $hint->jsonSerialize(); - }, $this->elements); + return array_map(fn(VettingTypeHint $hint) => $hint->jsonSerialize(), $this->elements); } } diff --git a/src/Surfnet/Stepup/Identity/Entity/ConfigurableSettings.php b/src/Surfnet/Stepup/Identity/Entity/ConfigurableSettings.php index 12ffe813d..629e8a809 100644 --- a/src/Surfnet/Stepup/Identity/Entity/ConfigurableSettings.php +++ b/src/Surfnet/Stepup/Identity/Entity/ConfigurableSettings.php @@ -29,30 +29,27 @@ */ final class ConfigurableSettings { - private TimeFrame $emailVerificationTimeFrame; - /** * @var Locale[] */ - private array $locales; + private readonly array $locales; /** - * @param TimeFrame $timeFrame - * @param Locale[] $locales + * @param Locale[] $locales */ - private function __construct(TimeFrame $timeFrame, array $locales) - { + private function __construct( + private readonly TimeFrame $emailVerificationTimeFrame, + array $locales, + ) { foreach ($locales as $index => $locale) { if (!$locale instanceof Locale) { throw InvalidArgumentException::invalidType( - 'Surfnet\Stepup\Identity\Value\Locale', + Locale::class, sprintf('locales[%s]', $index), - $locale + $locale, ); } } - - $this->emailVerificationTimeFrame = $timeFrame; $this->locales = $locales; } @@ -66,11 +63,9 @@ public static function create($emailVerificationTimeFrame, array $locales): self return new self( TimeFrame::ofSeconds($emailVerificationTimeFrame), array_map( - function ($locale): Locale { - return new Locale($locale); - }, - $locales - ) + fn($locale): Locale => new Locale($locale), + $locales, + ), ); } @@ -81,22 +76,19 @@ public function createNewEmailVerificationWindow() { return EmailVerificationWindow::createFromTimeFrameStartingAt( $this->emailVerificationTimeFrame, - DateTime::now() + DateTime::now(), ); } /** - * @param Locale $locale * @return bool */ public function isSupportedLocale(Locale $locale): bool { return array_reduce( $this->locales, - function ($supported, Locale $supportedLocale) use ($locale): bool { - return $supported || $supportedLocale->equals($locale); - }, - false + fn($supported, Locale $supportedLocale): bool => $supported || $supportedLocale->equals($locale), + false, ); } } diff --git a/src/Surfnet/Stepup/Identity/Entity/InstitutionCollection.php b/src/Surfnet/Stepup/Identity/Entity/InstitutionCollection.php index 10597adb9..a525a60a0 100644 --- a/src/Surfnet/Stepup/Identity/Entity/InstitutionCollection.php +++ b/src/Surfnet/Stepup/Identity/Entity/InstitutionCollection.php @@ -29,17 +29,11 @@ final class InstitutionCollection */ private $institutions = []; - /** - * @param Institution $institution - */ public function set(Institution $institution): void { $this->institutions[(string)$institution] = $institution; } - /** - * @param Institutions $institutions - */ public function update(Institutions $institutions): void { foreach ($institutions as $institution) { @@ -48,7 +42,6 @@ public function update(Institutions $institutions): void } /** - * @param Institution $institution * @return Institution */ public function get(Institution $institution) @@ -57,7 +50,6 @@ public function get(Institution $institution) } /** - * @param Institution $institution * @return Institution */ public function exists(Institution $institution): bool @@ -65,9 +57,6 @@ public function exists(Institution $institution): bool return array_key_exists((string)$institution, $this->institutions); } - /** - * @param Institution $institution - */ public function remove(Institution $institution): void { unset($this->institutions[(string)$institution]); diff --git a/src/Surfnet/Stepup/Identity/Entity/RecoveryToken.php b/src/Surfnet/Stepup/Identity/Entity/RecoveryToken.php index 0f5042e58..826475928 100644 --- a/src/Surfnet/Stepup/Identity/Entity/RecoveryToken.php +++ b/src/Surfnet/Stepup/Identity/Entity/RecoveryToken.php @@ -37,7 +37,7 @@ final class RecoveryToken extends SimpleEventSourcedEntity public static function create( RecoveryTokenId $id, RecoveryTokenType $type, - Identity $identity + Identity $identity, ): self { $token = new self; $token->tokenId = $id; @@ -68,8 +68,8 @@ public function revoke(): void $this->identity->getId(), $this->identity->getInstitution(), $this->tokenId, - $this->type - ) + $this->type, + ), ); } @@ -81,8 +81,8 @@ public function complyWithRevocation(IdentityId $authorityId): void $this->identity->getInstitution(), $this->tokenId, $this->type, - $authorityId - ) + $authorityId, + ), ); } } diff --git a/src/Surfnet/Stepup/Identity/Entity/RegistrationAuthority.php b/src/Surfnet/Stepup/Identity/Entity/RegistrationAuthority.php index 6c3139c0a..c5d1903d7 100644 --- a/src/Surfnet/Stepup/Identity/Entity/RegistrationAuthority.php +++ b/src/Surfnet/Stepup/Identity/Entity/RegistrationAuthority.php @@ -38,31 +38,23 @@ final class RegistrationAuthority extends SimpleEventSourcedEntity private ?Institution $institution = null; /** - * @param RegistrationAuthorityRole $role - * @param Location $location - * @param ContactInformation $contactInformation - * @param Institution $institution * @return RegistrationAuthority */ public static function accreditWith( RegistrationAuthorityRole $role, Location $location, ContactInformation $contactInformation, - Institution $institution + Institution $institution, ): self { - $registrationAuthority = new self(); - $registrationAuthority->role = $role; - $registrationAuthority->location = $location; + $registrationAuthority = new self(); + $registrationAuthority->role = $role; + $registrationAuthority->location = $location; $registrationAuthority->contactInformation = $contactInformation; - $registrationAuthority->institution = $institution; + $registrationAuthority->institution = $institution; return $registrationAuthority; } - /** - * @param Location $location - * @param ContactInformation $contactInformation - */ public function amendInformation(Location $location, ContactInformation $contactInformation): void { $this->location = $location; @@ -70,7 +62,6 @@ public function amendInformation(Location $location, ContactInformation $contact } /** - * @param RegistrationAuthorityRole $role * @return void */ public function appointAs(RegistrationAuthorityRole $role): void @@ -79,7 +70,6 @@ public function appointAs(RegistrationAuthorityRole $role): void } /** - * @param RegistrationAuthorityRole $role * @return bool */ public function isAppointedAs(RegistrationAuthorityRole $role) diff --git a/src/Surfnet/Stepup/Identity/Entity/RegistrationAuthorityCollection.php b/src/Surfnet/Stepup/Identity/Entity/RegistrationAuthorityCollection.php index f4716c9e2..b3f13ee19 100644 --- a/src/Surfnet/Stepup/Identity/Entity/RegistrationAuthorityCollection.php +++ b/src/Surfnet/Stepup/Identity/Entity/RegistrationAuthorityCollection.php @@ -27,17 +27,12 @@ final class RegistrationAuthorityCollection */ private array $registrationAuthorities = []; - /** - * @param Institution $institution - * @param RegistrationAuthority $registrationAuthority - */ public function set(Institution $institution, RegistrationAuthority $registrationAuthority): void { $this->registrationAuthorities[(string)$institution] = $registrationAuthority; } /** - * @param Institution $institution * @return RegistrationAuthority */ public function get(Institution $institution) @@ -46,7 +41,6 @@ public function get(Institution $institution) } /** - * @param Institution $institution * @return RegistrationAuthority */ public function exists(Institution $institution): bool @@ -54,9 +48,6 @@ public function exists(Institution $institution): bool return array_key_exists((string)$institution, $this->registrationAuthorities); } - /** - * @param Institution $institution - */ public function remove(Institution $institution): void { unset($this->registrationAuthorities[(string)$institution]); diff --git a/src/Surfnet/Stepup/Identity/Entity/SecondFactor.php b/src/Surfnet/Stepup/Identity/Entity/SecondFactor.php index c981a655b..73778dd99 100644 --- a/src/Surfnet/Stepup/Identity/Entity/SecondFactor.php +++ b/src/Surfnet/Stepup/Identity/Entity/SecondFactor.php @@ -26,7 +26,10 @@ interface SecondFactor { public function hasEqualOrHigherLoaComparedTo(SecondFactor $comparable, SecondFactorTypeService $service): bool; - public function hasTypeWithEqualOrLowerLoaComparedTo(SecondFactorType $type, SecondFactorTypeService $service): bool; + public function hasTypeWithEqualOrLowerLoaComparedTo( + SecondFactorType $type, + SecondFactorTypeService $service, + ): bool; public function typeAndIdentifierAreEqual(SecondFactorType $type, SecondFactorIdentifier $identifier): bool; diff --git a/src/Surfnet/Stepup/Identity/Entity/SecondFactorCollection.php b/src/Surfnet/Stepup/Identity/Entity/SecondFactorCollection.php index 0b47b51e0..cd221981b 100644 --- a/src/Surfnet/Stepup/Identity/Entity/SecondFactorCollection.php +++ b/src/Surfnet/Stepup/Identity/Entity/SecondFactorCollection.php @@ -24,17 +24,17 @@ final class SecondFactorCollection extends ArrayCollection { /** - * @param SecondFactorTypeService $service * @return null|SecondFactor */ public function getSecondFactorWithHighestLoa(SecondFactorTypeService $service) { return array_reduce( $this->toArray(), - function (SecondFactor $carry, SecondFactor $item) use ($service): SecondFactor { - return $service->hasEqualOrHigherLoaComparedTo($carry->getType(), $item->getType()) ? $carry : $item; - }, - $this->first() ?: null + fn(SecondFactor $carry, SecondFactor $item): SecondFactor => $service->hasEqualOrHigherLoaComparedTo( + $carry->getType(), + $item->getType(), + ) ? $carry : $item, + $this->first() ?: null, ); } } diff --git a/src/Surfnet/Stepup/Identity/Entity/UnverifiedSecondFactor.php b/src/Surfnet/Stepup/Identity/Entity/UnverifiedSecondFactor.php index 2266b80d3..401c438fe 100644 --- a/src/Surfnet/Stepup/Identity/Entity/UnverifiedSecondFactor.php +++ b/src/Surfnet/Stepup/Identity/Entity/UnverifiedSecondFactor.php @@ -56,12 +56,8 @@ class UnverifiedSecondFactor extends AbstractSecondFactor private ?string $verificationNonce = null; /** - * @param SecondFactorId $id - * @param Identity $identity - * @param SecondFactorType $type - * @param SecondFactorIdentifier $secondFactorIdentifier - * @param EmailVerificationWindow $emailVerificationWindow - * @param string $verificationNonce + * @param SecondFactorIdentifier $secondFactorIdentifier + * @param string $verificationNonce * @return UnverifiedSecondFactor */ public static function create( @@ -70,7 +66,7 @@ public static function create( SecondFactorType $type, $secondFactorIdentifier, EmailVerificationWindow $emailVerificationWindow, - $verificationNonce + $verificationNonce, ): self { if (!is_string($verificationNonce)) { throw InvalidArgumentException::invalidType('string', 'verificationNonce', $verificationNonce); @@ -133,8 +129,8 @@ public function verifyEmail(): void OtpGenerator::generate(8), $this->identity->getCommonName(), $this->identity->getEmail(), - $this->identity->getPreferredLocale() - ) + $this->identity->getPreferredLocale(), + ), ); } @@ -146,8 +142,8 @@ public function revoke(): void $this->identity->getInstitution(), $this->id, $this->type, - $this->secondFactorIdentifier - ) + $this->secondFactorIdentifier, + ), ); } @@ -160,14 +156,13 @@ public function complyWithRevocation(IdentityId $authorityId): void $this->id, $this->type, $this->secondFactorIdentifier, - $authorityId - ) + $authorityId, + ), ); } /** - * @param DateTime $registrationRequestedAt - * @param string $registrationCode + * @param string $registrationCode * @return VerifiedSecondFactor */ public function asVerified(DateTime $registrationRequestedAt, $registrationCode) @@ -178,13 +173,13 @@ public function asVerified(DateTime $registrationRequestedAt, $registrationCode) $this->type, $this->secondFactorIdentifier, $registrationRequestedAt, - $registrationCode + $registrationCode, ); } protected function applyIdentityForgottenEvent(IdentityForgottenEvent $event) { - $secondFactorIdentifierClass = get_class($this->secondFactorIdentifier); + $secondFactorIdentifierClass = $this->secondFactorIdentifier::class; $this->secondFactorIdentifier = $secondFactorIdentifierClass::unknown(); } diff --git a/src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php b/src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php index e48acd154..2efd55641 100644 --- a/src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php +++ b/src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php @@ -60,11 +60,6 @@ class VerifiedSecondFactor extends AbstractSecondFactor private ?string $registrationCode = null; /** - * @param SecondFactorId $id - * @param Identity $identity - * @param SecondFactorType $type - * @param SecondFactorIdentifier $secondFactorIdentifier - * @param DateTime $registrationRequestedAt * @param string $registrationCode * @return self */ @@ -74,7 +69,7 @@ public static function create( SecondFactorType $type, SecondFactorIdentifier $secondFactorIdentifier, DateTime $registrationRequestedAt, - $registrationCode + $registrationCode, ): self { if (!is_string($registrationCode)) { throw InvalidArgumentException::invalidType('string', 'registrationCode', $registrationCode); @@ -105,12 +100,13 @@ public function getId() /** * @param string $registrationCode - * @param SecondFactorIdentifier $secondFactorIdentifier * @return bool */ - public function hasRegistrationCodeAndIdentifier($registrationCode, SecondFactorIdentifier $secondFactorIdentifier): bool - { - return strcasecmp($registrationCode, $this->registrationCode) === 0 + public function hasRegistrationCodeAndIdentifier( + $registrationCode, + SecondFactorIdentifier $secondFactorIdentifier, + ): bool { + return strcasecmp($registrationCode, (string)$this->registrationCode) === 0 && $secondFactorIdentifier->equals($this->secondFactorIdentifier); } @@ -122,7 +118,7 @@ public function canBeVettedNow(): bool return !DateTime::now()->comesAfter( $this->registrationRequestedAt ->add(new DateInterval('P14D')) - ->endOfDay() + ->endOfDay(), ); } @@ -140,8 +136,8 @@ public function vet($provePossessionSkipped, VettingType $type): void $this->identity->getCommonName(), $this->identity->getEmail(), $this->identity->getPreferredLocale(), - $type - ) + $type, + ), ); return; } @@ -157,8 +153,8 @@ public function vet($provePossessionSkipped, VettingType $type): void $this->identity->getCommonName(), $this->identity->getEmail(), $this->identity->getPreferredLocale(), - $type - ) + $type, + ), ); } @@ -170,8 +166,8 @@ public function revoke(): void $this->identity->getInstitution(), $this->id, $this->type, - $this->secondFactorIdentifier - ) + $this->secondFactorIdentifier, + ), ); } @@ -184,8 +180,8 @@ public function complyWithRevocation(IdentityId $authorityId): void $this->id, $this->type, $this->secondFactorIdentifier, - $authorityId - ) + $authorityId, + ), ); } @@ -199,7 +195,7 @@ public function asVetted(VettingType $vettingType) $this->identity, $this->type, $this->secondFactorIdentifier, - $vettingType + $vettingType, ); } @@ -210,7 +206,7 @@ public function getLoaLevel(SecondFactorTypeService $secondFactorTypeService): i protected function applyIdentityForgottenEvent(IdentityForgottenEvent $event) { - $secondFactorIdentifierClass = get_class($this->secondFactorIdentifier); + $secondFactorIdentifierClass = $this->secondFactorIdentifier::class; $this->secondFactorIdentifier = $secondFactorIdentifierClass::unknown(); } diff --git a/src/Surfnet/Stepup/Identity/Entity/VettedSecondFactor.php b/src/Surfnet/Stepup/Identity/Entity/VettedSecondFactor.php index d230b53ad..6c88ce893 100644 --- a/src/Surfnet/Stepup/Identity/Entity/VettedSecondFactor.php +++ b/src/Surfnet/Stepup/Identity/Entity/VettedSecondFactor.php @@ -56,7 +56,7 @@ public static function create( Identity $identity, SecondFactorType $type, SecondFactorIdentifier $secondFactorIdentifier, - VettingType $vettingType + VettingType $vettingType, ): self { $secondFactor = new self(); $secondFactor->id = $id; @@ -88,8 +88,8 @@ public function revoke(): void $this->identity->getInstitution(), $this->id, $this->type, - $this->secondFactorIdentifier - ) + $this->secondFactorIdentifier, + ), ); } @@ -102,8 +102,8 @@ public function complyWithRevocation(IdentityId $authorityId): void $this->id, $this->type, $this->secondFactorIdentifier, - $authorityId - ) + $authorityId, + ), ); } @@ -114,7 +114,7 @@ public function vettingType(): VettingType protected function applyIdentityForgottenEvent(IdentityForgottenEvent $event) { - $secondFactorIdentifierClass = get_class($this->secondFactorIdentifier); + $secondFactorIdentifierClass = $this->secondFactorIdentifier::class; $this->secondFactorIdentifier = $secondFactorIdentifierClass::unknown(); } diff --git a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php index 413353219..1b5ec5589 100644 --- a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php @@ -43,7 +43,7 @@ class AppointedAsRaEvent extends IdentityEvent implements RightToObtainDataInter public function __construct( IdentityId $identityId, Institution $identityInstitution, - NameId $nameId + NameId $nameId, ) { parent::__construct($identityId, $identityInstitution); @@ -67,7 +67,7 @@ public static function deserialize(array $data) return new self( new IdentityId($data['identity_id']), new Institution($data['institution']), - new NameId($data['name_id']) + new NameId($data['name_id']), ); } @@ -77,9 +77,9 @@ public static function deserialize(array $data) public function serialize(): array { return [ - 'identity_id' => (string) $this->identityId, - 'institution' => (string) $this->identityInstitution, - 'name_id' => (string) $this->nameId + 'identity_id' => (string)$this->identityId, + 'institution' => (string)$this->identityInstitution, + 'name_id' => (string)$this->nameId, ]; } diff --git a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php index 35712286e..47123ddf1 100644 --- a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php @@ -30,7 +30,7 @@ class AppointedAsRaForInstitutionEvent extends IdentityEvent implements RightToO 'identity_id', 'institution', 'name_id', - 'ra_institution' + 'ra_institution', ]; /** @@ -47,7 +47,7 @@ public function __construct( IdentityId $identityId, Institution $identityInstitution, NameId $nameId, - Institution $raInstitution + Institution $raInstitution, ) { parent::__construct($identityId, $identityInstitution); @@ -74,7 +74,7 @@ public static function deserialize(array $data) new IdentityId($data['identity_id']), new Institution($data['institution']), new NameId($data['name_id']), - new Institution($data['ra_institution']) + new Institution($data['ra_institution']), ); } @@ -84,10 +84,10 @@ public static function deserialize(array $data) public function serialize(): array { return [ - 'identity_id' => (string) $this->identityId, - 'institution' => (string) $this->identityInstitution, - 'name_id' => (string) $this->nameId, - 'ra_institution' => (string) $this->raInstitution, + 'identity_id' => (string)$this->identityId, + 'institution' => (string)$this->identityInstitution, + 'name_id' => (string)$this->nameId, + 'ra_institution' => (string)$this->raInstitution, ]; } diff --git a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php index 62366938f..cbf6df473 100644 --- a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php @@ -43,7 +43,7 @@ class AppointedAsRaaEvent extends IdentityEvent implements RightToObtainDataInte public function __construct( IdentityId $identityId, Institution $identityInstitution, - NameId $nameId + NameId $nameId, ) { parent::__construct($identityId, $identityInstitution); @@ -67,7 +67,7 @@ public static function deserialize(array $data) return new self( new IdentityId($data['identity_id']), new Institution($data['institution']), - new NameId($data['name_id']) + new NameId($data['name_id']), ); } @@ -77,9 +77,9 @@ public static function deserialize(array $data) public function serialize(): array { return [ - 'identity_id' => (string) $this->identityId, - 'institution' => (string) $this->identityInstitution, - 'name_id' => (string) $this->nameId + 'identity_id' => (string)$this->identityId, + 'institution' => (string)$this->identityInstitution, + 'name_id' => (string)$this->nameId, ]; } diff --git a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaForInstitutionEvent.php index cbd52cc26..377f6dded 100644 --- a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaForInstitutionEvent.php @@ -30,7 +30,7 @@ class AppointedAsRaaForInstitutionEvent extends IdentityEvent implements RightTo 'identity_id', 'institution', 'name_id', - 'ra_institution' + 'ra_institution', ]; /** @@ -47,7 +47,7 @@ public function __construct( IdentityId $identityId, Institution $identityInstitution, NameId $nameId, - Institution $raInstitution + Institution $raInstitution, ) { parent::__construct($identityId, $identityInstitution); @@ -74,7 +74,7 @@ public static function deserialize(array $data) new IdentityId($data['identity_id']), new Institution($data['institution']), new NameId($data['name_id']), - new Institution($data['ra_institution']) + new Institution($data['ra_institution']), ); } @@ -84,10 +84,10 @@ public static function deserialize(array $data) public function serialize(): array { return [ - 'identity_id' => (string) $this->identityId, - 'institution' => (string) $this->identityInstitution, - 'name_id' => (string) $this->nameId, - 'ra_institution' => (string) $this->raInstitution, + 'identity_id' => (string)$this->identityId, + 'institution' => (string)$this->identityInstitution, + 'name_id' => (string)$this->nameId, + 'ra_institution' => (string)$this->raInstitution, ]; } diff --git a/src/Surfnet/Stepup/Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php b/src/Surfnet/Stepup/Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php index 6b8aef11a..5863e6cef 100644 --- a/src/Surfnet/Stepup/Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php @@ -47,11 +47,11 @@ class CompliedWithRecoveryCodeRevocationEvent extends IdentityEvent implements R ]; final public function __construct( - IdentityId $identityId, - Institution $identityInstitution, - RecoveryTokenId $recoveryTokenId, + IdentityId $identityId, + Institution $identityInstitution, + RecoveryTokenId $recoveryTokenId, RecoveryTokenType $recoveryTokenType, - IdentityId $authorityId + IdentityId $authorityId, ) { parent::__construct($identityId, $identityInstitution); @@ -69,7 +69,7 @@ final public static function deserialize(array $data) new Institution($data['identity_institution']), new RecoveryTokenId($data['recovery_token_id']), $recoveryTokenType, - new IdentityId($data['authority_id']) + new IdentityId($data['authority_id']), ); } diff --git a/src/Surfnet/Stepup/Identity/Event/CompliedWithRevocationEvent.php b/src/Surfnet/Stepup/Identity/Event/CompliedWithRevocationEvent.php index 299f1238b..8d3751544 100644 --- a/src/Surfnet/Stepup/Identity/Event/CompliedWithRevocationEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/CompliedWithRevocationEvent.php @@ -65,23 +65,23 @@ final public function __construct( SecondFactorId $secondFactorId, SecondFactorType $secondFactorType, SecondFactorIdentifier $secondFactorIdentifier, - IdentityId $authorityId + IdentityId $authorityId, ) { parent::__construct($identityId, $identityInstitution); - $this->authorityId = $authorityId; - $this->secondFactorId = $secondFactorId; - $this->secondFactorType = $secondFactorType; + $this->authorityId = $authorityId; + $this->secondFactorId = $secondFactorId; + $this->secondFactorType = $secondFactorType; $this->secondFactorIdentifier = $secondFactorIdentifier; } public function getAuditLogMetadata(): Metadata { - $metadata = new Metadata(); - $metadata->identityId = $this->identityId; - $metadata->identityInstitution = $this->identityInstitution; - $metadata->secondFactorId = $this->secondFactorId; - $metadata->secondFactorType = $this->secondFactorType; + $metadata = new Metadata(); + $metadata->identityId = $this->identityId; + $metadata->identityInstitution = $this->identityInstitution; + $metadata->secondFactorId = $this->secondFactorId; + $metadata->secondFactorType = $this->secondFactorType; $metadata->secondFactorIdentifier = $this->secondFactorIdentifier; return $metadata; @@ -97,7 +97,7 @@ final public static function deserialize(array $data) new SecondFactorId($data['second_factor_id']), $secondFactorType, SecondFactorIdentifierFactory::unknownForType($secondFactorType), - new IdentityId($data['authority_id']) + new IdentityId($data['authority_id']), ); } @@ -107,11 +107,11 @@ final public static function deserialize(array $data) final public function serialize(): array { return [ - 'identity_id' => (string) $this->identityId, - 'identity_institution' => (string) $this->identityInstitution, - 'second_factor_id' => (string) $this->secondFactorId, - 'second_factor_type' => (string) $this->secondFactorType, - 'authority_id' => (string) $this->authorityId, + 'identity_id' => (string)$this->identityId, + 'identity_institution' => (string)$this->identityInstitution, + 'second_factor_id' => (string)$this->secondFactorId, + 'second_factor_type' => (string)$this->secondFactorType, + 'authority_id' => (string)$this->authorityId, ]; } @@ -132,6 +132,7 @@ public function obtainUserData(): array $serializedSensitiveUserData = $this->getSensitiveData()->serialize(); return array_merge($serializedPublicUserData, $serializedSensitiveUserData); } + public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/EmailVerifiedEvent.php b/src/Surfnet/Stepup/Identity/Event/EmailVerifiedEvent.php index 9206ce210..9154a3f18 100644 --- a/src/Surfnet/Stepup/Identity/Event/EmailVerifiedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/EmailVerifiedEvent.php @@ -33,7 +33,10 @@ use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\RightToObtainDataInterface; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\SensitiveData; -class EmailVerifiedEvent extends IdentityEvent implements Forgettable, PossessionProvenAndVerified, RightToObtainDataInterface +class EmailVerifiedEvent extends IdentityEvent implements + Forgettable, + PossessionProvenAndVerified, + RightToObtainDataInterface { private array $allowlist = [ 'identity_id', @@ -44,7 +47,7 @@ class EmailVerifiedEvent extends IdentityEvent implements Forgettable, Possessio 'registration_requested_at', 'preferred_locale', 'common_name', - 'email' + 'email', ]; /** @@ -57,21 +60,11 @@ class EmailVerifiedEvent extends IdentityEvent implements Forgettable, Possessio */ public $secondFactorType; - /** - * @var SecondFactorIdentifier - */ - private $secondFactorIdentifier; - /** * @var DateTime */ public $registrationRequestedAt; - /** - * @var string - */ - public $registrationCode; - /** * @var CommonName */ @@ -88,16 +81,16 @@ class EmailVerifiedEvent extends IdentityEvent implements Forgettable, Possessio public $preferredLocale; /** - * @param IdentityId $identityId - * @param Institution $identityInstitution - * @param SecondFactorId $secondFactorId - * @param SecondFactorType $secondFactorType + * @param IdentityId $identityId + * @param Institution $identityInstitution + * @param SecondFactorId $secondFactorId + * @param SecondFactorType $secondFactorType * @param SecondFactorIdentifier $secondFactorIdentifier - * @param DateTime $registrationRequestedAt - * @param string $registrationCode - * @param CommonName $commonName - * @param Email $email - * @param Locale $preferredLocale + * @param DateTime $registrationRequestedAt + * @param string $registrationCode + * @param CommonName $commonName + * @param Email $email + * @param Locale $preferredLocale * * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ @@ -106,23 +99,21 @@ public function __construct( Institution $identityInstitution, SecondFactorId $secondFactorId, SecondFactorType $secondFactorType, - SecondFactorIdentifier $secondFactorIdentifier, + private SecondFactorIdentifier $secondFactorIdentifier, DateTime $registrationRequestedAt, - $registrationCode, + public $registrationCode, CommonName $commonName, Email $email, - Locale $preferredLocale + Locale $preferredLocale, ) { parent::__construct($identityId, $identityInstitution); - $this->secondFactorId = $secondFactorId; - $this->secondFactorType = $secondFactorType; - $this->secondFactorIdentifier = $secondFactorIdentifier; + $this->secondFactorId = $secondFactorId; + $this->secondFactorType = $secondFactorType; $this->registrationRequestedAt = $registrationRequestedAt; - $this->registrationCode = $registrationCode; - $this->commonName = $commonName; - $this->email = $email; - $this->preferredLocale = $preferredLocale; + $this->commonName = $commonName; + $this->email = $email; + $this->preferredLocale = $preferredLocale; } public function getAuditLogMetadata(): Metadata @@ -151,7 +142,7 @@ public static function deserialize(array $data) $data['registration_code'], CommonName::unknown(), Email::unknown(), - new Locale($data['preferred_locale']) + new Locale($data['preferred_locale']), ); } @@ -161,13 +152,13 @@ public static function deserialize(array $data) public function serialize(): array { return [ - 'identity_id' => (string) $this->identityId, - 'identity_institution' => (string) $this->identityInstitution, - 'second_factor_id' => (string) $this->secondFactorId, - 'second_factor_type' => (string) $this->secondFactorType, - 'registration_requested_at' => (string) $this->registrationRequestedAt, - 'registration_code' => $this->registrationCode, - 'preferred_locale' => (string) $this->preferredLocale, + 'identity_id' => (string)$this->identityId, + 'identity_institution' => (string)$this->identityInstitution, + 'second_factor_id' => (string)$this->secondFactorId, + 'second_factor_type' => (string)$this->secondFactorType, + 'registration_requested_at' => (string)$this->registrationRequestedAt, + 'registration_code' => $this->registrationCode, + 'preferred_locale' => (string)$this->preferredLocale, ]; } @@ -181,7 +172,7 @@ public function getSensitiveData() public function setSensitiveData(SensitiveData $sensitiveData): void { - $this->email = $sensitiveData->getEmail(); + $this->email = $sensitiveData->getEmail(); $this->commonName = $sensitiveData->getCommonName(); $this->secondFactorIdentifier = $sensitiveData->getSecondFactorIdentifier(); } diff --git a/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenAndVerifiedEvent.php b/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenAndVerifiedEvent.php index e32a41797..10b671fb4 100644 --- a/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenAndVerifiedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenAndVerifiedEvent.php @@ -33,7 +33,10 @@ use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\RightToObtainDataInterface; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\SensitiveData; -class GssfPossessionProvenAndVerifiedEvent extends IdentityEvent implements Forgettable, PossessionProvenAndVerified, RightToObtainDataInterface +class GssfPossessionProvenAndVerifiedEvent extends IdentityEvent implements + Forgettable, + PossessionProvenAndVerified, + RightToObtainDataInterface { private array $allowlist = [ 'identity_id', @@ -83,21 +86,16 @@ class GssfPossessionProvenAndVerifiedEvent extends IdentityEvent implements Forg public $registrationRequestedAt; /** - * @var string - */ - public $registrationCode; - - /** - * @param IdentityId $identityId - * @param Institution $identityInstitution - * @param SecondFactorId $secondFactorId - * @param StepupProvider $stepupProvider - * @param GssfId $gssfId - * @param CommonName $commonName - * @param Email $email - * @param Locale $locale - * @param DateTime $registrationRequestedAt - * @param string $registrationCode + * @param IdentityId $identityId + * @param Institution $identityInstitution + * @param SecondFactorId $secondFactorId + * @param StepupProvider $stepupProvider + * @param GssfId $gssfId + * @param CommonName $commonName + * @param Email $email + * @param Locale $locale + * @param DateTime $registrationRequestedAt + * @param string $registrationCode * * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ @@ -111,18 +109,17 @@ public function __construct( Email $email, Locale $locale, DateTime $registrationRequestedAt, - $registrationCode + public $registrationCode, ) { parent::__construct($identityId, $identityInstitution); - $this->secondFactorId = $secondFactorId; - $this->stepupProvider = $stepupProvider; - $this->gssfId = $gssfId; - $this->commonName = $commonName; - $this->email = $email; - $this->preferredLocale = $locale; - $this->registrationRequestedAt = $registrationRequestedAt; - $this->registrationCode = $registrationCode; + $this->secondFactorId = $secondFactorId; + $this->stepupProvider = $stepupProvider; + $this->gssfId = $gssfId; + $this->commonName = $commonName; + $this->email = $email; + $this->preferredLocale = $locale; + $this->registrationRequestedAt = $registrationRequestedAt; } public function getAuditLogMetadata(): Metadata @@ -131,7 +128,7 @@ public function getAuditLogMetadata(): Metadata $metadata->identityId = $this->identityId; $metadata->identityInstitution = $this->identityInstitution; $metadata->secondFactorId = $this->secondFactorId; - $metadata->secondFactorType = new SecondFactorType((string) $this->stepupProvider); + $metadata->secondFactorType = new SecondFactorType((string)$this->stepupProvider); $metadata->secondFactorIdentifier = $this->gssfId; return $metadata; @@ -154,7 +151,7 @@ public static function deserialize(array $data) Email::unknown(), new Locale($data['preferred_locale']), DateTime::fromString($data['registration_requested_at']), - (string) $data['registration_code'] + (string)$data['registration_code'], ); } @@ -164,13 +161,13 @@ public static function deserialize(array $data) public function serialize(): array { return [ - 'identity_id' => (string) $this->identityId, - 'identity_institution' => (string) $this->identityInstitution, - 'second_factor_id' => (string) $this->secondFactorId, - 'stepup_provider' => (string) $this->stepupProvider, - 'registration_requested_at' => (string) $this->registrationRequestedAt, - 'registration_code' => $this->registrationCode, - 'preferred_locale' => (string) $this->preferredLocale, + 'identity_id' => (string)$this->identityId, + 'identity_institution' => (string)$this->identityInstitution, + 'second_factor_id' => (string)$this->secondFactorId, + 'stepup_provider' => (string)$this->stepupProvider, + 'registration_requested_at' => (string)$this->registrationRequestedAt, + 'registration_code' => $this->registrationCode, + 'preferred_locale' => (string)$this->preferredLocale, ]; } @@ -179,7 +176,7 @@ public function getSensitiveData() return (new SensitiveData) ->withCommonName($this->commonName) ->withEmail($this->email) - ->withSecondFactorIdentifier($this->gssfId, new SecondFactorType((string) $this->stepupProvider)); + ->withSecondFactorIdentifier($this->gssfId, new SecondFactorType((string)$this->stepupProvider)); } public function setSensitiveData(SensitiveData $sensitiveData): void diff --git a/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenEvent.php b/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenEvent.php index 87c8381e0..0b9a39482 100644 --- a/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenEvent.php @@ -61,21 +61,11 @@ class GssfPossessionProvenEvent extends IdentityEvent implements Forgettable, Ri */ public $gssfId; - /** - * @var bool - */ - public $emailVerificationRequired; - /** * @var EmailVerificationWindow */ public $emailVerificationWindow; - /** - * @var string - */ - public $emailVerificationNonce; - /** * @var CommonName */ @@ -94,17 +84,17 @@ class GssfPossessionProvenEvent extends IdentityEvent implements Forgettable, Ri /** * @SuppressWarnings(PHPMD.ExcessiveParameterList) * - * @param IdentityId $identityId - * @param Institution $identityInstitution - * @param SecondFactorId $secondFactorId - * @param StepupProvider $stepupProvider - * @param GssfId $gssfId - * @param bool $emailVerificationRequired + * @param IdentityId $identityId + * @param Institution $identityInstitution + * @param SecondFactorId $secondFactorId + * @param StepupProvider $stepupProvider + * @param GssfId $gssfId + * @param bool $emailVerificationRequired * @param EmailVerificationWindow $emailVerificationWindow - * @param string $emailVerificationNonce - * @param CommonName $commonName - * @param Email $email - * @param Locale $preferredLocale + * @param string $emailVerificationNonce + * @param CommonName $commonName + * @param Email $email + * @param Locale $preferredLocale */ public function __construct( IdentityId $identityId, @@ -112,24 +102,22 @@ public function __construct( SecondFactorId $secondFactorId, StepupProvider $stepupProvider, GssfId $gssfId, - $emailVerificationRequired, + public $emailVerificationRequired, EmailVerificationWindow $emailVerificationWindow, - $emailVerificationNonce, + public $emailVerificationNonce, CommonName $commonName, Email $email, - Locale $preferredLocale + Locale $preferredLocale, ) { parent::__construct($identityId, $identityInstitution); - $this->secondFactorId = $secondFactorId; - $this->stepupProvider = $stepupProvider; - $this->gssfId = $gssfId; - $this->emailVerificationRequired = $emailVerificationRequired; - $this->emailVerificationWindow = $emailVerificationWindow; - $this->emailVerificationNonce = $emailVerificationNonce; - $this->commonName = $commonName; - $this->email = $email; - $this->preferredLocale = $preferredLocale; + $this->secondFactorId = $secondFactorId; + $this->stepupProvider = $stepupProvider; + $this->gssfId = $gssfId; + $this->emailVerificationWindow = $emailVerificationWindow; + $this->commonName = $commonName; + $this->email = $email; + $this->preferredLocale = $preferredLocale; } public function getAuditLogMetadata(): Metadata @@ -138,7 +126,7 @@ public function getAuditLogMetadata(): Metadata $metadata->identityId = $this->identityId; $metadata->identityInstitution = $this->identityInstitution; $metadata->secondFactorId = $this->secondFactorId; - $metadata->secondFactorType = new SecondFactorType((string) $this->stepupProvider); + $metadata->secondFactorType = new SecondFactorType((string)$this->stepupProvider); $metadata->secondFactorIdentifier = $this->gssfId; return $metadata; @@ -161,7 +149,7 @@ public static function deserialize(array $data) $data['email_verification_nonce'], CommonName::unknown(), Email::unknown(), - new Locale($data['preferred_locale']) + new Locale($data['preferred_locale']), ); } @@ -171,14 +159,14 @@ public static function deserialize(array $data) public function serialize(): array { return [ - 'identity_id' => (string) $this->identityId, - 'identity_institution' => (string) $this->identityInstitution, - 'second_factor_id' => (string) $this->secondFactorId, - 'stepup_provider' => (string) $this->stepupProvider, - 'email_verification_required' => (bool) $this->emailVerificationRequired, - 'email_verification_window' => $this->emailVerificationWindow->serialize(), - 'email_verification_nonce' => (string) $this->emailVerificationNonce, - 'preferred_locale' => (string) $this->preferredLocale, + 'identity_id' => (string)$this->identityId, + 'identity_institution' => (string)$this->identityInstitution, + 'second_factor_id' => (string)$this->secondFactorId, + 'stepup_provider' => (string)$this->stepupProvider, + 'email_verification_required' => (bool)$this->emailVerificationRequired, + 'email_verification_window' => $this->emailVerificationWindow->serialize(), + 'email_verification_nonce' => (string)$this->emailVerificationNonce, + 'preferred_locale' => (string)$this->preferredLocale, ]; } @@ -187,14 +175,14 @@ public function getSensitiveData() return (new SensitiveData) ->withCommonName($this->commonName) ->withEmail($this->email) - ->withSecondFactorIdentifier($this->gssfId, new SecondFactorType((string) $this->stepupProvider)); + ->withSecondFactorIdentifier($this->gssfId, new SecondFactorType((string)$this->stepupProvider)); } public function setSensitiveData(SensitiveData $sensitiveData): void { - $this->email = $sensitiveData->getEmail(); + $this->email = $sensitiveData->getEmail(); $this->commonName = $sensitiveData->getCommonName(); - $this->gssfId = $sensitiveData->getSecondFactorIdentifier(); + $this->gssfId = $sensitiveData->getSecondFactorIdentifier(); } public function obtainUserData(): array diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php index b044e53e8..ffb72cf93 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php @@ -75,20 +75,20 @@ public function __construct( Institution $institution, RegistrationAuthorityRole $role, Location $location, - ContactInformation $contactInformation + ContactInformation $contactInformation, ) { parent::__construct($identityId, $institution); - $this->nameId = $nameId; + $this->nameId = $nameId; $this->registrationAuthorityRole = $role; - $this->location = $location; - $this->contactInformation = $contactInformation; + $this->location = $location; + $this->contactInformation = $contactInformation; } public function getAuditLogMetadata(): Metadata { - $metadata = new Metadata(); - $metadata->identityId = $this->identityId; + $metadata = new Metadata(); + $metadata->identityId = $this->identityId; $metadata->identityInstitution = $this->identityInstitution; return $metadata; @@ -102,19 +102,19 @@ public static function deserialize(array $data) new Institution($data['institution']), RegistrationAuthorityRole::deserialize($data['registration_authority_role']), new Location($data['location']), - new ContactInformation($data['contact_information']) + new ContactInformation($data['contact_information']), ); } public function serialize(): array { return [ - 'identity_id' => (string) $this->identityId, - 'name_id' => (string) $this->nameId, - 'institution' => (string) $this->identityInstitution, + 'identity_id' => (string)$this->identityId, + 'name_id' => (string)$this->nameId, + 'institution' => (string)$this->identityInstitution, 'registration_authority_role' => $this->registrationAuthorityRole->serialize(), - 'location' => (string) $this->location, - 'contact_information' => (string) $this->contactInformation, + 'location' => (string)$this->location, + 'contact_information' => (string)$this->contactInformation, ]; } diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaForInstitutionEvent.php index 682162678..97eb911ef 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaForInstitutionEvent.php @@ -36,7 +36,7 @@ class IdentityAccreditedAsRaForInstitutionEvent extends IdentityEvent implements 'registration_authority_role', 'location', 'contact_information', - 'ra_institution' + 'ra_institution', ]; /** @@ -80,23 +80,23 @@ public function __construct( RegistrationAuthorityRole $role, Location $location, ContactInformation $contactInformation, - Institution $raInstitution + Institution $raInstitution, ) { parent::__construct($identityId, $institution); - $this->nameId = $nameId; + $this->nameId = $nameId; $this->registrationAuthorityRole = $role; - $this->location = $location; - $this->contactInformation = $contactInformation; - $this->raInstitution = $raInstitution; + $this->location = $location; + $this->contactInformation = $contactInformation; + $this->raInstitution = $raInstitution; } public function getAuditLogMetadata(): Metadata { - $metadata = new Metadata(); - $metadata->identityId = $this->identityId; + $metadata = new Metadata(); + $metadata->identityId = $this->identityId; $metadata->identityInstitution = $this->identityInstitution; - $metadata->raInstitution = $this->raInstitution; + $metadata->raInstitution = $this->raInstitution; return $metadata; } @@ -110,7 +110,7 @@ public static function deserialize(array $data) RegistrationAuthorityRole::deserialize($data['registration_authority_role']), new Location($data['location']), new ContactInformation($data['contact_information']), - new Institution($data['ra_institution']) + new Institution($data['ra_institution']), ); } @@ -120,13 +120,13 @@ public static function deserialize(array $data) public function serialize(): array { return [ - 'identity_id' => (string) $this->identityId, - 'name_id' => (string) $this->nameId, - 'institution' => (string) $this->identityInstitution, + 'identity_id' => (string)$this->identityId, + 'name_id' => (string)$this->nameId, + 'institution' => (string)$this->identityInstitution, 'registration_authority_role' => $this->registrationAuthorityRole->serialize(), - 'location' => (string) $this->location, - 'contact_information' => (string) $this->contactInformation, - 'ra_institution' => (string) $this->raInstitution, + 'location' => (string)$this->location, + 'contact_information' => (string)$this->contactInformation, + 'ra_institution' => (string)$this->raInstitution, ]; } diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php index 9789f2ad8..959c896f8 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php @@ -75,20 +75,20 @@ public function __construct( Institution $institution, RegistrationAuthorityRole $role, Location $location, - ContactInformation $contactInformation + ContactInformation $contactInformation, ) { parent::__construct($identityId, $institution); - $this->nameId = $nameId; + $this->nameId = $nameId; $this->registrationAuthorityRole = $role; - $this->location = $location; - $this->contactInformation = $contactInformation; + $this->location = $location; + $this->contactInformation = $contactInformation; } public function getAuditLogMetadata(): Metadata { - $metadata = new Metadata(); - $metadata->identityId = $this->identityId; + $metadata = new Metadata(); + $metadata->identityId = $this->identityId; $metadata->identityInstitution = $this->identityInstitution; return $metadata; @@ -102,19 +102,19 @@ public static function deserialize(array $data) new Institution($data['institution']), RegistrationAuthorityRole::deserialize($data['registration_authority_role']), new Location($data['location']), - new ContactInformation($data['contact_information']) + new ContactInformation($data['contact_information']), ); } public function serialize(): array { return [ - 'identity_id' => (string) $this->identityId, - 'name_id' => (string) $this->nameId, - 'institution' => (string) $this->identityInstitution, + 'identity_id' => (string)$this->identityId, + 'name_id' => (string)$this->nameId, + 'institution' => (string)$this->identityInstitution, 'registration_authority_role' => $this->registrationAuthorityRole->serialize(), - 'location' => (string) $this->location, - 'contact_information' => (string) $this->contactInformation, + 'location' => (string)$this->location, + 'contact_information' => (string)$this->contactInformation, ]; } diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaForInstitutionEvent.php index 3ba2e3007..38ded5f5e 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaForInstitutionEvent.php @@ -36,7 +36,7 @@ class IdentityAccreditedAsRaaForInstitutionEvent extends IdentityEvent implement 'registration_authority_role', 'location', 'contact_information', - 'ra_institution' + 'ra_institution', ]; /** @@ -79,23 +79,23 @@ public function __construct( RegistrationAuthorityRole $role, Location $location, ContactInformation $contactInformation, - Institution $raInstitution + Institution $raInstitution, ) { parent::__construct($identityId, $institution); - $this->nameId = $nameId; + $this->nameId = $nameId; $this->registrationAuthorityRole = $role; - $this->location = $location; - $this->contactInformation = $contactInformation; - $this->raInstitution = $raInstitution; + $this->location = $location; + $this->contactInformation = $contactInformation; + $this->raInstitution = $raInstitution; } public function getAuditLogMetadata(): Metadata { - $metadata = new Metadata(); - $metadata->identityId = $this->identityId; + $metadata = new Metadata(); + $metadata->identityId = $this->identityId; $metadata->identityInstitution = $this->identityInstitution; - $metadata->raInstitution = $this->raInstitution; + $metadata->raInstitution = $this->raInstitution; return $metadata; } @@ -109,7 +109,7 @@ public static function deserialize(array $data) RegistrationAuthorityRole::deserialize($data['registration_authority_role']), new Location($data['location']), new ContactInformation($data['contact_information']), - new Institution($data['ra_institution']) + new Institution($data['ra_institution']), ); } @@ -119,13 +119,13 @@ public static function deserialize(array $data) public function serialize(): array { return [ - 'identity_id' => (string) $this->identityId, - 'name_id' => (string) $this->nameId, - 'institution' => (string) $this->identityInstitution, + 'identity_id' => (string)$this->identityId, + 'name_id' => (string)$this->nameId, + 'institution' => (string)$this->identityInstitution, 'registration_authority_role' => $this->registrationAuthorityRole->serialize(), - 'location' => (string) $this->location, - 'contact_information' => (string) $this->contactInformation, - 'ra_institution' => (string) $this->raInstitution, + 'location' => (string)$this->location, + 'contact_information' => (string)$this->contactInformation, + 'ra_institution' => (string)$this->raInstitution, ]; } diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php index b30cd1a75..765c1361d 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php @@ -37,7 +37,7 @@ class IdentityCreatedEvent extends IdentityEvent implements Forgettable, RightTo 'name_id', 'preferred_locale', 'common_name', - 'email' + 'email', ]; /** @@ -66,7 +66,7 @@ public function __construct( NameId $nameId, CommonName $commonName, Email $email, - Locale $preferredLocale + Locale $preferredLocale, ) { parent::__construct($id, $institution); @@ -93,7 +93,7 @@ public static function deserialize(array $data) new NameId($data['name_id']), CommonName::unknown(), Email::unknown(), - new Locale($data['preferred_locale']) + new Locale($data['preferred_locale']), ); } @@ -103,10 +103,10 @@ public static function deserialize(array $data) public function serialize(): array { return [ - 'id' => (string) $this->identityId, - 'institution' => (string) $this->identityInstitution, - 'name_id' => (string) $this->nameId, - 'preferred_locale' => (string) $this->preferredLocale, + 'id' => (string)$this->identityId, + 'institution' => (string)$this->identityInstitution, + 'name_id' => (string)$this->nameId, + 'preferred_locale' => (string)$this->preferredLocale, ]; } @@ -119,7 +119,7 @@ public function getSensitiveData() public function setSensitiveData(SensitiveData $sensitiveData): void { - $this->email = $sensitiveData->getEmail(); + $this->email = $sensitiveData->getEmail(); $this->commonName = $sensitiveData->getCommonName(); } diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityEmailChangedEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityEmailChangedEvent.php index e5c2dded4..de686b7da 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityEmailChangedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityEmailChangedEvent.php @@ -31,7 +31,7 @@ class IdentityEmailChangedEvent extends IdentityEvent implements Forgettable, Ri private array $allowlist = [ 'id', 'identity_institution', - 'email' + 'email', ]; /** @@ -64,7 +64,7 @@ public static function deserialize(array $data) return new self( new IdentityId($data['id']), new Institution($data['institution']), - Email::unknown() + Email::unknown(), ); } @@ -74,8 +74,8 @@ public static function deserialize(array $data) public function serialize(): array { return [ - 'id' => (string) $this->identityId, - 'institution' => (string) $this->identityInstitution, + 'id' => (string)$this->identityId, + 'institution' => (string)$this->identityInstitution, ]; } diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityForgottenEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityForgottenEvent.php index a23fc129b..6114c4392 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityForgottenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityForgottenEvent.php @@ -35,8 +35,8 @@ class IdentityForgottenEvent extends IdentityEvent implements RightToObtainDataI */ public function getAuditLogMetadata(): Metadata { - $metadata = new Metadata(); - $metadata->identityId = $this->identityId; + $metadata = new Metadata(); + $metadata->identityId = $this->identityId; $metadata->identityInstitution = $this->identityInstitution; return $metadata; @@ -54,7 +54,7 @@ public function serialize(): array { return [ 'identity_id' => $this->identityId, - 'institution' => $this->identityInstitution + 'institution' => $this->identityInstitution, ]; } diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityRenamedEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityRenamedEvent.php index 68ea729e7..056d1e0fb 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityRenamedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityRenamedEvent.php @@ -64,7 +64,7 @@ public static function deserialize(array $data) return new self( new IdentityId($data['id']), new Institution($data['institution']), - CommonName::unknown() + CommonName::unknown(), ); } @@ -74,8 +74,8 @@ public static function deserialize(array $data) public function serialize(): array { return [ - 'id' => (string) $this->identityId, - 'institution' => (string) $this->identityInstitution, + 'id' => (string)$this->identityId, + 'institution' => (string)$this->identityInstitution, ]; } diff --git a/src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php b/src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php index 721518127..0c9c618bf 100644 --- a/src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php @@ -38,9 +38,9 @@ class LocalePreferenceExpressedEvent extends IdentityEvent implements RightToObt public $preferredLocale; /** - * @param IdentityId $id + * @param IdentityId $id * @param Institution $institution - * @param Locale $preferredLocale + * @param Locale $preferredLocale */ public function __construct(IdentityId $id, Institution $institution, Locale $preferredLocale) { @@ -67,7 +67,7 @@ public static function deserialize(array $data) return new self( new IdentityId($data['id']), new Institution($data['institution']), - new Locale($data['preferred_locale']) + new Locale($data['preferred_locale']), ); } @@ -77,9 +77,9 @@ public static function deserialize(array $data) public function serialize(): array { return [ - 'id' => (string) $this->identityId, - 'institution' => (string) $this->identityInstitution, - 'preferred_locale' => (string) $this->preferredLocale, + 'id' => (string)$this->identityId, + 'institution' => (string)$this->identityInstitution, + 'preferred_locale' => (string)$this->preferredLocale, ]; } diff --git a/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenAndVerifiedEvent.php b/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenAndVerifiedEvent.php index c1cd78d45..a5b72a2a4 100644 --- a/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenAndVerifiedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenAndVerifiedEvent.php @@ -32,7 +32,10 @@ use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\RightToObtainDataInterface; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\SensitiveData; -class PhonePossessionProvenAndVerifiedEvent extends IdentityEvent implements Forgettable, PossessionProvenAndVerified, RightToObtainDataInterface +class PhonePossessionProvenAndVerifiedEvent extends IdentityEvent implements + Forgettable, + PossessionProvenAndVerified, + RightToObtainDataInterface { private array $allowlist = [ 'identity_id', @@ -76,11 +79,6 @@ class PhonePossessionProvenAndVerifiedEvent extends IdentityEvent implements For */ public $registrationRequestedAt; - /** - * @var string - */ - public $registrationCode; - /** * @param IdentityId $identityId * @param Institution $identityInstitution @@ -101,7 +99,7 @@ public function __construct( Email $email, Locale $locale, DateTime $registrationRequestedAt, - $registrationCode + public $registrationCode, ) { parent::__construct($identityId, $identityInstitution); @@ -111,16 +109,15 @@ public function __construct( $this->email = $email; $this->preferredLocale = $locale; $this->registrationRequestedAt = $registrationRequestedAt; - $this->registrationCode = $registrationCode; } public function getAuditLogMetadata(): Metadata { - $metadata = new Metadata(); - $metadata->identityId = $this->identityId; - $metadata->identityInstitution = $this->identityInstitution; - $metadata->secondFactorId = $this->secondFactorId; - $metadata->secondFactorType = new SecondFactorType('sms'); + $metadata = new Metadata(); + $metadata->identityId = $this->identityId; + $metadata->identityInstitution = $this->identityInstitution; + $metadata->secondFactorId = $this->secondFactorId; + $metadata->secondFactorType = new SecondFactorType('sms'); $metadata->secondFactorIdentifier = $this->phoneNumber; return $metadata; @@ -142,7 +139,7 @@ public static function deserialize(array $data) Email::unknown(), new Locale($data['preferred_locale']), DateTime::fromString($data['registration_requested_at']), - (string) $data['registration_code'] + (string)$data['registration_code'], ); } @@ -152,12 +149,12 @@ public static function deserialize(array $data) public function serialize(): array { return [ - 'identity_id' => (string) $this->identityId, - 'identity_institution' => (string) $this->identityInstitution, - 'second_factor_id' => (string) $this->secondFactorId, - 'registration_requested_at' => (string) $this->registrationRequestedAt, - 'registration_code' => $this->registrationCode, - 'preferred_locale' => (string) $this->preferredLocale, + 'identity_id' => (string)$this->identityId, + 'identity_institution' => (string)$this->identityInstitution, + 'second_factor_id' => (string)$this->secondFactorId, + 'registration_requested_at' => (string)$this->registrationRequestedAt, + 'registration_code' => $this->registrationCode, + 'preferred_locale' => (string)$this->preferredLocale, ]; } diff --git a/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenEvent.php b/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenEvent.php index 6317f6aa5..b85697e89 100644 --- a/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenEvent.php @@ -55,21 +55,11 @@ class PhonePossessionProvenEvent extends IdentityEvent implements Forgettable, R */ public $phoneNumber; - /** - * @var bool - */ - public $emailVerificationRequired; - /** * @var EmailVerificationWindow */ public $emailVerificationWindow; - /** - * @var string - */ - public $emailVerificationNonce; - /** * @var CommonName */ @@ -104,20 +94,18 @@ public function __construct( Institution $identityInstitution, SecondFactorId $secondFactorId, PhoneNumber $phoneNumber, - $emailVerificationRequired, + public $emailVerificationRequired, EmailVerificationWindow $emailVerificationWindow, - $emailVerificationNonce, + public $emailVerificationNonce, CommonName $commonName, Email $email, - Locale $preferredLocale + Locale $preferredLocale, ) { parent::__construct($identityId, $identityInstitution); $this->secondFactorId = $secondFactorId; $this->phoneNumber = $phoneNumber; - $this->emailVerificationRequired = $emailVerificationRequired; $this->emailVerificationWindow = $emailVerificationWindow; - $this->emailVerificationNonce = $emailVerificationNonce; $this->commonName = $commonName; $this->email = $email; $this->preferredLocale = $preferredLocale; @@ -125,11 +113,11 @@ public function __construct( public function getAuditLogMetadata(): Metadata { - $metadata = new Metadata(); - $metadata->identityId = $this->identityId; - $metadata->identityInstitution = $this->identityInstitution; - $metadata->secondFactorId = $this->secondFactorId; - $metadata->secondFactorType = new SecondFactorType('sms'); + $metadata = new Metadata(); + $metadata->identityId = $this->identityId; + $metadata->identityInstitution = $this->identityInstitution; + $metadata->secondFactorId = $this->secondFactorId; + $metadata->secondFactorType = new SecondFactorType('sms'); $metadata->secondFactorIdentifier = $this->phoneNumber; return $metadata; @@ -151,7 +139,7 @@ public static function deserialize(array $data) $data['email_verification_nonce'], CommonName::unknown(), Email::unknown(), - new Locale($data['preferred_locale']) + new Locale($data['preferred_locale']), ); } @@ -161,13 +149,13 @@ public static function deserialize(array $data) public function serialize(): array { return [ - 'identity_id' => (string) $this->identityId, - 'identity_institution' => (string) $this->identityInstitution, - 'second_factor_id' => (string) $this->secondFactorId, - 'email_verification_required' => (bool) $this->emailVerificationRequired, + 'identity_id' => (string)$this->identityId, + 'identity_institution' => (string)$this->identityInstitution, + 'second_factor_id' => (string)$this->secondFactorId, + 'email_verification_required' => (bool)$this->emailVerificationRequired, 'email_verification_window' => $this->emailVerificationWindow->serialize(), - 'email_verification_nonce' => (string) $this->emailVerificationNonce, - 'preferred_locale' => (string) $this->preferredLocale, + 'email_verification_nonce' => (string)$this->emailVerificationNonce, + 'preferred_locale' => (string)$this->preferredLocale, ]; } @@ -181,8 +169,8 @@ public function getSensitiveData() public function setSensitiveData(SensitiveData $sensitiveData): void { - $this->email = $sensitiveData->getEmail(); - $this->commonName = $sensitiveData->getCommonName(); + $this->email = $sensitiveData->getEmail(); + $this->commonName = $sensitiveData->getCommonName(); $this->phoneNumber = $sensitiveData->getSecondFactorIdentifier(); } diff --git a/src/Surfnet/Stepup/Identity/Event/PhoneRecoveryTokenPossessionProvenEvent.php b/src/Surfnet/Stepup/Identity/Event/PhoneRecoveryTokenPossessionProvenEvent.php index 4951f2be0..2693c58c8 100644 --- a/src/Surfnet/Stepup/Identity/Event/PhoneRecoveryTokenPossessionProvenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/PhoneRecoveryTokenPossessionProvenEvent.php @@ -80,7 +80,7 @@ public function __construct( PhoneNumber $phoneNumber, CommonName $commonName, Email $email, - Locale $preferredLocale + Locale $preferredLocale, ) { parent::__construct($identityId, $identityInstitution); @@ -96,7 +96,7 @@ public function getAuditLogMetadata(): Metadata $metadata = new Metadata(); $metadata->identityId = $this->identityId; $metadata->identityInstitution = $this->identityInstitution; - $metadata->recoveryTokenId = (string) $this->phoneNumber; + $metadata->recoveryTokenId = (string)$this->phoneNumber; $metadata->recoveryTokenType = RecoveryTokenType::TYPE_SMS; return $metadata; } @@ -110,7 +110,7 @@ public static function deserialize(array $data) PhoneNumber::unknown(), CommonName::unknown(), Email::unknown(), - new Locale($data['preferred_locale']) + new Locale($data['preferred_locale']), ); } @@ -120,11 +120,11 @@ public static function deserialize(array $data) public function serialize(): array { return [ - 'identity_id' => (string) $this->identityId, - 'identity_institution' => (string) $this->identityInstitution, - 'recovery_token_id' => (string) $this->recoveryTokenId, + 'identity_id' => (string)$this->identityId, + 'identity_institution' => (string)$this->identityInstitution, + 'recovery_token_id' => (string)$this->recoveryTokenId, 'recovery_token_type' => RecoveryTokenType::TYPE_SMS, - 'preferred_locale' => (string) $this->preferredLocale, + 'preferred_locale' => (string)$this->preferredLocale, ]; } diff --git a/src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php b/src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php index 9c6120926..189c9b1c0 100644 --- a/src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php @@ -47,7 +47,7 @@ final public function __construct( IdentityId $identityId, Institution $identityInstitution, RecoveryTokenId $recoveryTokenId, - RecoveryTokenType $recoveryTokenType + RecoveryTokenType $recoveryTokenType, ) { parent::__construct($identityId, $identityInstitution); $this->recoveryTokenId = $recoveryTokenId; @@ -62,7 +62,7 @@ final public static function deserialize(array $data) new IdentityId($data['identity_id']), new Institution($data['identity_institution']), new RecoveryTokenId($data['recovery_token_id']), - $recoveryTokenType + $recoveryTokenType, ); } diff --git a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedEvent.php b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedEvent.php index b139368a0..a6e65cf2c 100644 --- a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedEvent.php @@ -66,7 +66,7 @@ public function __construct( Institution $institution, NameId $nameId, Location $location, - ContactInformation $contactInformation + ContactInformation $contactInformation, ) { parent::__construct($identityId, $institution); @@ -91,18 +91,18 @@ public static function deserialize(array $data) new Institution($data['institution']), new NameId($data['name_id']), new Location($data['location']), - new ContactInformation($data['contact_information']) + new ContactInformation($data['contact_information']), ); } public function serialize(): array { return [ - 'identity_id' => (string) $this->identityId, - 'institution' => (string) $this->identityInstitution, - 'name_id' => (string) $this->nameId, - 'location' => (string) $this->location, - 'contact_information' => (string) $this->contactInformation, + 'identity_id' => (string)$this->identityId, + 'institution' => (string)$this->identityInstitution, + 'name_id' => (string)$this->nameId, + 'location' => (string)$this->location, + 'contact_information' => (string)$this->contactInformation, ]; } diff --git a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedForInstitutionEvent.php index f1ce11f47..e80e8f2f6 100644 --- a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedForInstitutionEvent.php @@ -26,7 +26,8 @@ use Surfnet\Stepup\Identity\Value\NameId; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\RightToObtainDataInterface; -class RegistrationAuthorityInformationAmendedForInstitutionEvent extends IdentityEvent implements RightToObtainDataInterface +class RegistrationAuthorityInformationAmendedForInstitutionEvent extends IdentityEvent implements + RightToObtainDataInterface { private array $allowlist = [ 'identity_id', @@ -34,7 +35,7 @@ class RegistrationAuthorityInformationAmendedForInstitutionEvent extends Identit 'name_id', 'location', 'contact_information', - 'ra_institution' + 'ra_institution', ]; /** @@ -71,7 +72,7 @@ public function __construct( NameId $nameId, Location $location, ContactInformation $contactInformation, - Institution $raInstitution + Institution $raInstitution, ) { parent::__construct($identityId, $institution); @@ -98,19 +99,19 @@ public static function deserialize(array $data) new NameId($data['name_id']), new Location($data['location']), new ContactInformation($data['contact_information']), - new Institution($data['ra_institution']) + new Institution($data['ra_institution']), ); } public function serialize(): array { return [ - 'identity_id' => (string) $this->identityId, - 'institution' => (string) $this->identityInstitution, - 'name_id' => (string) $this->nameId, - 'location' => (string) $this->location, - 'contact_information' => (string) $this->contactInformation, - 'ra_institution' => (string) $this->raInstitution, + 'identity_id' => (string)$this->identityId, + 'institution' => (string)$this->identityInstitution, + 'name_id' => (string)$this->nameId, + 'location' => (string)$this->location, + 'contact_information' => (string)$this->contactInformation, + 'ra_institution' => (string)$this->raInstitution, ]; } diff --git a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedEvent.php b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedEvent.php index deed3bbcb..629256767 100644 --- a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedEvent.php @@ -61,20 +61,20 @@ public function __construct( Institution $institution, NameId $nameId, CommonName $commonName, - Email $email + Email $email, ) { parent::__construct($identityId, $institution); - $this->nameId = $nameId; + $this->nameId = $nameId; $this->commonName = $commonName; - $this->email = $email; + $this->email = $email; } public function getAuditLogMetadata(): Metadata { - $metadata = new Metadata(); - $metadata->identityId = $this->identityId; - $metadata->identityInstitution = $this->identityInstitution; + $metadata = new Metadata(); + $metadata->identityId = $this->identityId; + $metadata->identityInstitution = $this->identityInstitution; return $metadata; } @@ -86,16 +86,16 @@ public static function deserialize(array $data) new Institution($data['identity_institution']), new NameId($data['name_id']), CommonName::unknown(), - Email::unknown() + Email::unknown(), ); } public function serialize(): array { return [ - 'identity_id' => (string) $this->identityId, - 'identity_institution' => (string) $this->identityInstitution, - 'name_id' => (string) $this->nameId, + 'identity_id' => (string)$this->identityId, + 'identity_institution' => (string)$this->identityInstitution, + 'name_id' => (string)$this->nameId, ]; } @@ -108,7 +108,7 @@ public function getSensitiveData() public function setSensitiveData(SensitiveData $sensitiveData): void { - $this->email = $sensitiveData->getEmail(); + $this->email = $sensitiveData->getEmail(); $this->commonName = $sensitiveData->getCommonName(); } diff --git a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedForInstitutionEvent.php index beb58b8b4..1244051f7 100644 --- a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedForInstitutionEvent.php @@ -28,7 +28,9 @@ use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\RightToObtainDataInterface; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\SensitiveData; -class RegistrationAuthorityRetractedForInstitutionEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface +class RegistrationAuthorityRetractedForInstitutionEvent extends IdentityEvent implements + Forgettable, + RightToObtainDataInterface { private array $allowlist = [ 'identity_id', @@ -65,21 +67,21 @@ public function __construct( NameId $nameId, CommonName $commonName, Email $email, - Institution $raInstitution + Institution $raInstitution, ) { parent::__construct($identityId, $institution); - $this->nameId = $nameId; + $this->nameId = $nameId; $this->commonName = $commonName; - $this->email = $email; + $this->email = $email; $this->raInstitution = $raInstitution; } public function getAuditLogMetadata(): Metadata { - $metadata = new Metadata(); - $metadata->identityId = $this->identityId; - $metadata->identityInstitution = $this->identityInstitution; + $metadata = new Metadata(); + $metadata->identityId = $this->identityId; + $metadata->identityInstitution = $this->identityInstitution; return $metadata; } @@ -92,7 +94,7 @@ public static function deserialize(array $data) new NameId($data['name_id']), CommonName::unknown(), Email::unknown(), - new Institution($data['ra_institution']) + new Institution($data['ra_institution']), ); } @@ -102,10 +104,10 @@ public static function deserialize(array $data) public function serialize(): array { return [ - 'identity_id' => (string) $this->identityId, - 'identity_institution' => (string) $this->identityInstitution, - 'name_id' => (string) $this->nameId, - 'ra_institution' => (string) $this->raInstitution, + 'identity_id' => (string)$this->identityId, + 'identity_institution' => (string)$this->identityInstitution, + 'name_id' => (string)$this->nameId, + 'ra_institution' => (string)$this->raInstitution, ]; } @@ -118,7 +120,7 @@ public function getSensitiveData() public function setSensitiveData(SensitiveData $sensitiveData): void { - $this->email = $sensitiveData->getEmail(); + $this->email = $sensitiveData->getEmail(); $this->commonName = $sensitiveData->getCommonName(); } diff --git a/src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php b/src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php index 308fd24c9..7abb5ac3f 100644 --- a/src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php @@ -39,7 +39,9 @@ * This event is recorded when the user promised it stored the password * (displayed only once to the user) in a safe location. */ -class SafeStoreSecretRecoveryTokenPossessionPromisedEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface +class SafeStoreSecretRecoveryTokenPossessionPromisedEvent extends IdentityEvent implements + Forgettable, + RightToObtainDataInterface { private array $allowlist = [ 'identity_id', @@ -82,7 +84,7 @@ public function __construct( RecoveryTokenIdentifier $secret, CommonName $commonName, Email $email, - Locale $preferredLocale + Locale $preferredLocale, ) { parent::__construct($identityId, $identityInstitution); @@ -99,7 +101,7 @@ public function getAuditLogMetadata(): Metadata $metadata->identityId = $this->identityId; $metadata->identityInstitution = $this->identityInstitution; // In the audit log we do not show the secret (hashed) - $metadata->recoveryTokenId = (string) SafeStore::hidden(); + $metadata->recoveryTokenId = (string)SafeStore::hidden(); $metadata->recoveryTokenType = RecoveryTokenType::TYPE_SAFE_STORE; return $metadata; } @@ -113,7 +115,7 @@ public static function deserialize(array $data) SafeStore::unknown(), CommonName::unknown(), Email::unknown(), - new Locale($data['preferred_locale']) + new Locale($data['preferred_locale']), ); } @@ -123,11 +125,11 @@ public static function deserialize(array $data) public function serialize(): array { return [ - 'identity_id' => (string) $this->identityId, - 'identity_institution' => (string) $this->identityInstitution, - 'recovery_token_id' => (string) $this->recoveryTokenId, + 'identity_id' => (string)$this->identityId, + 'identity_institution' => (string)$this->identityInstitution, + 'recovery_token_id' => (string)$this->recoveryTokenId, 'recovery_token_type' => RecoveryTokenType::TYPE_SAFE_STORE, - 'preferred_locale' => (string) $this->preferredLocale, + 'preferred_locale' => (string)$this->preferredLocale, ]; } diff --git a/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php b/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php index 267fed113..de5c11c0f 100644 --- a/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php @@ -35,6 +35,7 @@ use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Forgettable; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\RightToObtainDataInterface; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\SensitiveData; + use function array_key_exists; /** @@ -56,8 +57,6 @@ class SecondFactorMigratedEvent extends IdentityEvent implements Forgettable, Ri 'email', ]; - private Institution $sourceInstitution; - /** * @var NameId */ @@ -108,7 +107,7 @@ public function __construct( IdentityId $identityId, NameId $targetNameId, Institution $targetInstitution, - Institution $sourceInstitution, + private Institution $sourceInstitution, SecondFactorId $secondFactorId, SecondFactorId $newSecondFactorId, SecondFactorType $secondFactorType, @@ -116,11 +115,9 @@ public function __construct( VettingType $vettingType, CommonName $commonName, Email $email, - Locale $preferredLocale + Locale $preferredLocale, ) { parent::__construct($identityId, $targetInstitution); - - $this->sourceInstitution = $sourceInstitution; $this->targetNameId = $targetNameId; $this->secondFactorId = $secondFactorId; $this->newSecondFactorId = $newSecondFactorId; @@ -166,7 +163,7 @@ public static function deserialize(array $data) $vettingType, CommonName::unknown(), Email::unknown(), - new Locale($data['preferred_locale']) + new Locale($data['preferred_locale']), ); } @@ -183,8 +180,8 @@ public function serialize(): array 'second_factor_id' => (string)$this->secondFactorId, 'new_second_factor_id' => (string)$this->newSecondFactorId, 'vetting_type' => $this->vettingType->jsonSerialize(), - 'second_factor_type' => (string) $this->secondFactorType, - 'preferred_locale' => (string) $this->preferredLocale, + 'second_factor_type' => (string)$this->secondFactorType, + 'preferred_locale' => (string)$this->preferredLocale, ]; } diff --git a/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedToEvent.php b/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedToEvent.php index 7f241e3f9..ecd0bc941 100644 --- a/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedToEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedToEvent.php @@ -79,7 +79,7 @@ public function __construct( SecondFactorId $secondFactorId, SecondFactorId $targetSecondFactorId, SecondFactorType $secondFactorType, - SecondFactorIdentifier $secondFactorIdentifier + SecondFactorIdentifier $secondFactorIdentifier, ) { parent::__construct($identityId, $institution); @@ -112,7 +112,7 @@ public static function deserialize(array $data) new SecondFactorId($data['second_factor_id']), new SecondFactorId($data['target_second_factor_id']), $secondFactorType, - SecondFactorIdentifierFactory::unknownForType($secondFactorType) + SecondFactorIdentifierFactory::unknownForType($secondFactorType), ); } @@ -127,7 +127,7 @@ public function serialize(): array 'second_factor_id' => (string)$this->secondFactorId, 'target_institution' => (string)$this->targetInstitution, 'target_second_factor_id' => (string)$this->targetSecondFactorId, - 'second_factor_type' => (string) $this->secondFactorType, + 'second_factor_type' => (string)$this->secondFactorType, ]; } diff --git a/src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php b/src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php index b8de346b1..2161d19c1 100644 --- a/src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php @@ -59,22 +59,22 @@ final public function __construct( Institution $identityInstitution, SecondFactorId $secondFactorId, SecondFactorType $secondFactorType, - SecondFactorIdentifier $secondFactorIdentifier + SecondFactorIdentifier $secondFactorIdentifier, ) { parent::__construct($identityId, $identityInstitution); - $this->secondFactorId = $secondFactorId; - $this->secondFactorType = $secondFactorType; + $this->secondFactorId = $secondFactorId; + $this->secondFactorType = $secondFactorType; $this->secondFactorIdentifier = $secondFactorIdentifier; } public function getAuditLogMetadata(): Metadata { - $metadata = new Metadata(); - $metadata->identityId = $this->identityId; - $metadata->identityInstitution = $this->identityInstitution; - $metadata->secondFactorId = $this->secondFactorId; - $metadata->secondFactorType = $this->secondFactorType; + $metadata = new Metadata(); + $metadata->identityId = $this->identityId; + $metadata->identityInstitution = $this->identityInstitution; + $metadata->secondFactorId = $this->secondFactorId; + $metadata->secondFactorType = $this->secondFactorType; $metadata->secondFactorIdentifier = $this->secondFactorIdentifier; return $metadata; @@ -89,7 +89,7 @@ final public static function deserialize(array $data) new Institution($data['identity_institution']), new SecondFactorId($data['second_factor_id']), $secondFactorType, - SecondFactorIdentifierFactory::unknownForType($secondFactorType) + SecondFactorIdentifierFactory::unknownForType($secondFactorType), ); } @@ -99,10 +99,10 @@ final public static function deserialize(array $data) final public function serialize(): array { return [ - 'identity_id' => (string) $this->identityId, - 'identity_institution' => (string) $this->identityInstitution, - 'second_factor_id' => (string) $this->secondFactorId, - 'second_factor_type' => (string) $this->secondFactorType, + 'identity_id' => (string)$this->identityId, + 'identity_institution' => (string)$this->identityInstitution, + 'second_factor_id' => (string)$this->secondFactorId, + 'second_factor_type' => (string)$this->secondFactorType, ]; } diff --git a/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php b/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php index 8bcd8368f..47af72b0a 100644 --- a/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php @@ -104,27 +104,27 @@ public function __construct( CommonName $commonName, Email $email, Locale $preferredLocale, - VettingType $vettingType + VettingType $vettingType, ) { parent::__construct($identityId, $institution); - $this->nameId = $nameId; - $this->secondFactorId = $secondFactorId; - $this->secondFactorType = $secondFactorType; + $this->nameId = $nameId; + $this->secondFactorId = $secondFactorId; + $this->secondFactorType = $secondFactorType; $this->secondFactorIdentifier = $secondFactorIdentifier; - $this->commonName = $commonName; - $this->email = $email; - $this->preferredLocale = $preferredLocale; + $this->commonName = $commonName; + $this->email = $email; + $this->preferredLocale = $preferredLocale; $this->vettingType = $vettingType; } public function getAuditLogMetadata(): Metadata { - $metadata = new Metadata(); - $metadata->identityId = $this->identityId; - $metadata->identityInstitution = $this->identityInstitution; - $metadata->secondFactorId = $this->secondFactorId; - $metadata->secondFactorType = $this->secondFactorType; + $metadata = new Metadata(); + $metadata->identityId = $this->identityId; + $metadata->identityInstitution = $this->identityInstitution; + $metadata->secondFactorId = $this->secondFactorId; + $metadata->secondFactorType = $this->secondFactorType; $metadata->secondFactorIdentifier = $this->secondFactorIdentifier; $metadata->vettingType = $this->vettingType; @@ -144,7 +144,7 @@ public static function deserialize(array $data) CommonName::unknown(), Email::unknown(), new Locale($data['preferred_locale']), - new UnknownVettingType() + new UnknownVettingType(), ); } @@ -154,12 +154,12 @@ public static function deserialize(array $data) public function serialize(): array { return [ - 'identity_id' => (string) $this->identityId, - 'name_id' => (string) $this->nameId, - 'identity_institution' => (string) $this->identityInstitution, - 'second_factor_id' => (string) $this->secondFactorId, - 'second_factor_type' => (string) $this->secondFactorType, - 'preferred_locale' => (string) $this->preferredLocale, + 'identity_id' => (string)$this->identityId, + 'name_id' => (string)$this->nameId, + 'identity_institution' => (string)$this->identityInstitution, + 'second_factor_id' => (string)$this->secondFactorId, + 'second_factor_type' => (string)$this->secondFactorType, + 'preferred_locale' => (string)$this->preferredLocale, ]; } @@ -174,8 +174,8 @@ public function getSensitiveData(): SensitiveData public function setSensitiveData(SensitiveData $sensitiveData): void { - $this->email = $sensitiveData->getEmail(); - $this->commonName = $sensitiveData->getCommonName(); + $this->email = $sensitiveData->getEmail(); + $this->commonName = $sensitiveData->getCommonName(); $this->secondFactorIdentifier = $sensitiveData->getSecondFactorIdentifier(); $this->vettingType = $sensitiveData->getVettingType(); } diff --git a/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php b/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php index 1f4308b77..0b18641e8 100644 --- a/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php +++ b/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php @@ -39,7 +39,9 @@ /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class SecondFactorVettedWithoutTokenProofOfPossession extends IdentityEvent implements Forgettable, RightToObtainDataInterface +class SecondFactorVettedWithoutTokenProofOfPossession extends IdentityEvent implements + Forgettable, + RightToObtainDataInterface { private array $allowlist = [ 'identity_id', @@ -110,27 +112,27 @@ public function __construct( CommonName $commonName, Email $email, Locale $preferredLocale, - VettingType $vettingType + VettingType $vettingType, ) { parent::__construct($identityId, $institution); - $this->nameId = $nameId; - $this->secondFactorId = $secondFactorId; - $this->secondFactorType = $secondFactorType; + $this->nameId = $nameId; + $this->secondFactorId = $secondFactorId; + $this->secondFactorType = $secondFactorType; $this->secondFactorIdentifier = $secondFactorIdentifier; - $this->commonName = $commonName; - $this->email = $email; - $this->preferredLocale = $preferredLocale; + $this->commonName = $commonName; + $this->email = $email; + $this->preferredLocale = $preferredLocale; $this->vettingType = $vettingType; } public function getAuditLogMetadata(): Metadata { - $metadata = new Metadata(); - $metadata->identityId = $this->identityId; - $metadata->identityInstitution = $this->identityInstitution; - $metadata->secondFactorId = $this->secondFactorId; - $metadata->secondFactorType = $this->secondFactorType; + $metadata = new Metadata(); + $metadata->identityId = $this->identityId; + $metadata->identityInstitution = $this->identityInstitution; + $metadata->secondFactorId = $this->secondFactorId; + $metadata->secondFactorType = $this->secondFactorType; $metadata->secondFactorIdentifier = $this->secondFactorIdentifier; $metadata->vettingType = $this->vettingType; @@ -150,7 +152,7 @@ public static function deserialize(array $data) CommonName::unknown(), Email::unknown(), new Locale($data['preferred_locale']), - new UnknownVettingType() + new UnknownVettingType(), ); } @@ -160,12 +162,12 @@ public static function deserialize(array $data) public function serialize(): array { return [ - 'identity_id' => (string) $this->identityId, - 'name_id' => (string) $this->nameId, - 'identity_institution' => (string) $this->identityInstitution, - 'second_factor_id' => (string) $this->secondFactorId, - 'second_factor_type' => (string) $this->secondFactorType, - 'preferred_locale' => (string) $this->preferredLocale, + 'identity_id' => (string)$this->identityId, + 'name_id' => (string)$this->nameId, + 'identity_institution' => (string)$this->identityInstitution, + 'second_factor_id' => (string)$this->secondFactorId, + 'second_factor_type' => (string)$this->secondFactorType, + 'preferred_locale' => (string)$this->preferredLocale, ]; } @@ -180,8 +182,8 @@ public function getSensitiveData(): SensitiveData public function setSensitiveData(SensitiveData $sensitiveData): void { - $this->email = $sensitiveData->getEmail(); - $this->commonName = $sensitiveData->getCommonName(); + $this->email = $sensitiveData->getEmail(); + $this->commonName = $sensitiveData->getCommonName(); $this->secondFactorIdentifier = $sensitiveData->getSecondFactorIdentifier(); $this->vettingType = $sensitiveData->getVettingType(); } diff --git a/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenAndVerifiedEvent.php b/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenAndVerifiedEvent.php index 8c08b2fe7..fc2f3180d 100644 --- a/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenAndVerifiedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenAndVerifiedEvent.php @@ -35,7 +35,10 @@ /** * @deprecated Built in U2F support is dropped from StepUp, this Event was not removed to support event replay */ -class U2fDevicePossessionProvenAndVerifiedEvent extends IdentityEvent implements Forgettable, PossessionProvenAndVerified, RightToObtainDataInterface +class U2fDevicePossessionProvenAndVerifiedEvent extends IdentityEvent implements + Forgettable, + PossessionProvenAndVerified, + RightToObtainDataInterface { private array $allowlist = [ 'identity_id', @@ -79,11 +82,6 @@ class U2fDevicePossessionProvenAndVerifiedEvent extends IdentityEvent implements */ public $registrationRequestedAt; - /** - * @var string - */ - public $registrationCode; - /** * @param IdentityId $identityId * @param Institution $identityInstitution @@ -104,7 +102,7 @@ public function __construct( Email $email, Locale $locale, DateTime $registrationRequestedAt, - $registrationCode + public $registrationCode, ) { parent::__construct($identityId, $identityInstitution); @@ -114,16 +112,15 @@ public function __construct( $this->email = $email; $this->preferredLocale = $locale; $this->registrationRequestedAt = $registrationRequestedAt; - $this->registrationCode = $registrationCode; } public function getAuditLogMetadata(): Metadata { - $metadata = new Metadata(); - $metadata->identityId = $this->identityId; - $metadata->identityInstitution = $this->identityInstitution; - $metadata->secondFactorId = $this->secondFactorId; - $metadata->secondFactorType = new SecondFactorType('sms'); + $metadata = new Metadata(); + $metadata->identityId = $this->identityId; + $metadata->identityInstitution = $this->identityInstitution; + $metadata->secondFactorId = $this->secondFactorId; + $metadata->secondFactorType = new SecondFactorType('sms'); $metadata->secondFactorIdentifier = $this->keyHandle; return $metadata; @@ -145,7 +142,7 @@ public static function deserialize(array $data) Email::unknown(), new Locale($data['preferred_locale']), DateTime::fromString($data['registration_requested_at']), - (string) $data['registration_code'] + (string)$data['registration_code'], ); } @@ -155,12 +152,12 @@ public static function deserialize(array $data) public function serialize(): array { return [ - 'identity_id' => (string) $this->identityId, - 'identity_institution' => (string) $this->identityInstitution, - 'second_factor_id' => (string) $this->secondFactorId, - 'registration_requested_at' => (string) $this->registrationRequestedAt, - 'registration_code' => $this->registrationCode, - 'preferred_locale' => (string) $this->preferredLocale, + 'identity_id' => (string)$this->identityId, + 'identity_institution' => (string)$this->identityInstitution, + 'second_factor_id' => (string)$this->secondFactorId, + 'registration_requested_at' => (string)$this->registrationRequestedAt, + 'registration_code' => $this->registrationCode, + 'preferred_locale' => (string)$this->preferredLocale, ]; } @@ -174,9 +171,9 @@ public function getSensitiveData() public function setSensitiveData(SensitiveData $sensitiveData): void { - $this->keyHandle = $sensitiveData->getSecondFactorIdentifier(); - $this->email = $sensitiveData->getEmail(); - $this->commonName = $sensitiveData->getCommonName(); + $this->keyHandle = $sensitiveData->getSecondFactorIdentifier(); + $this->email = $sensitiveData->getEmail(); + $this->commonName = $sensitiveData->getCommonName(); } public function obtainUserData(): array diff --git a/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php b/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php index c3b87133c..70a7771a0 100644 --- a/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php @@ -58,21 +58,11 @@ class U2fDevicePossessionProvenEvent extends IdentityEvent implements Forgettabl */ public $keyHandle; - /** - * @var bool - */ - public $emailVerificationRequired; - /** * @var EmailVerificationWindow */ public $emailVerificationWindow; - /** - * @var string - */ - public $emailVerificationNonce; - /** * @var CommonName */ @@ -107,20 +97,18 @@ public function __construct( Institution $identityInstitution, SecondFactorId $secondFactorId, U2fKeyHandle $keyHandle, - $emailVerificationRequired, + public $emailVerificationRequired, EmailVerificationWindow $emailVerificationWindow, - $emailVerificationNonce, + public $emailVerificationNonce, CommonName $commonName, Email $email, - Locale $preferredLocale + Locale $preferredLocale, ) { parent::__construct($identityId, $identityInstitution); $this->secondFactorId = $secondFactorId; $this->keyHandle = $keyHandle; - $this->emailVerificationRequired = $emailVerificationRequired; $this->emailVerificationWindow = $emailVerificationWindow; - $this->emailVerificationNonce = $emailVerificationNonce; $this->commonName = $commonName; $this->email = $email; $this->preferredLocale = $preferredLocale; @@ -128,11 +116,11 @@ public function __construct( public function getAuditLogMetadata(): Metadata { - $metadata = new Metadata(); - $metadata->identityId = $this->identityId; - $metadata->identityInstitution = $this->identityInstitution; - $metadata->secondFactorId = $this->secondFactorId; - $metadata->secondFactorType = new SecondFactorType('sms'); + $metadata = new Metadata(); + $metadata->identityId = $this->identityId; + $metadata->identityInstitution = $this->identityInstitution; + $metadata->secondFactorId = $this->secondFactorId; + $metadata->secondFactorType = new SecondFactorType('sms'); $metadata->secondFactorIdentifier = $this->keyHandle; return $metadata; @@ -154,7 +142,7 @@ public static function deserialize(array $data) $data['email_verification_nonce'], CommonName::unknown(), Email::unknown(), - new Locale($data['preferred_locale']) + new Locale($data['preferred_locale']), ); } @@ -164,13 +152,13 @@ public static function deserialize(array $data) public function serialize(): array { return [ - 'identity_id' => (string) $this->identityId, - 'identity_institution' => (string) $this->identityInstitution, - 'second_factor_id' => (string) $this->secondFactorId, - 'email_verification_required' => (bool) $this->emailVerificationRequired, - 'email_verification_window' => $this->emailVerificationWindow->serialize(), - 'email_verification_nonce' => (string) $this->emailVerificationNonce, - 'preferred_locale' => (string) $this->preferredLocale, + 'identity_id' => (string)$this->identityId, + 'identity_institution' => (string)$this->identityInstitution, + 'second_factor_id' => (string)$this->secondFactorId, + 'email_verification_required' => (bool)$this->emailVerificationRequired, + 'email_verification_window' => $this->emailVerificationWindow->serialize(), + 'email_verification_nonce' => (string)$this->emailVerificationNonce, + 'preferred_locale' => (string)$this->preferredLocale, ]; } @@ -184,9 +172,9 @@ public function getSensitiveData() public function setSensitiveData(SensitiveData $sensitiveData): void { - $this->email = $sensitiveData->getEmail(); - $this->commonName = $sensitiveData->getCommonName(); - $this->keyHandle = $sensitiveData->getSecondFactorIdentifier(); + $this->email = $sensitiveData->getEmail(); + $this->commonName = $sensitiveData->getCommonName(); + $this->keyHandle = $sensitiveData->getSecondFactorIdentifier(); } public function obtainUserData(): array diff --git a/src/Surfnet/Stepup/Identity/Event/VettedSecondFactorsAllRevokedEvent.php b/src/Surfnet/Stepup/Identity/Event/VettedSecondFactorsAllRevokedEvent.php index bd0538c6e..0fd17c4d8 100644 --- a/src/Surfnet/Stepup/Identity/Event/VettedSecondFactorsAllRevokedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/VettedSecondFactorsAllRevokedEvent.php @@ -32,16 +32,16 @@ class VettedSecondFactorsAllRevokedEvent extends IdentityEvent implements RightT final public function __construct( IdentityId $identityId, - Institution $identityInstitution + Institution $identityInstitution, ) { parent::__construct($identityId, $identityInstitution); } public function getAuditLogMetadata(): Metadata { - $metadata = new Metadata(); - $metadata->identityId = $this->identityId; - $metadata->identityInstitution = $this->identityInstitution; + $metadata = new Metadata(); + $metadata->identityId = $this->identityId; + $metadata->identityInstitution = $this->identityInstitution; return $metadata; } @@ -50,7 +50,7 @@ final public static function deserialize(array $data) { return new static( new IdentityId($data['identity_id']), - new Institution($data['identity_institution']) + new Institution($data['identity_institution']), ); } @@ -60,8 +60,8 @@ final public static function deserialize(array $data) final public function serialize(): array { return [ - 'identity_id' => (string) $this->identityId, - 'identity_institution' => (string) $this->identityInstitution, + 'identity_id' => (string)$this->identityId, + 'identity_institution' => (string)$this->identityInstitution, ]; } diff --git a/src/Surfnet/Stepup/Identity/Event/VettingTypeHintsSavedEvent.php b/src/Surfnet/Stepup/Identity/Event/VettingTypeHintsSavedEvent.php index 7bf94ac8f..2f0f77849 100644 --- a/src/Surfnet/Stepup/Identity/Event/VettingTypeHintsSavedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/VettingTypeHintsSavedEvent.php @@ -30,7 +30,7 @@ class VettingTypeHintsSavedEvent extends IdentityEvent implements RightToObtainD 'identity_id', 'identity_institution', 'hints', - 'institution' + 'institution', ]; /** @@ -47,7 +47,7 @@ public function __construct( IdentityId $identityId, Institution $identityInstitution, VettingTypeHintCollection $hints, - Institution $institution + Institution $institution, ) { parent::__construct($identityId, $identityInstitution); $this->hints = $hints; @@ -79,16 +79,17 @@ public static function deserialize(array $data) new IdentityId($data['identity_id']), new Institution($data['identity_institution']), VettingTypeHintCollection::deserialize($data['hints']), - new Institution($data['institution']) + new Institution($data['institution']), ); } + public function serialize(): array { return [ - 'identity_id' => (string) $this->identityId, - 'identity_institution' => (string) $this->identityInstitution, + 'identity_id' => (string)$this->identityId, + 'identity_institution' => (string)$this->identityInstitution, 'hints' => $this->hints->serialize(), - 'institution' => (string) $this->institution, + 'institution' => (string)$this->institution, ]; } } diff --git a/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenAndVerifiedEvent.php b/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenAndVerifiedEvent.php index aaf28be54..999bb4f3e 100644 --- a/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenAndVerifiedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenAndVerifiedEvent.php @@ -32,7 +32,10 @@ use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\RightToObtainDataInterface; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\SensitiveData; -class YubikeyPossessionProvenAndVerifiedEvent extends IdentityEvent implements Forgettable, PossessionProvenAndVerified, RightToObtainDataInterface +class YubikeyPossessionProvenAndVerifiedEvent extends IdentityEvent implements + Forgettable, + PossessionProvenAndVerified, + RightToObtainDataInterface { private array $allowlist = [ 'identity_id', @@ -79,20 +82,15 @@ class YubikeyPossessionProvenAndVerifiedEvent extends IdentityEvent implements F public $registrationRequestedAt; /** - * @var string - */ - public $registrationCode; - - /** - * @param IdentityId $identityId - * @param Institution $institution - * @param SecondFactorId $secondFactorId - * @param YubikeyPublicId $yubikeyPublicId - * @param CommonName $commonName - * @param Email $email - * @param Locale $locale - * @param DateTime $registrationRequestedAt - * @param string $registrationCode + * @param IdentityId $identityId + * @param Institution $institution + * @param SecondFactorId $secondFactorId + * @param YubikeyPublicId $yubikeyPublicId + * @param CommonName $commonName + * @param Email $email + * @param Locale $locale + * @param DateTime $registrationRequestedAt + * @param string $registrationCode */ public function __construct( IdentityId $identityId, @@ -103,26 +101,25 @@ public function __construct( Email $email, Locale $locale, DateTime $registrationRequestedAt, - $registrationCode + public $registrationCode, ) { parent::__construct($identityId, $institution); - $this->secondFactorId = $secondFactorId; - $this->yubikeyPublicId = $yubikeyPublicId; - $this->commonName = $commonName; - $this->email = $email; - $this->preferredLocale = $locale; - $this->registrationRequestedAt = $registrationRequestedAt; - $this->registrationCode = $registrationCode; + $this->secondFactorId = $secondFactorId; + $this->yubikeyPublicId = $yubikeyPublicId; + $this->commonName = $commonName; + $this->email = $email; + $this->preferredLocale = $locale; + $this->registrationRequestedAt = $registrationRequestedAt; } public function getAuditLogMetadata(): Metadata { - $metadata = new Metadata(); - $metadata->identityId = $this->identityId; - $metadata->identityInstitution = $this->identityInstitution; - $metadata->secondFactorId = $this->secondFactorId; - $metadata->secondFactorType = new SecondFactorType('yubikey'); + $metadata = new Metadata(); + $metadata->identityId = $this->identityId; + $metadata->identityInstitution = $this->identityInstitution; + $metadata->secondFactorId = $this->secondFactorId; + $metadata->secondFactorType = new SecondFactorType('yubikey'); $metadata->secondFactorIdentifier = $this->yubikeyPublicId; return $metadata; @@ -144,7 +141,7 @@ public static function deserialize(array $data) Email::unknown(), new Locale($data['preferred_locale']), DateTime::fromString($data['registration_requested_at']), - (string) $data['registration_code'] + (string)$data['registration_code'], ); } @@ -154,12 +151,12 @@ public static function deserialize(array $data) public function serialize(): array { return [ - 'identity_id' => (string) $this->identityId, - 'identity_institution' => (string) $this->identityInstitution, - 'second_factor_id' => (string) $this->secondFactorId, - 'registration_requested_at' => (string) $this->registrationRequestedAt, - 'registration_code' => $this->registrationCode, - 'preferred_locale' => (string) $this->preferredLocale, + 'identity_id' => (string)$this->identityId, + 'identity_institution' => (string)$this->identityInstitution, + 'second_factor_id' => (string)$this->secondFactorId, + 'registration_requested_at' => (string)$this->registrationRequestedAt, + 'registration_code' => $this->registrationCode, + 'preferred_locale' => (string)$this->preferredLocale, ]; } diff --git a/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenEvent.php b/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenEvent.php index bc4fb4bed..80923afee 100644 --- a/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenEvent.php @@ -58,11 +58,6 @@ class YubikeyPossessionProvenEvent extends IdentityEvent implements Forgettable, */ public $yubikeyPublicId; - /** - * @var bool - */ - public $emailVerificationRequired; - /** * @var DateTime */ @@ -73,11 +68,6 @@ class YubikeyPossessionProvenEvent extends IdentityEvent implements Forgettable, */ public $emailVerificationWindow; - /** - * @var string - */ - public $emailVerificationNonce; - /** * @var CommonName */ @@ -94,17 +84,8 @@ class YubikeyPossessionProvenEvent extends IdentityEvent implements Forgettable, public $preferredLocale; /** - * @param IdentityId $identityId - * @param Institution $institution - * @param SecondFactorId $secondFactorId - * @param YubikeyPublicId $yubikeyPublicId - * @param bool $emailVerificationRequired - * @param EmailVerificationWindow $emailVerificationWindow - * @param string $emailVerificationNonce - * @param CommonName $commonName - * @param Email $email - * @param Locale $preferredLocale - * + * @param bool $emailVerificationRequired + * @param string $emailVerificationNonce * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function __construct( @@ -112,32 +93,30 @@ public function __construct( Institution $institution, SecondFactorId $secondFactorId, YubikeyPublicId $yubikeyPublicId, - $emailVerificationRequired, + public $emailVerificationRequired, EmailVerificationWindow $emailVerificationWindow, - $emailVerificationNonce, + public $emailVerificationNonce, CommonName $commonName, Email $email, - Locale $preferredLocale + Locale $preferredLocale, ) { parent::__construct($identityId, $institution); - $this->secondFactorId = $secondFactorId; - $this->yubikeyPublicId = $yubikeyPublicId; - $this->emailVerificationRequired = $emailVerificationRequired; - $this->emailVerificationWindow = $emailVerificationWindow; - $this->emailVerificationNonce = $emailVerificationNonce; - $this->commonName = $commonName; - $this->email = $email; - $this->preferredLocale = $preferredLocale; + $this->secondFactorId = $secondFactorId; + $this->yubikeyPublicId = $yubikeyPublicId; + $this->emailVerificationWindow = $emailVerificationWindow; + $this->commonName = $commonName; + $this->email = $email; + $this->preferredLocale = $preferredLocale; } public function getAuditLogMetadata(): Metadata { - $metadata = new Metadata(); - $metadata->identityId = $this->identityId; - $metadata->identityInstitution = $this->identityInstitution; - $metadata->secondFactorId = $this->secondFactorId; - $metadata->secondFactorType = new SecondFactorType('yubikey'); + $metadata = new Metadata(); + $metadata->identityId = $this->identityId; + $metadata->identityInstitution = $this->identityInstitution; + $metadata->secondFactorId = $this->secondFactorId; + $metadata->secondFactorType = new SecondFactorType('yubikey'); $metadata->secondFactorIdentifier = $this->yubikeyPublicId; return $metadata; @@ -159,7 +138,7 @@ public static function deserialize(array $data) $data['email_verification_nonce'], CommonName::unknown(), Email::unknown(), - new Locale($data['preferred_locale']) + new Locale($data['preferred_locale']), ); } @@ -169,13 +148,13 @@ public static function deserialize(array $data) public function serialize(): array { return [ - 'identity_id' => (string) $this->identityId, - 'identity_institution' => (string) $this->identityInstitution, - 'second_factor_id' => (string) $this->secondFactorId, - 'email_verification_required' => (bool) $this->emailVerificationRequired, - 'email_verification_window' => $this->emailVerificationWindow->serialize(), - 'email_verification_nonce' => (string) $this->emailVerificationNonce, - 'preferred_locale' => (string) $this->preferredLocale, + 'identity_id' => (string)$this->identityId, + 'identity_institution' => (string)$this->identityInstitution, + 'second_factor_id' => (string)$this->secondFactorId, + 'email_verification_required' => (bool)$this->emailVerificationRequired, + 'email_verification_window' => $this->emailVerificationWindow->serialize(), + 'email_verification_nonce' => (string)$this->emailVerificationNonce, + 'preferred_locale' => (string)$this->preferredLocale, ]; } @@ -189,7 +168,7 @@ public function getSensitiveData() public function setSensitiveData(SensitiveData $sensitiveData): void { - $this->email = $sensitiveData->getEmail(); + $this->email = $sensitiveData->getEmail(); $this->commonName = $sensitiveData->getCommonName(); $this->yubikeyPublicId = $sensitiveData->getSecondFactorIdentifier(); } diff --git a/src/Surfnet/Stepup/Identity/Event/YubikeySecondFactorBootstrappedEvent.php b/src/Surfnet/Stepup/Identity/Event/YubikeySecondFactorBootstrappedEvent.php index 8cd15ec15..e1b9d0692 100644 --- a/src/Surfnet/Stepup/Identity/Event/YubikeySecondFactorBootstrappedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/YubikeySecondFactorBootstrappedEvent.php @@ -32,7 +32,9 @@ use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\RightToObtainDataInterface; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\SensitiveData; -final class YubikeySecondFactorBootstrappedEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface +final class YubikeySecondFactorBootstrappedEvent extends IdentityEvent implements + Forgettable, + RightToObtainDataInterface { private array $allowlist = [ 'identity_id', @@ -46,60 +48,23 @@ final class YubikeySecondFactorBootstrappedEvent extends IdentityEvent implement 'common_name', ]; - /** - * @var NameId - */ - public $nameId; - /** * @var Institution */ public $institution; - /** - * @var CommonName - */ - public $commonName; - - /** - * @var Email - */ - public $email; - - /** - * @var Locale - */ - public $preferredLocale; - - /** - * @var SecondFactorId - */ - public $secondFactorId; - - /** - * @var YubikeyPublicId - */ - public $yubikeyPublicId; - public function __construct( IdentityId $identityId, - NameId $nameId, + public NameId $nameId, Institution $institution, - CommonName $commonName, - Email $email, - Locale $preferredLocale, - SecondFactorId $secondFactorId, - YubikeyPublicId $yubikeyPublicId + public CommonName $commonName, + public Email $email, + public Locale $preferredLocale, + public SecondFactorId $secondFactorId, + public YubikeyPublicId $yubikeyPublicId, ) { parent::__construct($identityId, $institution); - - $this->nameId = $nameId; $this->institution = $institution; - $this->commonName = $commonName; - $this->email = $email; - $this->preferredLocale = $preferredLocale; - $this->secondFactorId = $secondFactorId; - $this->yubikeyPublicId = $yubikeyPublicId; } public function getAuditLogMetadata(): Metadata @@ -120,11 +85,11 @@ public function getAuditLogMetadata(): Metadata public function serialize(): array { return [ - 'identity_id' => (string) $this->identityId, - 'name_id' => (string) $this->nameId, - 'identity_institution' => (string) $this->identityInstitution, - 'preferred_locale' => (string) $this->preferredLocale, - 'second_factor_id' => (string) $this->secondFactorId, + 'identity_id' => (string)$this->identityId, + 'name_id' => (string)$this->nameId, + 'identity_institution' => (string)$this->identityInstitution, + 'preferred_locale' => (string)$this->preferredLocale, + 'second_factor_id' => (string)$this->secondFactorId, ]; } @@ -138,7 +103,7 @@ public static function deserialize(array $data) Email::unknown(), new Locale($data['preferred_locale']), new SecondFactorId($data['second_factor_id']), - YubikeyPublicId::unknown() + YubikeyPublicId::unknown(), ); } @@ -152,7 +117,7 @@ public function getSensitiveData() public function setSensitiveData(SensitiveData $sensitiveData): void { - $this->email = $sensitiveData->getEmail(); + $this->email = $sensitiveData->getEmail(); $this->commonName = $sensitiveData->getCommonName(); $this->yubikeyPublicId = $sensitiveData->getSecondFactorIdentifier(); } diff --git a/src/Surfnet/Stepup/Identity/EventSourcing/IdentityRepository.php b/src/Surfnet/Stepup/Identity/EventSourcing/IdentityRepository.php index 453f198fb..9d2e37c37 100644 --- a/src/Surfnet/Stepup/Identity/EventSourcing/IdentityRepository.php +++ b/src/Surfnet/Stepup/Identity/EventSourcing/IdentityRepository.php @@ -34,32 +34,23 @@ class IdentityRepository extends EventSourcingRepository { - protected EventStoreInterface $events; - - protected LoggerInterface $logger; - - private UserDataFilterInterface $userDataFilter; - /** * @param EventStreamDecorator[] $eventStreamDecorators */ public function __construct( - EventStoreInterface $eventStore, + protected EventStoreInterface $events, EventBusInterface $eventBus, AggregateFactory $aggregateFactory, - UserDataFilterInterface $userDataFilter, - LoggerInterface $logger, - array $eventStreamDecorators = [] + private readonly UserDataFilterInterface $userDataFilter, + protected LoggerInterface $logger, + array $eventStreamDecorators = [], ) { - $this->events = $eventStore; - $this->logger = $logger; - $this->userDataFilter = $userDataFilter; parent::__construct( - $eventStore, + $this->events, $eventBus, Identity::class, $aggregateFactory, - $eventStreamDecorators + $eventStreamDecorators, ); } diff --git a/src/Surfnet/Stepup/Identity/EventSourcing/WhitelistRepository.php b/src/Surfnet/Stepup/Identity/EventSourcing/WhitelistRepository.php index 49f84c03d..83f24ad2f 100644 --- a/src/Surfnet/Stepup/Identity/EventSourcing/WhitelistRepository.php +++ b/src/Surfnet/Stepup/Identity/EventSourcing/WhitelistRepository.php @@ -28,23 +28,23 @@ class WhitelistRepository extends EventSourcingRepository { /** - * @param EventStoreInterface $eventStore - * @param EventBusInterface $eventBus - * @param AggregateFactory $aggregateFactory + * @param EventStoreInterface $eventStore + * @param EventBusInterface $eventBus + * @param AggregateFactory $aggregateFactory * @param EventStreamDecorator[] $eventStreamDecorators */ public function __construct( EventStoreInterface $eventStore, EventBusInterface $eventBus, AggregateFactory $aggregateFactory, - array $eventStreamDecorators = [] + array $eventStreamDecorators = [], ) { parent::__construct( $eventStore, $eventBus, Whitelist::class, $aggregateFactory, - $eventStreamDecorators + $eventStreamDecorators, ); } } diff --git a/src/Surfnet/Stepup/Identity/Identity.php b/src/Surfnet/Stepup/Identity/Identity.php index 52ddd0181..ae12be824 100644 --- a/src/Surfnet/Stepup/Identity/Identity.php +++ b/src/Surfnet/Stepup/Identity/Identity.php @@ -175,7 +175,7 @@ public static function create( NameId $nameId, CommonName $commonName, Email $email, - Locale $preferredLocale + Locale $preferredLocale, ): self { $identity = new self(); $identity->apply(new IdentityCreatedEvent($id, $institution, $nameId, $commonName, $email, $preferredLocale)); @@ -211,8 +211,11 @@ public function changeEmail(Email $email): void $this->apply(new IdentityEmailChangedEvent($this->id, $this->institution, $email)); } - public function bootstrapYubikeySecondFactor(SecondFactorId $secondFactorId, YubikeyPublicId $yubikeyPublicId, $maxNumberOfTokens): void - { + public function bootstrapYubikeySecondFactor( + SecondFactorId $secondFactorId, + YubikeyPublicId $yubikeyPublicId, + $maxNumberOfTokens, + ): void { $this->assertNotForgotten(); $this->assertUserMayAddSecondFactor($maxNumberOfTokens); @@ -225,8 +228,8 @@ public function bootstrapYubikeySecondFactor(SecondFactorId $secondFactorId, Yub $this->email, $this->preferredLocale, $secondFactorId, - $yubikeyPublicId - ) + $yubikeyPublicId, + ), ); } @@ -235,7 +238,7 @@ public function provePossessionOfYubikey( YubikeyPublicId $yubikeyPublicId, $emailVerificationRequired, EmailVerificationWindow $emailVerificationWindow, - $maxNumberOfTokens + $maxNumberOfTokens, ): void { $this->assertNotForgotten(); $this->assertUserMayAddSecondFactor($maxNumberOfTokens); @@ -254,8 +257,8 @@ public function provePossessionOfYubikey( $emailVerificationNonce, $this->commonName, $this->email, - $this->preferredLocale - ) + $this->preferredLocale, + ), ); } else { $this->apply( @@ -268,8 +271,8 @@ public function provePossessionOfYubikey( $this->email, $this->preferredLocale, DateTime::now(), - OtpGenerator::generate(8) - ) + OtpGenerator::generate(8), + ), ); } } @@ -279,7 +282,7 @@ public function provePossessionOfPhone( PhoneNumber $phoneNumber, $emailVerificationRequired, EmailVerificationWindow $emailVerificationWindow, - $maxNumberOfTokens + $maxNumberOfTokens, ): void { $this->assertNotForgotten(); $this->assertUserMayAddSecondFactor($maxNumberOfTokens); @@ -298,8 +301,8 @@ public function provePossessionOfPhone( $emailVerificationNonce, $this->commonName, $this->email, - $this->preferredLocale - ) + $this->preferredLocale, + ), ); } else { $this->apply( @@ -312,14 +315,16 @@ public function provePossessionOfPhone( $this->email, $this->preferredLocale, DateTime::now(), - OtpGenerator::generate(8) - ) + OtpGenerator::generate(8), + ), ); } } - public function provePossessionOfPhoneRecoveryToken(RecoveryTokenId $recoveryTokenId, PhoneNumber $phoneNumber): void - { + public function provePossessionOfPhoneRecoveryToken( + RecoveryTokenId $recoveryTokenId, + PhoneNumber $phoneNumber, + ): void { $this->assertNotForgotten(); $this->assertUserMayAddRecoveryToken(RecoveryTokenType::sms()); $this->apply( @@ -330,8 +335,8 @@ public function provePossessionOfPhoneRecoveryToken(RecoveryTokenId $recoveryTok $phoneNumber, $this->commonName, $this->email, - $this->preferredLocale - ) + $this->preferredLocale, + ), ); } @@ -348,8 +353,8 @@ public function promisePossessionOfSafeStoreSecretRecoveryToken(RecoveryTokenId $secret, $this->commonName, $this->email, - $this->preferredLocale - ) + $this->preferredLocale, + ), ); } @@ -361,8 +366,8 @@ public function saveVettingTypeHints(Institution $institution, VettingTypeHintCo $this->id, $this->institution, $hints, - $institution - ) + $institution, + ), ); } @@ -372,7 +377,7 @@ public function provePossessionOfGssf( GssfId $gssfId, $emailVerificationRequired, EmailVerificationWindow $emailVerificationWindow, - $maxNumberOfTokens + $maxNumberOfTokens, ): void { $this->assertNotForgotten(); $this->assertUserMayAddSecondFactor($maxNumberOfTokens); @@ -392,8 +397,8 @@ public function provePossessionOfGssf( $emailVerificationNonce, $this->commonName, $this->email, - $this->preferredLocale - ) + $this->preferredLocale, + ), ); } else { $this->apply( @@ -407,8 +412,8 @@ public function provePossessionOfGssf( $this->email, $this->preferredLocale, DateTime::now(), - OtpGenerator::generate(8) - ) + OtpGenerator::generate(8), + ), ); } } @@ -421,7 +426,7 @@ public function provePossessionOfU2fDevice( U2fKeyHandle $keyHandle, $emailVerificationRequired, EmailVerificationWindow $emailVerificationWindow, - $maxNumberOfTokens + $maxNumberOfTokens, ): void { $this->assertNotForgotten(); $this->assertUserMayAddSecondFactor($maxNumberOfTokens); @@ -440,8 +445,8 @@ public function provePossessionOfU2fDevice( $emailVerificationNonce, $this->commonName, $this->email, - $this->preferredLocale - ) + $this->preferredLocale, + ), ); } else { $this->apply( @@ -454,8 +459,8 @@ public function provePossessionOfU2fDevice( $this->email, $this->preferredLocale, DateTime::now(), - OtpGenerator::generate(8) - ) + OtpGenerator::generate(8), + ), ); } } @@ -474,7 +479,7 @@ public function verifyEmail($verificationNonce): void if (!$secondFactorToVerify) { throw new DomainException( - 'Cannot verify second factor, no unverified second factor can be verified using the given nonce' + 'Cannot verify second factor, no unverified second factor can be verified using the given nonce', ); } @@ -499,17 +504,19 @@ public function vetSecondFactor( $identityVerified, SecondFactorTypeService $secondFactorTypeService, SecondFactorProvePossessionHelper $secondFactorProvePossessionHelper, - $provePossessionSkipped + $provePossessionSkipped, ): void { $this->assertNotForgotten(); /** @var VettedSecondFactor|null $secondFactorWithHighestLoa */ - $secondFactorWithHighestLoa = $this->vettedSecondFactors->getSecondFactorWithHighestLoa($secondFactorTypeService); + $secondFactorWithHighestLoa = $this->vettedSecondFactors->getSecondFactorWithHighestLoa( + $secondFactorTypeService, + ); $registrantsSecondFactor = $registrant->getVerifiedSecondFactor($registrantsSecondFactorId); if ($registrantsSecondFactor === null) { throw new DomainException( - sprintf('Registrant second factor with ID %s does not exist', $registrantsSecondFactorId) + sprintf('Registrant second factor with ID %s does not exist', $registrantsSecondFactorId), ); } @@ -518,14 +525,14 @@ public function vetSecondFactor( sprintf( 'Vetting failed: authority %s has %d vetted second factors!', $this->id, - count($this->vettedSecondFactors) - ) + count($this->vettedSecondFactors), + ), ); } if (!$secondFactorWithHighestLoa->hasEqualOrHigherLoaComparedTo( $registrantsSecondFactor, - $secondFactorTypeService + $secondFactorTypeService, )) { throw new DomainException("Authority does not have the required LoA to vet the registrant's second factor"); } @@ -534,12 +541,16 @@ public function vetSecondFactor( throw new DomainException('Will not vet second factor when physical identity has not been verified.'); } - if ($provePossessionSkipped && !$secondFactorProvePossessionHelper->canSkipProvePossession($registrantsSecondFactorType)) { - throw new DomainException(sprintf( - "The possession of registrants second factor with ID '%s' of type '%s' has to be physically proven", - $registrantsSecondFactorId, - $registrantsSecondFactorType->getSecondFactorType() - )); + if ($provePossessionSkipped && !$secondFactorProvePossessionHelper->canSkipProvePossession( + $registrantsSecondFactorType, + )) { + throw new DomainException( + sprintf( + "The possession of registrants second factor with ID '%s' of type '%s' has to be physically proven", + $registrantsSecondFactorId, + $registrantsSecondFactorType->getSecondFactorType(), + ), + ); } $registrant->complyWithVettingOfSecondFactor( @@ -548,23 +559,23 @@ public function vetSecondFactor( $registrantsSecondFactorIdentifier, $registrationCode, $documentNumber, - $provePossessionSkipped + $provePossessionSkipped, ); } public function registerSelfAssertedSecondFactor( SecondFactorIdentifier $secondFactorIdentifier, SecondFactorTypeService $secondFactorTypeService, - RecoveryTokenId $recoveryTokenId + RecoveryTokenId $recoveryTokenId, ): void { $this->assertNotForgotten(); $this->assertSelfAssertedTokenRegistrationAllowed(); try { $recoveryToken = $this->recoveryTokens->get($recoveryTokenId); - } catch (DomainException $e) { + } catch (DomainException) { throw new DomainException( - sprintf('Recovery token used during registration is not possessed by identity %s', (string)$this->id) + sprintf('Recovery token used during registration is not possessed by identity %s', (string)$this->id), ); } @@ -579,9 +590,9 @@ public function registerSelfAssertedSecondFactor( throw new DomainException( sprintf( 'Registering second factor of type %s with ID %s does not exist', - get_class($secondFactorIdentifier), - $secondFactorIdentifier->getValue() - ) + $secondFactorIdentifier::class, + $secondFactorIdentifier->getValue(), + ), ); } $registeringSecondFactor->vet(true, new SelfAssertedRegistrationVettingType($recoveryToken->getTokenId())); @@ -612,7 +623,7 @@ public function selfVetSecondFactor( Loa $authoringSecondFactorLoa, string $registrationCode, SecondFactorIdentifier $secondFactorIdentifier, - SecondFactorTypeService $secondFactorTypeService + SecondFactorTypeService $secondFactorTypeService, ): void { $this->assertNotForgotten(); $registeringSecondFactor = null; @@ -627,9 +638,9 @@ public function selfVetSecondFactor( throw new DomainException( sprintf( 'Registrant second factor of type %s with ID %s does not exist', - get_class($secondFactorIdentifier), - $secondFactorIdentifier->getValue() - ) + $secondFactorIdentifier::class, + $secondFactorIdentifier->getValue(), + ), ); } @@ -638,7 +649,7 @@ public function selfVetSecondFactor( } $selfVettingIsAllowed = $authoringSecondFactorLoa->levelIsHigherOrEqualTo( - $registeringSecondFactor->getLoaLevel($secondFactorTypeService) + $registeringSecondFactor->getLoaLevel($secondFactorTypeService), ); // Was the authorizing token a self-asserted token (does it have LoA 1.5?) @@ -646,7 +657,7 @@ public function selfVetSecondFactor( if (!$selfVettingIsAllowed && !$isSelfVetUsingSAT) { throw new DomainException( - "The second factor to be vetted has a higher LoA then the Token used for proving possession" + "The second factor to be vetted has a higher LoA then the Token used for proving possession", ); } @@ -668,7 +679,7 @@ public function migrateVettedSecondFactor( IdentityApi $sourceIdentity, SecondFactorId $secondFactorId, string $targetSecondFactorId, - int $maxNumberOfTokens + int $maxNumberOfTokens, ): void { $this->assertNotForgotten(); $this->assertUserMayAddSecondFactor($maxNumberOfTokens); @@ -694,8 +705,8 @@ public function migrateVettedSecondFactor( $secondFactor->vettingType(), $this->getCommonName(), $this->getEmail(), - $this->getPreferredLocale() - ) + $this->getPreferredLocale(), + ), ); $this->apply( @@ -706,8 +717,8 @@ public function migrateVettedSecondFactor( $secondFactor->getId(), new SecondFactorId($targetSecondFactorId), $secondFactor->getType(), - $secondFactor->getIdentifier() - ) + $secondFactor->getIdentifier(), + ), ); } @@ -717,7 +728,7 @@ public function complyWithVettingOfSecondFactor( SecondFactorIdentifier $secondFactorIdentifier, $registrationCode, DocumentNumber $documentNumber, - $provePossessionSkipped + $provePossessionSkipped, ): void { $this->assertNotForgotten(); @@ -732,7 +743,7 @@ public function complyWithVettingOfSecondFactor( if (!$secondFactorToVet) { throw new DomainException( 'Cannot vet second factor, no verified second factor can be vetted using the given registration code ' . - 'and second factor identifier' + 'and second factor identifier', ); } @@ -844,17 +855,19 @@ public function accreditWith( Institution $institution, Location $location, ContactInformation $contactInformation, - InstitutionConfiguration $institutionConfiguration + InstitutionConfiguration $institutionConfiguration, ): void { $this->assertNotForgotten(); - if (!$institutionConfiguration->isInstitutionAllowedToAccreditRoles(new ConfigurationInstitution($this->institution->getInstitution()))) { + if (!$institutionConfiguration->isInstitutionAllowedToAccreditRoles( + new ConfigurationInstitution($this->institution->getInstitution()), + )) { throw new DomainException('An Identity may only be accredited by configured institutions.'); } if (!$this->vettedSecondFactors->count()) { throw new DomainException( - 'An Identity must have at least one vetted second factor before it can be accredited' + 'An Identity must have at least one vetted second factor before it can be accredited', ); } @@ -863,37 +876,44 @@ public function accreditWith( } if ($role->equals(new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RA))) { - $this->apply(new IdentityAccreditedAsRaForInstitutionEvent( - $this->id, - $this->nameId, - $this->institution, - $role, - $location, - $contactInformation, - $institution - )); + $this->apply( + new IdentityAccreditedAsRaForInstitutionEvent( + $this->id, + $this->nameId, + $this->institution, + $role, + $location, + $contactInformation, + $institution, + ), + ); } elseif ($role->equals(new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RAA))) { - $this->apply(new IdentityAccreditedAsRaaForInstitutionEvent( - $this->id, - $this->nameId, - $this->institution, - $role, - $location, - $contactInformation, - $institution - )); + $this->apply( + new IdentityAccreditedAsRaaForInstitutionEvent( + $this->id, + $this->nameId, + $this->institution, + $role, + $location, + $contactInformation, + $institution, + ), + ); } else { throw new DomainException('An Identity can only be accredited with either the RA or RAA role'); } } - public function amendRegistrationAuthorityInformation(Institution $institution, Location $location, ContactInformation $contactInformation): void - { + public function amendRegistrationAuthorityInformation( + Institution $institution, + Location $location, + ContactInformation $contactInformation, + ): void { $this->assertNotForgotten(); if (!$this->registrationAuthorities->exists($institution)) { throw new DomainException( - 'Cannot amend registration authority information: identity is not a registration authority for institution' + 'Cannot amend registration authority information: identity is not a registration authority for institution', ); } @@ -904,8 +924,8 @@ public function amendRegistrationAuthorityInformation(Institution $institution, $this->nameId, $location, $contactInformation, - $institution - ) + $institution, + ), ); } @@ -919,13 +939,15 @@ public function amendRegistrationAuthorityInformation(Institution $institution, public function appointAs( Institution $institution, RegistrationAuthorityRole $role, - InstitutionConfiguration $institutionConfiguration + InstitutionConfiguration $institutionConfiguration, ): void { $this->assertNotForgotten(); - if (!$institutionConfiguration->isInstitutionAllowedToAccreditRoles(new ConfigurationInstitution($this->institution->getInstitution()))) { + if (!$institutionConfiguration->isInstitutionAllowedToAccreditRoles( + new ConfigurationInstitution($this->institution->getInstitution()), + )) { throw new DomainException( - 'Cannot appoint as different RegistrationAuthorityRole: identity is not a registration authority for institution' + 'Cannot appoint as different RegistrationAuthorityRole: identity is not a registration authority for institution', ); } @@ -936,9 +958,13 @@ public function appointAs( } if ($role->equals(new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RA))) { - $this->apply(new AppointedAsRaForInstitutionEvent($this->id, $this->institution, $this->nameId, $institution)); + $this->apply( + new AppointedAsRaForInstitutionEvent($this->id, $this->institution, $this->nameId, $institution), + ); } elseif ($role->equals(new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RAA))) { - $this->apply(new AppointedAsRaaForInstitutionEvent($this->id, $this->institution, $this->nameId, $institution)); + $this->apply( + new AppointedAsRaaForInstitutionEvent($this->id, $this->institution, $this->nameId, $institution), + ); } else { throw new DomainException('An Identity can only be appointed as either RA or RAA'); } @@ -950,18 +976,20 @@ public function retractRegistrationAuthority(Institution $institution): void if (!$this->registrationAuthorities->exists($institution)) { throw new DomainException( - 'Cannot Retract Registration Authority as the Identity is not a registration authority' + 'Cannot Retract Registration Authority as the Identity is not a registration authority', ); } - $this->apply(new RegistrationAuthorityRetractedForInstitutionEvent( - $this->id, - $this->institution, - $this->nameId, - $this->commonName, - $this->email, - $institution - )); + $this->apply( + new RegistrationAuthorityRetractedForInstitutionEvent( + $this->id, + $this->institution, + $this->nameId, + $this->commonName, + $this->email, + $institution, + ), + ); } public function expressPreferredLocale(Locale $preferredLocale): void @@ -991,8 +1019,8 @@ public function allVettedSecondFactorsRemoved(): void $this->apply( new VettedSecondFactorsAllRevokedEvent( $this->id, - $this->institution - ) + $this->institution, + ), ); } @@ -1030,7 +1058,7 @@ protected function applyYubikeySecondFactorBootstrappedEvent(YubikeySecondFactor $this, new SecondFactorType('yubikey'), $event->yubikeyPublicId, - new UnknownVettingType() + new UnknownVettingType(), ); $this->vettedSecondFactors->set((string)$secondFactor->getId(), $secondFactor); @@ -1044,7 +1072,7 @@ protected function applyYubikeyPossessionProvenEvent(YubikeyPossessionProvenEven new SecondFactorType('yubikey'), $event->yubikeyPublicId, $event->emailVerificationWindow, - $event->emailVerificationNonce + $event->emailVerificationNonce, ); $this->unverifiedSecondFactors->set((string)$secondFactor->getId(), $secondFactor); @@ -1058,7 +1086,7 @@ protected function applyYubikeyPossessionProvenAndVerifiedEvent(YubikeyPossessio new SecondFactorType('yubikey'), $event->yubikeyPublicId, $event->registrationRequestedAt, - $event->registrationCode + $event->registrationCode, ); $this->verifiedSecondFactors->set((string)$secondFactor->getId(), $secondFactor); @@ -1072,7 +1100,7 @@ protected function applyPhonePossessionProvenEvent(PhonePossessionProvenEvent $e new SecondFactorType('sms'), $event->phoneNumber, $event->emailVerificationWindow, - $event->emailVerificationNonce + $event->emailVerificationNonce, ); $this->unverifiedSecondFactors->set((string)$secondFactor->getId(), $secondFactor); @@ -1086,7 +1114,7 @@ protected function applyPhonePossessionProvenAndVerifiedEvent(PhonePossessionPro new SecondFactorType('sms'), $event->phoneNumber, $event->registrationRequestedAt, - $event->registrationCode + $event->registrationCode, ); $this->verifiedSecondFactors->set((string)$secondFactor->getId(), $secondFactor); @@ -1100,7 +1128,7 @@ protected function applyGssfPossessionProvenEvent(GssfPossessionProvenEvent $eve new SecondFactorType((string)$event->stepupProvider), $event->gssfId, $event->emailVerificationWindow, - $event->emailVerificationNonce + $event->emailVerificationNonce, ); $this->unverifiedSecondFactors->set((string)$secondFactor->getId(), $secondFactor); @@ -1114,7 +1142,7 @@ protected function applyGssfPossessionProvenAndVerifiedEvent(GssfPossessionProve new SecondFactorType((string)$event->stepupProvider), $event->gssfId, $event->registrationRequestedAt, - $event->registrationCode + $event->registrationCode, ); $this->verifiedSecondFactors->set((string)$secondFactor->getId(), $secondFactor); @@ -1128,7 +1156,7 @@ protected function applyU2fDevicePossessionProvenEvent(U2fDevicePossessionProven new SecondFactorType('u2f'), $event->keyHandle, $event->emailVerificationWindow, - $event->emailVerificationNonce + $event->emailVerificationNonce, ); $this->unverifiedSecondFactors->set((string)$secondFactor->getId(), $secondFactor); @@ -1142,7 +1170,7 @@ protected function applyU2fDevicePossessionProvenAndVerifiedEvent(U2fDevicePosse new SecondFactorType('u2f'), $event->keyHandle, $event->registrationRequestedAt, - $event->registrationCode + $event->registrationCode, ); $this->verifiedSecondFactors->set((string)$secondFactor->getId(), $secondFactor); @@ -1155,8 +1183,9 @@ protected function applyPhoneRecoveryTokenPossessionProvenEvent(PhoneRecoveryTok $this->recoveryTokens->set($recoveryToken); } - protected function applySafeStoreSecretRecoveryTokenPossessionPromisedEvent(SafeStoreSecretRecoveryTokenPossessionPromisedEvent $event) - { + protected function applySafeStoreSecretRecoveryTokenPossessionPromisedEvent( + SafeStoreSecretRecoveryTokenPossessionPromisedEvent $event, + ) { $recoveryToken = RecoveryTokenEntity::create($event->recoveryTokenId, RecoveryTokenType::safeStore(), $this); $this->recoveryTokens->set($recoveryToken); @@ -1187,7 +1216,7 @@ public function applySecondFactorMigratedEvent(SecondFactorMigratedEvent $event) $this, $event->secondFactorType, $event->secondFactorIdentifier, - $event->vettingType + $event->vettingType, ); $this->vettedSecondFactors->set($secondFactorId, $vetted); } @@ -1201,8 +1230,9 @@ protected function applySecondFactorVettedEvent(SecondFactorVettedEvent $event) $this->vettedSecondFactors->set($secondFactorId, $vetted); } - protected function applySecondFactorVettedWithoutTokenProofOfPossession(SecondFactorVettedWithoutTokenProofOfPossession $event) - { + protected function applySecondFactorVettedWithoutTokenProofOfPossession( + SecondFactorVettedWithoutTokenProofOfPossession $event, + ) { $secondFactorId = (string)$event->secondFactorId; /** @var VerifiedSecondFactor $verified */ @@ -1219,7 +1249,7 @@ protected function applyUnverifiedSecondFactorRevokedEvent(UnverifiedSecondFacto } protected function applyCompliedWithUnverifiedSecondFactorRevocationEvent( - CompliedWithUnverifiedSecondFactorRevocationEvent $event + CompliedWithUnverifiedSecondFactorRevocationEvent $event, ) { $this->unverifiedSecondFactors->remove((string)$event->secondFactorId); } @@ -1230,7 +1260,7 @@ protected function applyVerifiedSecondFactorRevokedEvent(VerifiedSecondFactorRev } protected function applyCompliedWithVerifiedSecondFactorRevocationEvent( - CompliedWithVerifiedSecondFactorRevocationEvent $event + CompliedWithVerifiedSecondFactorRevocationEvent $event, ) { $this->verifiedSecondFactors->remove((string)$event->secondFactorId); } @@ -1241,7 +1271,7 @@ protected function applyVettedSecondFactorRevokedEvent(VettedSecondFactorRevoked } protected function applyCompliedWithVettedSecondFactorRevocationEvent( - CompliedWithVettedSecondFactorRevocationEvent $event + CompliedWithVettedSecondFactorRevocationEvent $event, ) { $this->vettedSecondFactors->remove((string)$event->secondFactorId); } @@ -1258,37 +1288,49 @@ protected function applyRecoveryTokenRevokedEvent(RecoveryTokenRevokedEvent $eve protected function applyIdentityAccreditedAsRaForInstitutionEvent(IdentityAccreditedAsRaForInstitutionEvent $event) { - $this->registrationAuthorities->set($event->raInstitution, RegistrationAuthority::accreditWith( - $event->registrationAuthorityRole, - $event->location, - $event->contactInformation, - $event->raInstitution - )); + $this->registrationAuthorities->set( + $event->raInstitution, + RegistrationAuthority::accreditWith( + $event->registrationAuthorityRole, + $event->location, + $event->contactInformation, + $event->raInstitution, + ), + ); } - protected function applyIdentityAccreditedAsRaaForInstitutionEvent(IdentityAccreditedAsRaaForInstitutionEvent $event) + protected function applyIdentityAccreditedAsRaaForInstitutionEvent(IdentityAccreditedAsRaaForInstitutionEvent $event,) { - $this->registrationAuthorities->set($event->raInstitution, RegistrationAuthority::accreditWith( - $event->registrationAuthorityRole, - $event->location, - $event->contactInformation, - $event->raInstitution - )); + $this->registrationAuthorities->set( + $event->raInstitution, + RegistrationAuthority::accreditWith( + $event->registrationAuthorityRole, + $event->location, + $event->contactInformation, + $event->raInstitution, + ), + ); } protected function applyRegistrationAuthorityInformationAmendedForInstitutionEvent( - RegistrationAuthorityInformationAmendedForInstitutionEvent $event + RegistrationAuthorityInformationAmendedForInstitutionEvent $event, ) { - $this->registrationAuthorities->get($event->raInstitution)->amendInformation($event->location, $event->contactInformation); + $this->registrationAuthorities->get($event->raInstitution)->amendInformation( + $event->location, + $event->contactInformation, + ); } protected function applyAppointedAsRaaForInstitutionEvent(AppointedAsRaaForInstitutionEvent $event) { - $this->registrationAuthorities->get($event->raInstitution)->appointAs(new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RAA)); + $this->registrationAuthorities->get($event->raInstitution)->appointAs( + new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RAA), + ); } - protected function applyRegistrationAuthorityRetractedForInstitutionEvent(RegistrationAuthorityRetractedForInstitutionEvent $event) - { + protected function applyRegistrationAuthorityRetractedForInstitutionEvent( + RegistrationAuthorityRetractedForInstitutionEvent $event, + ) { $this->registrationAuthorities->remove($event->raInstitution); } @@ -1306,8 +1348,6 @@ protected function applyIdentityForgottenEvent(IdentityForgottenEvent $event) /** * This method is kept to be backwards compatible for changes before FGA - * - * @param AppointedAsRaEvent $event */ protected function applyAppointedAsRaEvent(AppointedAsRaEvent $event) { @@ -1317,8 +1357,6 @@ protected function applyAppointedAsRaEvent(AppointedAsRaEvent $event) /** * This method is kept to be backwards compatible for changes before FGA - * - * @param AppointedAsRaaEvent $event */ protected function applyAppointedAsRaaEvent(AppointedAsRaaEvent $event) { @@ -1333,33 +1371,35 @@ protected function applyAppointedAsRaaEvent(AppointedAsRaaEvent $event) */ protected function applyIdentityAccreditedAsRaEvent(IdentityAccreditedAsRaEvent $event) { - $this->registrationAuthorities->set($event->identityInstitution, RegistrationAuthority::accreditWith( - $event->registrationAuthorityRole, - $event->location, - $event->contactInformation, - $event->identityInstitution - )); + $this->registrationAuthorities->set( + $event->identityInstitution, + RegistrationAuthority::accreditWith( + $event->registrationAuthorityRole, + $event->location, + $event->contactInformation, + $event->identityInstitution, + ), + ); } /** * This method is kept to be backwards compatible for changes before FGA - * - * @param IdentityAccreditedAsRaaEvent $event */ protected function applyIdentityAccreditedAsRaaEvent(IdentityAccreditedAsRaaEvent $event) { - $this->registrationAuthorities->set($event->identityInstitution, RegistrationAuthority::accreditWith( - $event->registrationAuthorityRole, - $event->location, - $event->contactInformation, - $event->identityInstitution - )); + $this->registrationAuthorities->set( + $event->identityInstitution, + RegistrationAuthority::accreditWith( + $event->registrationAuthorityRole, + $event->location, + $event->contactInformation, + $event->identityInstitution, + ), + ); } /** * This method is kept to be backwards compatible for changes before FGA - * - * @param AppointedAsRaForInstitutionEvent $event */ protected function applyAppointedAsRaForInstitutionEvent(AppointedAsRaForInstitutionEvent $event) { @@ -1369,19 +1409,18 @@ protected function applyAppointedAsRaForInstitutionEvent(AppointedAsRaForInstitu /** * This method is kept to be backwards compatible for changes before FGA - * - * @param RegistrationAuthorityInformationAmendedEvent $event */ protected function applyRegistrationAuthorityInformationAmendedEvent( - RegistrationAuthorityInformationAmendedEvent $event + RegistrationAuthorityInformationAmendedEvent $event, ) { - $this->registrationAuthorities->get($event->identityInstitution)->amendInformation($event->location, $event->contactInformation); + $this->registrationAuthorities->get($event->identityInstitution)->amendInformation( + $event->location, + $event->contactInformation, + ); } /** * This method is kept to be backwards compatible for changes before FGA - * - * @param RegistrationAuthorityRetractedEvent $event */ protected function applyRegistrationAuthorityRetractedEvent(RegistrationAuthorityRetractedEvent $event) { @@ -1400,7 +1439,7 @@ protected function getChildEntities(): array $this->unverifiedSecondFactors->getValues(), $this->verifiedSecondFactors->getValues(), $this->vettedSecondFactors->getValues(), - $this->registrationAuthorities->getValues() + $this->registrationAuthorities->getValues(), ); } @@ -1424,7 +1463,7 @@ private function assertUserMayAddSecondFactor($maxNumberOfTokens): void count($this->vettedSecondFactors) >= $maxNumberOfTokens ) { throw new DomainException( - sprintf('User may not have more than %d token(s)', $maxNumberOfTokens) + sprintf('User may not have more than %d token(s)', $maxNumberOfTokens), ); } } @@ -1433,7 +1472,9 @@ private function assertUserMayAddRecoveryToken(RecoveryTokenType $recoveryTokenT { // Assert this token type is not yet registered if ($this->recoveryTokens->hasType($recoveryTokenType)) { - throw new DomainException(sprintf('Recovery token type %s is already registered', (string) $recoveryTokenType)); + throw new DomainException( + sprintf('Recovery token type %s is already registered', (string)$recoveryTokenType), + ); } } @@ -1505,7 +1546,9 @@ private function assertTokenNotAlreadyRegistered(SecondFactorType $type, SecondF private function assertSelfAssertedTokenRegistrationAllowed(): void { if ($this->vettedSecondFactors->count() !== 0) { - throw new DomainException("Self-asserted second factor registration is only allowed when no tokens are vetted yet"); + throw new DomainException( + "Self-asserted second factor registration is only allowed when no tokens are vetted yet", + ); } if ($this->recoveryTokens->count() === 0) { throw new DomainException("A recovery token is required to perform a self-asserted token registration"); @@ -1521,7 +1564,7 @@ private function assertAllVettedTokensAreSelfAsserted(): bool foreach ($this->vettedSecondFactors as $vettedSecondFactor) { if ($vettedSecondFactor->vettingType()->type() !== VettingType::TYPE_SELF_ASSERTED_REGISTRATION) { throw new DomainException( - 'Not all tokens are self-asserted, it is not allowed to self-vet using the self-asserted token' + 'Not all tokens are self-asserted, it is not allowed to self-vet using the self-asserted token', ); } } diff --git a/src/Surfnet/Stepup/Identity/Value/CommonName.php b/src/Surfnet/Stepup/Identity/Value/CommonName.php index 4f33da2c3..46e604ec7 100644 --- a/src/Surfnet/Stepup/Identity/Value/CommonName.php +++ b/src/Surfnet/Stepup/Identity/Value/CommonName.php @@ -19,11 +19,12 @@ namespace Surfnet\Stepup\Identity\Value; use JsonSerializable; +use Stringable; use Surfnet\Stepup\Exception\InvalidArgumentException; -final class CommonName implements JsonSerializable +final class CommonName implements JsonSerializable, Stringable { - private string $commonName; + private readonly string $commonName; /** * @return self diff --git a/src/Surfnet/Stepup/Identity/Value/ContactInformation.php b/src/Surfnet/Stepup/Identity/Value/ContactInformation.php index dc3eb473a..0ec9a1de1 100644 --- a/src/Surfnet/Stepup/Identity/Value/ContactInformation.php +++ b/src/Surfnet/Stepup/Identity/Value/ContactInformation.php @@ -19,11 +19,12 @@ namespace Surfnet\Stepup\Identity\Value; use JsonSerializable; +use Stringable; use Surfnet\Stepup\Exception\InvalidArgumentException; -final class ContactInformation implements JsonSerializable +final class ContactInformation implements JsonSerializable, Stringable { - private string $contactInformation; + private readonly string $contactInformation; /** * @param string $contactInformation @@ -38,7 +39,6 @@ public function __construct($contactInformation) } /** - * @param ContactInformation $otherContactInformation * @return bool */ public function equals(ContactInformation $otherContactInformation): bool diff --git a/src/Surfnet/Stepup/Identity/Value/DocumentNumber.php b/src/Surfnet/Stepup/Identity/Value/DocumentNumber.php index 7db32c042..beff460ba 100644 --- a/src/Surfnet/Stepup/Identity/Value/DocumentNumber.php +++ b/src/Surfnet/Stepup/Identity/Value/DocumentNumber.php @@ -19,11 +19,12 @@ namespace Surfnet\Stepup\Identity\Value; use JsonSerializable; +use Stringable; use Surfnet\Stepup\Exception\InvalidArgumentException; -final class DocumentNumber implements JsonSerializable +final class DocumentNumber implements JsonSerializable, Stringable { - private string $documentNumber; + private readonly string $documentNumber; /** * @return self diff --git a/src/Surfnet/Stepup/Identity/Value/Email.php b/src/Surfnet/Stepup/Identity/Value/Email.php index da5a34abc..50652941d 100644 --- a/src/Surfnet/Stepup/Identity/Value/Email.php +++ b/src/Surfnet/Stepup/Identity/Value/Email.php @@ -19,11 +19,12 @@ namespace Surfnet\Stepup\Identity\Value; use JsonSerializable; +use Stringable; use Surfnet\Stepup\Exception\InvalidArgumentException; -final class Email implements JsonSerializable +final class Email implements JsonSerializable, Stringable { - private string $email; + private readonly string $email; /** * @return self @@ -43,10 +44,12 @@ public function __construct($email) } if (filter_var($email, FILTER_VALIDATE_EMAIL) === false) { - throw new InvalidArgumentException(sprintf( - 'Email given: "%s is not a RFC 822 (https://www.ietf.org/rfc/rfc0822.txt) compliant email address"', - $email - )); + throw new InvalidArgumentException( + sprintf( + 'Email given: "%s is not a RFC 822 (https://www.ietf.org/rfc/rfc0822.txt) compliant email address"', + $email, + ), + ); } $this->email = trim($email); diff --git a/src/Surfnet/Stepup/Identity/Value/EmailVerificationWindow.php b/src/Surfnet/Stepup/Identity/Value/EmailVerificationWindow.php index 109f8362a..19e1b6310 100644 --- a/src/Surfnet/Stepup/Identity/Value/EmailVerificationWindow.php +++ b/src/Surfnet/Stepup/Identity/Value/EmailVerificationWindow.php @@ -19,24 +19,19 @@ namespace Surfnet\Stepup\Identity\Value; use Broadway\Serializer\Serializable as SerializableInterface; +use Stringable; use Surfnet\Stepup\DateTime\DateTime; use Surfnet\Stepup\Exception\InvalidArgumentException; -final class EmailVerificationWindow implements SerializableInterface +final readonly class EmailVerificationWindow implements SerializableInterface, Stringable { - private DateTime $start; - - private DateTime $end; - - private function __construct(DateTime $start, DateTime $end) - { - $this->start = $start; - $this->end = $end; + private function __construct( + private DateTime $start, + private DateTime $end, + ) { } /** - * @param TimeFrame $timeFrame - * @param DateTime $start * @return EmailVerificationWindow */ public static function createFromTimeFrameStartingAt(TimeFrame $timeFrame, DateTime $start): EmailVerificationWindow @@ -45,19 +40,19 @@ public static function createFromTimeFrameStartingAt(TimeFrame $timeFrame, DateT } /** - * @param DateTime $start - * @param DateTime $end * @return EmailVerificationWindow */ public static function createWindowFromTill(DateTime $start, DateTime $end): EmailVerificationWindow { if (!$end->comesAfter($start)) { - throw new InvalidArgumentException(sprintf( - 'An EmailVerificationWindow can only be created with an end time that is after the start time, ' - . 'given start: "%s", given end: "%s"', - (string) $start, - (string) $end - )); + throw new InvalidArgumentException( + sprintf( + 'An EmailVerificationWindow can only be created with an end time that is after the start time, ' + . 'given start: "%s", given end: "%s"', + (string)$start, + (string)$end, + ), + ); } return new EmailVerificationWindow($start, $end); @@ -82,7 +77,6 @@ public function openUntil() } /** - * @param EmailVerificationWindow $other * @return bool */ public function equals(EmailVerificationWindow $other): bool @@ -94,13 +88,13 @@ public static function deserialize(array $data) { return new EmailVerificationWindow( DateTime::fromString($data['start']), - DateTime::fromString($data['end']) + DateTime::fromString($data['end']), ); } public function serialize(): array { - return ['start' => (string) $this->start, 'end' => (string) $this->end]; + return ['start' => (string)$this->start, 'end' => (string)$this->end]; } public function __toString(): string diff --git a/src/Surfnet/Stepup/Identity/Value/GssfId.php b/src/Surfnet/Stepup/Identity/Value/GssfId.php index fe83f573a..117f6a336 100644 --- a/src/Surfnet/Stepup/Identity/Value/GssfId.php +++ b/src/Surfnet/Stepup/Identity/Value/GssfId.php @@ -22,7 +22,7 @@ final class GssfId implements SecondFactorIdentifier { - private string $gssfId; + private readonly string $gssfId; public static function unknown(): self { diff --git a/src/Surfnet/Stepup/Identity/Value/HashedSecret.php b/src/Surfnet/Stepup/Identity/Value/HashedSecret.php index d8765fac0..722dc54b1 100644 --- a/src/Surfnet/Stepup/Identity/Value/HashedSecret.php +++ b/src/Surfnet/Stepup/Identity/Value/HashedSecret.php @@ -23,11 +23,9 @@ */ class HashedSecret implements Secret { - private string $secret; - - public function __construct(string $secret) - { - $this->secret = $secret; + public function __construct( + private readonly string $secret, + ) { } public function getSecret(): string diff --git a/src/Surfnet/Stepup/Identity/Value/IdentityId.php b/src/Surfnet/Stepup/Identity/Value/IdentityId.php index 705f8eba6..a797a94d8 100644 --- a/src/Surfnet/Stepup/Identity/Value/IdentityId.php +++ b/src/Surfnet/Stepup/Identity/Value/IdentityId.php @@ -24,7 +24,7 @@ final class IdentityId implements Id, JsonSerializable { - private string $value; + private readonly string $value; public function __construct($value) { diff --git a/src/Surfnet/Stepup/Identity/Value/Institution.php b/src/Surfnet/Stepup/Identity/Value/Institution.php index b9b07a1e4..8d1025664 100644 --- a/src/Surfnet/Stepup/Identity/Value/Institution.php +++ b/src/Surfnet/Stepup/Identity/Value/Institution.php @@ -19,11 +19,12 @@ namespace Surfnet\Stepup\Identity\Value; use JsonSerializable; +use Stringable; use Surfnet\Stepup\Exception\InvalidArgumentException; -final class Institution implements JsonSerializable +final class Institution implements JsonSerializable, Stringable { - private string $institution; + private readonly string $institution; /** * @param string $institution may not be an empty string @@ -46,7 +47,6 @@ public function getInstitution() } /** - * @param Institution $otherInstitution * @return bool */ public function equals(Institution $otherInstitution): bool diff --git a/src/Surfnet/Stepup/Identity/Value/Locale.php b/src/Surfnet/Stepup/Identity/Value/Locale.php index 6ed88b3e7..619d272b3 100644 --- a/src/Surfnet/Stepup/Identity/Value/Locale.php +++ b/src/Surfnet/Stepup/Identity/Value/Locale.php @@ -19,11 +19,12 @@ namespace Surfnet\Stepup\Identity\Value; use JsonSerializable; +use Stringable; use Surfnet\Stepup\Exception\InvalidArgumentException; -final class Locale implements JsonSerializable +final class Locale implements JsonSerializable, Stringable { - private string $locale; + private readonly string $locale; /** * @param string $locale @@ -38,7 +39,6 @@ public function __construct($locale) } /** - * @param self $other * @return bool */ public function equals(Locale $other): bool diff --git a/src/Surfnet/Stepup/Identity/Value/Location.php b/src/Surfnet/Stepup/Identity/Value/Location.php index 057f02d72..9a11df010 100644 --- a/src/Surfnet/Stepup/Identity/Value/Location.php +++ b/src/Surfnet/Stepup/Identity/Value/Location.php @@ -19,11 +19,12 @@ namespace Surfnet\Stepup\Identity\Value; use JsonSerializable; +use Stringable; use Surfnet\Stepup\Exception\InvalidArgumentException; -final class Location implements JsonSerializable +final class Location implements JsonSerializable, Stringable { - private string $location; + private readonly string $location; /** * @param string $location @@ -38,7 +39,6 @@ public function __construct($location) } /** - * @param Location $otherLocation * @return bool */ public function equals(Location $otherLocation): bool diff --git a/src/Surfnet/Stepup/Identity/Value/NameId.php b/src/Surfnet/Stepup/Identity/Value/NameId.php index 6fec2f840..6c6a527f4 100644 --- a/src/Surfnet/Stepup/Identity/Value/NameId.php +++ b/src/Surfnet/Stepup/Identity/Value/NameId.php @@ -19,12 +19,13 @@ namespace Surfnet\Stepup\Identity\Value; use JsonSerializable; +use Stringable; use Surfnet\Stepup\Exception\InvalidArgumentException; /** * The natural identifier of an Identity is the SAML Name ID. */ -final class NameId implements JsonSerializable +final class NameId implements JsonSerializable, Stringable { /** * This length reflects the maximum length supported by the data store for the @@ -34,7 +35,7 @@ final class NameId implements JsonSerializable */ private const MAX_LENGTH = 255; - private string $value; + private readonly string $value; public function __construct($value) { @@ -44,7 +45,7 @@ public function __construct($value) if (strlen($value) > self::MAX_LENGTH) { throw new InvalidArgumentException( - 'Invalid argument type: maximum length for nameId exceeds configured length of ' . self::MAX_LENGTH + 'Invalid argument type: maximum length for nameId exceeds configured length of ' . self::MAX_LENGTH, ); } diff --git a/src/Surfnet/Stepup/Identity/Value/OnPremiseVettingType.php b/src/Surfnet/Stepup/Identity/Value/OnPremiseVettingType.php index 822b2479b..be152f43c 100644 --- a/src/Surfnet/Stepup/Identity/Value/OnPremiseVettingType.php +++ b/src/Surfnet/Stepup/Identity/Value/OnPremiseVettingType.php @@ -25,11 +25,8 @@ class OnPremiseVettingType implements VettingType */ protected $type = VettingType::TYPE_ON_PREMISE; - private DocumentNumber $documentNumber; - - public function __construct(DocumentNumber $documentNumber) + public function __construct(private readonly DocumentNumber $documentNumber) { - $this->documentNumber = $documentNumber; } public static function deserialize(array $data): self @@ -52,7 +49,7 @@ public function jsonSerialize(): array { return [ 'type' => $this->type(), - 'document_number' => (string) $this->getDocumentNumber() + 'document_number' => (string)$this->getDocumentNumber(), ]; } diff --git a/src/Surfnet/Stepup/Identity/Value/PhoneNumber.php b/src/Surfnet/Stepup/Identity/Value/PhoneNumber.php index 9f79ed336..c151b810c 100644 --- a/src/Surfnet/Stepup/Identity/Value/PhoneNumber.php +++ b/src/Surfnet/Stepup/Identity/Value/PhoneNumber.php @@ -22,7 +22,7 @@ final class PhoneNumber implements SecondFactorIdentifier, RecoveryTokenIdentifier { - private string $phoneNumber; + private readonly string $phoneNumber; public static function unknown(): self { @@ -36,11 +36,13 @@ public function __construct($phoneNumber) } if (!preg_match('~^\+[\d\s]+ \(0\) \d+$~', $phoneNumber)) { - throw new InvalidArgumentException(sprintf( - "Invalid phone number format, expected +{countryCode} (0) {subscriber}, got '%s...' (truncated)", - // 12 characters captures the most extended country code up to and incl. the first subscriber digit - substr($phoneNumber, 0, 12) - )); + throw new InvalidArgumentException( + sprintf( + "Invalid phone number format, expected +{countryCode} (0) {subscriber}, got '%s...' (truncated)", + // 12 characters captures the most extended country code up to and incl. the first subscriber digit + substr($phoneNumber, 0, 12), + ), + ); } $this->phoneNumber = $phoneNumber; diff --git a/src/Surfnet/Stepup/Identity/Value/RecoveryTokenId.php b/src/Surfnet/Stepup/Identity/Value/RecoveryTokenId.php index 1d6d881a0..c171289f7 100644 --- a/src/Surfnet/Stepup/Identity/Value/RecoveryTokenId.php +++ b/src/Surfnet/Stepup/Identity/Value/RecoveryTokenId.php @@ -23,7 +23,7 @@ final class RecoveryTokenId implements Id { - private string $value; + private readonly string $value; public function __construct($value) { diff --git a/src/Surfnet/Stepup/Identity/Value/RecoveryTokenIdentifierFactory.php b/src/Surfnet/Stepup/Identity/Value/RecoveryTokenIdentifierFactory.php index 42b311a0c..542b2417b 100644 --- a/src/Surfnet/Stepup/Identity/Value/RecoveryTokenIdentifierFactory.php +++ b/src/Surfnet/Stepup/Identity/Value/RecoveryTokenIdentifierFactory.php @@ -30,7 +30,9 @@ public static function forType(RecoveryTokenType $type, string $recoveryTokenIde if ($type->isSafeStore()) { return new SafeStore(new HashedSecret($recoveryTokenIdentifier)); } - throw new InvalidArgumentException(sprintf('Unsupported type given while building recovery method: "%s"', $type)); + throw new InvalidArgumentException( + sprintf('Unsupported type given while building recovery method: "%s"', $type), + ); } public static function unknownForType(RecoveryTokenType $type): RecoveryTokenIdentifier @@ -42,7 +44,7 @@ public static function unknownForType(RecoveryTokenType $type): RecoveryTokenIde return SafeStore::unknown(); } throw new InvalidArgumentException( - sprintf('Unsupported type given while building unknown recovery method: "%s"', $type) + sprintf('Unsupported type given while building unknown recovery method: "%s"', $type), ); } } diff --git a/src/Surfnet/Stepup/Identity/Value/RecoveryTokenType.php b/src/Surfnet/Stepup/Identity/Value/RecoveryTokenType.php index 40d836eeb..55cffa241 100644 --- a/src/Surfnet/Stepup/Identity/Value/RecoveryTokenType.php +++ b/src/Surfnet/Stepup/Identity/Value/RecoveryTokenType.php @@ -18,19 +18,22 @@ namespace Surfnet\Stepup\Identity\Value; +use Stringable; use Surfnet\Stepup\Exception\InvalidArgumentException; -final class RecoveryTokenType +final class RecoveryTokenType implements Stringable { - const TYPE_SMS = 'sms'; - const TYPE_SAFE_STORE = 'safe-store'; + public const TYPE_SMS = 'sms'; + public const TYPE_SAFE_STORE = 'safe-store'; - private string $type; + private readonly string $type; public function __construct($type) { if (!is_string($type)) { - throw new InvalidArgumentException(sprintf('The RecoveryTokenType must be of type string, %s given', gettype($type))); + throw new InvalidArgumentException( + sprintf('The RecoveryTokenType must be of type string, %s given', gettype($type)), + ); } if (!in_array($type, [self::TYPE_SMS, self::TYPE_SAFE_STORE])) { diff --git a/src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php b/src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php index 0beca2c07..63fec6a6e 100644 --- a/src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php +++ b/src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php @@ -19,15 +19,16 @@ namespace Surfnet\Stepup\Identity\Value; use Broadway\Serializer\Serializable as SerializableInterface; +use Stringable; use Surfnet\Stepup\Exception\InvalidArgumentException; -final class RegistrationAuthorityRole implements SerializableInterface +final class RegistrationAuthorityRole implements SerializableInterface, Stringable { - const ROLE_RA = 1; - const ROLE_RAA = 2; - const ROLE_SRAA = 3; + public const ROLE_RA = 1; + public const ROLE_RAA = 2; + public const ROLE_SRAA = 3; - private int $role; + private readonly int $role; /** * @param string $role may not be an empty string @@ -36,7 +37,7 @@ public function __construct($role) { if (!is_int($role) || !in_array($role, [self::ROLE_RA, self::ROLE_RAA, self::ROLE_SRAA])) { throw new InvalidArgumentException( - 'Invalid role given, role must be one of RegistrationAuthorityRole::[ROLE_RA|ROLE_RAA|ROLE_SRAA]' + 'Invalid role given, role must be one of RegistrationAuthorityRole::[ROLE_RA|ROLE_RAA|ROLE_SRAA]', ); } @@ -57,7 +58,6 @@ public static function raa(): self } /** - * @param RegistrationAuthorityRole $role * @return bool */ public function equals(RegistrationAuthorityRole $role): bool @@ -88,7 +88,7 @@ public function jsonSerialize() public function __toString(): string { - return (string) $this->role; + return (string)$this->role; } public static function deserialize(array $data) diff --git a/src/Surfnet/Stepup/Identity/Value/SafeStore.php b/src/Surfnet/Stepup/Identity/Value/SafeStore.php index a5ee86e9d..a3c8fbee2 100644 --- a/src/Surfnet/Stepup/Identity/Value/SafeStore.php +++ b/src/Surfnet/Stepup/Identity/Value/SafeStore.php @@ -23,11 +23,9 @@ */ class SafeStore implements RecoveryTokenIdentifier { - private Secret $secret; - - public function __construct(Secret $hashedSecret) - { - $this->secret = $hashedSecret; + public function __construct( + private readonly Secret $secret, + ) { } public static function unknown(): self diff --git a/src/Surfnet/Stepup/Identity/Value/SecondFactorId.php b/src/Surfnet/Stepup/Identity/Value/SecondFactorId.php index fb49e605e..fb2ab51ec 100644 --- a/src/Surfnet/Stepup/Identity/Value/SecondFactorId.php +++ b/src/Surfnet/Stepup/Identity/Value/SecondFactorId.php @@ -23,7 +23,7 @@ final class SecondFactorId implements Id { - private string $value; + private readonly string $value; public function __construct($value) { diff --git a/src/Surfnet/Stepup/Identity/Value/SelfAssertedRegistrationVettingType.php b/src/Surfnet/Stepup/Identity/Value/SelfAssertedRegistrationVettingType.php index e91412f3a..4bc220cf1 100644 --- a/src/Surfnet/Stepup/Identity/Value/SelfAssertedRegistrationVettingType.php +++ b/src/Surfnet/Stepup/Identity/Value/SelfAssertedRegistrationVettingType.php @@ -25,11 +25,8 @@ class SelfAssertedRegistrationVettingType implements VettingType */ protected $type = VettingType::TYPE_SELF_ASSERTED_REGISTRATION; - protected RecoveryTokenId $authoringRecoveryToken; - - public function __construct(RecoveryTokenId $recoveryTokenId) + public function __construct(protected RecoveryTokenId $authoringRecoveryToken) { - $this->authoringRecoveryToken = $recoveryTokenId; } public static function deserialize(array $data): self diff --git a/src/Surfnet/Stepup/Identity/Value/SelfVetVettingType.php b/src/Surfnet/Stepup/Identity/Value/SelfVetVettingType.php index 470d41aa5..96bf87d83 100644 --- a/src/Surfnet/Stepup/Identity/Value/SelfVetVettingType.php +++ b/src/Surfnet/Stepup/Identity/Value/SelfVetVettingType.php @@ -27,11 +27,8 @@ class SelfVetVettingType implements VettingType */ protected $type = VettingType::TYPE_SELF_VET; - private Loa $authoringLoa; - - public function __construct(Loa $loa) + public function __construct(private readonly Loa $authoringLoa) { - $this->authoringLoa = $loa; } public static function deserialize(array $data): self @@ -42,7 +39,7 @@ public static function deserialize(array $data): self public function auditLog(): string { - return sprintf(' (self vetted using LoA: %s)', (string) $this->authoringLoa()); + return sprintf(' (self vetted using LoA: %s)', (string)$this->authoringLoa()); } public function authoringLoa(): Loa @@ -56,8 +53,8 @@ public function jsonSerialize(): array 'type' => $this->type(), 'loa' => [ 'level' => $this->authoringLoa->getLevel(), - 'identifier' => (string) $this->authoringLoa, - ] + 'identifier' => (string)$this->authoringLoa, + ], ]; } diff --git a/src/Surfnet/Stepup/Identity/Value/StepupProvider.php b/src/Surfnet/Stepup/Identity/Value/StepupProvider.php index a7959be7a..9cdbc809b 100644 --- a/src/Surfnet/Stepup/Identity/Value/StepupProvider.php +++ b/src/Surfnet/Stepup/Identity/Value/StepupProvider.php @@ -18,11 +18,12 @@ namespace Surfnet\Stepup\Identity\Value; +use Stringable; use Surfnet\Stepup\Exception\InvalidArgumentException; -final class StepupProvider +final class StepupProvider implements Stringable { - private string $provider; + private readonly string $provider; public function __construct($provider) { diff --git a/src/Surfnet/Stepup/Identity/Value/TimeFrame.php b/src/Surfnet/Stepup/Identity/Value/TimeFrame.php index 9e1ba91d5..f91de8f7a 100644 --- a/src/Surfnet/Stepup/Identity/Value/TimeFrame.php +++ b/src/Surfnet/Stepup/Identity/Value/TimeFrame.php @@ -20,19 +20,14 @@ namespace Surfnet\Stepup\Identity\Value; use DateInterval; +use Stringable; use Surfnet\Stepup\DateTime\DateTime; use Surfnet\Stepup\Exception\InvalidArgumentException; -final class TimeFrame +final readonly class TimeFrame implements Stringable { - private DateInterval $timeFrame; - - /** - * @param DateInterval $timeFrame - */ - final private function __construct(DateInterval $timeFrame) + final private function __construct(private DateInterval $timeFrame) { - $this->timeFrame = $timeFrame; } /** @@ -49,7 +44,6 @@ public static function ofSeconds($seconds): TimeFrame } /** - * @param DateTime $dateTime * @return DateTime */ public function getEndWhenStartingAt(DateTime $dateTime): DateTime @@ -58,7 +52,6 @@ public function getEndWhenStartingAt(DateTime $dateTime): DateTime } /** - * @param TimeFrame $other * @return bool */ public function equals(TimeFrame $other): bool diff --git a/src/Surfnet/Stepup/Identity/Value/U2fKeyHandle.php b/src/Surfnet/Stepup/Identity/Value/U2fKeyHandle.php index 37c1085f2..bef51ff6d 100644 --- a/src/Surfnet/Stepup/Identity/Value/U2fKeyHandle.php +++ b/src/Surfnet/Stepup/Identity/Value/U2fKeyHandle.php @@ -25,7 +25,7 @@ */ final class U2fKeyHandle implements SecondFactorIdentifier { - const UNKNOWN = '—'; + public const UNKNOWN = '—'; private string $value; diff --git a/src/Surfnet/Stepup/Identity/Value/UnhashedSecret.php b/src/Surfnet/Stepup/Identity/Value/UnhashedSecret.php index 950e54a1a..6e2b876b4 100644 --- a/src/Surfnet/Stepup/Identity/Value/UnhashedSecret.php +++ b/src/Surfnet/Stepup/Identity/Value/UnhashedSecret.php @@ -41,21 +41,18 @@ class UnhashedSecret implements HashableSecret */ private const ALGORITHM = PASSWORD_BCRYPT; - private string $secret; - public function hashSecret(): Secret { $hashedSecret = password_hash( $this->secret, self::ALGORITHM, - ['cost' => self::COST] + ['cost' => self::COST], ); return new HashedSecret($hashedSecret); } - public function __construct(string $secret) + public function __construct(private readonly string $secret) { - $this->secret = $secret; } public function getSecret(): string diff --git a/src/Surfnet/Stepup/Identity/Value/VettingTypeHint.php b/src/Surfnet/Stepup/Identity/Value/VettingTypeHint.php index 5a6263345..f8f87847a 100644 --- a/src/Surfnet/Stepup/Identity/Value/VettingTypeHint.php +++ b/src/Surfnet/Stepup/Identity/Value/VettingTypeHint.php @@ -22,17 +22,13 @@ class VettingTypeHint implements JsonSerializable { - private string $locale; - - /** - * The hint text is nullable - */ - private ?string $hint; - - public function __construct(string $locale, ?string $hint) - { - $this->locale = $locale; - $this->hint = $hint; + public function __construct( + private readonly string $locale, + /** + * The hint text is nullable + */ + private readonly ?string $hint, + ) { } public function jsonSerialize() diff --git a/src/Surfnet/Stepup/Identity/Value/YubikeyPublicId.php b/src/Surfnet/Stepup/Identity/Value/YubikeyPublicId.php index 34aa0f9db..39904b619 100644 --- a/src/Surfnet/Stepup/Identity/Value/YubikeyPublicId.php +++ b/src/Surfnet/Stepup/Identity/Value/YubikeyPublicId.php @@ -22,7 +22,7 @@ final class YubikeyPublicId implements SecondFactorIdentifier { - const UNKNOWN = '—'; + public const UNKNOWN = '—'; private string $value; @@ -49,7 +49,7 @@ public function __construct($value) } if ($value !== sprintf('%08s', ltrim($value, '0'))) { throw new InvalidArgumentException( - 'Given Yubikey public ID is longer than 8 digits, yet left-padded with zeroes' + 'Given Yubikey public ID is longer than 8 digits, yet left-padded with zeroes', ); } diff --git a/src/Surfnet/Stepup/Identity/Whitelist.php b/src/Surfnet/Stepup/Identity/Whitelist.php index 440cb6a54..87dbcc7d9 100644 --- a/src/Surfnet/Stepup/Identity/Whitelist.php +++ b/src/Surfnet/Stepup/Identity/Whitelist.php @@ -32,7 +32,7 @@ final class Whitelist extends EventSourcedAggregateRoot implements WhitelistApi /** * There can ever be only one whitelist, so using a fixed UUIDv4 */ - const WHITELIST_AGGREGATE_ID = '125ccee5-d650-437a-a0b0-6bf17c8188fa'; + public const WHITELIST_AGGREGATE_ID = '125ccee5-d650-437a-a0b0-6bf17c8188fa'; /** * @var InstitutionCollection The collection of institutions currently on the whitelist @@ -65,10 +65,12 @@ public function add(InstitutionCollection $institutionCollection): void { foreach ($institutionCollection as $institution) { if ($this->whitelist->contains($institution)) { - throw new DomainException(sprintf( - 'Cannot add institution "%s" as it is already whitelisted', - $institution - )); + throw new DomainException( + sprintf( + 'Cannot add institution "%s" as it is already whitelisted', + $institution, + ), + ); } } @@ -79,10 +81,12 @@ public function remove(InstitutionCollection $institutionCollection): void { foreach ($institutionCollection as $institution) { if (!$this->whitelist->contains($institution)) { - throw new DomainException(sprintf( - 'Cannot remove institution "%s" as it is not whitelisted', - $institution - )); + throw new DomainException( + sprintf( + 'Cannot remove institution "%s" as it is not whitelisted', + $institution, + ), + ); } } diff --git a/src/Surfnet/Stepup/Tests/Configuration/Event/EventSerializationAndDeserializationTest.php b/src/Surfnet/Stepup/Tests/Configuration/Event/EventSerializationAndDeserializationTest.php index f8b3c4a0c..8f6515d87 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Event/EventSerializationAndDeserializationTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Event/EventSerializationAndDeserializationTest.php @@ -65,8 +65,9 @@ class EventSerializationAndDeserializationTest extends TestCase * * @dataProvider institutionConfigurationEventsProvider */ - public function an_event_should_be_the_same_after_serialization_and_deserialization(SerializableInterface $unserializedEvent): void - { + public function an_event_should_be_the_same_after_serialization_and_deserialization( + SerializableInterface $unserializedEvent, + ): void { $serializedEvent = $unserializedEvent->serialize(); $deserializedEvent = $unserializedEvent::deserialize($serializedEvent); @@ -87,38 +88,38 @@ public function institutionConfigurationEventsProvider(): array // Configuration 'NewConfigurationCreatedEvent' => [ new NewConfigurationCreatedEvent( - Configuration::CONFIGURATION_ID - ) + Configuration::CONFIGURATION_ID, + ), ], 'ConfigurationUpdatedEvent' => [ new ConfigurationUpdatedEvent( Configuration::CONFIGURATION_ID, - ['configurationKey' => 'configurationValue'] - ) + ['configurationKey' => 'configurationValue'], + ), ], 'EmailTemplatesUpdatedEvent' => [ new EmailTemplatesUpdatedEvent( Configuration::CONFIGURATION_ID, - ['template'] - ) + ['template'], + ), ], 'IdentityProvidersUpdatedEvent' => [ new IdentityProvidersUpdatedEvent( Configuration::CONFIGURATION_ID, - ['idp'] - ) + ['idp'], + ), ], 'ServiceProvidersUpdatedEvent' => [ new ServiceProvidersUpdatedEvent( Configuration::CONFIGURATION_ID, - ['sp'] - ) + ['sp'], + ), ], 'SraaUpdatedEvent' => [ new SraaUpdatedEvent( Configuration::CONFIGURATION_ID, - ['sraa'] - ) + ['sraa'], + ), ], // InstitutionConfiguration @@ -132,43 +133,43 @@ public function institutionConfigurationEventsProvider(): array new NumberOfTokensPerIdentityOption(0), new SsoOn2faOption(false), new SelfVetOption(true), - new SelfAssertedTokensOption(true) - ) + new SelfAssertedTokensOption(true), + ), ], 'UseRaLocationsOptionChangedEvent' => [ new UseRaLocationsOptionChangedEvent( $institutionConfigurationId, $institution, - new UseRaLocationsOption(true) - ) + new UseRaLocationsOption(true), + ), ], 'ShowRaaContactInformationOptionChangedEvent' => [ new ShowRaaContactInformationOptionChangedEvent( $institutionConfigurationId, $institution, - new ShowRaaContactInformationOption(true) - ) + new ShowRaaContactInformationOption(true), + ), ], 'VerifyEmailOptionChangedEvent' => [ new VerifyEmailOptionChangedEvent( $institutionConfigurationId, $institution, - new VerifyEmailOption(true) - ) + new VerifyEmailOption(true), + ), ], 'SelfVetOptionChangedEvent' => [ new SelfVetOptionChangedEvent( $institutionConfigurationId, $institution, - new SelfVetOption(false) - ) + new SelfVetOption(false), + ), ], 'SsoOn2faOptionChangedEvent' => [ new SsoOn2faOptionChangedEvent( $institutionConfigurationId, $institution, - new SsoOn2faOption(false) - ) + new SsoOn2faOption(false), + ), ], 'AllowedSecondFactorListUpdatedEvent:withSecondFactors' => [ new AllowedSecondFactorListUpdatedEvent( @@ -177,15 +178,15 @@ public function institutionConfigurationEventsProvider(): array AllowedSecondFactorList::ofTypes([ new SecondFactorType('yubikey'), new SecondFactorType('sms'), - ]) - ) + ]), + ), ], 'AllowedSecondFactorListUpdatedEvent:blank' => [ new AllowedSecondFactorListUpdatedEvent( $institutionConfigurationId, $institution, - AllowedSecondFactorList::blank() - ) + AllowedSecondFactorList::blank(), + ), ], 'RaLocationAddedEvent' => [ new RaLocationAddedEvent( @@ -194,42 +195,42 @@ public function institutionConfigurationEventsProvider(): array new RaLocationId($uuid), new RaLocationName('Test name'), new Location('Test location'), - new ContactInformation('Test contact information') - ) + new ContactInformation('Test contact information'), + ), ], 'RaLocationRenamedEvent' => [ new RaLocationRenamedEvent( $institutionConfigurationId, new RaLocationId($uuid), - new RaLocationName('Test name') - ) + new RaLocationName('Test name'), + ), ], 'RaLocationRelocatedEvent' => [ new RaLocationRelocatedEvent( $institutionConfigurationId, new RaLocationId($uuid), - new Location('Test location') - ) + new Location('Test location'), + ), ], 'RaLocationContactInformationChangedEvent' => [ new RaLocationContactInformationChangedEvent( $institutionConfigurationId, new RaLocationId($uuid), - new ContactInformation('Test contact information') - ) + new ContactInformation('Test contact information'), + ), ], 'RaLocationRemovedEvent' => [ new RaLocationRemovedEvent( $institutionConfigurationId, - new RaLocationId($uuid) - ) + new RaLocationId($uuid), + ), ], 'InstitutionConfigurationRemovedEvent' => [ new InstitutionConfigurationRemovedEvent( $institutionConfigurationId, - new Institution('Babelfish Inc') - ) - ] + new Institution('Babelfish Inc'), + ), + ], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Configuration/InstitutionConfigurationTest.php b/src/Surfnet/Stepup/Tests/Configuration/InstitutionConfigurationTest.php index 2a2a56e03..5a57a349e 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/InstitutionConfigurationTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/InstitutionConfigurationTest.php @@ -49,10 +49,10 @@ class InstitutionConfigurationTest extends AggregateRootScenarioTestCase */ public function use_ra_locations_option_is_set_to_false_by_default_upon_creation_of_an_institution_configuration(): void { - $institution = new Institution('Institution'); - $institutionConfigurationId = InstitutionConfigurationId::from($institution); + $institution = new Institution('Institution'); + $institutionConfigurationId = InstitutionConfigurationId::from($institution); $showRaaContactInformationOption = new ShowRaaContactInformationOption(true); - $verifyEmailOption = new VerifyEmailOption(true); + $verifyEmailOption = new VerifyEmailOption(true); $ssoOn2faOption = SsoOn2faOption::getDefault(); $selfVetOption = SelfVetOption::getDefault(); $selfAssertedTokensOption = SelfAssertedTokensOption::getDefault(); @@ -63,12 +63,10 @@ public function use_ra_locations_option_is_set_to_false_by_default_upon_creation $selectRaaOption = InstitutionAuthorizationOption::getDefault(InstitutionRole::selectRaa()); $this->scenario - ->when(function () use ($institution, $institutionConfigurationId) { - return InstitutionConfiguration::create( - $institutionConfigurationId, - $institution - ); - })->then([ + ->when(fn() => InstitutionConfiguration::create( + $institutionConfigurationId, + $institution, + ))->then([ new NewInstitutionConfigurationCreatedEvent( $institutionConfigurationId, $institution, @@ -78,27 +76,27 @@ public function use_ra_locations_option_is_set_to_false_by_default_upon_creation $numberOfTokensPerIdentityOption, $ssoOn2faOption, $selfVetOption, - $selfAssertedTokensOption + $selfAssertedTokensOption, ), new AllowedSecondFactorListUpdatedEvent( $institutionConfigurationId, $institution, - AllowedSecondFactorList::blank() + AllowedSecondFactorList::blank(), ), new UseRaOptionChangedEvent( $institutionConfigurationId, $institution, - $useRaOption + $useRaOption, ), new UseRaaOptionChangedEvent( $institutionConfigurationId, $institution, - $useRaaOption + $useRaaOption, ), new SelectRaaOptionChangedEvent( $institutionConfigurationId, $institution, - $selectRaaOption + $selectRaaOption, ), ]); } @@ -109,10 +107,10 @@ public function use_ra_locations_option_is_set_to_false_by_default_upon_creation */ public function show_raa_contact_information_option_is_set_to_true_by_default_upon_creation_of_an_institution_configuration(): void { - $institution = new Institution('Institution'); + $institution = new Institution('Institution'); $institutionConfigurationId = InstitutionConfigurationId::from($institution); - $useRaLocationsOption = new UseRaLocationsOption(false); - $verifyEmailOption = new VerifyEmailOption(true); + $useRaLocationsOption = new UseRaLocationsOption(false); + $verifyEmailOption = new VerifyEmailOption(true); $ssoOn2faOption = SsoOn2faOption::getDefault(); $selfVetOption = SelfVetOption::getDefault(); $selfAssertedTokensOption = SelfAssertedTokensOption::getDefault(); @@ -123,12 +121,10 @@ public function show_raa_contact_information_option_is_set_to_true_by_default_up $selectRaaOption = InstitutionAuthorizationOption::getDefault(InstitutionRole::selectRaa()); $this->scenario - ->when(function () use ($institution, $institutionConfigurationId, $useRaLocationsOption, $verifyEmailOption) { - return InstitutionConfiguration::create( - $institutionConfigurationId, - $institution - ); - })->then([ + ->when(fn() => InstitutionConfiguration::create( + $institutionConfigurationId, + $institution, + ))->then([ new NewInstitutionConfigurationCreatedEvent( $institutionConfigurationId, $institution, @@ -138,27 +134,27 @@ public function show_raa_contact_information_option_is_set_to_true_by_default_up $numberOfTokensPerIdentityOption, $ssoOn2faOption, $selfVetOption, - $selfAssertedTokensOption + $selfAssertedTokensOption, ), new AllowedSecondFactorListUpdatedEvent( $institutionConfigurationId, $institution, - AllowedSecondFactorList::blank() + AllowedSecondFactorList::blank(), ), new UseRaOptionChangedEvent( $institutionConfigurationId, $institution, - $useRaOption + $useRaOption, ), new UseRaaOptionChangedEvent( $institutionConfigurationId, $institution, - $useRaaOption + $useRaaOption, ), new SelectRaaOptionChangedEvent( $institutionConfigurationId, $institution, - $selectRaaOption + $selectRaaOption, ), ]); } @@ -169,11 +165,11 @@ public function show_raa_contact_information_option_is_set_to_true_by_default_up */ public function use_ra_locations_option_is_not_changed_if_its_given_value_is_not_different_from_the_current_value(): void { - $institution = new Institution('Institution'); - $institutionConfigurationId = InstitutionConfigurationId::from($institution); - $originalUseRaLocationsOption = new UseRaLocationsOption(true); + $institution = new Institution('Institution'); + $institutionConfigurationId = InstitutionConfigurationId::from($institution); + $originalUseRaLocationsOption = new UseRaLocationsOption(true); $showRaaContactInformationOption = new ShowRaaContactInformationOption(true); - $verifyEmailOption = new VerifyEmailOption(true); + $verifyEmailOption = new VerifyEmailOption(true); $ssoOn2faOption = SsoOn2faOption::getDefault(); $selfVetOption = SelfVetOption::getDefault(); $selfAssertedTokensOption = SelfAssertedTokensOption::getDefault(); @@ -181,7 +177,7 @@ public function use_ra_locations_option_is_not_changed_if_its_given_value_is_not $theSameUseRaLocationsOption = $originalUseRaLocationsOption; $this->scenario - ->withAggregateId((string) $institutionConfigurationId->getInstitutionConfigurationId()) + ->withAggregateId((string)$institutionConfigurationId->getInstitutionConfigurationId()) ->given([ new NewInstitutionConfigurationCreatedEvent( $institutionConfigurationId, @@ -192,12 +188,14 @@ public function use_ra_locations_option_is_not_changed_if_its_given_value_is_not $numberOfTokensPerIdentityOption, $ssoOn2faOption, $selfVetOption, - $selfAssertedTokensOption - ) + $selfAssertedTokensOption, + ), ]) - ->when(function (InstitutionConfiguration $institutionConfiguration) use ($theSameUseRaLocationsOption): void { - $institutionConfiguration->configureUseRaLocationsOption($theSameUseRaLocationsOption); - }) + ->when( + function (InstitutionConfiguration $institutionConfiguration) use ($theSameUseRaLocationsOption): void { + $institutionConfiguration->configureUseRaLocationsOption($theSameUseRaLocationsOption); + }, + ) ->then([]); } @@ -207,11 +205,11 @@ public function use_ra_locations_option_is_not_changed_if_its_given_value_is_not */ public function show_raa_contact_information_option_is_not_changed_if_its_given_value_is_not_different_from_the_current_value(): void { - $institution = new Institution('Institution'); - $institutionConfigurationId = InstitutionConfigurationId::from($institution); - $useRaLocationsOption = new UseRaLocationsOption(true); + $institution = new Institution('Institution'); + $institutionConfigurationId = InstitutionConfigurationId::from($institution); + $useRaLocationsOption = new UseRaLocationsOption(true); $originalShowRaaContactInformationOption = new ShowRaaContactInformationOption(true); - $verifyEmailOption = new VerifyEmailOption(true); + $verifyEmailOption = new VerifyEmailOption(true); $ssoOn2faOption = SsoOn2faOption::getDefault(); $numberOfTokensPerIdentityOption = new NumberOfTokensPerIdentityOption(0); $selfVetOption = new SelfVetOption(false); @@ -219,7 +217,7 @@ public function show_raa_contact_information_option_is_not_changed_if_its_given_ $sameShowRaaContactInformationOption = $originalShowRaaContactInformationOption; $this->scenario - ->withAggregateId((string) $institutionConfigurationId->getInstitutionConfigurationId()) + ->withAggregateId((string)$institutionConfigurationId->getInstitutionConfigurationId()) ->given([ new NewInstitutionConfigurationCreatedEvent( $institutionConfigurationId, @@ -230,12 +228,17 @@ public function show_raa_contact_information_option_is_not_changed_if_its_given_ $numberOfTokensPerIdentityOption, $ssoOn2faOption, $selfVetOption, - $selfAssertedTokensOption - ) + $selfAssertedTokensOption, + ), ]) - ->when(function (InstitutionConfiguration $institutionConfiguration) use ($sameShowRaaContactInformationOption): void { - $institutionConfiguration->configureShowRaaContactInformationOption($sameShowRaaContactInformationOption); - }) + ->when( + function (InstitutionConfiguration $institutionConfiguration) use ($sameShowRaaContactInformationOption, + ): void { + $institutionConfiguration->configureShowRaaContactInformationOption( + $sameShowRaaContactInformationOption, + ); + }, + ) ->then([]); } @@ -245,11 +248,11 @@ public function show_raa_contact_information_option_is_not_changed_if_its_given_ */ public function use_ra_locations_option_is_changed_if_its_given_value_is_different_from_the_current_value(): void { - $institution = new Institution('Institution'); - $institutionConfigurationId = InstitutionConfigurationId::from($institution); - $originalUseRaLocationsOption = new UseRaLocationsOption(true); + $institution = new Institution('Institution'); + $institutionConfigurationId = InstitutionConfigurationId::from($institution); + $originalUseRaLocationsOption = new UseRaLocationsOption(true); $showRaaContactInformationOption = new ShowRaaContactInformationOption(true); - $verifyEmailOption = new VerifyEmailOption(true); + $verifyEmailOption = new VerifyEmailOption(true); $ssoOn2faOption = SsoOn2faOption::getDefault(); $selfVetOption = new SelfVetOption(false); $selfAssertedTokensOption = new SelfAssertedTokensOption(true); @@ -257,7 +260,7 @@ public function use_ra_locations_option_is_changed_if_its_given_value_is_differe $expectedUseRaLocationsOption = new UseRaLocationsOption(false); $this->scenario - ->withAggregateId((string) $institutionConfigurationId->getInstitutionConfigurationId()) + ->withAggregateId((string)$institutionConfigurationId->getInstitutionConfigurationId()) ->given([ new NewInstitutionConfigurationCreatedEvent( $institutionConfigurationId, @@ -268,17 +271,20 @@ public function use_ra_locations_option_is_changed_if_its_given_value_is_differe $numberOfTokensPerIdentityOption, $ssoOn2faOption, $selfVetOption, - $selfAssertedTokensOption - ) + $selfAssertedTokensOption, + ), ]) - ->when(function (InstitutionConfiguration $institutionConfiguration) use ($expectedUseRaLocationsOption): void { - $institutionConfiguration->configureUseRaLocationsOption($expectedUseRaLocationsOption); - }) + ->when( + function (InstitutionConfiguration $institutionConfiguration) use ($expectedUseRaLocationsOption, + ): void { + $institutionConfiguration->configureUseRaLocationsOption($expectedUseRaLocationsOption); + }, + ) ->then([ new UseRaLocationsOptionChangedEvent( $institutionConfigurationId, $institution, - $expectedUseRaLocationsOption + $expectedUseRaLocationsOption, ), ]); } @@ -289,11 +295,11 @@ public function use_ra_locations_option_is_changed_if_its_given_value_is_differe */ public function show_raa_contact_information_option_is_changed_if_its_given_value_is_different_from_the_current_value(): void { - $institution = new Institution('Institution'); - $institutionConfigurationId = InstitutionConfigurationId::from($institution); - $useRaLocationsOption = new UseRaLocationsOption(true); + $institution = new Institution('Institution'); + $institutionConfigurationId = InstitutionConfigurationId::from($institution); + $useRaLocationsOption = new UseRaLocationsOption(true); $originalShowRaaContactInformationOption = new ShowRaaContactInformationOption(true); - $verifyEmailOption = new VerifyEmailOption(true); + $verifyEmailOption = new VerifyEmailOption(true); $ssoOn2faOption = SsoOn2faOption::getDefault(); $selfVetOption = new SelfVetOption(false); $selfAssertedTokensOption = new SelfAssertedTokensOption(true); @@ -301,7 +307,7 @@ public function show_raa_contact_information_option_is_changed_if_its_given_valu $expectedShowRaaContactInformationOption = new ShowRaaContactInformationOption(false); $this->scenario - ->withAggregateId((string) $institutionConfigurationId->getInstitutionConfigurationId()) + ->withAggregateId((string)$institutionConfigurationId->getInstitutionConfigurationId()) ->given([ new NewInstitutionConfigurationCreatedEvent( $institutionConfigurationId, @@ -312,17 +318,23 @@ public function show_raa_contact_information_option_is_changed_if_its_given_valu $numberOfTokensPerIdentityOption, $ssoOn2faOption, $selfVetOption, - $selfAssertedTokensOption - ) + $selfAssertedTokensOption, + ), ]) - ->when(function (InstitutionConfiguration $institutionConfiguration) use ($expectedShowRaaContactInformationOption): void { - $institutionConfiguration->configureShowRaaContactInformationOption($expectedShowRaaContactInformationOption); - }) + ->when( + function (InstitutionConfiguration $institutionConfiguration) use ( + $expectedShowRaaContactInformationOption, + ): void { + $institutionConfiguration->configureShowRaaContactInformationOption( + $expectedShowRaaContactInformationOption, + ); + }, + ) ->then([ new ShowRaaContactInformationOptionChangedEvent( $institutionConfigurationId, $institution, - $expectedShowRaaContactInformationOption + $expectedShowRaaContactInformationOption, ), ]); } @@ -333,10 +345,10 @@ public function show_raa_contact_information_option_is_changed_if_its_given_valu */ public function test_the_setting_of_fga_options_on_an_institution_configuration(): void { - $institution = new Institution('Institution'); - $institutionConfigurationId = InstitutionConfigurationId::from($institution); + $institution = new Institution('Institution'); + $institutionConfigurationId = InstitutionConfigurationId::from($institution); $showRaaContactInformationOption = new ShowRaaContactInformationOption(true); - $verifyEmailOption = new VerifyEmailOption(true); + $verifyEmailOption = new VerifyEmailOption(true); $ssoOn2faOption = SsoOn2faOption::getDefault(); $selfVetOption = new SelfVetOption(false); $selfAssertedTokensOption = new SelfAssertedTokensOption(false); @@ -350,18 +362,18 @@ public function test_the_setting_of_fga_options_on_an_institution_configuration( ->when( function () use ( $institution, - $institutionConfigurationId + $institutionConfigurationId, ) { $institutionConfiguration = InstitutionConfiguration::create( $institutionConfigurationId, - $institution + $institution, ); // First destroy the current config $institutionConfiguration->destroy(); return $institutionConfiguration; - } + }, )->then( [ new NewInstitutionConfigurationCreatedEvent( @@ -373,33 +385,33 @@ function () use ( $numberOfTokensPerIdentityOption, $ssoOn2faOption, $selfVetOption, - $selfAssertedTokensOption + $selfAssertedTokensOption, ), new AllowedSecondFactorListUpdatedEvent( $institutionConfigurationId, $institution, - AllowedSecondFactorList::blank() + AllowedSecondFactorList::blank(), ), new UseRaOptionChangedEvent( $institutionConfigurationId, $institution, - $useRaOption + $useRaOption, ), new UseRaaOptionChangedEvent( $institutionConfigurationId, $institution, - $useRaaOption + $useRaaOption, ), new SelectRaaOptionChangedEvent( $institutionConfigurationId, $institution, - $selectRaaOption + $selectRaaOption, ), new InstitutionConfigurationRemovedEvent( $institutionConfigurationId, - $institution + $institution, ), - ] + ], ); } diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/AllowedSecondFactorListTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/AllowedSecondFactorListTest.php index ea29ddb3b..f178292a3 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/AllowedSecondFactorListTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/AllowedSecondFactorListTest.php @@ -39,7 +39,7 @@ public function an_allowed_second_factor_list_deduplicates_its_second_factors_up $this->assertCount( 1, iterator_to_array($allowedSecondFactorList), - 'The AllowedSecondFactorList should have deduplicated its second factors, but it did not' + 'The AllowedSecondFactorList should have deduplicated its second factors, but it did not', ); } @@ -66,13 +66,13 @@ public function a_blank_allowed_second_factor_list_allows_all_second_factors($av public function an_allowed_second_factor_list_contains_a_given_second_factor() { $allowedSecondFactorList = AllowedSecondFactorList::ofTypes([new SecondFactorType('sms')]); - $allowedSecondFactor = new SecondFactorType('sms'); + $allowedSecondFactor = new SecondFactorType('sms'); $containsSecondFactor = $allowedSecondFactorList->contains($allowedSecondFactor); $this->assertTrue( $containsSecondFactor, - 'An allowed second factor list should contain a listed second factor but it does not' + 'An allowed second factor list should contain a listed second factor but it does not', ); } @@ -83,13 +83,13 @@ public function an_allowed_second_factor_list_contains_a_given_second_factor() public function an_allowed_second_factor_list_does_not_contain_a_given_second_factor() { $allowedSecondFactorList = AllowedSecondFactorList::ofTypes([new SecondFactorType('sms')]); - $allowedSecondFactor = new SecondFactorType('yubikey'); + $allowedSecondFactor = new SecondFactorType('yubikey'); $containsSecondFactor = $allowedSecondFactorList->contains($allowedSecondFactor); $this->assertFalse( $containsSecondFactor, - 'An allowed second factor list should not contain a listed second factor but it does' + 'An allowed second factor list should not contain a listed second factor but it does', ); } @@ -118,13 +118,13 @@ public function an_allowed_second_factor_list_contains_the_given_second_factors( public function a_second_factor_on_the_allowed_second_factor_list_is_allowed() { $allowedSecondFactorList = AllowedSecondFactorList::ofTypes([new SecondFactorType('sms')]); - $allowedSecondFactor = new SecondFactorType('sms'); + $allowedSecondFactor = new SecondFactorType('sms'); $isSecondFactorAllowed = $allowedSecondFactorList->allows($allowedSecondFactor); $this->assertTrue( $isSecondFactorAllowed, - 'An allowed second factor list should allow a listed second factor but it does not' + 'An allowed second factor list should allow a listed second factor but it does not', ); } @@ -135,13 +135,13 @@ public function a_second_factor_on_the_allowed_second_factor_list_is_allowed() public function a_second_factor_not_on_the_allowed_second_factor_list_is_not_allowed() { $allowedSecondFactorList = AllowedSecondFactorList::ofTypes([new SecondFactorType('sms')]); - $disallowedSecondFactor = new SecondFactorType('yubikey'); + $disallowedSecondFactor = new SecondFactorType('yubikey'); $isSecondFactorAllowed = $allowedSecondFactorList->allows($disallowedSecondFactor); $this->assertFalse( $isSecondFactorAllowed, - 'An allowed second factor list should not allow an unlisted second factor but it does not' + 'An allowed second factor list should not allow an unlisted second factor but it does not', ); } @@ -153,9 +153,11 @@ public function a_second_factor_not_on_the_allowed_second_factor_list_is_not_all * @param SecondFactorType[] $firstList * @param SecondFactorType[] $secondList */ - public function allowed_second_factor_lists_with_different_elements_are_not_considered_equal(array $firstList, array $secondList) - { - $base = AllowedSecondFactorList::ofTypes($firstList); + public function allowed_second_factor_lists_with_different_elements_are_not_considered_equal( + array $firstList, + array $secondList, + ) { + $base = AllowedSecondFactorList::ofTypes($firstList); $other = AllowedSecondFactorList::ofTypes($secondList); $this->assertFalse($base->equals($other)); @@ -169,9 +171,11 @@ public function allowed_second_factor_lists_with_different_elements_are_not_cons * @param SecondFactorType[] $firstList * @param SecondFactorType[] $secondList */ - public function allowed_second_factor_lists_with_the_same_elements_are_considered_equal(array $firstList, array $secondList) - { - $base = AllowedSecondFactorList::ofTypes($firstList); + public function allowed_second_factor_lists_with_the_same_elements_are_considered_equal( + array $firstList, + array $secondList, + ) { + $base = AllowedSecondFactorList::ofTypes($firstList); $other = AllowedSecondFactorList::ofTypes($secondList); $this->assertTrue($base->equals($other)); @@ -182,11 +186,11 @@ public function differentAllowedSecondFactorListsProvider() return [ 'Different second factor types' => [ [new SecondFactorType('sms'), new SecondFactorType('tiqr')], - [new SecondFactorType('yubikey'), new SecondFactorType('tiqr')] + [new SecondFactorType('yubikey'), new SecondFactorType('tiqr')], ], 'First list contains second list' => [ [new SecondFactorType('sms'), new SecondFactorType('tiqr'), new SecondFactorType('yubikey')], - [new SecondFactorType('yubikey')] + [new SecondFactorType('yubikey')], ], 'First list is empty' => [ [], @@ -195,7 +199,7 @@ public function differentAllowedSecondFactorListsProvider() 'Second list is empty' => [ [new SecondFactorType('sms'), new SecondFactorType('tiqr')], [], - ] + ], ]; } @@ -217,7 +221,7 @@ public function sameAllowedSecondFactorListsProvider() 'Same second factor types, due to deduplication in first list' => [ [new SecondFactorType('sms'), new SecondFactorType('sms'), new SecondFactorType('tiqr')], [new SecondFactorType('sms'), new SecondFactorType('tiqr')], - ] + ], ]; } @@ -227,9 +231,10 @@ public function availableSecondFactorTypeProvider() 'biometric' => ['loa' => 3], 'tiqr' => ['loa' => 3], ]); - $secondFactorTypes = array_map(function ($availableSecondFactorType) { - return [new SecondFactorType($availableSecondFactorType)]; - }, $service->getAvailableSecondFactorTypes()); + $secondFactorTypes = array_map( + fn($availableSecondFactorType) => [new SecondFactorType($availableSecondFactorType)], + $service->getAvailableSecondFactorTypes(), + ); return array_combine($service->getAvailableSecondFactorTypes(), $secondFactorTypes); } diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/ContactInformationTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/ContactInformationTest.php index b025ff536..f83bea058 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/ContactInformationTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/ContactInformationTest.php @@ -32,7 +32,7 @@ class ContactInformationTest extends UnitTest * * @param mixed $invalidValue */ - public function it_cannot_be_created_with_anything_but_a_nonempty_string(int|float|StdClass|array $invalidValue): void + public function it_cannot_be_created_with_anything_but_a_nonempty_string(int|float|StdClass|array $invalidValue,): void { $this->expectException(InvalidArgumentException::class); new ContactInformation($invalidValue); @@ -45,9 +45,9 @@ public function it_cannot_be_created_with_anything_but_a_nonempty_string(int|flo public function two_instances_with_the_same_value_are_equal(): void { $contactInformation = new ContactInformation('a'); - $theSame = new ContactInformation('a'); - $theSameWithSpaces = new ContactInformation(' a '); - $different = new ContactInformation('A'); + $theSame = new ContactInformation('a'); + $theSameWithSpaces = new ContactInformation(' a '); + $different = new ContactInformation('A'); $this->assertTrue($contactInformation->equals($theSame)); $this->assertTrue($contactInformation->equals($theSameWithSpaces)); @@ -60,10 +60,10 @@ public function two_instances_with_the_same_value_are_equal(): void public function invalidValueProvider(): array { return [ - 'array' => [[]], + 'array' => [[]], 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], + 'float' => [1.2], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php index acf23d1e8..8f1b289b1 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php @@ -59,7 +59,10 @@ public function institution_entries_are_sorted(): void public function institution_entries_default_is_own_institution(): void { $useRaOption1 = InstitutionAuthorizationOption::fromInstitutionConfig($this->institutionRole, null); - $useRaOption2 = InstitutionAuthorizationOption::fromInstitutionConfig($this->institutionRole, [$this->institution->getInstitution()]); + $useRaOption2 = InstitutionAuthorizationOption::fromInstitutionConfig( + $this->institutionRole, + [$this->institution->getInstitution()], + ); $this->assertEquals([$this->institution], $useRaOption1->getInstitutions($this->institution)); $this->assertEquals([$this->institution], $useRaOption2->getInstitutions($this->institution)); } @@ -69,10 +72,16 @@ public function institution_entries_default_is_own_institution(): void * @group domain * @dataProvider institutionSetComparisonProvider */ - public function institution_option_instances_can_be_compared(bool $expectation, ?array $configurationA, ?array $configurationB): void - { + public function institution_option_instances_can_be_compared( + bool $expectation, + ?array $configurationA, + ?array $configurationB, + ): void { $useRaOption = InstitutionAuthorizationOption::fromInstitutionConfig($this->institutionRole, $configurationA); - $secondInstitutionOption = InstitutionAuthorizationOption::fromInstitutionConfig($this->institutionRole, $configurationB); + $secondInstitutionOption = InstitutionAuthorizationOption::fromInstitutionConfig( + $this->institutionRole, + $configurationB, + ); $this->assertEquals($expectation, $useRaOption->equals($secondInstitutionOption)); } @@ -82,7 +91,10 @@ public function institution_option_instances_can_be_compared(bool $expectation, */ public function can_be_retrieved_json_serializable(): void { - $institutionOption = InstitutionAuthorizationOption::fromInstitutionConfig($this->institutionRole, ['z', 'y', 'x']); + $institutionOption = InstitutionAuthorizationOption::fromInstitutionConfig( + $this->institutionRole, + ['z', 'y', 'x'], + ); $this->assertEquals(['x', 'y', 'z'], $institutionOption->jsonSerialize()); } @@ -107,6 +119,7 @@ public function invalid_types_are_rejected_during_construction(bool|int|array $a InstitutionAuthorizationOption::fromInstitutionConfig($this->institutionRole, $arguments); } + /** * @test * @group domain @@ -116,7 +129,11 @@ public function should_be_set_to_default_if_created_with_own_institution_as_inst $institutions = [ $this->institution, ]; - $option = InstitutionAuthorizationOption::fromInstitutions(InstitutionRole::useRa(), $this->institution, $institutions); + $option = InstitutionAuthorizationOption::fromInstitutions( + InstitutionRole::useRa(), + $this->institution, + $institutions, + ); $this->assertEquals([$this->institution], $option->getInstitutions($this->institution)); $this->assertEquals(true, $option->isDefault()); @@ -129,7 +146,10 @@ public function should_be_set_to_default_if_created_with_own_institution_as_inst */ public function the_default_value_is_given_institution(): void { - $this->assertEquals([$this->institution], InstitutionAuthorizationOption::getDefault($this->institutionRole)->getInstitutions($this->institution)); + $this->assertEquals( + [$this->institution], + InstitutionAuthorizationOption::getDefault($this->institutionRole)->getInstitutions($this->institution) + ); } /** @@ -138,7 +158,10 @@ public function the_default_value_is_given_institution(): void */ public function the_empty_value_is_no_value(): void { - $this->assertEquals([], InstitutionAuthorizationOption::getEmpty($this->institutionRole)->getInstitutions($this->institution)); + $this->assertEquals( + [], + InstitutionAuthorizationOption::getEmpty($this->institutionRole)->getInstitutions($this->institution) + ); } /** @@ -155,8 +178,11 @@ public function the_blank_method_should_return_null(): void * @group domain * @dataProvider institutionHasInstitutionProvider */ - public function the_has_institution_method_should_check_for_institutions(bool $expectation, array $institutionList, string $institution): void - { + public function the_has_institution_method_should_check_for_institutions( + bool $expectation, + array $institutionList, + string $institution, + ): void { $institution = new Institution($institution); $list = []; foreach ($institutionList as $inst) { diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionConfigurationIdTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionConfigurationIdTest.php index 90a0c2bb5..2e1e7e903 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionConfigurationIdTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionConfigurationIdTest.php @@ -45,8 +45,9 @@ public function two_institution_configuration_ids_created_for_the_different_inst * @dataProvider nonStringOrEmptyStringProvider * @param $nonStringOrEmptyString */ - public function an_institution_configuration_id_cannot_be_created_from_something_other_than_a_string(string|int|float|StdClass|array $nonStringOrEmptyString): void - { + public function an_institution_configuration_id_cannot_be_created_from_something_other_than_a_string( + string|int|float|StdClass|array $nonStringOrEmptyString, + ): void { $this->expectException(InvalidArgumentException::class); new InstitutionConfigurationId($nonStringOrEmptyString); @@ -94,7 +95,7 @@ public function institution_configuration_ids_are_created_case_insensitively_fro $this->assertTrue( $isSameId, 'An InstitutionConfigurationId based on an institution with mixed casing' - . 'should match an InstitutionConfigurationId based on the same institution in lower case' + . 'should match an InstitutionConfigurationId based on the same institution in lower case', ); } @@ -107,7 +108,7 @@ public function normalized_institution_configuration_ids_and_unnormalized_instit $mixedCaseInstitution = new Institution('An InStItUtIoN'); $unnormalizedInstitutionConfigurationId = InstitutionConfigurationId::from($mixedCaseInstitution); - $normalizedInstitutionConfigurationId = InstitutionConfigurationId::normalizedFrom($mixedCaseInstitution); + $normalizedInstitutionConfigurationId = InstitutionConfigurationId::normalizedFrom($mixedCaseInstitution); $isSameId = $unnormalizedInstitutionConfigurationId->equals($normalizedInstitutionConfigurationId); @@ -122,10 +123,10 @@ public function nonStringOrEmptyStringProvider(): array return [ 'empty string' => [''], 'blank string' => [' '], - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], + 'array' => [[]], + 'integer' => [1], + 'float' => [1.2], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionSetTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionSetTest.php index 20b4e0136..ceffd786c 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionSetTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionSetTest.php @@ -76,7 +76,9 @@ public function duplicate_entries_are_not_allowed_case_insensitive(): void */ public function only_institutions_can_be_present_in_set(): void { - $this->expectExceptionMessage("Invalid argument type: \"Surfnet\Stepup\Configuration\Value\Institution\" expected, \"Surfnet\Stepup\Configuration\Value\Location\" given for \"institutions\""); + $this->expectExceptionMessage( + "Invalid argument type: \"Surfnet\Stepup\Configuration\Value\Institution\" expected, \"Surfnet\Stepup\Configuration\Value\Location\" given for \"institutions\"", + ); $this->expectException(InvalidArgumentException::class); $institution = new Institution('b'); @@ -106,12 +108,12 @@ public function factory_method_can_build_from_array_of_string(): void new Institution('a'), new Institution('b'), new Institution('c'), - new Institution('d') + new Institution('d'), ]; $set = InstitutionSet::create($input); $this->assertEquals( $input, - $set->toScalarArray() + $set->toScalarArray(), ); } @@ -122,8 +124,6 @@ public function factory_method_can_build_from_array_of_string(): void * @group domain * @dataProvider dirtyInstitutionListProvider * - * - * @param array $invalid */ public function factory_method_can_build_from_array_of_string_and_rejects_invalid_types(array $invalid): void { @@ -142,7 +142,7 @@ public function sets_can_be_compared(): void new Institution('a'), new Institution('b'), new Institution('c'), - new Institution('d') + new Institution('d'), ]; $set = InstitutionSet::create($input); $secondSet = InstitutionSet::create($input); diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionTest.php index 4a9a23f87..9f1c2fcaf 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionTest.php @@ -32,8 +32,9 @@ class InstitutionTest extends UnitTest * * @param mixed $invalidValue */ - public function an_institution_cannot_be_created_with_anything_but_a_nonempty_string(string|int|float|StdClass|array $invalidValue): void - { + public function an_institution_cannot_be_created_with_anything_but_a_nonempty_string( + string|int|float|StdClass|array $invalidValue, + ): void { $this->expectException(InvalidArgumentException::class); new Institution($invalidValue); } @@ -44,10 +45,10 @@ public function an_institution_cannot_be_created_with_anything_but_a_nonempty_st */ public function two_institutions_with_the_same_value_are_equal(): void { - $institution = new Institution('a'); - $theSame = new Institution('a'); + $institution = new Institution('a'); + $theSame = new Institution('a'); $theSameWithSpaces = new Institution(' a '); - $different = new Institution('A'); + $different = new Institution('A'); $this->assertTrue($institution->equals($theSame)); $this->assertTrue($institution->equals($theSameWithSpaces)); @@ -59,10 +60,10 @@ public function nonStringOrNonEmptyStringProvider(): array return [ 'empty string' => [''], 'blank string' => [' '], - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], + 'array' => [[]], + 'integer' => [1], + 'float' => [1.2], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/LocationTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/LocationTest.php index f6768de67..01c1f36dd 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/LocationTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/LocationTest.php @@ -45,10 +45,10 @@ public function it_cannot_be_created_with_anything_but_a_string(bool|int|float|s */ public function two_locations_with_the_same_value_are_equal(): void { - $location = new Location('a'); - $theSame = new Location('a'); + $location = new Location('a'); + $theSame = new Location('a'); $theSameWithSpaces = new Location(' a '); - $different = new Location('A'); + $different = new Location('A'); $this->assertTrue($location->equals($theSame)); $this->assertTrue($location->equals($theSameWithSpaces)); @@ -61,12 +61,12 @@ public function two_locations_with_the_same_value_are_equal(): void public function nonStringProvider(): array { return [ - 'null' => [null], - 'boolean' => [false], - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new stdClass()], + 'null' => [null], + 'boolean' => [false], + 'array' => [[]], + 'integer' => [1], + 'float' => [1.2], + 'object' => [new stdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php index cf8dc4f36..19e3b0ac0 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php @@ -33,12 +33,14 @@ class RaLocationIdTest extends TestCase * * @param mixed $nonStringOrEmptyString */ - public function an_ra_location_id_cannot_be_created_with_anything_but_a_nonempty_string(string|int|float|StdClass|array $nonStringOrEmptyString): void - { + public function an_ra_location_id_cannot_be_created_with_anything_but_a_nonempty_string( + string|int|float|StdClass|array $nonStringOrEmptyString, + ): void { $this->expectException(InvalidArgumentException::class); new RaLocationId($nonStringOrEmptyString); } + /** * @test * @group domain @@ -61,7 +63,7 @@ public function two_ra_location_ids_with_the_same_values_are_equal(): void $uuid = $this->uuid(); $raLocationId = new RaLocationId($uuid); - $theSame = new RaLocationId($uuid); + $theSame = new RaLocationId($uuid); $this->assertTrue($raLocationId->equals($theSame)); } @@ -73,7 +75,7 @@ public function two_ra_location_ids_with_the_same_values_are_equal(): void public function two_ra_location_ids_with_different_values_are_not_equal(): void { $raLocationId = new RaLocationId($this->uuid()); - $different = new RaLocationId($this->uuid()); + $different = new RaLocationId($this->uuid()); $this->assertFalse($raLocationId->equals($different)); } @@ -83,14 +85,15 @@ public function nonStringOrEmptyStringProvider(): array return [ 'empty string' => [''], 'blank string' => [' '], - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], + 'array' => [[]], + 'integer' => [1], + 'float' => [1.2], + 'object' => [new StdClass()], ]; } - private function uuid(): string { - return (string) Uuid::uuid4(); + private function uuid(): string + { + return (string)Uuid::uuid4(); } } diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationListTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationListTest.php index 7ef942c0d..b677dcb13 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationListTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationListTest.php @@ -97,7 +97,7 @@ public function an_ra_location_list_has_an_ra_location_with_a_given_ra_location_ public function an_ra_location_list_does_not_have_ra_locations_with_a_non_present_ra_location_id(): void { $raLocations = $this->getRaLocationsArray(); - $expectedRaLocationIdNotToBePresent = new RaLocationId((string) Uuid::uuid4()); + $expectedRaLocationIdNotToBePresent = new RaLocationId((string)Uuid::uuid4()); $raLocationList = new RaLocationList($raLocations); @@ -142,16 +142,16 @@ protected function getRaLocationsArray(): array { return [ RaLocation::create( - new RaLocationId((string) Uuid::uuid4()), + new RaLocationId((string)Uuid::uuid4()), new RaLocationName('An RA location name'), new Location('A location'), - new ContactInformation('Contact Information') + new ContactInformation('Contact Information'), ), RaLocation::create( - new RaLocationId((string) Uuid::uuid4()), + new RaLocationId((string)Uuid::uuid4()), new RaLocationName('Another RA location name'), new Location('Another location'), - new ContactInformation('Some more contact Information') + new ContactInformation('Some more contact Information'), ), ]; } diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationNameTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationNameTest.php index 0a9a5050f..488179efa 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationNameTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationNameTest.php @@ -32,8 +32,9 @@ class RaLocationNameTest extends TestCase * * @param mixed $nonStringOrEmptyString */ - public function an_ra_location_name_cannot_be_created_with_anything_but_a_nonempty_string(string|int|float|StdClass|array $nonStringOrEmptyString): void - { + public function an_ra_location_name_cannot_be_created_with_anything_but_a_nonempty_string( + string|int|float|StdClass|array $nonStringOrEmptyString, + ): void { $this->expectException(InvalidArgumentException::class); new RaLocationName($nonStringOrEmptyString); @@ -46,7 +47,7 @@ public function an_ra_location_name_cannot_be_created_with_anything_but_a_nonemp public function two_ra_location_names_with_the_same_values_are_equal(): void { $raLocationName = new RaLocationName('a'); - $theSame = new RaLocationName('a'); + $theSame = new RaLocationName('a'); $this->assertTrue($raLocationName->equals($theSame)); } @@ -58,7 +59,7 @@ public function two_ra_location_names_with_the_same_values_are_equal(): void public function two_ra_location_names_with_different_values_are_not_equal(): void { $raLocationName = new RaLocationName('a'); - $different = new RaLocationName('A'); + $different = new RaLocationName('A'); $this->assertFalse($raLocationName->equals($different)); } @@ -68,10 +69,10 @@ public function nonStringOrEmptyStringProvider(): array return [ 'empty string' => [''], 'blank string' => [' '], - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], + 'array' => [[]], + 'integer' => [1], + 'float' => [1.2], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/ShowRaaContactInformationOptionTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/ShowRaaContactInformationOptionTest.php index 7337380da..1220ce327 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/ShowRaaContactInformationOptionTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/ShowRaaContactInformationOptionTest.php @@ -33,8 +33,9 @@ class ShowRaaContactInformationOptionTest extends TestCase * * @param mixed $nonBooleanProvider */ - public function show_raa_contact_information_option_can_only_be_boolean(string|int|float|StdClass|array $nonBooleanProvider): void - { + public function show_raa_contact_information_option_can_only_be_boolean( + string|int|float|StdClass|array $nonBooleanProvider, + ): void { $this->expectException(InvalidArgumentException::class); new ShowRaaContactInformationOption($nonBooleanProvider); @@ -50,7 +51,7 @@ public function two_show_raa_contact_information_options_with_the_same_values_ar $option = true; $showRaaContactInformationOption = new ShowRaaContactInformationOption($option); - $theSame = new ShowRaaContactInformationOption($option); + $theSame = new ShowRaaContactInformationOption($option); $this->assertTrue($showRaaContactInformationOption->equals($theSame)); } @@ -63,7 +64,7 @@ public function two_show_raa_contact_information_options_with_the_same_values_ar public function two_show_raa_contact_information_options_with_different_values_are_not_equal(): void { $showRaaContactInformationOption = new ShowRaaContactInformationOption(true); - $different = new ShowRaaContactInformationOption(false); + $different = new ShowRaaContactInformationOption(false); $this->assertFalse($showRaaContactInformationOption->equals($different)); } @@ -84,11 +85,11 @@ public function default_value_is_true(): void public function nonBooleanProvider(): array { return [ - 'string' => [''], - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], + 'string' => [''], + 'array' => [[]], + 'integer' => [1], + 'float' => [1.2], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/UseRaLocationsOptionTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/UseRaLocationsOptionTest.php index 09db74cef..7639946b8 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/UseRaLocationsOptionTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/UseRaLocationsOptionTest.php @@ -33,7 +33,7 @@ class UseRaLocationsOptionTest extends TestCase * * @param mixed $nonBooleanProvider */ - public function use_ra_locations_option_can_only_be_boolean(string|int|float|StdClass|array $nonBooleanProvider): void + public function use_ra_locations_option_can_only_be_boolean(string|int|float|StdClass|array $nonBooleanProvider,): void { $this->expectException(InvalidArgumentException::class); @@ -50,7 +50,7 @@ public function two_use_ra_location_options_with_the_same_values_are_equal(): vo $option = true; $useRaLocationsOption = new UseRaLocationsOption($option); - $theSame = new UseRaLocationsOption($option); + $theSame = new UseRaLocationsOption($option); $this->assertTrue($useRaLocationsOption->equals($theSame)); } @@ -63,7 +63,7 @@ public function two_use_ra_location_options_with_the_same_values_are_equal(): vo public function two_use_ra_location_options_with_different_values_are_not_equal(): void { $useRaLocationsOption = new UseRaLocationsOption(true); - $different = new UseRaLocationsOption(false); + $different = new UseRaLocationsOption(false); $this->assertFalse($useRaLocationsOption->equals($different)); } @@ -76,7 +76,7 @@ public function two_use_ra_location_options_with_different_values_are_not_equal( public function default_value_is_false(): void { $default = UseRaLocationsOption::getDefault(); - $false = new UseRaLocationsOption(false); + $false = new UseRaLocationsOption(false); $this->assertTrue($default->equals($false)); } @@ -84,11 +84,11 @@ public function default_value_is_false(): void public function nonBooleanProvider(): array { return [ - 'string' => [''], - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], + 'string' => [''], + 'array' => [[]], + 'integer' => [1], + 'float' => [1.2], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/DateTime/DateTimeTest.php b/src/Surfnet/Stepup/Tests/DateTime/DateTimeTest.php index c439bc76d..fc47de7fb 100644 --- a/src/Surfnet/Stepup/Tests/DateTime/DateTimeTest.php +++ b/src/Surfnet/Stepup/Tests/DateTime/DateTimeTest.php @@ -49,9 +49,9 @@ public function the_configured_format_is_what_is_needed_for_correct_application_ public function to_string_returns_the_time_in_the_correct_format(): void { $coreDateTimeObject = new CoreDateTime('@1000'); - $ourDateTimeObject = new DateTime(new CoreDateTime('@1000')); + $ourDateTimeObject = new DateTime(new CoreDateTime('@1000')); - $this->assertEquals($coreDateTimeObject->format(DateTime::FORMAT), (string) $ourDateTimeObject); + $this->assertEquals($coreDateTimeObject->format(DateTime::FORMAT), (string)$ourDateTimeObject); } /** @@ -60,7 +60,7 @@ public function to_string_returns_the_time_in_the_correct_format(): void */ public function add_returns_a_different_object_that_has_the_interval_added(): void { - $base = new DateTime(new CoreDateTime('@1000')); + $base = new DateTime(new CoreDateTime('@1000')); $interval = new DateInterval('PT1S'); $result = $base->add($interval); @@ -75,7 +75,7 @@ public function add_returns_a_different_object_that_has_the_interval_added(): vo */ public function sub_returns_a_different_object_that_has_the_interval_substracted(): void { - $base = new DateTime(new CoreDateTime('@1000')); + $base = new DateTime(new CoreDateTime('@1000')); $interval = new DateInterval('PT1S'); $result = $base->sub($interval); @@ -90,10 +90,10 @@ public function sub_returns_a_different_object_that_has_the_interval_substracted */ public function comes_before_works_with_exclusive_comparison(): void { - $base = new DateTime(new CoreDateTime('@1000')); + $base = new DateTime(new CoreDateTime('@1000')); $before = new DateTime(new CoreDateTime('@999')); - $same = new DateTime(new CoreDateTime('@1000')); - $after = new DateTime(new CoreDateTime('@1001')); + $same = new DateTime(new CoreDateTime('@1000')); + $after = new DateTime(new CoreDateTime('@1001')); $this->assertTrue($before->comesBefore($base)); $this->assertFalse($same->comesBefore($base)); @@ -106,10 +106,10 @@ public function comes_before_works_with_exclusive_comparison(): void */ public function comes_before_or_is_equal_works_with_inclusive_comparison(): void { - $base = new DateTime(new CoreDateTime('@1000')); + $base = new DateTime(new CoreDateTime('@1000')); $before = new DateTime(new CoreDateTime('@999')); - $same = new DateTime(new CoreDateTime('@1000')); - $after = new DateTime(new CoreDateTime('@1001')); + $same = new DateTime(new CoreDateTime('@1000')); + $after = new DateTime(new CoreDateTime('@1001')); $this->assertTrue($before->comesBeforeOrIsEqual($base)); $this->assertTrue($same->comesBeforeOrIsEqual($base)); @@ -122,10 +122,10 @@ public function comes_before_or_is_equal_works_with_inclusive_comparison(): void */ public function comes_after_works_with_exclusive_comparison(): void { - $base = new DateTime(new CoreDateTime('@1000')); + $base = new DateTime(new CoreDateTime('@1000')); $before = new DateTime(new CoreDateTime('@999')); - $same = new DateTime(new CoreDateTime('@1000')); - $after = new DateTime(new CoreDateTime('@1001')); + $same = new DateTime(new CoreDateTime('@1000')); + $after = new DateTime(new CoreDateTime('@1001')); $this->assertFalse($before->comesAfter($base)); $this->assertFalse($same->comesAfter($base)); @@ -138,10 +138,10 @@ public function comes_after_works_with_exclusive_comparison(): void */ public function comes_after_or_is_equal_works_with_inclusive_comparison(): void { - $base = new DateTime(new CoreDateTime('@1000')); + $base = new DateTime(new CoreDateTime('@1000')); $before = new DateTime(new CoreDateTime('@999')); - $same = new DateTime(new CoreDateTime('@1000')); - $after = new DateTime(new CoreDateTime('@1001')); + $same = new DateTime(new CoreDateTime('@1000')); + $after = new DateTime(new CoreDateTime('@1001')); $this->assertFalse($before->comesAfterOrIsEqual($base)); $this->assertTrue($same->comesAfterOrIsEqual($base)); diff --git a/src/Surfnet/Stepup/Tests/Helper/JsonHelperTest.php b/src/Surfnet/Stepup/Tests/Helper/JsonHelperTest.php index 35ef174dd..70c92c8d3 100644 --- a/src/Surfnet/Stepup/Tests/Helper/JsonHelperTest.php +++ b/src/Surfnet/Stepup/Tests/Helper/JsonHelperTest.php @@ -47,7 +47,7 @@ public function json_helper_can_only_decode_strings(bool|int|float|StdClass|arra public function json_helper_decodes_strings_to_arrays(): void { $expectedDecodedResult = ['hello' => 'world']; - $json = '{ "hello" : "world" }'; + $json = '{ "hello" : "world" }'; $actualDecodedResult = JsonHelper::decode($json); @@ -72,10 +72,10 @@ public function nonStringProvider(): array { return [ 'boolean' => [true], - 'array' => [[]], + 'array' => [[]], 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], + 'float' => [1.2], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Helper/UserDataFilterTest.php b/src/Surfnet/Stepup/Tests/Helper/UserDataFilterTest.php index 0c5d6e633..e89ef7bd0 100644 --- a/src/Surfnet/Stepup/Tests/Helper/UserDataFilterTest.php +++ b/src/Surfnet/Stepup/Tests/Helper/UserDataFilterTest.php @@ -41,8 +41,10 @@ class UserDataFilterTest extends TestCase /** * @dataProvider provideEvents */ - public function test_filtering_is_applied_with_expected_result(IdentityCreatedEvent|PhonePossessionProvenAndVerifiedEvent|AppointedAsRaaForInstitutionEvent|PhonePossessionProvenEvent $event, array $expectation): void - { + public function test_filtering_is_applied_with_expected_result( + IdentityCreatedEvent|PhonePossessionProvenAndVerifiedEvent|AppointedAsRaaForInstitutionEvent|PhonePossessionProvenEvent $event, + array $expectation, + ): void { $helper = new UserDataFilter(); $data = $helper->filter($event); $this->assertSame($expectation, array_keys($data)); @@ -56,7 +58,7 @@ public function provideEvents(): Generator new NameId("nameId"), new CommonName("commonName"), new Email("test@institution.nl"), - new Locale("nl_NL") + new Locale("nl_NL"), ); $expectation = [ 'id', @@ -77,7 +79,7 @@ public function provideEvents(): Generator new Email("test@example.com"), new Locale("nl_NL"), new DateTime(), - "Y3MWWNDR" + "Y3MWWNDR", ); $expectation = [ 'identity_id', @@ -96,7 +98,7 @@ public function provideEvents(): Generator new IdentityId("id"), new Institution("institution"), new NameId("nameId"), - new Institution("ra") + new Institution("ra"), ); $expectation = [ 'identity_id', @@ -116,7 +118,7 @@ public function provideEvents(): Generator "30c0fcb136bf324eea652d5b86c1a08c", new CommonName("commonname"), new Email("test@example.com"), - new Locale("nl_NL") + new Locale("nl_NL"), ); $expectation = [ 'identity_id', @@ -130,6 +132,4 @@ public function provideEvents(): Generator ]; yield [$event, $expectation]; } - - } diff --git a/src/Surfnet/Stepup/Tests/Helper/UserDataFormatterTest.php b/src/Surfnet/Stepup/Tests/Helper/UserDataFormatterTest.php index a998e8274..f791d94ca 100644 --- a/src/Surfnet/Stepup/Tests/Helper/UserDataFormatterTest.php +++ b/src/Surfnet/Stepup/Tests/Helper/UserDataFormatterTest.php @@ -33,7 +33,7 @@ public function test_data_is_formatted(): void ['name' => 'name2', 'value' => 'some-value-2'], ['name' => 'name3', 'value' => 'some-value-3'], ], - 'name' => 'Stepup-Middleware' + 'name' => 'Stepup-Middleware', ]; $inputData = [ @@ -55,19 +55,20 @@ public function test_errors_are_included_in_output(): void ], 'name' => 'Stepup-Middleware', 'message' => [ - 'The application is teetering on the edge of catastrophe!' - ] + 'The application is teetering on the edge of catastrophe!', + ], ]; $inputData = [ 'foobar-name1' => 'some-value-1', ]; - $this->assertEquals($expected, + $this->assertEquals( + $expected, $formatter->format( $inputData, - ['The application is teetering on the edge of catastrophe!'] - ) + ['The application is teetering on the edge of catastrophe!'], + ), ); } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Collection/InstitutionCollectionTest.php b/src/Surfnet/Stepup/Tests/Identity/Collection/InstitutionCollectionTest.php index d8cb65e3c..43d62d31a 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Collection/InstitutionCollectionTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Collection/InstitutionCollectionTest.php @@ -96,7 +96,7 @@ public function an_institution_already_in_the_collection_cannot_be_added(): void */ public function an_institution_in_the_collection_can_be_removed(): void { - $institutions = $this->getInstitutions(); + $institutions = $this->getInstitutions(); $inCollection = $institutions[0]; $institutionCollection = new InstitutionCollection($institutions); diff --git a/src/Surfnet/Stepup/Tests/Identity/Entity/ConfigurableSettingsTest.php b/src/Surfnet/Stepup/Tests/Identity/Entity/ConfigurableSettingsTest.php index 07442405a..c2f4a74fe 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Entity/ConfigurableSettingsTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Entity/ConfigurableSettingsTest.php @@ -56,10 +56,10 @@ public function a_new_email_verification_window_always_starts_now(): void public function localeVerifications(): array { return [ - 'No app locales, false' => [false, 'nl_NL', []], - 'English app locale, Dutch locale, false' => [false, 'nl_NL', ['en_GB']], - 'English, German app locales, Dutch locale, false' => [false, 'nl_NL', ['en_GB', 'de_DE']], - 'English, Dutch app locales, Dutch locale, true' => [true, 'nl_NL', ['en_GB', 'nl_NL']], + 'No app locales, false' => [false, 'nl_NL', []], + 'English app locale, Dutch locale, false' => [false, 'nl_NL', ['en_GB']], + 'English, German app locales, Dutch locale, false' => [false, 'nl_NL', ['en_GB', 'de_DE']], + 'English, Dutch app locales, Dutch locale, true' => [true, 'nl_NL', ['en_GB', 'nl_NL']], ]; } @@ -67,12 +67,13 @@ public function localeVerifications(): array * @test * @group domain * @dataProvider localeVerifications - * @param boolean $isValid - * @param string $localeString * @param string[] $validLocaleStrings */ - public function a_locale_can_be_verified_to_be_a_valid_locale(bool $isValid, string $localeString, array $validLocaleStrings): void - { + public function a_locale_can_be_verified_to_be_a_valid_locale( + bool $isValid, + string $localeString, + array $validLocaleStrings, + ): void { $configuration = ConfigurableSettings::create(3, $validLocaleStrings); $this->assertEquals($isValid, $configuration->isSupportedLocale(new Locale($localeString))); diff --git a/src/Surfnet/Stepup/Tests/Identity/Entity/SecondFactorCollectionTest.php b/src/Surfnet/Stepup/Tests/Identity/Entity/SecondFactorCollectionTest.php index e4f4a5220..d83a858c5 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Entity/SecondFactorCollectionTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Entity/SecondFactorCollectionTest.php @@ -39,7 +39,7 @@ public function collection_can_return_second_factor_with_highest_loa(): void ]); $secondFactor = $collection->getSecondFactorWithHighestLoa( - new SecondFactorTypeService([]) + new SecondFactorTypeService([]), ); $this->assertNotNull($secondFactor, 'Collection should have returned a second factor object'); @@ -47,12 +47,11 @@ public function collection_can_return_second_factor_with_highest_loa(): void } /** - * @param string $type * @return SecondFactor */ private function mockVettedSecondFactor(string $type) { - $mock = m::mock('\Surfnet\Stepup\Identity\Entity\SecondFactor'); + $mock = m::mock(SecondFactor::class); $mock->shouldReceive('getType') ->andReturn(new SecondFactorType($type)); diff --git a/src/Surfnet/Stepup/Tests/Identity/Event/EventSerializationAndDeserializationTest.php b/src/Surfnet/Stepup/Tests/Identity/Event/EventSerializationAndDeserializationTest.php index 3afaf71ff..c142c6e92 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Event/EventSerializationAndDeserializationTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Event/EventSerializationAndDeserializationTest.php @@ -79,19 +79,20 @@ class EventSerializationAndDeserializationTest extends UnitTest * @test * @group domain * @dataProvider eventProvider - * @param SerializableInterface $event */ - public function an_event_should_be_the_same_after_serialization_and_deserialization(SerializableInterface $event): void + public function an_event_should_be_the_same_after_serialization_and_deserialization(SerializableInterface $event,): void { $isForgettableEvent = $event instanceof Forgettable; $providesSensitiveData = method_exists($event, 'getSensitiveData') || method_exists($event, 'setSensitiveData'); if (!$isForgettableEvent && $providesSensitiveData) { - $this->fail(sprintf( - 'You provide sensitive data in %s, but do not implement %s', - get_class($event), - 'Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Forgettable' - )); + $this->fail( + sprintf( + 'You provide sensitive data in %s, but do not implement %s', + $event::class, + Forgettable::class, + ), + ); } $serializedEvent = $event->serialize(); @@ -111,12 +112,12 @@ public function an_event_should_be_the_same_after_serialization_and_deserializat * @test * @group domain * @dataProvider serializedDataProvider - * @param string $serializedData - * @param string $serializedSensitiveData - * @param SerializableInterface $event */ - public function an_serialized_event_should_be_the_same(string $serializedData, string $serializedSensitiveData, SerializableInterface $event): void - { + public function an_serialized_event_should_be_the_same( + string $serializedData, + string $serializedSensitiveData, + SerializableInterface $event, + ): void { $isForgettableEvent = $event instanceof Forgettable; $serializedDataArray = json_decode($serializedData, true); @@ -153,8 +154,8 @@ public function eventProvider(): array new SecondFactorId($this->UUID()), new SecondFactorType('sms'), new PhoneNumber('+358 (0) 687654321'), - new IdentityId($this->UUID()) - ) + new IdentityId($this->UUID()), + ), ], 'CompliedWithUnverifiedSecondFactorRevocationEvent:yubikey' => [ new CompliedWithUnverifiedSecondFactorRevocationEvent( @@ -163,8 +164,8 @@ public function eventProvider(): array new SecondFactorId($this->UUID()), new SecondFactorType('yubikey'), new YubikeyPublicId('01906382'), - new IdentityId($this->UUID()) - ) + new IdentityId($this->UUID()), + ), ], 'CompliedWithUnverifiedSecondFactorRevocationEvent:tiqr' => [ new CompliedWithUnverifiedSecondFactorRevocationEvent( @@ -173,8 +174,8 @@ public function eventProvider(): array new SecondFactorId($this->UUID()), new SecondFactorType('tiqr'), new GssfId('bleep-blorp'), - new IdentityId($this->UUID()) - ) + new IdentityId($this->UUID()), + ), ], 'CompliedWithVerifiedSecondFactorRevocationEvent:sms' => [ new CompliedWithVerifiedSecondFactorRevocationEvent( @@ -183,8 +184,8 @@ public function eventProvider(): array new SecondFactorId($this->UUID()), new SecondFactorType('sms'), new PhoneNumber('+0 (0) 000000000'), - new IdentityId($this->UUID()) - ) + new IdentityId($this->UUID()), + ), ], 'CompliedWithVerifiedSecondFactorRevocationEvent:yubikey' => [ new CompliedWithVerifiedSecondFactorRevocationEvent( @@ -193,8 +194,8 @@ public function eventProvider(): array new SecondFactorId($this->UUID()), new SecondFactorType('yubikey'), new YubikeyPublicId('01906382'), - new IdentityId($this->UUID()) - ) + new IdentityId($this->UUID()), + ), ], 'CompliedWithVerifiedSecondFactorRevocationEvent:tiqr' => [ new CompliedWithVerifiedSecondFactorRevocationEvent( @@ -203,8 +204,8 @@ public function eventProvider(): array new SecondFactorId($this->UUID()), new SecondFactorType('tiqr'), new GssfId('bleep-blorp'), - new IdentityId($this->UUID()) - ) + new IdentityId($this->UUID()), + ), ], 'CompliedWithVettedSecondFactorRevocationEvent:sms' => [ new CompliedWithVettedSecondFactorRevocationEvent( @@ -213,8 +214,8 @@ public function eventProvider(): array new SecondFactorId($this->UUID()), new SecondFactorType('sms'), new PhoneNumber('+0 (0) 000000000'), - new IdentityId($this->UUID()) - ) + new IdentityId($this->UUID()), + ), ], 'CompliedWithVettedSecondFactorRevocationEvent:yubikey' => [ new CompliedWithVettedSecondFactorRevocationEvent( @@ -223,8 +224,8 @@ public function eventProvider(): array new SecondFactorId($this->UUID()), new SecondFactorType('yubikey'), new YubikeyPublicId('01906382'), - new IdentityId($this->UUID()) - ) + new IdentityId($this->UUID()), + ), ], 'CompliedWithVettedSecondFactorRevocationEvent:tiqr' => [ new CompliedWithVettedSecondFactorRevocationEvent( @@ -233,8 +234,8 @@ public function eventProvider(): array new SecondFactorId($this->UUID()), new SecondFactorType('tiqr'), new GssfId('bleep-blorp'), - new IdentityId($this->UUID()) - ) + new IdentityId($this->UUID()), + ), ], 'EmailVerifiedEvent:sms' => [ new EmailVerifiedEvent( @@ -247,8 +248,8 @@ public function eventProvider(): array '123', new CommonName('Henk Westbroek'), new Email('info@example.invalid'), - new Locale('en_GB') - ) + new Locale('en_GB'), + ), ], 'EmailVerifiedEvent:yubikey' => [ new EmailVerifiedEvent( @@ -261,8 +262,8 @@ public function eventProvider(): array '123', new CommonName('Henk Westbroek'), new Email('info@example.invalid'), - new Locale('en_GB') - ) + new Locale('en_GB'), + ), ], 'EmailVerifiedEvent:tiqr' => [ new EmailVerifiedEvent( @@ -275,8 +276,8 @@ public function eventProvider(): array '123', new CommonName('Henk Westbroek'), new Email('info@example.invalid'), - new Locale('en_GB') - ) + new Locale('en_GB'), + ), ], 'IdentityCreatedEvent' => [ new IdentityCreatedEvent( @@ -285,22 +286,22 @@ public function eventProvider(): array new NameId('42'), new CommonName('Henk Westbroek'), new Email('info@example.invalid'), - new Locale('en_GB') - ) + new Locale('en_GB'), + ), ], 'IdentityEmailChangedEvent' => [ new IdentityEmailChangedEvent( new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), - new Email('info@example.invalid') - ) + new Email('info@example.invalid'), + ), ], 'IdentityRenamedEvent' => [ new IdentityRenamedEvent( new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), - new CommonName('Henk Westbroek') - ) + new CommonName('Henk Westbroek'), + ), ], 'PhonePossessionProvenEvent' => [ new PhonePossessionProvenEvent( @@ -309,12 +310,15 @@ public function eventProvider(): array new SecondFactorId($this->UUID()), new PhoneNumber('+31 (0) 612345678'), true, - EmailVerificationWindow::createFromTimeFrameStartingAt(TimeFrame::ofSeconds(3), new DateTime(new CoreDateTime('@1000'))), + EmailVerificationWindow::createFromTimeFrameStartingAt( + TimeFrame::ofSeconds(3), + new DateTime(new CoreDateTime('@1000')), + ), '42', new CommonName('Henk Westbroek'), new Email('info@example.invalid'), - new Locale('en_GB') - ) + new Locale('en_GB'), + ), ], 'UnverifiedSecondFactorRevokedEvent:sms' => [ new UnverifiedSecondFactorRevokedEvent( @@ -322,8 +326,8 @@ public function eventProvider(): array new Institution('Babelfish Inc.'), new SecondFactorId($this->UUID()), new SecondFactorType('sms'), - new PhoneNumber('+31 (0) 612345678') - ) + new PhoneNumber('+31 (0) 612345678'), + ), ], 'UnverifiedSecondFactorRevokedEvent:yubikey' => [ new UnverifiedSecondFactorRevokedEvent( @@ -331,8 +335,8 @@ public function eventProvider(): array new Institution('Babelfish Inc.'), new SecondFactorId($this->UUID()), new SecondFactorType('yubikey'), - new YubikeyPublicId('01906382') - ) + new YubikeyPublicId('01906382'), + ), ], 'UnverifiedSecondFactorRevokedEvent:tiqr' => [ new UnverifiedSecondFactorRevokedEvent( @@ -340,8 +344,8 @@ public function eventProvider(): array new Institution('Babelfish Inc.'), new SecondFactorId($this->UUID()), new SecondFactorType('tiqr'), - new GssfId('bleep-blorp') - ) + new GssfId('bleep-blorp'), + ), ], 'VerifiedSecondFactorRevokedEvent:sms' => [ new VerifiedSecondFactorRevokedEvent( @@ -349,8 +353,8 @@ public function eventProvider(): array new Institution('Babelfish Inc.'), new SecondFactorId($this->UUID()), new SecondFactorType('sms'), - PhoneNumber::unknown() - ) + PhoneNumber::unknown(), + ), ], 'VerifiedSecondFactorRevokedEvent:yubikey' => [ new VerifiedSecondFactorRevokedEvent( @@ -358,8 +362,8 @@ public function eventProvider(): array new Institution('Babelfish Inc.'), new SecondFactorId($this->UUID()), new SecondFactorType('yubikey'), - new YubikeyPublicId('01906382') - ) + new YubikeyPublicId('01906382'), + ), ], 'VerifiedSecondFactorRevokedEvent:tiqr' => [ new VerifiedSecondFactorRevokedEvent( @@ -367,8 +371,8 @@ public function eventProvider(): array new Institution('Babelfish Inc.'), new SecondFactorId($this->UUID()), new SecondFactorType('tiqr'), - new GssfId('bleep-blorp') - ) + new GssfId('bleep-blorp'), + ), ], 'VettedSecondFactorRevokedEvent:sms' => [ new VettedSecondFactorRevokedEvent( @@ -376,8 +380,8 @@ public function eventProvider(): array new Institution('Babelfish Inc.'), new SecondFactorId($this->UUID()), new SecondFactorType('sms'), - new PhoneNumber('+1 (0) 5155550100') - ) + new PhoneNumber('+1 (0) 5155550100'), + ), ], 'VettedSecondFactorRevokedEvent:yubikey' => [ new VettedSecondFactorRevokedEvent( @@ -385,8 +389,8 @@ public function eventProvider(): array new Institution('Babelfish Inc.'), new SecondFactorId($this->UUID()), new SecondFactorType('yubikey'), - new YubikeyPublicId('01906382') - ) + new YubikeyPublicId('01906382'), + ), ], 'VettedSecondFactorRevokedEvent:tiqr' => [ new VettedSecondFactorRevokedEvent( @@ -394,8 +398,8 @@ public function eventProvider(): array new Institution('Babelfish Inc.'), new SecondFactorId($this->UUID()), new SecondFactorType('tiqr'), - new GssfId('bleep-blorp') - ) + new GssfId('bleep-blorp'), + ), ], 'YubikeyPossessionProvenEvent' => [ new YubikeyPossessionProvenEvent( @@ -404,12 +408,15 @@ public function eventProvider(): array new SecondFactorId($this->UUID()), new YubikeyPublicId('19382933'), true, - EmailVerificationWindow::createFromTimeFrameStartingAt(TimeFrame::ofSeconds(3), new DateTime(new CoreDateTime('@1000'))), + EmailVerificationWindow::createFromTimeFrameStartingAt( + TimeFrame::ofSeconds(3), + new DateTime(new CoreDateTime('@1000')), + ), '42', new CommonName('Henk Westbroek'), new Email('info@example.invalid'), - new Locale('en_GB') - ) + new Locale('en_GB'), + ), ], 'GssfPossessionProvenEvent' => [ new GssfPossessionProvenEvent( @@ -419,12 +426,15 @@ public function eventProvider(): array new StepupProvider('tiqr'), new GssfId('_' . md5('Tiqr')), true, - EmailVerificationWindow::createFromTimeFrameStartingAt(TimeFrame::ofSeconds(3), new DateTime(new CoreDateTime('@1000'))), + EmailVerificationWindow::createFromTimeFrameStartingAt( + TimeFrame::ofSeconds(3), + new DateTime(new CoreDateTime('@1000')), + ), '42', new CommonName('Henk Westbroek'), new Email('info@example.invalid'), - new Locale('en_GB') - ) + new Locale('en_GB'), + ), ], 'IdentityAccreditedAsRaEvent' => [ new IdentityAccreditedAsRaEvent( @@ -433,8 +443,8 @@ public function eventProvider(): array new Institution('Babelfish Inc.'), new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RA), new Location('somewhere behind you'), - new ContactInformation('Call me maybe') - ) + new ContactInformation('Call me maybe'), + ), ], 'IdentityAccreditedAsRaaEvent' => [ new IdentityAccreditedAsRaaEvent( @@ -443,8 +453,8 @@ public function eventProvider(): array new Institution('Babelfish Inc.'), new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RAA), new Location('somewhere behind you'), - new ContactInformation('Call me maybe') - ) + new ContactInformation('Call me maybe'), + ), ], 'RegistrationAuthorityInformationAmendedEvent' => [ new RegistrationAuthorityInformationAmendedEvent( @@ -452,22 +462,22 @@ public function eventProvider(): array new Institution('Blue Note'), new NameId(md5('Coleman Hawkins')), new Location('New York'), - new ContactInformation("131 West 3rd Street, NY") - ) + new ContactInformation("131 West 3rd Street, NY"), + ), ], 'AppointedAsRaaEvent' => [ new AppointedAsRaaEvent( new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), - new NameId(md5('someNameId')) - ) + new NameId(md5('someNameId')), + ), ], 'AppointedAsRaEvent' => [ new AppointedAsRaEvent( new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), - new NameId(md5('someNameId')) - ) + new NameId(md5('someNameId')), + ), ], 'RegistrationAuthorityRetractedEvent' => [ new RegistrationAuthorityRetractedEvent( @@ -475,31 +485,31 @@ public function eventProvider(): array new Institution('Babelfish Inc.'), new NameId(md5('someNameId')), new CommonName('Henk Westbroek'), - new Email('info@example.invalid') - ) + new Email('info@example.invalid'), + ), ], 'LocalePreferenceExpressedEvent' => [ new LocalePreferenceExpressedEvent( new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), - new Locale('fi_FI') - ) + new Locale('fi_FI'), + ), ], 'AppointedAsRaaForInstitutionEvent' => [ new AppointedAsRaaForInstitutionEvent( new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), new NameId(md5('someNameId')), - new Institution('Babelfish BV.') - ) + new Institution('Babelfish BV.'), + ), ], 'AppointedAsRaForInstitutionEvent' => [ new AppointedAsRaForInstitutionEvent( new IdentityId($this->UUID()), new Institution('Babelfish Inc.'), new NameId(md5('someNameId')), - new Institution('Babelfish BV.') - ) + new Institution('Babelfish BV.'), + ), ], 'IdentityAccreditedAsRaForInstitutionEvent' => [ new IdentityAccreditedAsRaForInstitutionEvent( @@ -509,8 +519,8 @@ public function eventProvider(): array new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RA), new Location('somewhere behind you'), new ContactInformation('Call me maybe'), - new Institution('Babelfish BV.') - ) + new Institution('Babelfish BV.'), + ), ], 'IdentityAccreditedAsRaaForInstitutionEvent' => [ new IdentityAccreditedAsRaaForInstitutionEvent( @@ -520,8 +530,8 @@ public function eventProvider(): array new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RAA), new Location('somewhere behind you'), new ContactInformation('Call me maybe'), - new Institution('Babelfish BV.') - ) + new Institution('Babelfish BV.'), + ), ], 'RegistrationAuthorityInformationAmendedForInstitutionEvent' => [ new RegistrationAuthorityInformationAmendedForInstitutionEvent( @@ -530,8 +540,8 @@ public function eventProvider(): array new NameId(md5('Coleman Hawkins')), new Location('New York'), new ContactInformation("131 West 3rd Street, NY"), - new Institution('Babelfish Inc.') - ) + new Institution('Babelfish Inc.'), + ), ], 'RegistrationAuthorityRetractedForInstitutionEvent' => [ new RegistrationAuthorityRetractedForInstitutionEvent( @@ -540,13 +550,14 @@ public function eventProvider(): array new NameId(md5('someNameId')), new CommonName('Henk Westbroek'), new Email('info@example.invalid'), - new Institution('Babelfish Inc.') - ) + new Institution('Babelfish Inc.'), + ), ], ]; } - public function serializedDataProvider(): array{ + public function serializedDataProvider(): array + { return [ // Tests for changes in BC support for adding the VettingType in the SecondFactorVettedEvents in favour of the 'DocumentNumber' 'SecondFactorVettedEvent:support-new-event-with-vetting-type' => [ @@ -562,7 +573,7 @@ public function serializedDataProvider(): array{ new CommonName('jane-d1 Institution-D.EXAMPLE.COM'), new Email('jane+jane-d1@stepup.example.com'), new Locale('nl_NL'), - new OnPremiseVettingType(new DocumentNumber('012345678')) + new OnPremiseVettingType(new DocumentNumber('012345678')), ), ], 'SecondFactorVettedEvent:support-old-event-with-document-number' => [ @@ -578,7 +589,7 @@ public function serializedDataProvider(): array{ new CommonName('jane-d1 Institution-D.EXAMPLE.COM'), new Email('jane+jane-d1@stepup.example.com'), new Locale('nl_NL'), - new OnPremiseVettingType(new DocumentNumber('012345678')) + new OnPremiseVettingType(new DocumentNumber('012345678')), ), ], 'SecondFactorVettedWithoutTokenProofOfPossession:support-new-event-with-vetting-type' => [ @@ -594,7 +605,7 @@ public function serializedDataProvider(): array{ new CommonName('jane-d1 Institution-D.EXAMPLE.COM'), new Email('jane+jane-d1@stepup.example.com'), new Locale('nl_NL'), - new OnPremiseVettingType(new DocumentNumber('012345678')) + new OnPremiseVettingType(new DocumentNumber('012345678')), ), ], 'SecondFactorVettedWithoutTokenProofOfPossession:support-old-event-with-document-number' => [ @@ -610,7 +621,7 @@ public function serializedDataProvider(): array{ new CommonName('jane-d1 Institution-D.EXAMPLE.COM'), new Email('jane+jane-d1@stepup.example.com'), new Locale('nl_NL'), - new OnPremiseVettingType(new DocumentNumber('012345678')) + new OnPremiseVettingType(new DocumentNumber('012345678')), ), ], ]; @@ -618,6 +629,6 @@ public function serializedDataProvider(): array{ private function UUID(): string { - return (string) Uuid::uuid4(); + return (string)Uuid::uuid4(); } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Event/ForgettableEventsTest.php b/src/Surfnet/Stepup/Tests/Identity/Event/ForgettableEventsTest.php index 6f1acce9e..b87f45b16 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Event/ForgettableEventsTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Event/ForgettableEventsTest.php @@ -20,6 +20,36 @@ use PHPUnit\Framework\TestCase; use ReflectionClass; +use Surfnet\Stepup\Identity\Event\CompliedWithRevocationEvent; +use Surfnet\Stepup\Identity\Event\CompliedWithUnverifiedSecondFactorRevocationEvent; +use Surfnet\Stepup\Identity\Event\CompliedWithVerifiedSecondFactorRevocationEvent; +use Surfnet\Stepup\Identity\Event\CompliedWithVettedSecondFactorRevocationEvent; +use Surfnet\Stepup\Identity\Event\EmailVerifiedEvent; +use Surfnet\Stepup\Identity\Event\GssfPossessionProvenAndVerifiedEvent; +use Surfnet\Stepup\Identity\Event\GssfPossessionProvenEvent; +use Surfnet\Stepup\Identity\Event\IdentityCreatedEvent; +use Surfnet\Stepup\Identity\Event\IdentityEmailChangedEvent; +use Surfnet\Stepup\Identity\Event\IdentityRenamedEvent; +use Surfnet\Stepup\Identity\Event\PhonePossessionProvenAndVerifiedEvent; +use Surfnet\Stepup\Identity\Event\PhonePossessionProvenEvent; +use Surfnet\Stepup\Identity\Event\PhoneRecoveryTokenPossessionProvenEvent; +use Surfnet\Stepup\Identity\Event\RegistrationAuthorityRetractedEvent; +use Surfnet\Stepup\Identity\Event\RegistrationAuthorityRetractedForInstitutionEvent; +use Surfnet\Stepup\Identity\Event\SafeStoreSecretRecoveryTokenPossessionPromisedEvent; +use Surfnet\Stepup\Identity\Event\SecondFactorMigratedEvent; +use Surfnet\Stepup\Identity\Event\SecondFactorMigratedToEvent; +use Surfnet\Stepup\Identity\Event\SecondFactorRevokedEvent; +use Surfnet\Stepup\Identity\Event\SecondFactorVettedEvent; +use Surfnet\Stepup\Identity\Event\SecondFactorVettedWithoutTokenProofOfPossession; +use Surfnet\Stepup\Identity\Event\U2fDevicePossessionProvenAndVerifiedEvent; +use Surfnet\Stepup\Identity\Event\U2fDevicePossessionProvenEvent; +use Surfnet\Stepup\Identity\Event\UnverifiedSecondFactorRevokedEvent; +use Surfnet\Stepup\Identity\Event\VerifiedSecondFactorRevokedEvent; +use Surfnet\Stepup\Identity\Event\VettedSecondFactorRevokedEvent; +use Surfnet\Stepup\Identity\Event\YubikeyPossessionProvenAndVerifiedEvent; +use Surfnet\Stepup\Identity\Event\YubikeyPossessionProvenEvent; +use Surfnet\Stepup\Identity\Event\YubikeySecondFactorBootstrappedEvent; +use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Forgettable; final class ForgettableEventsTest extends TestCase { @@ -30,50 +60,50 @@ final class ForgettableEventsTest extends TestCase public function certain_events_are_forgettable_events_and_others_are_not(): void { $forgettableEventFqcns = [ - 'Surfnet\Stepup\Identity\Event\CompliedWithRevocationEvent', - 'Surfnet\Stepup\Identity\Event\CompliedWithUnverifiedSecondFactorRevocationEvent', - 'Surfnet\Stepup\Identity\Event\CompliedWithVerifiedSecondFactorRevocationEvent', - 'Surfnet\Stepup\Identity\Event\CompliedWithVettedSecondFactorRevocationEvent', - 'Surfnet\Stepup\Identity\Event\EmailVerifiedEvent', - 'Surfnet\Stepup\Identity\Event\GssfPossessionProvenEvent', - 'Surfnet\Stepup\Identity\Event\GssfPossessionProvenAndVerifiedEvent', - 'Surfnet\Stepup\Identity\Event\IdentityCreatedEvent', - 'Surfnet\Stepup\Identity\Event\IdentityEmailChangedEvent', - 'Surfnet\Stepup\Identity\Event\IdentityRenamedEvent', - 'Surfnet\Stepup\Identity\Event\SafeStoreSecretRecoveryTokenPossessionPromisedEvent', - 'Surfnet\Stepup\Identity\Event\SecondFactorMigratedEvent', - 'Surfnet\Stepup\Identity\Event\SecondFactorMigratedToEvent', - 'Surfnet\Stepup\Identity\Event\PhonePossessionProvenEvent', - 'Surfnet\Stepup\Identity\Event\PhonePossessionProvenAndVerifiedEvent', - 'Surfnet\Stepup\Identity\Event\PhoneRecoveryTokenPossessionProvenEvent', - 'Surfnet\Stepup\Identity\Event\RegistrationAuthorityRetractedEvent', - 'Surfnet\Stepup\Identity\Event\SecondFactorRevokedEvent', - 'Surfnet\Stepup\Identity\Event\SecondFactorVettedEvent', - 'Surfnet\Stepup\Identity\Event\SecondFactorVettedWithoutTokenProofOfPossession', - 'Surfnet\Stepup\Identity\Event\U2fDevicePossessionProvenEvent', - 'Surfnet\Stepup\Identity\Event\U2fDevicePossessionProvenAndVerifiedEvent', - 'Surfnet\Stepup\Identity\Event\UnverifiedSecondFactorRevokedEvent', - 'Surfnet\Stepup\Identity\Event\VerifiedSecondFactorRevokedEvent', - 'Surfnet\Stepup\Identity\Event\VettedSecondFactorRevokedEvent', - 'Surfnet\Stepup\Identity\Event\YubikeyPossessionProvenEvent', - 'Surfnet\Stepup\Identity\Event\YubikeyPossessionProvenAndVerifiedEvent', - 'Surfnet\Stepup\Identity\Event\YubikeySecondFactorBootstrappedEvent', - 'Surfnet\Stepup\Identity\Event\RegistrationAuthorityRetractedForInstitutionEvent', + CompliedWithRevocationEvent::class, + CompliedWithUnverifiedSecondFactorRevocationEvent::class, + CompliedWithVerifiedSecondFactorRevocationEvent::class, + CompliedWithVettedSecondFactorRevocationEvent::class, + EmailVerifiedEvent::class, + GssfPossessionProvenEvent::class, + GssfPossessionProvenAndVerifiedEvent::class, + IdentityCreatedEvent::class, + IdentityEmailChangedEvent::class, + IdentityRenamedEvent::class, + SafeStoreSecretRecoveryTokenPossessionPromisedEvent::class, + SecondFactorMigratedEvent::class, + SecondFactorMigratedToEvent::class, + PhonePossessionProvenEvent::class, + PhonePossessionProvenAndVerifiedEvent::class, + PhoneRecoveryTokenPossessionProvenEvent::class, + RegistrationAuthorityRetractedEvent::class, + SecondFactorRevokedEvent::class, + SecondFactorVettedEvent::class, + SecondFactorVettedWithoutTokenProofOfPossession::class, + U2fDevicePossessionProvenEvent::class, + U2fDevicePossessionProvenAndVerifiedEvent::class, + UnverifiedSecondFactorRevokedEvent::class, + VerifiedSecondFactorRevokedEvent::class, + VettedSecondFactorRevokedEvent::class, + YubikeyPossessionProvenEvent::class, + YubikeyPossessionProvenAndVerifiedEvent::class, + YubikeySecondFactorBootstrappedEvent::class, + RegistrationAuthorityRetractedForInstitutionEvent::class, ]; $otherIdentityEventFqcns = array_diff($this->getConcreteIdentityEventFqcns(), $forgettableEventFqcns); - $forgettableFqcn = 'Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Forgettable'; + $forgettableFqcn = Forgettable::class; foreach ($forgettableEventFqcns as $fqcn) { $this->assertTrue( is_a($fqcn, $forgettableFqcn, true), - sprintf('%s is not a Forgettable event, please implement %s', $fqcn, $forgettableFqcn) + sprintf('%s is not a Forgettable event, please implement %s', $fqcn, $forgettableFqcn), ); } foreach ($otherIdentityEventFqcns as $fqcn) { $this->assertFalse( is_a($fqcn, $forgettableFqcn, true), - sprintf('%s is a Forgettable event, is this correct? Then add it to the list', $fqcn, $forgettableFqcn) + sprintf('%s is a Forgettable event, is this correct? Then add it to the list', $fqcn, $forgettableFqcn), ); } } @@ -86,15 +116,15 @@ private function getConcreteIdentityEventFqcns(): array return array_filter( array_map( function ($file): ?string { - $fqcn = sprintf( + $fqcn = sprintf( 'Surfnet\Stepup\Identity\Event\%s', - preg_replace('/\\..+?$/', '', basename($file)) + preg_replace('/\\..+?$/', '', basename($file)), ); $reflection = new ReflectionClass($fqcn); return $reflection->isInstantiable() ? $fqcn : null; }, - glob(__DIR__ . '/../../../Identity/Event/*Event.php') - ) + glob(__DIR__ . '/../../../Identity/Event/*Event.php'), + ), ); } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Event/WhitelistEventSerializationAndDeserializationTest.php b/src/Surfnet/Stepup/Tests/Identity/Event/WhitelistEventSerializationAndDeserializationTest.php index 81769197f..1c9ae51ad 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Event/WhitelistEventSerializationAndDeserializationTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Event/WhitelistEventSerializationAndDeserializationTest.php @@ -34,11 +34,10 @@ class WhitelistEventSerializationAndDeserializationTest extends UnitTest * @group domain * @group whitelist * @dataProvider eventProvider - * @param SerializableInterface $event */ - public function an_event_should_be_the_same_after_serialization_and_deserialization(SerializableInterface $event): void + public function an_event_should_be_the_same_after_serialization_and_deserialization(SerializableInterface $event,): void { - $class = get_class($event); + $class = $event::class; $this->assertTrue($event == call_user_func([$class, 'deserialize'], $event->serialize())); } @@ -46,16 +45,16 @@ public function eventProvider(): array { return [ 'WhitelistCreatedEvent' => [ - new WhitelistCreatedEvent($this->getInstitutionCollection()) + new WhitelistCreatedEvent($this->getInstitutionCollection()), ], 'WhitelistReplacedEvent' => [ - new WhitelistReplacedEvent($this->getInstitutionCollection()) + new WhitelistReplacedEvent($this->getInstitutionCollection()), ], 'InstitutionsAddedToWhitelistEvent' => [ - new InstitutionsAddedToWhitelistEvent($this->getInstitutionCollection()) + new InstitutionsAddedToWhitelistEvent($this->getInstitutionCollection()), ], 'InstitutionsRemovedFromWhitelistEvent' => [ - new InstitutionsRemovedFromWhitelistEvent($this->getInstitutionCollection()) + new InstitutionsRemovedFromWhitelistEvent($this->getInstitutionCollection()), ], ]; } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/CommonNameTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/CommonNameTest.php index 41e4f8296..cbd39d587 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/CommonNameTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/CommonNameTest.php @@ -32,7 +32,7 @@ class CommonNameTest extends UnitTest * * @param mixed $invalidValue */ - public function the_common_name_address_must_be_a_non_empty_string(string|int|float|StdClass|array $invalidValue): void + public function the_common_name_address_must_be_a_non_empty_string(string|int|float|StdClass|array $invalidValue,): void { $this->expectException(InvalidArgumentException::class); @@ -46,9 +46,9 @@ public function the_common_name_address_must_be_a_non_empty_string(string|int|fl public function two_common_names_with_the_same_value_are_equal(): void { $commonName = new CommonName('John Doe'); - $theSame = new CommonName('John Doe'); - $different = new CommonName('Jane Doe'); - $unknown = CommonName::unknown(); + $theSame = new CommonName('John Doe'); + $different = new CommonName('Jane Doe'); + $unknown = CommonName::unknown(); $this->assertTrue($commonName->equals($theSame)); $this->assertFalse($commonName->equals($different)); @@ -63,10 +63,10 @@ public function invalidArgumentProvider(): array return [ 'empty string' => [''], 'blank string' => [' '], - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], + 'array' => [[]], + 'integer' => [1], + 'float' => [1.2], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/ContactInformationTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/ContactInformationTest.php index f4a49e11e..5b6cca367 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/ContactInformationTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/ContactInformationTest.php @@ -32,7 +32,7 @@ class ContactInformationTest extends UnitTest * * @param mixed $invalidValue */ - public function it_cannot_be_created_with_anything_but_a_nonempty_string(int|float|StdClass|array $invalidValue): void + public function it_cannot_be_created_with_anything_but_a_nonempty_string(int|float|StdClass|array $invalidValue,): void { $this->expectException(InvalidArgumentException::class); @@ -46,9 +46,9 @@ public function it_cannot_be_created_with_anything_but_a_nonempty_string(int|flo public function two_instances_with_the_same_value_are_equal(): void { $contactInformation = new ContactInformation('a'); - $theSame = new ContactInformation('a'); - $theSameWithSpaces = new ContactInformation(' a '); - $different = new ContactInformation('A'); + $theSame = new ContactInformation('a'); + $theSameWithSpaces = new ContactInformation(' a '); + $different = new ContactInformation('A'); $this->assertTrue($contactInformation->equals($theSame)); $this->assertTrue($contactInformation->equals($theSameWithSpaces)); @@ -61,10 +61,10 @@ public function two_instances_with_the_same_value_are_equal(): void public function invalidValueProvider(): array { return [ - 'array' => [[]], + 'array' => [[]], 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], + 'float' => [1.2], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/DocumentNumberTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/DocumentNumberTest.php index 5663026ea..59d209bef 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/DocumentNumberTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/DocumentNumberTest.php @@ -45,9 +45,9 @@ public function the_document_number_must_be_a_non_empty_string(string|int|float| public function two_document_numbers_with_the_same_value_are_equal(): void { $commonName = new DocumentNumber('John Doe'); - $theSame = new DocumentNumber('John Doe'); - $different = new DocumentNumber('Jane Doe'); - $unknown = DocumentNumber::unknown(); + $theSame = new DocumentNumber('John Doe'); + $different = new DocumentNumber('Jane Doe'); + $unknown = DocumentNumber::unknown(); $this->assertTrue($commonName->equals($theSame)); $this->assertFalse($commonName->equals($different)); @@ -61,10 +61,10 @@ public function invalidArgumentProvider(): array { return [ 'empty string' => [''], - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], + 'array' => [[]], + 'integer' => [1], + 'float' => [1.2], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/EmailTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/EmailTest.php index cb39d7991..43f7e0ae3 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/EmailTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/EmailTest.php @@ -57,10 +57,10 @@ public function the_email_address_given_must_be_rfc_822_compliant(string $invali */ public function two_emails_with_the_same_value_are_equal(): void { - $email = new Email('email@example.invalid'); - $theSame = new Email('email@example.invalid'); + $email = new Email('email@example.invalid'); + $theSame = new Email('email@example.invalid'); $different = new Email('different@example.invalid'); - $unknown = Email::unknown(); + $unknown = Email::unknown(); $this->assertTrue($email->equals($theSame)); $this->assertFalse($email->equals($different)); @@ -75,10 +75,10 @@ public function invalidArgumentProvider(): array return [ 'empty string' => [''], 'blank string' => [' '], - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], + 'array' => [[]], + 'integer' => [1], + 'float' => [1.2], + 'object' => [new StdClass()], ]; } @@ -92,9 +92,9 @@ public function invalidArgumentProvider(): array public function invalidEmailProvider(): array { return [ - 'no @-sign' => ['mailboxexample.invalid'], - 'no tld' => ['mailbox@example'], - 'no mailbox' => ['@example.invalid'], + 'no @-sign' => ['mailboxexample.invalid'], + 'no tld' => ['mailbox@example'], + 'no mailbox' => ['@example.invalid'], 'invalid mailbox' => ['(｡◕‿◕｡)@example.invalid'], ]; } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/EmailVerificationWindowTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/EmailVerificationWindowTest.php index cc775ef01..7322707f0 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/EmailVerificationWindowTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/EmailVerificationWindowTest.php @@ -69,13 +69,13 @@ public function a_window_is_considered_equal_when_the_start_and_end_are_the_same // since we work with second precision, we might run issues trusting normal time, so we fixate the time DateTimeHelper::setCurrentTime(new DateTime(new CoreDateTime('@10000'))); - $base = $this->newEmailVerificationWindow(3); - $same = $this->newEmailVerificationWindow(3); - $startsSameEndsEarlier = $this->newEmailVerificationWindow(2); - $startsSameEndsLater = $this->newEmailVerificationWindow(4); - $startsLater = $this->newEmailVerificationWindow(3, 'PT1S'); - $startsLaterEndsAtSameTime = $this->newEmailVerificationWindow(2, 'PT1S'); - $startsEarlier = $this->newEmailVerificationWindow(2, '-PT1S'); + $base = $this->newEmailVerificationWindow(3); + $same = $this->newEmailVerificationWindow(3); + $startsSameEndsEarlier = $this->newEmailVerificationWindow(2); + $startsSameEndsLater = $this->newEmailVerificationWindow(4); + $startsLater = $this->newEmailVerificationWindow(3, 'PT1S'); + $startsLaterEndsAtSameTime = $this->newEmailVerificationWindow(2, 'PT1S'); + $startsEarlier = $this->newEmailVerificationWindow(2, '-PT1S'); $startsEarlierEndsAtSameTime = $this->newEmailVerificationWindow(4, '-PT1S'); $this->assertTrue($base->equals($same)); @@ -105,7 +105,7 @@ public function the_window_correctly_calculates_the_end_datetime(): void $window = EmailVerificationWindow::createWindowFromTill( DateTime::now(), - DateTime::now()->add(new DateInterval('PT3S')) + DateTime::now()->add(new DateInterval('PT3S')), ); $endTimeTwo = $window->openUntil(); $this->assertEquals(new DateTime(new CoreDateTime('@13')), $endTimeTwo); @@ -114,7 +114,6 @@ public function the_window_correctly_calculates_the_end_datetime(): void /** * Helper method for easy EmailVerificationWindow creation * - * @param int $timeFrameSeconds * @param string|null $startTimeOffset * @return EmailVerificationWindow */ @@ -132,7 +131,7 @@ private function newEmailVerificationWindow(int $timeFrameSeconds, $startTimeOff return EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds($timeFrameSeconds), - $start + $start, ); } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/GssfIdTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/GssfIdTest.php index b030ec138..4f806688f 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/GssfIdTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/GssfIdTest.php @@ -32,8 +32,9 @@ class GssfIdTest extends UnitTest * * @param mixed $invalidValue */ - public function a_gssf_id_cannot_be_created_with_anything_but_a_nonempty_string(string|int|float|StdClass|array $invalidValue): void - { + public function a_gssf_id_cannot_be_created_with_anything_but_a_nonempty_string( + string|int|float|StdClass|array $invalidValue, + ): void { $this->expectException(InvalidArgumentException::class); new GssfId($invalidValue); @@ -45,10 +46,10 @@ public function a_gssf_id_cannot_be_created_with_anything_but_a_nonempty_string( */ public function two_gssf_ids_with_the_same_value_are_equal(): void { - $gssf = new GssfId('a'); - $theSame = new GssfId(' a'); - $different = new GssfId('A'); - $unknown = GssfId::unknown(); + $gssf = new GssfId('a'); + $theSame = new GssfId(' a'); + $different = new GssfId('A'); + $unknown = GssfId::unknown(); $this->assertTrue($gssf->equals($theSame)); $this->assertFalse($gssf->equals($different)); @@ -63,10 +64,10 @@ public function invalidValueProvider(): array return [ 'empty string' => [''], 'blank string' => [' '], - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], + 'array' => [[]], + 'integer' => [1], + 'float' => [1.2], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/InstitutionTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/InstitutionTest.php index 496881bd6..58598f4d2 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/InstitutionTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/InstitutionTest.php @@ -32,8 +32,9 @@ class InstitutionTest extends UnitTest * * @param mixed $invalidValue */ - public function an_institution_cannot_be_created_with_anything_but_a_nonempty_string(string|int|float|StdClass|array $invalidValue): void - { + public function an_institution_cannot_be_created_with_anything_but_a_nonempty_string( + string|int|float|StdClass|array $invalidValue, + ): void { $this->expectException(InvalidArgumentException::class); new Institution($invalidValue); @@ -45,10 +46,10 @@ public function an_institution_cannot_be_created_with_anything_but_a_nonempty_st */ public function two_institutions_with_the_same_value_are_equal(): void { - $institution = new Institution('a'); - $theSame = new Institution('a'); + $institution = new Institution('a'); + $theSame = new Institution('a'); $theSameWithSpaces = new Institution(' a '); - $different = new Institution('A'); + $different = new Institution('A'); $this->assertTrue($institution->equals($theSame)); $this->assertTrue($institution->equals($theSameWithSpaces)); @@ -63,10 +64,10 @@ public function invalidValueProvider(): array return [ 'empty string' => [''], 'blank string' => [' '], - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], + 'array' => [[]], + 'integer' => [1], + 'float' => [1.2], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/LocationTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/LocationTest.php index cc4104dcc..7fee2ec21 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/LocationTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/LocationTest.php @@ -32,7 +32,7 @@ class LocationTest extends UnitTest * * @param mixed $invalidValue */ - public function it_cannot_be_created_with_anything_but_a_nonempty_string(int|float|StdClass|array $invalidValue): void + public function it_cannot_be_created_with_anything_but_a_nonempty_string(int|float|StdClass|array $invalidValue,): void { $this->expectException(InvalidArgumentException::class); @@ -45,10 +45,10 @@ public function it_cannot_be_created_with_anything_but_a_nonempty_string(int|flo */ public function two_locations_with_the_same_value_are_equal(): void { - $location = new Location('a'); - $theSame = new Location('a'); + $location = new Location('a'); + $theSame = new Location('a'); $theSameWithSpaces = new Location(' a '); - $different = new Location('A'); + $different = new Location('A'); $this->assertTrue($location->equals($theSame)); $this->assertTrue($location->equals($theSameWithSpaces)); @@ -61,10 +61,10 @@ public function two_locations_with_the_same_value_are_equal(): void public function invalidValueProvider(): array { return [ - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], + 'array' => [[]], + 'integer' => [1], + 'float' => [1.2], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/PhoneNumberTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/PhoneNumberTest.php index 47450faa7..9263a7cda 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/PhoneNumberTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/PhoneNumberTest.php @@ -32,8 +32,9 @@ class PhoneNumberTest extends UnitTest * * @param mixed $invalidValue */ - public function a_phone_number_cannot_be_created_with_anything_but_a_nonempty_string(string|int|float|StdClass|array $invalidValue): void - { + public function a_phone_number_cannot_be_created_with_anything_but_a_nonempty_string( + string|int|float|StdClass|array $invalidValue, + ): void { $this->expectException(InvalidArgumentException::class); new PhoneNumber($invalidValue); @@ -45,10 +46,10 @@ public function a_phone_number_cannot_be_created_with_anything_but_a_nonempty_st */ public function two_phone_numbers_with_the_same_value_are_equal(): void { - $one = new PhoneNumber('+31 (0) 12345678'); - $theSame = new PhoneNumber('+31 (0) 12345678'); - $different = new PhoneNumber('+31 (0) 87654321'); - $unknown = PhoneNumber::unknown(); + $one = new PhoneNumber('+31 (0) 12345678'); + $theSame = new PhoneNumber('+31 (0) 12345678'); + $different = new PhoneNumber('+31 (0) 87654321'); + $unknown = PhoneNumber::unknown(); $this->assertTrue($one->equals($theSame)); $this->assertFalse($one->equals($different)); @@ -63,10 +64,10 @@ public function invalidValueProvider(): array return [ 'empty string' => [''], 'blank string' => [' '], - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], + 'array' => [[]], + 'integer' => [1], + 'float' => [1.2], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/RecoveryTokenIdentifierFactoryTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/RecoveryTokenIdentifierFactoryTest.php index 3748d1533..464412e78 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/RecoveryTokenIdentifierFactoryTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/RecoveryTokenIdentifierFactoryTest.php @@ -34,20 +34,20 @@ public function test_generates_identifiers_of_all_types(): void { $this->assertEquals( new PhoneNumber('+31 (0) 12345678'), - RecoveryTokenIdentifierFactory::forType(RecoveryTokenType::sms(), '+31 (0) 12345678') + RecoveryTokenIdentifierFactory::forType(RecoveryTokenType::sms(), '+31 (0) 12345678'), ); $this->assertEquals( new SafeStore(new HashedSecret('super-secret')), - RecoveryTokenIdentifierFactory::forType(RecoveryTokenType::safeStore(), 'super-secret') + RecoveryTokenIdentifierFactory::forType(RecoveryTokenType::safeStore(), 'super-secret'), ); $this->assertEquals( PhoneNumber::unknown(), - RecoveryTokenIdentifierFactory::unknownForType(RecoveryTokenType::sms()) + RecoveryTokenIdentifierFactory::unknownForType(RecoveryTokenType::sms()), ); $this->assertEquals( SafeStore::unknown(), - RecoveryTokenIdentifierFactory::unknownForType(RecoveryTokenType::safeStore()) + RecoveryTokenIdentifierFactory::unknownForType(RecoveryTokenType::safeStore()), ); } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/RegistrationAuthorityRoleTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/RegistrationAuthorityRoleTest.php index 48234281d..0a4e2fde8 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/RegistrationAuthorityRoleTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/RegistrationAuthorityRoleTest.php @@ -45,9 +45,9 @@ public function it_cannot_be_created_with_anything_but_a_valid_role(float|StdCla */ public function two_roles_with_the_same_value_are_equal(): void { - $role = new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RAA); - $theSame = new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RAA); - $different = new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_SRAA); + $role = new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RAA); + $theSame = new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RAA); + $different = new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_SRAA); $this->assertTrue($role->equals($theSame)); $this->assertFalse($role->equals($different)); @@ -59,9 +59,9 @@ public function two_roles_with_the_same_value_are_equal(): void public function invalidValueProvider(): array { return [ - 'array' => [[]], - 'float' => [1.2], - 'object' => [new StdClass()], + 'array' => [[]], + 'float' => [1.2], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/SafeStoreTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/SafeStoreTest.php index cb4b09c8b..5eb981f14 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/SafeStoreTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/SafeStoreTest.php @@ -24,6 +24,7 @@ use Surfnet\Stepup\Identity\Value\RecoveryTokenIdentifier; use Surfnet\Stepup\Identity\Value\SafeStore; use Surfnet\Stepup\Identity\Value\UnhashedSecret; + use function password_verify; class SafeStoreTest extends UnitTest diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/SecondFactorIdentifierFactoryTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/SecondFactorIdentifierFactoryTest.php index 485b98a55..1ec091995 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/SecondFactorIdentifierFactoryTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/SecondFactorIdentifierFactoryTest.php @@ -35,28 +35,28 @@ public function generates_identifiers_of_all_types(): void { $this->assertEquals( new PhoneNumber('+31 (0) 12345678'), - SecondFactorIdentifierFactory::forType(new SecondFactorType('sms'), '+31 (0) 12345678') + SecondFactorIdentifierFactory::forType(new SecondFactorType('sms'), '+31 (0) 12345678'), ); $this->assertEquals( new YubikeyPublicId('08189273'), - SecondFactorIdentifierFactory::forType(new SecondFactorType('yubikey'), '08189273') + SecondFactorIdentifierFactory::forType(new SecondFactorType('yubikey'), '08189273'), ); $this->assertEquals( new GssfId('urn:abcd-efgh-ijkl'), - SecondFactorIdentifierFactory::forType(new SecondFactorType('tiqr'), 'urn:abcd-efgh-ijkl') + SecondFactorIdentifierFactory::forType(new SecondFactorType('tiqr'), 'urn:abcd-efgh-ijkl'), ); $this->assertEquals( PhoneNumber::unknown(), - SecondFactorIdentifierFactory::unknownForType(new SecondFactorType('sms')) + SecondFactorIdentifierFactory::unknownForType(new SecondFactorType('sms')), ); $this->assertEquals( YubikeyPublicId::unknown(), - SecondFactorIdentifierFactory::unknownForType(new SecondFactorType('yubikey')) + SecondFactorIdentifierFactory::unknownForType(new SecondFactorType('yubikey')), ); $this->assertEquals( GssfId::unknown(), - SecondFactorIdentifierFactory::unknownForType(new SecondFactorType('tiqr')) + SecondFactorIdentifierFactory::unknownForType(new SecondFactorType('tiqr')), ); } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/StepupProviderTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/StepupProviderTest.php index eb1a38c18..1327a4a6b 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/StepupProviderTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/StepupProviderTest.php @@ -32,8 +32,9 @@ class StepupProviderTest extends UnitTest * * @param mixed $invalidValue */ - public function a_stepup_provider_cannot_be_created_with_anything_but_a_nonempty_string(string|int|float|StdClass|array $invalidValue): void - { + public function a_stepup_provider_cannot_be_created_with_anything_but_a_nonempty_string( + string|int|float|StdClass|array $invalidValue, + ): void { $this->expectException(InvalidArgumentException::class); new StepupProvider($invalidValue); @@ -46,8 +47,8 @@ public function a_stepup_provider_cannot_be_created_with_anything_but_a_nonempty public function two_stepup_providers_with_the_same_value_are_equal(): void { $institution = new StepupProvider('a'); - $theSame = new StepupProvider('a'); - $different = new StepupProvider('A'); + $theSame = new StepupProvider('a'); + $different = new StepupProvider('A'); $this->assertTrue($institution->equals($theSame)); $this->assertFalse($institution->equals($different)); @@ -61,10 +62,10 @@ public function invalidValueProvider(): array return [ 'empty string' => [''], 'blank string' => [' '], - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], + 'array' => [[]], + 'integer' => [1], + 'float' => [1.2], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/TimeFrameTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/TimeFrameTest.php index 9b5015752..a9383b498 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/TimeFrameTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/TimeFrameTest.php @@ -30,7 +30,7 @@ class TimeFrameTest extends UnitTest * @group domain * @dataProvider invalidValueProvider */ - public function it_cannot_be_given_an_non_positive_amount_of_seconds(string|float|int|StdClass|array $invalidValue): void + public function it_cannot_be_given_an_non_positive_amount_of_seconds(string|float|int|StdClass|array $invalidValue,): void { $this->expectException(InvalidArgumentException::class); @@ -49,8 +49,8 @@ public function to_string_output_matches_amount_of_seconds_as_string(): void $this->assertEquals( '1000', - (string) $timeFrame, - 'The amount of seconds as string must match timeFrame::__toString' + (string)$timeFrame, + 'The amount of seconds as string must match timeFrame::__toString', ); } @@ -61,12 +61,12 @@ public function invalidValueProvider(): array { return [ 'empty string' => [''], - 'string' => ['abc'], - 'array' => [[]], - 'float' => [2.718], - 'zero' => [0], + 'string' => ['abc'], + 'array' => [[]], + 'float' => [2.718], + 'zero' => [0], 'negative int' => [-1], - 'object' => [new StdClass()], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/YubikeyPublicIdTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/YubikeyPublicIdTest.php index 3a6f2a7d9..2f2503730 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/YubikeyPublicIdTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/YubikeyPublicIdTest.php @@ -30,10 +30,10 @@ class YubikeyPublicIdTest extends UnitTest */ public function two_yubikey_public_ids_with_the_same_value_are_equal(): void { - $id = new YubikeyPublicId('00001234'); - $theSame = new YubikeyPublicId('00001234'); - $different = new YubikeyPublicId('987654321'); - $unknown = YubikeyPublicId::unknown(); + $id = new YubikeyPublicId('00001234'); + $theSame = new YubikeyPublicId('00001234'); + $different = new YubikeyPublicId('987654321'); + $unknown = YubikeyPublicId::unknown(); $this->assertTrue($id->equals($theSame)); $this->assertFalse($id->equals($different)); @@ -43,14 +43,14 @@ public function two_yubikey_public_ids_with_the_same_value_are_equal(): void public function invalidFormatProvider(): array { return [ - '7-character unpadded ID' => ['1906381'], - '9-character padded ID' => ['0123456789'], - '19-character padded ID' => ['01234567890123456789'], - '21-character ID' => ['101234567890123456789'], - 'empty ID' => [''], - 'ID with alphabetical characters' => ['abc'], + '7-character unpadded ID' => ['1906381'], + '9-character padded ID' => ['0123456789'], + '19-character padded ID' => ['01234567890123456789'], + '21-character ID' => ['101234567890123456789'], + 'empty ID' => [''], + 'ID with alphabetical characters' => ['abc'], 'ID with alphanumerical characters' => ['abc01908389'], - 'Larger than 0xffffffffffffffff' => ['18446744073709551616'] + 'Larger than 0xffffffffffffffff' => ['18446744073709551616'], ]; } @@ -71,9 +71,9 @@ public function it_cannot_be_constructed_with_an_invalid_format(string $invalidF public function validFormatProvider(): array { return [ - '8-character ID' => ['01906381'], - '1-character ID' => ['00000001'], - '0-character ID' => ['00000000'], + '8-character ID' => ['01906381'], + '1-character ID' => ['00000001'], + '0-character ID' => ['00000000'], '16-character ID' => ['1234560123456789'], '20-character ID' => ['12345678901234567890'], ]; @@ -83,8 +83,6 @@ public function validFormatProvider(): array * @test * @group domain * @dataProvider validFormatProvider - * - * @param string $validFormat */ public function its_value_matches_its_input_value(string $validFormat): void { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Filter/InstitutionAuthorizationRepositoryFilter.php b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Filter/InstitutionAuthorizationRepositoryFilter.php index 1b742040f..b3b8aa860 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Filter/InstitutionAuthorizationRepositoryFilter.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Filter/InstitutionAuthorizationRepositoryFilter.php @@ -24,8 +24,6 @@ class InstitutionAuthorizationRepositoryFilter { /** - * @param QueryBuilder $queryBuilder - * @param InstitutionAuthorizationContextInterface $authorizationContext * @param string $institutionField * @param string $authorizationAlias */ @@ -33,7 +31,7 @@ public function filter( QueryBuilder $queryBuilder, InstitutionAuthorizationContextInterface $authorizationContext, $institutionField, - $authorizationAlias + $authorizationAlias, ): void { // If actor is SRAA we don't need filtering if ($authorizationContext->isActorSraa()) { @@ -51,7 +49,7 @@ public function filter( $whereCondition = sprintf( '%s IN (:%s)', $institutionField, - $parameter + $parameter, ); $queryBuilder->andWhere($whereCondition); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/AuthorizationContextService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/AuthorizationContextService.php index 288657439..c1777209d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/AuthorizationContextService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/AuthorizationContextService.php @@ -38,24 +38,12 @@ */ class AuthorizationContextService { - private SraaService $sraaService; - - private IdentityService $identityService; - - private ConfiguredInstitutionRepository $institutionRepository; - - private AuthorizationRepository $authorizationRepository; - public function __construct( - SraaService $sraaService, - IdentityService $identityService, - ConfiguredInstitutionRepository $institutionRepository, - AuthorizationRepository $authorizationRepository + private readonly SraaService $sraaService, + private readonly IdentityService $identityService, + private readonly ConfiguredInstitutionRepository $institutionRepository, + private readonly AuthorizationRepository $authorizationRepository, ) { - $this->sraaService = $sraaService; - $this->identityService = $identityService; - $this->institutionRepository = $institutionRepository; - $this->authorizationRepository = $authorizationRepository; } public function buildSelectRaaInstitutionAuthorizationContext(IdentityId $actorId): InstitutionAuthorizationContext @@ -75,7 +63,7 @@ public function buildSelectRaaInstitutionAuthorizationContext(IdentityId $actorI */ public function buildInstitutionAuthorizationContext( IdentityId $actorId, - RegistrationAuthorityRole $role + RegistrationAuthorityRole $role, ): InstitutionAuthorizationContext { $isSraa = $this->isSraa($actorId); if ($isSraa) { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/AuthorizationService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/AuthorizationService.php index afb577d76..c3019a7cb 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/AuthorizationService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/AuthorizationService.php @@ -38,24 +38,12 @@ */ class AuthorizationService { - private IdentityService $identityService; - - private InstitutionConfigurationOptionsService $institutionConfigurationService; - - private SecondFactorService $secondFactorService; - - private RecoveryTokenService $recoveryTokenService; - public function __construct( - IdentityService $identityService, - InstitutionConfigurationOptionsService $institutionConfigurationService, - SecondFactorService $secondFactorService, - RecoveryTokenService $recoveryTokenService + private readonly IdentityService $identityService, + private readonly InstitutionConfigurationOptionsService $institutionConfigurationService, + private readonly SecondFactorService $secondFactorService, + private readonly RecoveryTokenService $recoveryTokenService, ) { - $this->identityService = $identityService; - $this->institutionConfigurationService = $institutionConfigurationService; - $this->secondFactorService = $secondFactorService; - $this->recoveryTokenService = $recoveryTokenService; } /** @@ -76,18 +64,22 @@ public function assertRegistrationOfSelfAssertedTokensIsAllowed(IdentityId $iden $institutionConfiguration = $this->findInstitutionConfiguration($identity); if (!$institutionConfiguration instanceof InstitutionConfigurationOptions) { - return $this->deny('Institution configuration could not be found, unable to ascertain if self-asserted tokens feature is enabled'); + return $this->deny( + 'Institution configuration could not be found, unable to ascertain if self-asserted tokens feature is enabled', + ); } if (!$institutionConfiguration->selfAssertedTokensOption->isEnabled()) { - return $this->deny(sprintf('Institution "%s", does not allow self-asserted tokens', (string) $identity->institution)); + return $this->deny( + sprintf('Institution "%s", does not allow self-asserted tokens', (string)$identity->institution), + ); } $hasVettedSecondFactorToken = $this->secondFactorService->hasVettedByIdentity($identityId); $options = $this->identityService->getSelfAssertedTokenRegistrationOptions( $identity, - $hasVettedSecondFactorToken + $hasVettedSecondFactorToken, ); if ($hasVettedSecondFactorToken) { @@ -98,7 +90,9 @@ public function assertRegistrationOfSelfAssertedTokensIsAllowed(IdentityId $iden // registered token was a SAT. $hadOtherTokenType = $options->possessedSelfAssertedToken === false && $options->possessedToken === true; if ($hadOtherTokenType) { - return $this->deny('Identity never possessed a self-asserted token, but did/does possess one of the other types'); + return $this->deny( + 'Identity never possessed a self-asserted token, but did/does possess one of the other types', + ); } // The Identity is not allowed to do a SAT when he had a RT, but lost it. And also currently has no SF $hasActiveRecoveryToken = $this->recoveryTokenService->identityHasActiveRecoveryToken($identity); @@ -125,11 +119,15 @@ public function assertSelfVetUsingSelfAssertedTokenIsAllowed(IdentityId $identit $institutionConfiguration = $this->findInstitutionConfiguration($identity); if (!$institutionConfiguration instanceof InstitutionConfigurationOptions) { - return $this->deny('Institution configuration could not be found, unable to ascertain if self-asserted tokens feature is enabled'); + return $this->deny( + 'Institution configuration could not be found, unable to ascertain if self-asserted tokens feature is enabled', + ); } if (!$institutionConfiguration->selfAssertedTokensOption->isEnabled()) { - return $this->deny(sprintf('Institution "%s", does not allow self-asserted tokens', (string) $identity->institution)); + return $this->deny( + sprintf('Institution "%s", does not allow self-asserted tokens', (string)$identity->institution), + ); } $query = new VettedSecondFactorQuery(); @@ -161,20 +159,26 @@ public function assertRecoveryTokensAreAllowed(IdentityId $identityId): Authoriz $institutionConfiguration = $this->findInstitutionConfiguration($identity); if (!$institutionConfiguration instanceof InstitutionConfigurationOptions) { - return $this->deny('Institution configuration could not be found, unable to ascertain if self-asserted tokens feature is enabled'); + return $this->deny( + 'Institution configuration could not be found, unable to ascertain if self-asserted tokens feature is enabled', + ); } if (!$institutionConfiguration->selfAssertedTokensOption->isEnabled()) { - return $this->deny(sprintf('Institution "%s", does not allow self-asserted tokens', (string) $identity->institution)); + return $this->deny( + sprintf('Institution "%s", does not allow self-asserted tokens', (string)$identity->institution), + ); } // Only allow CRUD actions on recovery tokens when the identity previously registered a SAT $options = $this->identityService->getSelfAssertedTokenRegistrationOptions( $identity, - $this->secondFactorService->hasVettedByIdentity($identityId) + $this->secondFactorService->hasVettedByIdentity($identityId), ); if ($options->possessedSelfAssertedToken === false) { - return $this->deny('Identity never possessed a self-asserted token, deny access to recovery token CRUD actions'); + return $this->deny( + 'Identity never possessed a self-asserted token, deny access to recovery token CRUD actions', + ); } return $this->allow(); @@ -183,7 +187,7 @@ public function assertRecoveryTokensAreAllowed(IdentityId $identityId): Authoriz private function findInstitutionConfiguration(Identity $identity): ?InstitutionConfigurationOptions { $institution = new Institution((string)$identity->institution); - return $this->institutionConfigurationService + return $this->institutionConfigurationService ->findInstitutionConfigurationOptionsFor($institution); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/CommandAuthorizationService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/CommandAuthorizationService.php index 924aab817..728ca994d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/CommandAuthorizationService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/CommandAuthorizationService.php @@ -30,7 +30,6 @@ use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\SelfServiceExecutable; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\CreateIdentityCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\ExpressLocalePreferenceCommand; -use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\RevokeOwnRecoveryTokenCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\RevokeRegistrantsRecoveryTokenCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\RevokeRegistrantsSecondFactorCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\UpdateIdentityCommand; @@ -57,25 +56,15 @@ */ class CommandAuthorizationService { - private WhitelistService $whitelistService; - private IdentityService $identityService; - private AuthorizationContextService $authorizationContextService; - private LoggerInterface $logger; - public function __construct( - WhitelistService $whitelistService, - IdentityService $identityService, - LoggerInterface $logger, - AuthorizationContextService $authorizationContextService + private readonly WhitelistService $whitelistService, + private readonly IdentityService $identityService, + private readonly LoggerInterface $logger, + private readonly AuthorizationContextService $authorizationContextService, ) { - $this->logger = $logger; - $this->authorizationContextService = $authorizationContextService; - $this->whitelistService = $whitelistService; - $this->identityService = $identityService; } /** - * @param Institution $institution * @param IdentityId|null $actorId * @return bool */ @@ -85,12 +74,12 @@ public function isInstitutionWhitelisted(Institution $institution, IdentityId $a if (!is_null($actorId) && $this->isSraa($actorId)) { return true; } - return (bool) $this->whitelistService->isWhitelisted($institution->getInstitution()); + return (bool)$this->whitelistService->isWhitelisted($institution->getInstitution()); } public function maySelfServiceCommandBeExecutedOnBehalfOf(Command $command, IdentityId $actorId = null): bool { - $commandName = get_class($command); + $commandName = $command::class; $identityId = $actorId instanceof IdentityId ? $actorId->getIdentityId() : null; // Assert Self Service command could be executed @@ -102,7 +91,7 @@ public function maySelfServiceCommandBeExecutedOnBehalfOf(Command $command, Iden $this->logAllowSelfService( 'SRAA user is always allowed to record SelfService commands', $commandName, - $identityId + $identityId, ); return true; } @@ -112,7 +101,7 @@ public function maySelfServiceCommandBeExecutedOnBehalfOf(Command $command, Iden $this->logAllowSelfService( 'Allowing execution of a SelfAsserted command', $commandName, - $identityId + $identityId, ); return true; } @@ -125,7 +114,7 @@ public function maySelfServiceCommandBeExecutedOnBehalfOf(Command $command, Iden $this->logAllowSelfService( 'Allowing execution of a CreateIdentityCommand or UpdateIdentityCommand command', $commandName, - $identityId + $identityId, ); return true; } @@ -135,7 +124,7 @@ public function maySelfServiceCommandBeExecutedOnBehalfOf(Command $command, Iden $this->logDenySelfService( 'The actor identity id does not match that of the identity id that was recorded in the command', $commandName, - $identityId + $identityId, ); return false; } @@ -151,9 +140,9 @@ public function maySelfServiceCommandBeExecutedOnBehalfOf(Command $command, Iden public function mayRaCommandBeExecutedOnBehalfOf( Command $command, IdentityId $actorId = null, - Institution $actorInstitution = null + Institution $actorInstitution = null, ): bool { - $commandName = get_class($command); + $commandName = $command::class; $identityId = $actorId instanceof IdentityId ? $actorId->getIdentityId() : null; $this->logger->notice('Running the mayRaCommandBeExecutedOnBehalfOf sequence'); @@ -166,7 +155,7 @@ public function mayRaCommandBeExecutedOnBehalfOf( $this->logAllowRa( 'RA(A) is always allowed to perform the ExpressLocalePreferenceCommand', $commandName, - $identityId + $identityId, ); return true; } @@ -176,7 +165,7 @@ public function mayRaCommandBeExecutedOnBehalfOf( $this->logDenyRA( 'ActorId and/or actorInstitution is missing in mayRaCommandBeExecutedOnBehalfOf', $commandName, - $identityId + $identityId, ); return false; } @@ -186,7 +175,7 @@ public function mayRaCommandBeExecutedOnBehalfOf( $this->logAllowRa( 'SRAA is always allowed to execute RA commands', $commandName, - $identityId + $identityId, ); return true; } @@ -209,7 +198,9 @@ public function mayRaCommandBeExecutedOnBehalfOf( $command instanceof RevokeRegistrantsSecondFactorCommand || $command instanceof RevokeRegistrantsRecoveryTokenCommand ) { - $this->logger->notice('VetSecondFactorCommand and RevokeRegistrantsSecondFactorCommand require a RA role'); + $this->logger->notice( + 'VetSecondFactorCommand and RevokeRegistrantsSecondFactorCommand require a RA role', + ); $roleRequirement = RegistrationAuthorityRole::ra(); // Use the institution of the identity (the user vetting or having his token revoked). $identity = $this->identityService->find($command->identityId); @@ -217,7 +208,7 @@ public function mayRaCommandBeExecutedOnBehalfOf( $this->logDenyRA( 'Unable to find the identity of the user that is being vetted, or revoked', $commandName, - $identityId + $identityId, ); return false; } @@ -225,22 +216,22 @@ public function mayRaCommandBeExecutedOnBehalfOf( sprintf( 'Changed RA institution (before %s) to identity institution: %s', $raInstitution, - $identity->institution->getInstitution() - ) + $identity->institution->getInstitution(), + ), ); $raInstitution = $identity->institution->getInstitution(); } $authorizationContext = $this->authorizationContextService->buildInstitutionAuthorizationContext( $actorId, - $roleRequirement + $roleRequirement, ); $this->logger->notice( sprintf( 'Identity is authorized RA(A) role in institutions: %s', - implode(',', $authorizationContext->getInstitutions()->serialize()) - ) + implode(',', $authorizationContext->getInstitutions()->serialize()), + ), ); if (!$authorizationContext->getInstitutions()->contains(new Institution($raInstitution))) { @@ -248,10 +239,10 @@ public function mayRaCommandBeExecutedOnBehalfOf( sprintf( 'Identity is not RA(A) for the specified RA institution, "%s". Allowed institutions: "%s"', $raInstitution, - implode(',', $authorizationContext->getInstitutions()->serialize()) + implode(',', $authorizationContext->getInstitutions()->serialize()), ), $commandName, - $identityId + $identityId, ); return false; } @@ -259,7 +250,7 @@ public function mayRaCommandBeExecutedOnBehalfOf( $this->logAllowRa( 'Allowed', $commandName, - $identityId + $identityId, ); return true; } @@ -270,7 +261,9 @@ private function isSraa(IdentityId $actorId = null): bool return false; } - $registrationAuthorityCredentials = $this->identityService->findRegistrationAuthorityCredentialsOf($actorId->getIdentityId()); + $registrationAuthorityCredentials = $this->identityService->findRegistrationAuthorityCredentialsOf( + $actorId->getIdentityId(), + ); if (!$registrationAuthorityCredentials) { return false; } @@ -288,8 +281,8 @@ private function logAllowSelfService(string $message, string $commandName, ?stri 'Allowing SelfService command %s for identity %s. With message "%s"', $commandName, $identityId, - $message - ) + $message, + ), ); } @@ -303,8 +296,8 @@ private function logDenySelfService(string $message, string $commandName, ?strin 'Denying SelfService command %s for identity %s. With message "%s"', $commandName, $identityId, - $message - ) + $message, + ), ); } @@ -318,8 +311,8 @@ private function logAllowRa(string $message, string $commandName, ?string $ident 'Allowing RA command %s for identity %s. With message "%s"', $commandName, $identityId, - $message - ) + $message, + ), ); } @@ -333,8 +326,8 @@ private function logDenyRA(string $message, string $commandName, ?string $identi 'Denying RA command %s for identity %s. With message "%s"', $commandName, $identityId, - $message - ) + $message, + ), ); } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/AuthorizationDecision.php b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/AuthorizationDecision.php index 0e78bd2d3..8dfaad2cb 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/AuthorizationDecision.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/AuthorizationDecision.php @@ -20,12 +20,8 @@ use Assert\Assertion; -final class AuthorizationDecision +final readonly class AuthorizationDecision { - private int $code; - - private array $errorMessages; - public static function allowed(): self { return new self(200); @@ -37,10 +33,10 @@ public static function denied(array $messages = []): self return new self(403, $messages); } - private function __construct(int $code, array $errorMessages = []) - { - $this->code = $code; - $this->errorMessages = $errorMessages; + private function __construct( + private int $code, + private array $errorMessages = [], + ) { } public function getCode(): int diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionAuthorizationContext.php b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionAuthorizationContext.php index 906b10ce4..24c7b449a 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionAuthorizationContext.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionAuthorizationContext.php @@ -34,16 +34,10 @@ */ class InstitutionAuthorizationContext implements InstitutionAuthorizationContextInterface { - private ?InstitutionCollection $institutions; - - private bool $isSraa; - public function __construct( - InstitutionCollection $institutions = null, - bool $isSraa = false + private readonly ?InstitutionCollection $institutions = null, + private readonly bool $isSraa = false, ) { - $this->institutions = $institutions; - $this->isSraa = $isSraa; } public function getInstitutions(): InstitutionCollection diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionRoleSet.php b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionRoleSet.php index 9af40c8f6..98125f2dd 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionRoleSet.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionRoleSet.php @@ -26,7 +26,7 @@ final class InstitutionRoleSet implements InstitutionRoleSetInterface /** * @var InstitutionRole[] */ - private array $institutionRoles; + private readonly array $institutionRoles; public function __construct(array $institutionRoles) { @@ -35,7 +35,7 @@ public function __construct(array $institutionRoles) throw InvalidArgumentException::invalidType( 'InsititutionRole[]', 'institutionRoles', - $institutionRoles + $institutionRoles, ); } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionRoleSetInterface.php b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionRoleSetInterface.php index 67eacf76c..380c70286 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionRoleSetInterface.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionRoleSetInterface.php @@ -18,9 +18,6 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Authorization\Value; -use Surfnet\Stepup\Configuration\Value\InstitutionRole; -use Surfnet\StepupMiddleware\ApiBundle\Exception\InvalidArgumentException; - interface InstitutionRoleSetInterface { public function getRoles(); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/AllowedSecondFactor.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/AllowedSecondFactor.php index 305a94116..a9de9890d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/AllowedSecondFactor.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/AllowedSecondFactor.php @@ -46,15 +46,10 @@ private function __construct() { } - /** - * @param Institution $institution - * @param SecondFactorType $secondFactorType - * @return AllowedSecondFactor - */ public static function createFrom(Institution $institution, SecondFactorType $secondFactorType): self { - $allowedSecondFactor = new self; - $allowedSecondFactor->institution = $institution; + $allowedSecondFactor = new self; + $allowedSecondFactor->institution = $institution; $allowedSecondFactor->secondFactorType = $secondFactorType; return $allowedSecondFactor; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/ConfiguredInstitution.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/ConfiguredInstitution.php index 3e95abde7..1f30e0e10 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/ConfiguredInstitution.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/ConfiguredInstitution.php @@ -33,10 +33,6 @@ class ConfiguredInstitution #[ORM\Column(type: 'stepup_configuration_institution')] public $institution; - /** - * @param Institution $institution - * @return ConfiguredInstitution - */ public static function createFrom(Institution $institution): self { $configuredInstitution = new self; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/InstitutionAuthorization.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/InstitutionAuthorization.php index 1b4dd860a..65c0d5904 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/InstitutionAuthorization.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/InstitutionAuthorization.php @@ -53,15 +53,12 @@ class InstitutionAuthorization public $institutionRole; /** - * @param Institution $institution - * @param Institution $institutionRelation - * @param InstitutionRole $institutionRole * @return InstitutionAuthorization */ public static function create( Institution $institution, Institution $institutionRelation, - InstitutionRole $institutionRole + InstitutionRole $institutionRole, ): self { $options = new self; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/InstitutionConfigurationOptions.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/InstitutionConfigurationOptions.php index dbfecfdba..f0c89b3f8 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/InstitutionConfigurationOptions.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/InstitutionConfigurationOptions.php @@ -90,14 +90,14 @@ public static function create( NumberOfTokensPerIdentityOption $numberOfTokensPerIdentityOption, SsoOn2faOption $ssoOn2faOption, SelfVetOption $selfVetOption, - SelfAssertedTokensOption $selfAssertedTokensOption + SelfAssertedTokensOption $selfAssertedTokensOption, ): self { $options = new self; - $options->institution = $institution; - $options->useRaLocationsOption = $useRaLocationsOption; + $options->institution = $institution; + $options->useRaLocationsOption = $useRaLocationsOption; $options->showRaaContactInformationOption = $showRaaContactInformationOption; - $options->verifyEmailOption = $verifyEmailOption; + $options->verifyEmailOption = $verifyEmailOption; $options->numberOfTokensPerIdentityOption = $numberOfTokensPerIdentityOption; $options->ssoOn2faOption = $ssoOn2faOption; $options->selfVetOption = $selfVetOption; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/RaLocation.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/RaLocation.php index 3b1f0f33c..07d5d31f6 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/RaLocation.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/RaLocation.php @@ -18,6 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity; +use Doctrine\ORM\Mapping as ORM; use JsonSerializable; use Surfnet\Stepup\Configuration\Value\ContactInformation; use Surfnet\Stepup\Configuration\Value\Institution; @@ -25,7 +26,6 @@ use Surfnet\Stepup\Configuration\Value\RaLocationName; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository\RaLocationRepository; use Surfnet\StepupMiddleware\ApiBundle\Exception\InvalidArgumentException; -use Doctrine\ORM\Mapping as ORM; #[ORM\Table] #[ORM\Index(name: 'idx_ra_location_institution', columns: ['institution'])] @@ -69,7 +69,7 @@ public static function create( Institution $institution, RaLocationName $name, Location $location, - ContactInformation $contactInformation + ContactInformation $contactInformation, ): self { if (!is_string($id)) { throw InvalidArgumentException::invalidType('string', 'id', $id); @@ -77,10 +77,10 @@ public static function create( $raLocation = new self; - $raLocation->id = $id; - $raLocation->institution = $institution; - $raLocation->name = $name; - $raLocation->location = $location; + $raLocation->id = $id; + $raLocation->institution = $institution; + $raLocation->name = $name; + $raLocation->location = $location; $raLocation->contactInformation = $contactInformation; return $raLocation; @@ -89,10 +89,10 @@ public static function create( public function jsonSerialize() { return [ - 'id' => $this->id, - 'institution' => $this->institution, - 'name' => $this->name, - 'location' => $this->location, + 'id' => $this->id, + 'institution' => $this->institution, + 'name' => $this->name, + 'location' => $this->location, 'contact_information' => $this->contactInformation, ]; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/AllowedSecondFactorListProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/AllowedSecondFactorListProjector.php index 2ed3432bb..6e39cfb25 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/AllowedSecondFactorListProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/AllowedSecondFactorListProjector.php @@ -25,16 +25,11 @@ final class AllowedSecondFactorListProjector extends Projector { - private AllowedSecondFactorRepository $allowedSecondFactorRepository; - - public function __construct(AllowedSecondFactorRepository $allowedSecondFactorRepository) - { - $this->allowedSecondFactorRepository = $allowedSecondFactorRepository; + public function __construct( + private readonly AllowedSecondFactorRepository $allowedSecondFactorRepository, + ) { } - /** - * @param AllowedSecondFactorListUpdatedEvent $event - */ public function applyAllowedSecondFactorListUpdatedEvent(AllowedSecondFactorListUpdatedEvent $event): void { // Start with a clean slate diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/ConfiguredInstitutionProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/ConfiguredInstitutionProjector.php index 70de45aa4..554863814 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/ConfiguredInstitutionProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/ConfiguredInstitutionProjector.php @@ -26,11 +26,9 @@ final class ConfiguredInstitutionProjector extends Projector { - private ConfiguredInstitutionRepository $configuredInstitutionRepository; - - public function __construct(ConfiguredInstitutionRepository $configuredInstitutionRepository) - { - $this->configuredInstitutionRepository = $configuredInstitutionRepository; + public function __construct( + private readonly ConfiguredInstitutionRepository $configuredInstitutionRepository, + ) { } public function applyNewInstitutionConfigurationCreatedEvent(NewInstitutionConfigurationCreatedEvent $event): void diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/InstitutionAuthorizationProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/InstitutionAuthorizationProjector.php index 08501e3fb..7fd76f770 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/InstitutionAuthorizationProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/InstitutionAuthorizationProjector.php @@ -32,15 +32,10 @@ */ final class InstitutionAuthorizationProjector extends Projector { - private InstitutionAuthorizationRepository $institutionAuthorizationRepository; - private InstitutionConfigurationOptionsRepository $institutionConfigurationOptionsRepository; - public function __construct( - InstitutionAuthorizationRepository $institutionAuthorizationRepository, - InstitutionConfigurationOptionsRepository $institutionConfigurationOptionsRepository + private readonly InstitutionAuthorizationRepository $institutionAuthorizationRepository, + private readonly InstitutionConfigurationOptionsRepository $institutionConfigurationOptionsRepository, ) { - $this->institutionAuthorizationRepository = $institutionAuthorizationRepository; - $this->institutionConfigurationOptionsRepository = $institutionConfigurationOptionsRepository; } public function applyNewInstitutionConfigurationCreatedEvent(NewInstitutionConfigurationCreatedEvent $event): void @@ -52,7 +47,7 @@ public function applyUseRaOptionChangedEvent(UseRaOptionChangedEvent $event): vo { $this->institutionAuthorizationRepository->saveInstitutionOption( $event->institution, - $event->useRaOption + $event->useRaOption, ); } @@ -60,7 +55,7 @@ public function applyUseRaaOptionChangedEvent(UseRaaOptionChangedEvent $event): { $this->institutionAuthorizationRepository->saveInstitutionOption( $event->institution, - $event->useRaaOption + $event->useRaaOption, ); } @@ -68,14 +63,14 @@ public function applySelectRaaOptionChangedEvent(SelectRaaOptionChangedEvent $ev { $this->institutionAuthorizationRepository->saveInstitutionOption( $event->institution, - $event->selectRaaOption + $event->selectRaaOption, ); } public function applyInstitutionConfigurationRemovedEvent(InstitutionConfigurationRemovedEvent $event): void { $this->institutionAuthorizationRepository->clearInstitutionOption( - $event->institution + $event->institution, ); } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/InstitutionConfigurationOptionsProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/InstitutionConfigurationOptionsProjector.php index 5b38dcdab..9f22e2dc2 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/InstitutionConfigurationOptionsProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/InstitutionConfigurationOptionsProjector.php @@ -34,16 +34,10 @@ final class InstitutionConfigurationOptionsProjector extends Projector { - private InstitutionConfigurationOptionsRepository $institutionConfigurationOptionsRepository; - - private AllowedSecondFactorRepository $allowedSecondFactorRepository; - public function __construct( - InstitutionConfigurationOptionsRepository $institutionConfigurationOptionsRepository, - AllowedSecondFactorRepository $allowedSecondFactorRepository + private readonly InstitutionConfigurationOptionsRepository $institutionConfigurationOptionsRepository, + private readonly AllowedSecondFactorRepository $allowedSecondFactorRepository, ) { - $this->institutionConfigurationOptionsRepository = $institutionConfigurationOptionsRepository; - $this->allowedSecondFactorRepository = $allowedSecondFactorRepository; } public function applyNewInstitutionConfigurationCreatedEvent(NewInstitutionConfigurationCreatedEvent $event): void @@ -56,7 +50,7 @@ public function applyNewInstitutionConfigurationCreatedEvent(NewInstitutionConfi $event->numberOfTokensPerIdentityOption, $event->ssoOn2faOption, $event->selfVetOption, - $event->selfAssertedTokensOption + $event->selfAssertedTokensOption, ); $this->institutionConfigurationOptionsRepository->save($institutionConfigurationOptions); @@ -64,15 +58,19 @@ public function applyNewInstitutionConfigurationCreatedEvent(NewInstitutionConfi public function applyUseRaLocationsOptionChangedEvent(UseRaLocationsOptionChangedEvent $event): void { - $institutionConfigurationOptions = $this->institutionConfigurationOptionsRepository->findConfigurationOptionsFor($event->institution); + $institutionConfigurationOptions = $this->institutionConfigurationOptionsRepository->findConfigurationOptionsFor( + $event->institution, + ); $institutionConfigurationOptions->useRaLocationsOption = $event->useRaLocationsOption; $this->institutionConfigurationOptionsRepository->save($institutionConfigurationOptions); } - public function applyShowRaaContactInformationOptionChangedEvent(ShowRaaContactInformationOptionChangedEvent $event): void + public function applyShowRaaContactInformationOptionChangedEvent(ShowRaaContactInformationOptionChangedEvent $event,): void { - $institutionConfigurationOptions = $this->institutionConfigurationOptionsRepository->findConfigurationOptionsFor($event->institution); + $institutionConfigurationOptions = $this->institutionConfigurationOptionsRepository->findConfigurationOptionsFor( + $event->institution, + ); $institutionConfigurationOptions->showRaaContactInformationOption = $event->showRaaContactInformationOption; $this->institutionConfigurationOptionsRepository->save($institutionConfigurationOptions); @@ -80,15 +78,19 @@ public function applyShowRaaContactInformationOptionChangedEvent(ShowRaaContactI public function applyVerifyEmailOptionChangedEvent(VerifyEmailOptionChangedEvent $event): void { - $institutionConfigurationOptions = $this->institutionConfigurationOptionsRepository->findConfigurationOptionsFor($event->institution); + $institutionConfigurationOptions = $this->institutionConfigurationOptionsRepository->findConfigurationOptionsFor( + $event->institution, + ); $institutionConfigurationOptions->verifyEmailOption = $event->verifyEmailOption; $this->institutionConfigurationOptionsRepository->save($institutionConfigurationOptions); } - public function applyNumberOfTokensPerIdentityOptionChangedEvent(NumberOfTokensPerIdentityOptionChangedEvent $event): void + public function applyNumberOfTokensPerIdentityOptionChangedEvent(NumberOfTokensPerIdentityOptionChangedEvent $event,): void { - $institutionConfigurationOptions = $this->institutionConfigurationOptionsRepository->findConfigurationOptionsFor($event->institution); + $institutionConfigurationOptions = $this->institutionConfigurationOptionsRepository->findConfigurationOptionsFor( + $event->institution, + ); $institutionConfigurationOptions->numberOfTokensPerIdentityOption = $event->numberOfTokensPerIdentityOption; $this->institutionConfigurationOptionsRepository->save($institutionConfigurationOptions); @@ -96,7 +98,9 @@ public function applyNumberOfTokensPerIdentityOptionChangedEvent(NumberOfTokensP public function applySelfVetOptionChangedEvent(SelfVetOptionChangedEvent $event): void { - $institutionConfigurationOptions = $this->institutionConfigurationOptionsRepository->findConfigurationOptionsFor($event->institution); + $institutionConfigurationOptions = $this->institutionConfigurationOptionsRepository->findConfigurationOptionsFor( + $event->institution, + ); $institutionConfigurationOptions->selfVetOption = $event->selfVetOption; $this->institutionConfigurationOptionsRepository->save($institutionConfigurationOptions); @@ -104,7 +108,9 @@ public function applySelfVetOptionChangedEvent(SelfVetOptionChangedEvent $event) public function applySsoOn2faOptionChangedEvent(SsoOn2faOptionChangedEvent $event): void { - $institutionConfigurationOptions = $this->institutionConfigurationOptionsRepository->findConfigurationOptionsFor($event->institution); + $institutionConfigurationOptions = $this->institutionConfigurationOptionsRepository->findConfigurationOptionsFor( + $event->institution, + ); $institutionConfigurationOptions->ssoOn2faOption = $event->ssoOn2faOption; $this->institutionConfigurationOptionsRepository->save($institutionConfigurationOptions); @@ -112,7 +118,9 @@ public function applySsoOn2faOptionChangedEvent(SsoOn2faOptionChangedEvent $even public function applySelfAssertedTokensOptionChangedEvent(SelfAssertedTokensOptionChangedEvent $event): void { - $institutionConfigurationOptions = $this->institutionConfigurationOptionsRepository->findConfigurationOptionsFor($event->institution); + $institutionConfigurationOptions = $this->institutionConfigurationOptionsRepository->findConfigurationOptionsFor( + $event->institution, + ); $institutionConfigurationOptions->selfAssertedTokensOption = $event->selfAssertedTokensOption; $this->institutionConfigurationOptionsRepository->save($institutionConfigurationOptions); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/RaLocationProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/RaLocationProjector.php index 864178401..cc308a544 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/RaLocationProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/RaLocationProjector.php @@ -32,11 +32,8 @@ class RaLocationProjector extends Projector { - private RaLocationRepository $repository; - - public function __construct(RaLocationRepository $repository) + public function __construct(private readonly RaLocationRepository $repository) { - $this->repository = $repository; } public function applyRaLocationAddedEvent(RaLocationAddedEvent $event): void @@ -46,7 +43,7 @@ public function applyRaLocationAddedEvent(RaLocationAddedEvent $event): void $event->institution, $event->raLocationName, $event->location, - $event->contactInformation + $event->contactInformation, ); $this->repository->save($raLocation); @@ -92,7 +89,6 @@ public function applyInstitutionConfigurationRemovedEvent(InstitutionConfigurati } /** - * @param RaLocationId $raLocationId * @return RaLocation */ private function fetchRaLocationById(RaLocationId $raLocationId) @@ -101,13 +97,13 @@ private function fetchRaLocationById(RaLocationId $raLocationId) if (is_null($raLocation)) { throw new RuntimeException( - 'Tried to update an RA Locations contact information, but location could not be found' + 'Tried to update an RA Locations contact information, but location could not be found', ); } if (!$raLocation instanceof RaLocation) { throw new RuntimeException( - 'Tried to update an RA Locations contact information, but location is of the wrong type' + 'Tried to update an RA Locations contact information, but location is of the wrong type', ); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/AllowedSecondFactorRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/AllowedSecondFactorRepository.php index 63f4f6861..879870426 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/AllowedSecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/AllowedSecondFactorRepository.php @@ -38,10 +38,9 @@ public function save(AllowedSecondFactor $allowedSecondFactor): void } /** - * @param Institution $institution * @return AllowedSecondFactor[] */ - public function getAllowedSecondFactorsFor(Institution $institution) + public function getAllowedSecondFactorsFor(Institution $institution): array { return $this->createQueryBuilder('asf') ->select() diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/ConfiguredInstitutionRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/ConfiguredInstitutionRepository.php index 9758216f6..a4b304582 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/ConfiguredInstitutionRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/ConfiguredInstitutionRepository.php @@ -30,9 +30,6 @@ public function __construct(ManagerRegistry $registry) parent::__construct($registry, ConfiguredInstitution::class); } - /** - * @param ConfiguredInstitution $configuredInstitution - */ public function save(ConfiguredInstitution $configuredInstitution): void { $entityManager = $this->getEntityManager(); @@ -41,7 +38,6 @@ public function save(ConfiguredInstitution $configuredInstitution): void } /** - * @param Institution $institution * @return bool */ public function hasConfigurationFor(Institution $institution): bool @@ -56,9 +52,6 @@ public function hasConfigurationFor(Institution $institution): bool return $result !== null; } - /** - * @param Institution $institution - */ public function removeConfigurationFor(Institution $institution): void { $this->createQueryBuilder('ci') diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionAuthorizationRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionAuthorizationRepository.php index 59e0eeb75..7ddf08077 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionAuthorizationRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionAuthorizationRepository.php @@ -35,8 +35,6 @@ public function __construct(ManagerRegistry $registry) } /** - * @param Institution $institution - * @param InstitutionRole $role * @return InstitutionAuthorization[] */ public function findAuthorizationOptionsForInstitutionByRole(Institution $institution, InstitutionRole $role) @@ -51,7 +49,6 @@ public function findAuthorizationOptionsForInstitutionByRole(Institution $instit } /** - * @param Institution $institution * @return InstitutionAuthorization[] */ public function findAuthorizationOptionsForInstitution(Institution $institution) @@ -64,7 +61,6 @@ public function findAuthorizationOptionsForInstitution(Institution $institution) } /** - * @param Institution $institution * @return InstitutionAuthorization[] */ public function findSelectRaasForInstitution(Institution $institution) @@ -79,19 +75,19 @@ public function findSelectRaasForInstitution(Institution $institution) } /** - * @param Institution $institution - * @param InstitutionAuthorizationOption $institutionOption * @throws OptimisticLockException */ - public function saveInstitutionOption(Institution $institution, InstitutionAuthorizationOption $institutionOption): void - { + public function saveInstitutionOption( + Institution $institution, + InstitutionAuthorizationOption $institutionOption, + ): void { $institutionAuthorizations = []; foreach ($institutionOption->getInstitutions($institution) as $relatedInstitution) { $institutionAuthorizations[] = InstitutionAuthorization::create( $institution, $relatedInstitution, - $institutionOption->getInstitutionRole() + $institutionOption->getInstitutionRole(), ); } @@ -99,7 +95,6 @@ public function saveInstitutionOption(Institution $institution, InstitutionAutho } /** - * @param Institution $institution * @param InstitutionAuthorizationOption $institutionOption * @throws OptimisticLockException */ @@ -108,8 +103,8 @@ public function clearInstitutionOption(Institution $institution): void $entityManager = $this->getEntityManager(); $entityManager->createQuery( - 'DELETE '.InstitutionAuthorization::class.' ia - WHERE ia.institution = :institution' + 'DELETE ' . InstitutionAuthorization::class . ' ia + WHERE ia.institution = :institution', ) ->setParameter('institution', $institution->getInstitution()) ->execute(); @@ -119,28 +114,25 @@ public function clearInstitutionOption(Institution $institution): void /** - * @param Institution $institution * @throws OptimisticLockException */ public function setDefaultInstitutionOption(Institution $institution): void { $this->saveInstitutionOption( $institution, - InstitutionAuthorizationOption::getDefault(InstitutionRole::useRa()) + InstitutionAuthorizationOption::getDefault(InstitutionRole::useRa()), ); $this->saveInstitutionOption( $institution, - InstitutionAuthorizationOption::getDefault(InstitutionRole::useRaa()) + InstitutionAuthorizationOption::getDefault(InstitutionRole::useRaa()), ); $this->saveInstitutionOption( $institution, - InstitutionAuthorizationOption::getDefault(InstitutionRole::selectRaa()) + InstitutionAuthorizationOption::getDefault(InstitutionRole::selectRaa()), ); } /** - * @param Institution $institution - * @param InstitutionRole $role * @param InstitutionAuthorization[] $institutionAuthorizations * @throws OptimisticLockException */ @@ -154,16 +146,14 @@ private function save(Institution $institution, InstitutionRole $role, array $in $entityManager->flush(); } - /** - * @param EntityManager $entityManager - * @param Institution $institution - * @param InstitutionRole $role - */ - private function clearOldAuthorizations(EntityManager $entityManager, Institution $institution, InstitutionRole $role): void - { + private function clearOldAuthorizations( + EntityManager $entityManager, + Institution $institution, + InstitutionRole $role, + ): void { $entityManager->createQuery( - 'DELETE '.InstitutionAuthorization::class.' ia - WHERE ia.institutionRole = :role AND ia.institution = :institution' + 'DELETE ' . InstitutionAuthorization::class . ' ia + WHERE ia.institutionRole = :role AND ia.institution = :institution', ) ->setParameter('role', $role) ->setParameter('institution', $institution->getInstitution()) @@ -171,12 +161,13 @@ private function clearOldAuthorizations(EntityManager $entityManager, Institutio } /** - * @param EntityManager $entityManager - * @param InstitutionRole $role * @param InstitutionAuthorization[] $institutionAuthorizations */ - private function addNewAuthorizations(EntityManager $entityManager, InstitutionRole $role, array $institutionAuthorizations): void - { + private function addNewAuthorizations( + EntityManager $entityManager, + InstitutionRole $role, + array $institutionAuthorizations, + ): void { foreach ($institutionAuthorizations as $institutionAuthorization) { if ($institutionAuthorization->institutionRole === $role) { $entityManager->persist($institutionAuthorization); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionConfigurationOptionsRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionConfigurationOptionsRepository.php index d2fc52ad6..e008a03a3 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionConfigurationOptionsRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionConfigurationOptionsRepository.php @@ -32,7 +32,6 @@ public function __construct(ManagerRegistry $registry) } /** - * @param Institution $institution * @return InstitutionConfigurationOptions * @throws NonUniqueResultException */ @@ -45,9 +44,6 @@ public function findConfigurationOptionsFor(Institution $institution) ->getOneOrNullResult(); } - /** - * @param InstitutionConfigurationOptions $institutionConfigurationOptions - */ public function save(InstitutionConfigurationOptions $institutionConfigurationOptions): void { $entityManager = $this->getEntityManager(); @@ -55,9 +51,6 @@ public function save(InstitutionConfigurationOptions $institutionConfigurationOp $entityManager->flush(); } - /** - * @param Institution $institution - */ public function removeConfigurationOptionsFor(Institution $institution): void { $this->createQueryBuilder('ico') diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/RaLocationRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/RaLocationRepository.php index 08aba2ef0..0211b5199 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/RaLocationRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/RaLocationRepository.php @@ -34,7 +34,6 @@ public function __construct(ManagerRegistry $registry) } /** - * @param RaLocationQuery $query * @return null|RaLocation[] */ public function search(RaLocationQuery $query) @@ -43,12 +42,12 @@ public function search(RaLocationQuery $query) throw new RuntimeException(sprintf('Unknown order by column "%s"', $query->orderBy)); } - $orderBy = 'rl.'.$query->orderBy; + $orderBy = 'rl.' . $query->orderBy; $orderDirection = $query->orderDirection === 'asc' ? 'ASC' : 'DESC'; return $this->getEntityManager()->createQueryBuilder() ->select('rl') - ->from('Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity\RaLocation', 'rl') + ->from(RaLocation::class, 'rl') ->where('rl.institution = :institution') ->setParameter('institution', $query->institution->getInstitution()) ->orderBy($orderBy, $orderDirection) @@ -57,7 +56,6 @@ public function search(RaLocationQuery $query) } /** - * @param RaLocationId $raLocationId * @return RaLocation[] */ public function findByRaLocationId(RaLocationId $raLocationId) @@ -69,9 +67,6 @@ public function findByRaLocationId(RaLocationId $raLocationId) ->getOneOrNullResult(); } - /** - * @param RaLocation $raLocation - */ public function save(RaLocation $raLocation): void { $entityManager = $this->getEntityManager(); @@ -79,9 +74,6 @@ public function save(RaLocation $raLocation): void $entityManager->flush(); } - /** - * @param RaLocation $raLocation - */ public function remove(RaLocation $raLocation): void { $entityManager = $this->getEntityManager(); @@ -90,7 +82,6 @@ public function remove(RaLocation $raLocation): void } /** - * @param Institution $institution * @return RaLocation[] */ public function findByInstitution(Institution $institution) @@ -102,9 +93,6 @@ public function findByInstitution(Institution $institution) ->getResult(); } - /** - * @param Institution $institution - */ public function removeRaLocationsFor(Institution $institution): void { $this->createQueryBuilder('rl') diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/AllowedSecondFactorListService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/AllowedSecondFactorListService.php index af3210e09..127ab72c1 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/AllowedSecondFactorListService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/AllowedSecondFactorListService.php @@ -26,23 +26,18 @@ class AllowedSecondFactorListService { - private AllowedSecondFactorRepository $allowedSecondFactorRepository; - - private ConfiguredInstitutionRepository $configuredInstitutionRepository; - public function __construct( - AllowedSecondFactorRepository $allowedSecondFactoryRepository, - ConfiguredInstitutionRepository $configuredInstitutionRepository + private readonly AllowedSecondFactorRepository $allowedSecondFactorRepository, + private readonly ConfiguredInstitutionRepository $configuredInstitutionRepository, ) { - $this->allowedSecondFactorRepository = $allowedSecondFactoryRepository; - $this->configuredInstitutionRepository = $configuredInstitutionRepository; } public function getAllowedSecondFactorListFor(Institution $institution): AllowedSecondFactorList { - $allowedSecondFactors = array_map(function (AllowedSecondFactor $allowedSecondFactor) { - return $allowedSecondFactor->secondFactorType; - }, $this->allowedSecondFactorRepository->getAllowedSecondFactorsFor($institution)); + $allowedSecondFactors = array_map( + fn(AllowedSecondFactor $allowedSecondFactor) => $allowedSecondFactor->secondFactorType, + $this->allowedSecondFactorRepository->getAllowedSecondFactorsFor($institution), + ); return AllowedSecondFactorList::ofTypes($allowedSecondFactors); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/AllowedSecondFactorMap.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/AllowedSecondFactorMap.php index 73bdc412c..72eb0a104 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/AllowedSecondFactorMap.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/AllowedSecondFactorMap.php @@ -47,10 +47,6 @@ public static function from($allowedSecondFactors): self return $allowedSecondFactorMap; } - /** - * @param Institution $institution - * @return AllowedSecondFactorList - */ public function getAllowedSecondFactorListFor(Institution $institution): AllowedSecondFactorList { $institution = strtolower($institution->getInstitution()); @@ -62,7 +58,6 @@ public function getAllowedSecondFactorListFor(Institution $institution): Allowed } /** - * @param AllowedSecondFactor $allowedSecondFactor * @SuppressWarnings(PHPMD.UnusedPrivateMethod) */ private function add(AllowedSecondFactor $allowedSecondFactor): void diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/ConfiguredInstitutionService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/ConfiguredInstitutionService.php index 45446c8cd..0b04c2521 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/ConfiguredInstitutionService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/ConfiguredInstitutionService.php @@ -25,11 +25,9 @@ class ConfiguredInstitutionService { - private ConfiguredInstitutionRepository $repository; - - public function __construct(ConfiguredInstitutionRepository $repository) - { - $this->repository = $repository; + public function __construct( + private readonly ConfiguredInstitutionRepository $repository, + ) { } /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionAuthorizationOptionMap.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionAuthorizationOptionMap.php index d06b2849d..9ac663dbf 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionAuthorizationOptionMap.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionAuthorizationOptionMap.php @@ -31,7 +31,6 @@ final class InstitutionAuthorizationOptionMap /** * InstitutionAuthorizationOptionMap constructor. - * @param Institution $institution * @param InstitutionAuthorization[] $institutionAuthorizations */ private function __construct(Institution $institution, array $institutionAuthorizations) @@ -52,24 +51,28 @@ private function __construct(Institution $institution, array $institutionAuthori $institutions[$role->getType()][] = $authorization->institutionRelation; } foreach ($roles as $role) { - $institutionAuthorizationOption = InstitutionAuthorizationOption::fromInstitutions($role, $institution, $institutions[$role->getType()]); + $institutionAuthorizationOption = InstitutionAuthorizationOption::fromInstitutions( + $role, + $institution, + $institutions[$role->getType()], + ); $this->institutionOptions[$role->getType()] = $institutionAuthorizationOption; } } /** - * @param Institution $institution * @param InstitutionAuthorization[]|null * @return InstitutionAuthorizationOptionMap */ - public static function fromInstitutionAuthorizations(Institution $institution, array $institutionAuthorizations): self - { + public static function fromInstitutionAuthorizations( + Institution $institution, + array $institutionAuthorizations, + ): self { return new self($institution, $institutionAuthorizations); } /** * InstitutionAuthorizationOption - * @param InstitutionRole $role * @return InstitutionAuthorizationOption */ public function getAuthorizationOptionsByRole(InstitutionRole $role) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionAuthorizationService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionAuthorizationService.php index d00d7f9f6..750f50df4 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionAuthorizationService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionAuthorizationService.php @@ -25,24 +25,17 @@ class InstitutionAuthorizationService { - private InstitutionAuthorizationRepository $repository; - - /** - * @param InstitutionAuthorizationRepository $repository - */ - public function __construct( - InstitutionAuthorizationRepository $repository - ) { - $this->repository = $repository; + public function __construct(private readonly InstitutionAuthorizationRepository $repository) + { } /** - * @param Institution $institution - * @param InstitutionRole $role * @return InstitutionAuthorizationOption */ - public function findAuthorizationsByRoleFor(Institution $institution, InstitutionRole $role): InstitutionAuthorizationOption - { + public function findAuthorizationsByRoleFor( + Institution $institution, + InstitutionRole $role, + ): InstitutionAuthorizationOption { $authorizations = $this->repository->findAuthorizationOptionsForInstitutionByRole($institution, $role); $institutions = []; @@ -54,7 +47,6 @@ public function findAuthorizationsByRoleFor(Institution $institution, Institutio } /** - * @param Institution $institution * @return InstitutionAuthorizationOptionMap */ public function findAuthorizationsFor(Institution $institution) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionConfigurationOptionsService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionConfigurationOptionsService.php index 0cee156b5..43a925138 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionConfigurationOptionsService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionConfigurationOptionsService.php @@ -24,23 +24,13 @@ class InstitutionConfigurationOptionsService { - private InstitutionConfigurationOptionsRepository $repository; - - /** - * @var int - */ - private $numberOfTokensPerIdentity; - /** - * @param InstitutionConfigurationOptionsRepository $repository * @param int $numberOfTokensPerIdentity */ public function __construct( - InstitutionConfigurationOptionsRepository $repository, - $numberOfTokensPerIdentity + private readonly InstitutionConfigurationOptionsRepository $repository, + private $numberOfTokensPerIdentity, ) { - $this->repository = $repository; - $this->numberOfTokensPerIdentity = $numberOfTokensPerIdentity; } /** @@ -52,7 +42,6 @@ public function findAllInstitutionConfigurationOptions(): array } /** - * @param Institution $institution * @return InstitutionConfigurationOptions|null */ public function findInstitutionConfigurationOptionsFor(Institution $institution) @@ -66,7 +55,6 @@ public function findInstitutionConfigurationOptionsFor(Institution $institution) * When the DISABLED value is set on the institution (when no specific configuration was pushed) the application * default is returned. * - * @param Institution $institution * @return int */ public function getMaxNumberOfTokensFor(Institution $institution) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/RaLocationService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/RaLocationService.php index 65d67ff16..29dc42e14 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/RaLocationService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/RaLocationService.php @@ -26,15 +26,11 @@ class RaLocationService { - private RaLocationRepository $repository; - - public function __construct(RaLocationRepository $repository) + public function __construct(private readonly RaLocationRepository $repository) { - $this->repository = $repository; } /** - * @param RaLocationQuery $query * @return null|RaLocation[] */ public function search(RaLocationQuery $query) @@ -43,7 +39,6 @@ public function search(RaLocationQuery $query) } /** - * @param RaLocationId $raLocationId * @return RaLocation[] */ public function findByRaLocationId(RaLocationId $raLocationId) @@ -53,7 +48,6 @@ public function findByRaLocationId(RaLocationId $raLocationId) /** - * @param Institution $institution * @return RaLocation[] */ public function listRaLocationsFor(Institution $institution) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuditLogController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuditLogController.php index 64716a3e7..0a29858e7 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuditLogController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuditLogController.php @@ -29,11 +29,9 @@ final class AuditLogController extends AbstractController { - private AuditLogService $auditLogService; - - public function __construct(AuditLogService $service) - { - $this->auditLogService = $service; + public function __construct( + private readonly AuditLogService $auditLogService, + ) { } public function secondFactorAuditLog(Request $request, Institution $institution) @@ -45,12 +43,12 @@ public function secondFactorAuditLog(Request $request, Institution $institution) throw new BadApiRequestException(['This API-call MUST include the identityId as get parameter']); } - $query = new SecondFactorAuditLogQuery(); + $query = new SecondFactorAuditLogQuery(); $query->identityInstitution = $institution; - $query->identityId = new IdentityId($identityId); - $query->orderBy = $request->get('orderBy', $query->orderBy); - $query->orderDirection = $request->get('orderDirection', $query->orderDirection); - $query->pageNumber = $request->get('p', 1); + $query->identityId = new IdentityId($identityId); + $query->orderBy = $request->get('orderBy', $query->orderBy); + $query->orderDirection = $request->get('orderDirection', $query->orderDirection); + $query->pageNumber = $request->get('p', 1); $paginator = $this->auditLogService->searchSecondFactorAuditLog($query); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuthorizationController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuthorizationController.php index bd05febd1..54e65638c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuthorizationController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuthorizationController.php @@ -25,16 +25,16 @@ class AuthorizationController extends AbstractController { - private AuthorizationService $authorizationService; - - public function __construct(AuthorizationService $authorizationService) - { - $this->authorizationService = $authorizationService; + public function __construct( + private readonly AuthorizationService $authorizationService, + ) { } public function mayRegisterSelfAssertedTokens(string $identityId) { - $decision = $this->authorizationService->assertRegistrationOfSelfAssertedTokensIsAllowed(new IdentityId($identityId)); + $decision = $this->authorizationService->assertRegistrationOfSelfAssertedTokensIsAllowed( + new IdentityId($identityId), + ); return JsonAuthorizationResponse::from($decision); } @@ -46,7 +46,9 @@ public function mayRegisterRecoveryTokens(string $identityId) public function maySelfVetSelfAssertedToken(string $identityId) { - $decision = $this->authorizationService->assertSelfVetUsingSelfAssertedTokenIsAllowed(new IdentityId($identityId)); + $decision = $this->authorizationService->assertSelfVetUsingSelfAssertedTokenIsAllowed( + new IdentityId($identityId), + ); return JsonAuthorizationResponse::from($decision); } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php index 37b59025a..e6c290054 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php @@ -34,7 +34,6 @@ use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; -use Symfony\Component\Security\Core\Authorization\AuthorizationChecker; use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface; /** @@ -42,36 +41,13 @@ */ class CommandController extends AbstractController { - private WhitelistService $whitelistService; - - private TransactionAwarePipeline $pipeline; - - private MetadataEnricher $metadataEnricher; - - /** - * @var AuthorizationChecker - */ - private AuthorizationCheckerInterface $authorizationChecker; - - private LoggerInterface $logger; - - private CommandAuthorizationService $commandAuthorizationService; - - public function __construct( - TransactionAwarePipeline $pipeline, - WhitelistService $whitelistService, - MetadataEnricher $enricher, - AuthorizationCheckerInterface $authorizationChecker, - LoggerInterface $logger, - CommandAuthorizationService $commandAuthorizationService + private readonly TransactionAwarePipeline $pipeline, + private readonly MetadataEnricher $metadataEnricher, + private readonly AuthorizationCheckerInterface $authorizationChecker, + private readonly LoggerInterface $logger, + private readonly CommandAuthorizationService $commandAuthorizationService, ) { - $this->pipeline = $pipeline; - $this->whitelistService = $whitelistService; - $this->authorizationChecker = $authorizationChecker; - $this->metadataEnricher = $enricher; - $this->logger = $logger; - $this->commandAuthorizationService = $commandAuthorizationService; } public function handle(Command $command, Metadata $metadata, Request $request): JsonResponse @@ -94,7 +70,7 @@ public function handle(Command $command, Metadata $metadata, Request $request): } catch (ForbiddenException $e) { throw new AccessDeniedHttpException( sprintf('Processing of command "%s" is forbidden for this client', $command), - $e + $e, ); } @@ -106,11 +82,6 @@ public function handle(Command $command, Metadata $metadata, Request $request): return $response; } - /** - * @param Command $command - * @param Metadata $metadata - * @return Institution - */ private function resolveInstitution(Command $command, Metadata $metadata): Institution { if ($metadata->actorInstitution) { @@ -127,14 +98,10 @@ private function resolveInstitution(Command $command, Metadata $metadata): Insti // conservative, if we cannot determine an institution, deny processing. throw new AccessDeniedHttpException( - 'Cannot reliably determine the institution of the actor, denying processing of command' + 'Cannot reliably determine the institution of the actor, denying processing of command', ); } - /** - * @param Command $command - * @param Metadata $metadata - */ private function handleAuthorization(Command $command, Metadata $metadata): void { // Get the actorId and actorInstitution from the metadata @@ -149,27 +116,33 @@ private function handleAuthorization(Command $command, Metadata $metadata): void $this->logger->notice('Ensuring that the actor institution is on the whitelist, or the actor is SRAA'); $institution = $this->resolveInstitution($command, $metadata); if (!$this->commandAuthorizationService->isInstitutionWhitelisted($institution, $actorId)) { - throw new AccessDeniedHttpException(sprintf( - 'Institution "%s" is not on the whitelist and actor "%s" is not an SRAA, processing of command denied', - $institution, - $metadata->actorId - )); + throw new AccessDeniedHttpException( + sprintf( + 'Institution "%s" is not on the whitelist and actor "%s" is not an SRAA, processing of command denied', + $institution, + $metadata->actorId, + ), + ); } - $this->logger->notice('Ensuring that the actor is allowed to execute a command based on the fine grained authorization configuration'); + $this->logger->notice( + 'Ensuring that the actor is allowed to execute a command based on the fine grained authorization configuration', + ); // Validate that if a command is an SelfServiceExecutable we may execute the command // This should be an SRAA or the actor itself // Be aware that for the CreateIdentityCommand and UpdateIdentityCommand the actorId is unknown because we aren't logged in yet if (!$this->commandAuthorizationService->maySelfserviceCommandBeExecutedOnBehalfOf( $command, - $actorId + $actorId, )) { - throw new AccessDeniedHttpException(sprintf( - 'The actor "%s" is not allowed to act on behalf of identity "%s" processing of SelfService command denied', - new IdentityId($metadata->actorId), - $command->getIdentityId() - )); + throw new AccessDeniedHttpException( + sprintf( + 'The actor "%s" is not allowed to act on behalf of identity "%s" processing of SelfService command denied', + new IdentityId($metadata->actorId), + $command->getIdentityId(), + ), + ); } // Validate that if a command is an RAExecutable we may execute the command @@ -177,13 +150,15 @@ private function handleAuthorization(Command $command, Metadata $metadata): void if (!$this->commandAuthorizationService->mayRaCommandBeExecutedOnBehalfOf( $command, $actorId, - $actorInstitution + $actorInstitution, )) { - throw new AccessDeniedHttpException(sprintf( - 'The actor "%s" is not allowed to act on behalf of institution "%s" processing of RA command denied', - new IdentityId($metadata->actorId), - $institution - )); + throw new AccessDeniedHttpException( + sprintf( + 'The actor "%s" is not allowed to act on behalf of institution "%s" processing of RA command denied', + new IdentityId($metadata->actorId), + $institution, + ), + ); } } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ConfiguredInstitutionController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ConfiguredInstitutionController.php index 02e214230..f1243c34e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ConfiguredInstitutionController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ConfiguredInstitutionController.php @@ -24,11 +24,9 @@ class ConfiguredInstitutionController extends AbstractController { - private ConfiguredInstitutionService $configuredInstitutionService; - - public function __construct(ConfiguredInstitutionService $allListings) - { - $this->configuredInstitutionService = $allListings; + public function __construct( + private readonly ConfiguredInstitutionService $configuredInstitutionService, + ) { } public function collection(): JsonResponse diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/DeprovisionController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/DeprovisionController.php index 902652d45..d3f2dd77d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/DeprovisionController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/DeprovisionController.php @@ -27,16 +27,10 @@ class DeprovisionController extends AbstractController { - private DeprovisionServiceInterface $deprovisionService; - - private UserDataFormatterInterface $formatHelper; - public function __construct( - DeprovisionServiceInterface $deprovisionService, - UserDataFormatterInterface $formatHelper + private readonly DeprovisionServiceInterface $deprovisionService, + private readonly UserDataFormatterInterface $formatHelper, ) { - $this->deprovisionService = $deprovisionService; - $this->formatHelper = $formatHelper; } public function deprovision(string $collabPersonId): JsonResponse @@ -48,7 +42,7 @@ public function deprovision(string $collabPersonId): JsonResponse if ($userData !== []) { $this->deprovisionService->deprovision($collabPersonId); } - } catch (DomainException $e) { + } catch (DomainException) { // On domain exceptions, like when the identity is forgotten, we return OK, with empty data // just so the deprovision run does not end prematurely. At this point, no other domain exceptions // are thrown. diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php index 615dd07b9..1119e39a6 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php @@ -29,26 +29,21 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; class IdentityController extends AbstractController { - private IdentityService $identityService; - - private InstitutionRoleSet $roleRequirements; + private readonly InstitutionRoleSet $roleRequirements; public function __construct( - IdentityService $identityService + private IdentityService $identityService, ) { - $this->identityService = $identityService; - $this->roleRequirements = new InstitutionRoleSet( - [new InstitutionRole(InstitutionRole::ROLE_USE_RA), new InstitutionRole(InstitutionRole::ROLE_USE_RAA)] + [new InstitutionRole(InstitutionRole::ROLE_USE_RA), new InstitutionRole(InstitutionRole::ROLE_USE_RAA)], ); } - public function getAction($id): JsonResponse + public function get($id): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/InstitutionConfigurationOptionsController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/InstitutionConfigurationOptionsController.php index d6a65ca79..13dc93ff9 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/InstitutionConfigurationOptionsController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/InstitutionConfigurationOptionsController.php @@ -29,23 +29,11 @@ final class InstitutionConfigurationOptionsController extends AbstractController { - private InstitutionConfigurationOptionsService $institutionConfigurationOptionsService; - - /** - * @return InstitutionAuthorizationService - */ - private InstitutionAuthorizationService $institutionAuthorizationService; - - private AllowedSecondFactorListService $allowedSecondFactorListService; - public function __construct( - InstitutionConfigurationOptionsService $institutionConfigurationOptionsService, - InstitutionAuthorizationService $institutionAuthorizationService, - AllowedSecondFactorListService $allowedSecondFactorListService + private readonly InstitutionConfigurationOptionsService $institutionConfigurationOptionsService, + private readonly InstitutionAuthorizationService $institutionAuthorizationService, + private readonly AllowedSecondFactorListService $allowedSecondFactorListService, ) { - $this->institutionConfigurationOptionsService = $institutionConfigurationOptionsService; - $this->institutionAuthorizationService = $institutionAuthorizationService; - $this->allowedSecondFactorListService = $allowedSecondFactorListService; } public function getForInstitution($institutionName): JsonResponse @@ -64,7 +52,7 @@ public function getForInstitution($institutionName): JsonResponse if ($institutionConfigurationOptions === null) { throw new NotFoundHttpException( - sprintf('No institution configuration options found for institution "%s"', $institution) + sprintf('No institution configuration options found for institution "%s"', $institution), ); } @@ -77,18 +65,24 @@ public function getForInstitution($institutionName): JsonResponse ->findAuthorizationsFor($institution); return new JsonResponse([ - 'institution' => $institutionConfigurationOptions->institution, - 'use_ra_locations' => $institutionConfigurationOptions->useRaLocationsOption, + 'institution' => $institutionConfigurationOptions->institution, + 'use_ra_locations' => $institutionConfigurationOptions->useRaLocationsOption, 'show_raa_contact_information' => $institutionConfigurationOptions->showRaaContactInformationOption, - 'verify_email' => $institutionConfigurationOptions->verifyEmailOption, + 'verify_email' => $institutionConfigurationOptions->verifyEmailOption, 'sso_on_2fa' => $institutionConfigurationOptions->ssoOn2faOption, 'self_vet' => $institutionConfigurationOptions->selfVetOption, 'allow_self_asserted_tokens' => $institutionConfigurationOptions->selfAssertedTokensOption, 'number_of_tokens_per_identity' => $numberOfTokensPerIdentity, - 'allowed_second_factors' => $allowedSecondFactorList, - 'use_ra' => $institutionConfigurationOptionsMap->getAuthorizationOptionsByRole(InstitutionRole::useRa())->jsonSerialize(), - 'use_raa' => $institutionConfigurationOptionsMap->getAuthorizationOptionsByRole(InstitutionRole::useRaa())->jsonSerialize(), - 'select_raa' => $institutionConfigurationOptionsMap->getAuthorizationOptionsByRole(InstitutionRole::selectRaa())->jsonSerialize(), + 'allowed_second_factors' => $allowedSecondFactorList, + 'use_ra' => $institutionConfigurationOptionsMap->getAuthorizationOptionsByRole( + InstitutionRole::useRa(), + )->jsonSerialize(), + 'use_raa' => $institutionConfigurationOptionsMap->getAuthorizationOptionsByRole( + InstitutionRole::useRaa(), + )->jsonSerialize(), + 'select_raa' => $institutionConfigurationOptionsMap->getAuthorizationOptionsByRole( + InstitutionRole::selectRaa(), + )->jsonSerialize(), ]); } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ProfileController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ProfileController.php index 183831e53..83a1f9b51 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ProfileController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ProfileController.php @@ -28,27 +28,28 @@ class ProfileController extends AbstractController { - private ProfileService $profileService; - public function __construct( - ProfileService $profileService + private readonly ProfileService $profileService, ) { - $this->profileService = $profileService; } - public function getAction(Request $request, $identityId): JsonResponse + public function get(Request $request, $identityId): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); // Is the actor allowed to view the profile page? $actorId = $request->get('actorId'); if ($identityId !== $actorId) { - throw new AccessDeniedHttpException("Identity and actor id should match. It is not yet allowed to view the profile of somebody else."); + throw new AccessDeniedHttpException( + "Identity and actor id should match. It is not yet allowed to view the profile of somebody else.", + ); } $profile = $this->profileService->createProfile($identityId); if (!$profile instanceof Profile) { - throw new NotFoundHttpException("The profile cannot be created, the identity id did not match an identity."); + throw new NotFoundHttpException( + "The profile cannot be created, the identity id did not match an identity.", + ); } return new JsonResponse($profile); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php index f847c5429..5169695a2 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php @@ -18,7 +18,6 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Controller; -use Surfnet\Stepup\Configuration\Value\InstitutionRole; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\RegistrationAuthorityRole; use Surfnet\StepupMiddleware\ApiBundle\Authorization\Service\AuthorizationContextService; @@ -29,24 +28,18 @@ use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; + use function sprintf; class RaCandidateController extends AbstractController { - private RaCandidateService $raCandidateService; - - private AuthorizationContextService $authorizationService; - public function __construct( - RaCandidateService $raCandidateService, - AuthorizationContextService $authorizationService + private readonly RaCandidateService $raCandidateService, + private readonly AuthorizationContextService $authorizationService, ) { - $this->raCandidateService = $raCandidateService; - $this->authorizationService = $authorizationService; } /** - * @param Request $request * @return JsonCollectionResponse */ public function search(Request $request) @@ -55,16 +48,16 @@ public function search(Request $request) $actorId = new IdentityId($request->get('actorId')); - $query = new RaCandidateQuery(); - $query->institution = $request->get('institution'); - $query->commonName = $request->get('commonName'); - $query->email = $request->get('email'); + $query = new RaCandidateQuery(); + $query->institution = $request->get('institution'); + $query->commonName = $request->get('commonName'); + $query->email = $request->get('email'); $query->secondFactorTypes = $request->get('secondFactorTypes'); - $query->raInstitution = $request->get('raInstitution'); - $query->pageNumber = (int) $request->get('p', 1); + $query->raInstitution = $request->get('raInstitution'); + $query->pageNumber = (int)$request->get('p', 1); $query->authorizationContext = $this->authorizationService->buildSelectRaaInstitutionAuthorizationContext( - $actorId + $actorId, ); $paginator = $this->raCandidateService->search($query); @@ -75,10 +68,9 @@ public function search(Request $request) } /** - * @param Request $request * @return JsonResponse */ - public function getAction(Request $request): JsonResponse + public function get(Request $request): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); @@ -88,7 +80,7 @@ public function getAction(Request $request): JsonResponse $authorizationContext = $this->authorizationService->buildInstitutionAuthorizationContext( $actorId, - RegistrationAuthorityRole::ra() + RegistrationAuthorityRole::ra(), ); $raCandidate = $this->raCandidateService->findOneByIdentityId($identityId); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaController.php index c62a01329..3509aa0d1 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaController.php @@ -25,11 +25,9 @@ class RaController extends AbstractController { - private RaListingService $raListingService; - - public function __construct(RaListingService $raListingService) - { - $this->raListingService = $raListingService; + public function __construct( + private readonly RaListingService $raListingService, + ) { } public function list(Institution $institution): JsonCollectionResponse diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php index dcdd80db0..c13c40e05 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php @@ -32,19 +32,13 @@ class RaListingController extends AbstractController { - private RaListingService $raListingService; - - private AuthorizationContextService $authorizationService; - public function __construct( - RaListingService $raListingService, - AuthorizationContextService $authorizationService + private readonly RaListingService $raListingService, + private readonly AuthorizationContextService $authorizationService, ) { - $this->raListingService = $raListingService; - $this->authorizationService = $authorizationService; } - public function getAction(Request $request, $identityId): JsonResponse + public function get(Request $request, $identityId): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); @@ -53,13 +47,13 @@ public function getAction(Request $request, $identityId): JsonResponse $authorizationContext = $this->authorizationService->buildInstitutionAuthorizationContext( $actorId, - RegistrationAuthorityRole::raa() + RegistrationAuthorityRole::raa(), ); $raListing = $this->raListingService->findByIdentityIdAndRaInstitutionWithContext( new IdentityId($identityId), $institution, - $authorizationContext + $authorizationContext, ); if ($raListing === null) { @@ -70,7 +64,6 @@ public function getAction(Request $request, $identityId): JsonResponse } /** - * @param Request $request * @return JsonCollectionResponse */ public function search(Request $request) @@ -110,7 +103,7 @@ public function search(Request $request) $query->orderDirection = $request->get('orderDirection'); $query->authorizationContext = $this->authorizationService->buildInstitutionAuthorizationContext( $actorId, - RegistrationAuthorityRole::raa() + RegistrationAuthorityRole::raa(), ); $searchResults = $this->raListingService->search($query); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaLocationController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaLocationController.php index 45d4a4108..ade76efdd 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaLocationController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaLocationController.php @@ -29,37 +29,32 @@ final class RaLocationController extends AbstractController { - /** - * @return RaLocationService - */ - private RaLocationService $raLocationService; - - public function __construct(RaLocationService $raLocationService) - { - $this->raLocationService = $raLocationService; + public function __construct( + private readonly RaLocationService $raLocationService, + ) { } public function search(Request $request, Institution $institution): JsonCollectionResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); - $query = new RaLocationQuery(); - $query->institution = $institution; - $query->orderBy = $request->get('orderBy', $query->orderBy); + $query = new RaLocationQuery(); + $query->institution = $institution; + $query->orderBy = $request->get('orderBy', $query->orderBy); $query->orderDirection = $request->get('orderDirection', $query->orderDirection); $raLocations = $this->raLocationService->search($query); - $count = count($raLocations); + $count = count($raLocations); return new JsonCollectionResponse($count, 1, $count, $raLocations); } - public function getAction(Request $request): JsonResponse + public function get(Request $request): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); $raLocationId = new RaLocationId($request->get('raLocationId')); - $raLocation = $this->raLocationService->findByRaLocationId($raLocationId); + $raLocation = $this->raLocationService->findByRaLocationId($raLocationId); return new JsonResponse($raLocation); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php index 7549d61f2..a2615fdf5 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php @@ -30,16 +30,10 @@ final class RaSecondFactorController extends AbstractController { - private RaSecondFactorService $raSecondFactorService; - - private AuthorizationContextService $authorizationService; - public function __construct( - RaSecondFactorService $raSecondFactorService, - AuthorizationContextService $authorizationService + private readonly RaSecondFactorService $raSecondFactorService, + private readonly AuthorizationContextService $authorizationService, ) { - $this->raSecondFactorService = $raSecondFactorService; - $this->authorizationService = $authorizationService; } public function collection(Request $request) @@ -67,7 +61,6 @@ public function export(Request $request): JsonResponse } /** - * @param Request $request * @return RaSecondFactorQuery */ private function buildRaSecondFactorQuery(Request $request): RaSecondFactorQuery @@ -86,7 +79,7 @@ private function buildRaSecondFactorQuery(Request $request): RaSecondFactorQuery $query->orderDirection = $request->get('orderDirection'); $query->authorizationContext = $this->authorizationService->buildInstitutionAuthorizationContext( $actorId, - RegistrationAuthorityRole::ra() + RegistrationAuthorityRole::ra(), ); return $query; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php index 3546a6761..36c68c3b1 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php @@ -38,23 +38,14 @@ */ class RecoveryTokenController extends AbstractController { - private RecoveryTokenService $service; - - private AuthorizationContextService $authorizationService; - - private LoggerInterface $logger; - public function __construct( - RecoveryTokenService $recoveryTokenServiceService, - AuthorizationContextService $authorizationService, - LoggerInterface $logger + private readonly RecoveryTokenService $service, + private readonly AuthorizationContextService $authorizationService, + private readonly LoggerInterface $logger, ) { - $this->service = $recoveryTokenServiceService; - $this->authorizationService = $authorizationService; - $this->logger = $logger; } - public function getAction($id): JsonResponse + public function get($id): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); $this->logger->info(sprintf('Received request to get recovery token: %s', $id)); @@ -70,7 +61,9 @@ public function getAction($id): JsonResponse public function collection(Request $request) { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); - $this->logger->info(sprintf('Received search request for recovery tokens with params: %s', $request->getQueryString())); + $this->logger->info( + sprintf('Received search request for recovery tokens with params: %s', $request->getQueryString()), + ); $query = new RecoveryTokenQuery(); $query->identityId = $request->get('identityId'); $query->type = $request->get('type'); @@ -78,7 +71,7 @@ public function collection(Request $request) $query->institution = $request->get('institution'); $query->email = $request->get('email'); $query->name = $request->get('name'); - $query->pageNumber = (int) $request->get('p', 1); + $query->pageNumber = (int)$request->get('p', 1); $query->orderBy = $request->get('orderBy'); $query->orderDirection = $request->get('orderDirection'); @@ -90,7 +83,7 @@ public function collection(Request $request) $actorId = new IdentityId($actorId); $query->authorizationContext = $this->authorizationService->buildInstitutionAuthorizationContext( $actorId, - RegistrationAuthorityRole::ra() + RegistrationAuthorityRole::ra(), ); } $paginator = $this->service->search($query); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/SraaController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/SraaController.php index 3f9180407..6d5b60853 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/SraaController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/SraaController.php @@ -27,18 +27,15 @@ class SraaController extends AbstractController { - private SraaService $sraaService; - - public function __construct(SraaService $sraaService) + public function __construct(private readonly SraaService $sraaService) { - $this->sraaService = $sraaService; } /** * @param string $nameId injected by symfony from the request * @return JsonNotFoundResponse|JsonResponse */ - public function getAction($nameId): JsonResponse + public function get($nameId): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); @@ -51,7 +48,7 @@ public function getAction($nameId): JsonResponse return new JsonResponse($sraa); } - public function list() : JsonResponse + public function list(): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php index d2c76beca..c4f37f3d1 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php @@ -30,14 +30,12 @@ class UnverifiedSecondFactorController extends AbstractController { - private SecondFactorService $secondFactorService; - - public function __construct(SecondFactorService $secondFactorService) - { - $this->secondFactorService = $secondFactorService; + public function __construct( + private readonly SecondFactorService $secondFactorService, + ) { } - public function getAction($id): JsonResponse + public function get($id): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); @@ -54,10 +52,10 @@ public function collection(Request $request) { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); - $query = new UnverifiedSecondFactorQuery(); - $query->identityId = $request->get('identityId'); + $query = new UnverifiedSecondFactorQuery(); + $query->identityId = $request->get('identityId'); $query->verificationNonce = $request->get('verificationNonce'); - $query->pageNumber = (int) $request->get('p', 1); + $query->pageNumber = (int)$request->get('p', 1); $paginator = $this->secondFactorService->searchUnverifiedSecondFactors($query); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VerifiedSecondFactorController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VerifiedSecondFactorController.php index 66f348623..c6d4c7510 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VerifiedSecondFactorController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VerifiedSecondFactorController.php @@ -18,7 +18,6 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Controller; -use Surfnet\Stepup\Configuration\Value\InstitutionRole; use Surfnet\Stepup\Helper\SecondFactorProvePossessionHelper; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\RegistrationAuthorityRole; @@ -40,24 +39,14 @@ */ class VerifiedSecondFactorController extends AbstractController { - private SecondFactorService $secondFactorService; - - private AuthorizationContextService $institutionAuthorizationService; - - private SecondFactorProvePossessionHelper $secondFactorProvePossessionHelper; - - public function __construct( - SecondFactorService $secondFactorService, - AuthorizationContextService $authorizationService, - SecondFactorProvePossessionHelper $secondFactorProvePossessionHelper + private readonly SecondFactorService $secondFactorService, + private readonly AuthorizationContextService $institutionAuthorizationService, + private readonly SecondFactorProvePossessionHelper $secondFactorProvePossessionHelper, ) { - $this->secondFactorService = $secondFactorService; - $this->institutionAuthorizationService = $authorizationService; - $this->secondFactorProvePossessionHelper = $secondFactorProvePossessionHelper; } - public function getAction($id): JsonResponse + public function get($id): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); @@ -87,10 +76,10 @@ public function collection(Request $request) } $query->registrationCode = $request->get('registrationCode'); - $query->pageNumber = (int) $request->get('p', 1); + $query->pageNumber = (int)$request->get('p', 1); $query->authorizationContext = $this->institutionAuthorizationService->buildInstitutionAuthorizationContext( $actorId, - RegistrationAuthorityRole::ra() + RegistrationAuthorityRole::ra(), ); $paginator = $this->secondFactorService->searchVerifiedSecondFactors($query); @@ -104,7 +93,7 @@ public function collectionOfIdentity(Request $request) $query = new VerifiedSecondFactorOfIdentityQuery(); $query->identityId = new IdentityId($request->get('identityId')); - $query->pageNumber = (int) $request->get('p', 1); + $query->pageNumber = (int)$request->get('p', 1); $paginator = $this->secondFactorService->searchVerifiedSecondFactorsOfIdentity($query); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php index b157abdd3..0b1aaf8a6 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php @@ -30,14 +30,12 @@ class VettedSecondFactorController extends AbstractController { - private SecondFactorService $secondFactorService; - - public function __construct(SecondFactorService $secondFactorService) - { - $this->secondFactorService = $secondFactorService; + public function __construct( + private readonly SecondFactorService $secondFactorService, + ) { } - public function getAction($id): JsonResponse + public function get($id): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); @@ -54,9 +52,9 @@ public function collection(Request $request) { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); - $query = new VettedSecondFactorQuery(); + $query = new VettedSecondFactorQuery(); $query->identityId = $request->get('identityId'); - $query->pageNumber = (int) $request->get('p', 1); + $query->pageNumber = (int)$request->get('p', 1); $paginator = $this->secondFactorService->searchVettedSecondFactors($query); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettingTypeHintController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettingTypeHintController.php index e6ca2ce19..806d609fb 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettingTypeHintController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettingTypeHintController.php @@ -22,35 +22,24 @@ use Surfnet\Stepup\Configuration\Value\InstitutionRole; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\Institution; -use Surfnet\Stepup\Identity\Value\RecoveryTokenId; -use Surfnet\StepupMiddleware\ApiBundle\Authorization\Service\AuthorizationContextService; use Surfnet\StepupMiddleware\ApiBundle\Exception\NotFoundException; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\RecoveryTokenQuery; -use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\RecoveryTokenService; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonCollectionResponse; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Service\VettingTypeHintService; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use function in_array; -use function sprintf; class VettingTypeHintController extends AbstractController { - private VettingTypeHintService $service; - - private LoggerInterface $logger; - public function __construct( - VettingTypeHintService $vettingTypeHintService, - LoggerInterface $logger + private readonly VettingTypeHintService $service, + private readonly LoggerInterface $logger, ) { - $this->service = $vettingTypeHintService; - $this->logger = $logger; } - public function getAction($institution): JsonResponse + public function get($institution): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); $this->logger->info(sprintf('Received request to get a vetting type hint for institution: %s', $institution)); @@ -58,7 +47,10 @@ public function getAction($institution): JsonResponse try { $recoveryToken = $this->service->findBy(new Institution($institution)); } catch (NotFoundException $e) { - throw new NotFoundHttpException(sprintf("Vetting type hint for institution '%s' was not found", $institution), $e); + throw new NotFoundHttpException( + sprintf("Vetting type hint for institution '%s' was not found", $institution), + $e, + ); } return new JsonResponse($recoveryToken); } @@ -66,7 +58,9 @@ public function getAction($institution): JsonResponse public function collection(Request $request) { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); - $this->logger->info(sprintf('Received search request for recovery tokens with params: %s', $request->getQueryString())); + $this->logger->info( + sprintf('Received search request for recovery tokens with params: %s', $request->getQueryString()), + ); $query = new RecoveryTokenQuery(); $query->identityId = $request->get('identityId'); $query->type = $request->get('type'); @@ -74,7 +68,7 @@ public function collection(Request $request) $query->institution = $request->get('institution'); $query->email = $request->get('email'); $query->name = $request->get('name'); - $query->pageNumber = (int) $request->get('p', 1); + $query->pageNumber = (int)$request->get('p', 1); $query->orderBy = $request->get('orderBy'); $query->orderDirection = $request->get('orderDirection'); @@ -86,7 +80,7 @@ public function collection(Request $request) $actorId = new IdentityId($actorId); $query->authorizationContext = $this->authorizationService->buildInstitutionAuthorizationContext( $actorId, - new InstitutionRole(InstitutionRole::ROLE_USE_RA) + new InstitutionRole(InstitutionRole::ROLE_USE_RA), ); } $paginator = $this->service->search($query); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/DependencyInjection/Configuration.php b/src/Surfnet/StepupMiddleware/ApiBundle/DependencyInjection/Configuration.php index 92f432acf..e8d1e0b26 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/DependencyInjection/Configuration.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/DependencyInjection/Configuration.php @@ -30,15 +30,13 @@ public function getConfigTreeBuilder(): TreeBuilder $rootNode ->children() - ->scalarNode('http_basic_realm') - ->defaultValue('Secure Gateway API') - ->validate() - ->ifTrue(function ($realm): bool { - return !is_string($realm) || empty($realm); - }) - ->thenInvalid("Invalid HTTP Basic realm '%s'. Must be string and non-empty.") - ->end() - ->end() + ->scalarNode('http_basic_realm') + ->defaultValue('Secure Gateway API') + ->validate() + ->ifTrue(fn($realm): bool => !is_string($realm) || empty($realm)) + ->thenInvalid("Invalid HTTP Basic realm '%s'. Must be string and non-empty.") + ->end() + ->end() ->end(); return $treeBuilder; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/AuthorityRoleType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/AuthorityRoleType.php index cb04ac9d8..f5a349d45 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/AuthorityRoleType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/AuthorityRoleType.php @@ -29,7 +29,7 @@ */ class AuthorityRoleType extends Type { - const NAME = 'authority_role'; + public const NAME = 'authority_role'; public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) { @@ -46,7 +46,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) return $value; } - return (string) $value; + return (string)$value; } public function convertToPHPValue($value, AbstractPlatform $platform) @@ -61,7 +61,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) // get nice standard message, so we can throw it keeping the exception chain $doctrineExceptionMessage = ConversionException::conversionFailed( $value, - $this->getName() + $this->getName(), )->getMessage(); throw new ConversionException($doctrineExceptionMessage, 0, $e); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/CommonNameType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/CommonNameType.php index 9e462c501..40e23b159 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/CommonNameType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/CommonNameType.php @@ -29,7 +29,7 @@ */ class CommonNameType extends Type { - const NAME = 'stepup_common_name'; + public const NAME = 'stepup_common_name'; public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) { @@ -42,7 +42,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) return $value; } - return (string) $value; + return (string)$value; } public function convertToPHPValue($value, AbstractPlatform $platform) @@ -57,7 +57,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) // get nice standard message, so we can throw it keeping the exception chain $doctrineExceptionMessage = ConversionException::conversionFailed( $value, - $this->getName() + $this->getName(), )->getMessage(); throw new ConversionException($doctrineExceptionMessage, 0, $e); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationContactInformationType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationContactInformationType.php index 2ba32b6ae..e6822ef35 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationContactInformationType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationContactInformationType.php @@ -21,15 +21,15 @@ use Doctrine\DBAL\Platforms\AbstractPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; -use Surfnet\Stepup\Exception\InvalidArgumentException; use Surfnet\Stepup\Configuration\Value\ContactInformation; +use Surfnet\Stepup\Exception\InvalidArgumentException; /** * Custom Type for the ContactInformation Value Object for the Configuration domain */ class ConfigurationContactInformationType extends Type { - const NAME = 'stepup_configuration_contact_information'; + public const NAME = 'stepup_configuration_contact_information'; public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) { @@ -46,9 +46,9 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) throw new ConversionException( sprintf( "Encountered illegal contact information of type %s '%s', expected a ContactInformation instance", - is_object($value) ? get_class($value) : gettype($value), - is_scalar($value) ? (string) $value : '' - ) + get_debug_type($value), + is_scalar($value) ? (string)$value : '', + ), ); } @@ -67,7 +67,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) // get nice standard message, so we can throw it keeping the exception chain $doctrineExceptionMessage = ConversionException::conversionFailed( $value, - $this->getName() + $this->getName(), )->getMessage(); throw new ConversionException($doctrineExceptionMessage, 0, $e); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationInstitutionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationInstitutionType.php index abf0aff55..7c93cdb67 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationInstitutionType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationInstitutionType.php @@ -29,7 +29,7 @@ */ class ConfigurationInstitutionType extends Type { - const NAME = 'stepup_configuration_institution'; + public const NAME = 'stepup_configuration_institution'; public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) { @@ -46,9 +46,9 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) throw new ConversionException( sprintf( "Encountered illegal institution of type %s '%s', expected an Institution instance", - is_object($value) ? get_class($value) : gettype($value), - is_scalar($value) ? (string) $value : '' - ) + get_debug_type($value), + is_scalar($value) ? (string)$value : '', + ), ); } @@ -67,7 +67,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) // get nice standard message, so we can throw it keeping the exception chain $doctrineExceptionMessage = ConversionException::conversionFailed( $value, - $this->getName() + $this->getName(), )->getMessage(); throw new ConversionException($doctrineExceptionMessage, 0, $e); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationLocationType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationLocationType.php index d52f5deb1..017766a87 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationLocationType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationLocationType.php @@ -21,15 +21,15 @@ use Doctrine\DBAL\Platforms\AbstractPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; -use Surfnet\Stepup\Exception\InvalidArgumentException; use Surfnet\Stepup\Configuration\Value\Location; +use Surfnet\Stepup\Exception\InvalidArgumentException; /** * Custom Type for the Location Value Object for the Configuration domain */ class ConfigurationLocationType extends Type { - const NAME = 'stepup_configuration_location'; + public const NAME = 'stepup_configuration_location'; public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) { @@ -46,9 +46,9 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) throw new ConversionException( sprintf( "Encountered illegal location of type %s '%s', expected a Location instance", - is_object($value) ? get_class($value) : gettype($value), - is_scalar($value) ? (string) $value : '' - ) + get_debug_type($value), + is_scalar($value) ? (string)$value : '', + ), ); } @@ -67,7 +67,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) // get nice standard message, so we can throw it keeping the exception chain $doctrineExceptionMessage = ConversionException::conversionFailed( $value, - $this->getName() + $this->getName(), )->getMessage(); throw new ConversionException($doctrineExceptionMessage, 0, $e); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ContactInformationType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ContactInformationType.php index 93842158a..d9d8ab3ae 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ContactInformationType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ContactInformationType.php @@ -29,7 +29,7 @@ */ class ContactInformationType extends Type { - const NAME = 'stepup_contact_information'; + public const NAME = 'stepup_contact_information'; public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) { @@ -42,7 +42,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) return $value; } - return (string) $value; + return (string)$value; } public function convertToPHPValue($value, AbstractPlatform $platform) @@ -57,7 +57,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) // get nice standard message, so we can throw it keeping the exception chain $doctrineExceptionMessage = ConversionException::conversionFailed( $value, - $this->getName() + $this->getName(), )->getMessage(); throw new ConversionException($doctrineExceptionMessage, 0, $e); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DateTimeType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DateTimeType.php index dcece31fc..f66137c3e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DateTimeType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DateTimeType.php @@ -31,10 +31,10 @@ */ class DateTimeType extends Type { - const NAME = 'stepup_datetime'; + public const NAME = 'stepup_datetime'; /** - * @param array $fieldDeclaration + * @param array $fieldDeclaration * @param AbstractPlatform $platform * @return string * @throws DBALException @@ -45,7 +45,7 @@ public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $pla } /** - * @param mixed $value + * @param mixed $value * @param AbstractPlatform $platform * @return null|string */ @@ -62,7 +62,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) } /** - * @param mixed $value + * @param mixed $value * @param AbstractPlatform $platform * @return null|DateTime * @throws ConversionException @@ -73,13 +73,17 @@ public function convertToPHPValue($value, AbstractPlatform $platform) return $value; } - $dateTime = CoreDateTime::createFromFormat($platform->getDateTimeFormatString(), $value, new DateTimeZone('UTC')); + $dateTime = CoreDateTime::createFromFormat( + $platform->getDateTimeFormatString(), + $value, + new DateTimeZone('UTC'), + ); if (!$dateTime) { throw ConversionException::conversionFailedFormat( $value, $this->getName(), - $platform->getDateTimeFormatString() + $platform->getDateTimeFormatString(), ); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DocumentNumberType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DocumentNumberType.php index e2fbe33ae..236f0b747 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DocumentNumberType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DocumentNumberType.php @@ -29,10 +29,10 @@ */ class DocumentNumberType extends Type { - const NAME = 'stepup_document_number'; + public const NAME = 'stepup_document_number'; /** - * @param array $fieldDeclaration + * @param array $fieldDeclaration * @param AbstractPlatform $platform * @return string * @throws DBALException @@ -58,9 +58,9 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) throw new ConversionException( sprintf( "Encountered illegal document number of type %s '%s', expected a DocumentNumber instance", - is_object($value) ? get_class($value) : gettype($value), - is_scalar($value) ? (string) $value : '' - ) + get_debug_type($value), + is_scalar($value) ? (string)$value : '', + ), ); } @@ -68,7 +68,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) } /** - * @param mixed $value + * @param mixed $value * @param AbstractPlatform $platform * @return null|DocumentNumber * @throws ConversionException diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/EmailType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/EmailType.php index 32cd2381f..89a51f73c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/EmailType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/EmailType.php @@ -29,7 +29,7 @@ */ class EmailType extends Type { - const NAME = 'stepup_email'; + public const NAME = 'stepup_email'; public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) { @@ -42,7 +42,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) return $value; } - return (string) $value; + return (string)$value; } public function convertToPHPValue($value, AbstractPlatform $platform) @@ -57,7 +57,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) // get nice standard message, so we can throw it keeping the exception chain $doctrineExceptionMessage = ConversionException::conversionFailed( $value, - $this->getName() + $this->getName(), )->getMessage(); throw new ConversionException($doctrineExceptionMessage, 0, $e); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionRoleType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionRoleType.php index 7c98c0db1..13542f76c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionRoleType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionRoleType.php @@ -21,7 +21,6 @@ use Doctrine\DBAL\Platforms\AbstractPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; -use Surfnet\Stepup\Configuration\Value\InstitutionAuthorizationOption; use Surfnet\Stepup\Configuration\Value\InstitutionRole; use Surfnet\Stepup\Exception\InvalidArgumentException; @@ -30,7 +29,7 @@ */ class InstitutionRoleType extends Type { - const NAME = 'stepup_institution_role'; + public const NAME = 'stepup_institution_role'; public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) { @@ -47,9 +46,9 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) throw new ConversionException( sprintf( "Encountered illegal location of type %s '%s', expected a InstitutionRole instance", - is_object($value) ? get_class($value) : gettype($value), - is_scalar($value) ? (string) $value : '' - ) + get_debug_type($value), + is_scalar($value) ? (string)$value : '', + ), ); } @@ -68,7 +67,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) // get nice standard message, so we can throw it keeping the exception chain $doctrineExceptionMessage = ConversionException::conversionFailed( $value, - $this->getName() + $this->getName(), )->getMessage(); throw new ConversionException($doctrineExceptionMessage, 0, $e); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionType.php index 5f7f410f5..381600263 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionType.php @@ -21,15 +21,15 @@ use Doctrine\DBAL\Platforms\AbstractPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; -use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\Stepup\Exception\InvalidArgumentException; +use Surfnet\Stepup\Identity\Value\Institution; /** * Custom Type for the Institution Value Object */ class InstitutionType extends Type { - const NAME = 'institution'; + public const NAME = 'institution'; public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) { @@ -42,7 +42,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) return $value; } - return (string) $value; + return (string)$value; } public function convertToPHPValue($value, AbstractPlatform $platform) @@ -57,7 +57,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) // get nice standard message, so we can throw it keeping the exception chain $doctrineExceptionMessage = ConversionException::conversionFailed( $value, - $this->getName() + $this->getName(), )->getMessage(); throw new ConversionException($doctrineExceptionMessage, 0, $e); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/LocaleType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/LocaleType.php index dd62270a6..89c8ce455 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/LocaleType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/LocaleType.php @@ -29,7 +29,7 @@ */ class LocaleType extends Type { - const NAME = 'stepup_locale'; + public const NAME = 'stepup_locale'; public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) { @@ -42,7 +42,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) return $value; } - return (string) $value; + return (string)$value; } public function convertToPHPValue($value, AbstractPlatform $platform) @@ -57,7 +57,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) // get nice standard message, so we can throw it keeping the exception chain $doctrineExceptionMessage = ConversionException::conversionFailed( $value, - $this->getName() + $this->getName(), )->getMessage(); throw new ConversionException($doctrineExceptionMessage, 0, $e); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/LocationType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/LocationType.php index 254cbcb68..ffb292321 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/LocationType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/LocationType.php @@ -29,7 +29,7 @@ */ class LocationType extends Type { - const NAME = 'stepup_location'; + public const NAME = 'stepup_location'; public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) { @@ -42,7 +42,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) return $value; } - return (string) $value; + return (string)$value; } public function convertToPHPValue($value, AbstractPlatform $platform) @@ -57,7 +57,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) // get nice standard message, so we can throw it keeping the exception chain $doctrineExceptionMessage = ConversionException::conversionFailed( $value, - $this->getName() + $this->getName(), )->getMessage(); throw new ConversionException($doctrineExceptionMessage, 0, $e); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NameIdType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NameIdType.php index c5ff9903d..329fae98a 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NameIdType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NameIdType.php @@ -29,7 +29,7 @@ */ class NameIdType extends Type { - const NAME = 'stepup_name_id'; + public const NAME = 'stepup_name_id'; public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) { @@ -42,7 +42,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) return $value; } - return (string) $value; + return (string)$value; } public function convertToPHPValue($value, AbstractPlatform $platform) @@ -57,7 +57,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) // get nice standard message, so we can throw it keeping the exception chain $doctrineExceptionMessage = ConversionException::conversionFailed( $value, - $this->getName() + $this->getName(), )->getMessage(); throw new ConversionException($doctrineExceptionMessage, 0, $e); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NumberOfTokensPerIdentityType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NumberOfTokensPerIdentityType.php index 49fd1198b..27ef1612a 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NumberOfTokensPerIdentityType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NumberOfTokensPerIdentityType.php @@ -29,7 +29,7 @@ */ class NumberOfTokensPerIdentityType extends Type { - const NAME = 'stepup_number_of_tokens_per_identity_option'; + public const NAME = 'stepup_number_of_tokens_per_identity_option'; public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) { @@ -47,9 +47,9 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) sprintf( "Encountered illegal number of tokens per identity %s '%s', expected a NumberOfTokensPerIdentityOption instance", - is_object($value) ? get_class($value) : gettype($value), - is_scalar($value) ? (string) $value : '' - ) + get_debug_type($value), + is_scalar($value) ? (string)$value : '', + ), ); } @@ -63,12 +63,12 @@ public function convertToPHPValue($value, AbstractPlatform $platform) } try { - $numberOfTokensPerIdentityOption = new NumberOfTokensPerIdentityOption((int) $value); + $numberOfTokensPerIdentityOption = new NumberOfTokensPerIdentityOption((int)$value); } catch (InvalidArgumentException $e) { // get nice standard message, so we can throw it keeping the exception chain $doctrineExceptionMessage = ConversionException::conversionFailed( $value, - $this->getName() + $this->getName(), )->getMessage(); throw new ConversionException($doctrineExceptionMessage, 0, $e); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RaLocationNameType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RaLocationNameType.php index d06dd6dc4..7deae2490 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RaLocationNameType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RaLocationNameType.php @@ -29,7 +29,7 @@ */ class RaLocationNameType extends Type { - const NAME = 'stepup_ra_location_name'; + public const NAME = 'stepup_ra_location_name'; public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) { @@ -46,9 +46,9 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) throw new ConversionException( sprintf( "Encountered illegal RA location name of type %s '%s', expected a RaLocationName instance", - is_object($value) ? get_class($value) : gettype($value), - is_scalar($value) ? (string) $value : '' - ) + get_debug_type($value), + is_scalar($value) ? (string)$value : '', + ), ); } @@ -67,7 +67,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) // get nice standard message, so we can throw it keeping the exception chain $doctrineExceptionMessage = ConversionException::conversionFailed( $value, - $this->getName() + $this->getName(), )->getMessage(); throw new ConversionException($doctrineExceptionMessage, 0, $e); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RecoveryTokenStatusType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RecoveryTokenStatusType.php index 3a6222c24..996efc727 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RecoveryTokenStatusType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RecoveryTokenStatusType.php @@ -28,7 +28,7 @@ */ class RecoveryTokenStatusType extends Type { - const NAME = 'stepup_recovery_token_status'; + public const NAME = 'stepup_recovery_token_status'; public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform): string { @@ -45,9 +45,9 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): int throw new ConversionException( sprintf( "Encountered illegal recovery token status of type %s '%s', expected a RecoveryTokenStatus instance", - is_object($value) ? get_class($value) : gettype($value), - is_scalar($value) ? (string) $value : '' - ) + get_debug_type($value), + is_scalar($value) ? (string)$value : '', + ), ); } @@ -59,7 +59,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): int return 20; } - throw new ConversionException(sprintf("Encountered inconvertible second factor status '%s'", (string) $value)); + throw new ConversionException(sprintf("Encountered inconvertible second factor status '%s'", (string)$value)); } /** @@ -79,9 +79,9 @@ public function convertToPHPValue($value, AbstractPlatform $platform): RecoveryT throw new ConversionException( sprintf( "Encountered illegal recovery token status of type %s '%s', expected it to be one of [0,10,20]", - is_object($value) ? get_class($value) : gettype($value), - is_scalar($value) ? (string) $value : '' - ) + get_debug_type($value), + is_scalar($value) ? (string)$value : '', + ), ); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorStatusType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorStatusType.php index 0901599c4..5ea8a4009 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorStatusType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorStatusType.php @@ -29,10 +29,10 @@ */ class SecondFactorStatusType extends Type { - const NAME = 'stepup_second_factor_status'; + public const NAME = 'stepup_second_factor_status'; /** - * @param array $fieldDeclaration + * @param array $fieldDeclaration * @param AbstractPlatform $platform * @return string */ @@ -42,7 +42,7 @@ public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $pla } /** - * @param mixed $value + * @param mixed $value * @param AbstractPlatform $platform * @return int * @throws ConversionException @@ -53,9 +53,9 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) throw new ConversionException( sprintf( "Encountered illegal second factor status of type %s '%s', expected a SecondFactorStatus instance", - is_object($value) ? get_class($value) : gettype($value), - is_scalar($value) ? (string) $value : '' - ) + get_debug_type($value), + is_scalar($value) ? (string)$value : '', + ), ); } @@ -71,11 +71,11 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) return 40; } - throw new ConversionException(sprintf("Encountered inconvertible second factor status '%s'", (string) $value)); + throw new ConversionException(sprintf("Encountered inconvertible second factor status '%s'", (string)$value)); } /** - * @param mixed $value + * @param mixed $value * @param AbstractPlatform $platform * @return SecondFactorStatus * @throws ConversionException @@ -97,9 +97,9 @@ public function convertToPHPValue($value, AbstractPlatform $platform) throw new ConversionException( sprintf( "Encountered illegal second factor status of type %s '%s', expected it to be one of [0,10,20,30,40]", - is_object($value) ? get_class($value) : gettype($value), - is_scalar($value) ? (string) $value : '' - ) + get_debug_type($value), + is_scalar($value) ? (string)$value : '', + ), ); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorTypeType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorTypeType.php index 9c4661c76..65589f020 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorTypeType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorTypeType.php @@ -29,7 +29,7 @@ */ class SecondFactorTypeType extends Type { - const NAME = 'stepup_second_factor_type'; + public const NAME = 'stepup_second_factor_type'; public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) { @@ -42,7 +42,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) return $value; } - return (string) $value; + return (string)$value; } public function convertToPHPValue($value, AbstractPlatform $platform) @@ -57,7 +57,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) // get nice standard message, so we can throw it keeping the exception chain $doctrineExceptionMessage = ConversionException::conversionFailed( $value, - $this->getName() + $this->getName(), )->getMessage(); throw new ConversionException($doctrineExceptionMessage, 0, $e); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SelfAssertedTokensOptionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SelfAssertedTokensOptionType.php index 5aa124f5b..4ec78a6a7 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SelfAssertedTokensOptionType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SelfAssertedTokensOptionType.php @@ -29,7 +29,7 @@ */ class SelfAssertedTokensOptionType extends Type { - const NAME = 'stepup_self_asserted_tokens_option'; + public const NAME = 'stepup_self_asserted_tokens_option'; public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) { @@ -47,13 +47,13 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) sprintf( "Encountered illegal self vet option %s '%s', expected a SelfAssertedTokensOption instance", - is_object($value) ? get_class($value) : gettype($value), - is_scalar($value) ? (string) $value : '' - ) + get_debug_type($value), + is_scalar($value) ? (string)$value : '', + ), ); } - return (int) $value->isEnabled(); + return (int)$value->isEnabled(); } public function convertToPHPValue($value, AbstractPlatform $platform) @@ -63,12 +63,12 @@ public function convertToPHPValue($value, AbstractPlatform $platform) } try { - $selfAssertedTokensOption = new SelfAssertedTokensOption((bool) $value); + $selfAssertedTokensOption = new SelfAssertedTokensOption((bool)$value); } catch (TypeError $e) { // get nice standard message, so we can throw it keeping the exception chain $doctrineExceptionMessage = ConversionException::conversionFailed( $value, - $this->getName() + $this->getName(), )->getMessage(); throw new ConversionException($doctrineExceptionMessage, 0, $e); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SelfVetOptionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SelfVetOptionType.php index b4bf7c7cd..9fc83c3e0 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SelfVetOptionType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SelfVetOptionType.php @@ -29,7 +29,7 @@ */ class SelfVetOptionType extends Type { - const NAME = 'stepup_self_vet_option'; + public const NAME = 'stepup_self_vet_option'; public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) { @@ -47,13 +47,13 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) sprintf( "Encountered illegal self vet option %s '%s', expected a SelfVetOption instance", - is_object($value) ? get_class($value) : gettype($value), - is_scalar($value) ? (string) $value : '' - ) + get_debug_type($value), + is_scalar($value) ? (string)$value : '', + ), ); } - return (int) $value->isEnabled(); + return (int)$value->isEnabled(); } public function convertToPHPValue($value, AbstractPlatform $platform) @@ -63,12 +63,12 @@ public function convertToPHPValue($value, AbstractPlatform $platform) } try { - $selfVetOption = new SelfVetOption((bool) $value); + $selfVetOption = new SelfVetOption((bool)$value); } catch (TypeError $e) { // get nice standard message, so we can throw it keeping the exception chain $doctrineExceptionMessage = ConversionException::conversionFailed( $value, - $this->getName() + $this->getName(), )->getMessage(); throw new ConversionException($doctrineExceptionMessage, 0, $e); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ShowRaaContactInformationOptionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ShowRaaContactInformationOptionType.php index aaa7e7519..8ace3e3a1 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ShowRaaContactInformationOptionType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ShowRaaContactInformationOptionType.php @@ -29,7 +29,7 @@ */ class ShowRaaContactInformationOptionType extends Type { - const NAME = 'stepup_show_raa_contact_information_option'; + public const NAME = 'stepup_show_raa_contact_information_option'; public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) { @@ -46,13 +46,13 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) throw new ConversionException( sprintf( "Encountered illegal location of type %s '%s', expected a ShowRaaContactInformationOption instance", - is_object($value) ? get_class($value) : gettype($value), - is_scalar($value) ? (string) $value : '' - ) + get_debug_type($value), + is_scalar($value) ? (string)$value : '', + ), ); } - return (int) $value->isEnabled(); + return (int)$value->isEnabled(); } public function convertToPHPValue($value, AbstractPlatform $platform) @@ -63,13 +63,13 @@ public function convertToPHPValue($value, AbstractPlatform $platform) try { $showRaaContactInformationOption = new ShowRaaContactInformationOption( - $platform->convertFromBoolean($value) + $platform->convertFromBoolean($value), ); } catch (InvalidArgumentException $e) { // get nice standard message, so we can throw it keeping the exception chain $doctrineExceptionMessage = ConversionException::conversionFailed( $value, - $this->getName() + $this->getName(), )->getMessage(); throw new ConversionException($doctrineExceptionMessage, 0, $e); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SsoOn2faOptionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SsoOn2faOptionType.php index af4be71ac..415a18096 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SsoOn2faOptionType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SsoOn2faOptionType.php @@ -29,7 +29,7 @@ */ class SsoOn2faOptionType extends Type { - const NAME = 'stepup_sso_on_2fa_option'; + public const NAME = 'stepup_sso_on_2fa_option'; public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) { @@ -47,13 +47,13 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) sprintf( "Encountered illegal sso on 2fo vet option %s '%s', expected a SsoOn2faOption instance", - is_object($value) ? get_class($value) : gettype($value), - is_scalar($value) ? (string) $value : '' - ) + get_debug_type($value), + is_scalar($value) ? (string)$value : '', + ), ); } - return (int) $value->isEnabled(); + return (int)$value->isEnabled(); } public function convertToPHPValue($value, AbstractPlatform $platform) @@ -63,12 +63,12 @@ public function convertToPHPValue($value, AbstractPlatform $platform) } try { - $ssoOn2faOption = new SsoOn2faOption((bool) $value); + $ssoOn2faOption = new SsoOn2faOption((bool)$value); } catch (TypeError $e) { // get nice standard message, so we can throw it keeping the exception chain $doctrineExceptionMessage = ConversionException::conversionFailed( $value, - $this->getName() + $this->getName(), )->getMessage(); throw new ConversionException($doctrineExceptionMessage, 0, $e); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/UseRaLocationsOptionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/UseRaLocationsOptionType.php index 597e7a48b..5084179b1 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/UseRaLocationsOptionType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/UseRaLocationsOptionType.php @@ -29,7 +29,7 @@ */ class UseRaLocationsOptionType extends Type { - const NAME = 'stepup_use_ra_locations_option'; + public const NAME = 'stepup_use_ra_locations_option'; public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) { @@ -46,13 +46,13 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) throw new ConversionException( sprintf( "Encountered illegal location of type %s '%s', expected a UseRaLocationsOption instance", - is_object($value) ? get_class($value) : gettype($value), - is_scalar($value) ? (string) $value : '' - ) + get_debug_type($value), + is_scalar($value) ? (string)$value : '', + ), ); } - return (int) $value->isEnabled(); + return (int)$value->isEnabled(); } public function convertToPHPValue($value, AbstractPlatform $platform) @@ -67,7 +67,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) // get nice standard message, so we can throw it keeping the exception chain $doctrineExceptionMessage = ConversionException::conversionFailed( $value, - $this->getName() + $this->getName(), )->getMessage(); throw new ConversionException($doctrineExceptionMessage, 0, $e); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VerifyEmailOptionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VerifyEmailOptionType.php index d56f1c105..3a46665ed 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VerifyEmailOptionType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VerifyEmailOptionType.php @@ -29,7 +29,7 @@ */ class VerifyEmailOptionType extends Type { - const NAME = 'stepup_verify_email_option'; + public const NAME = 'stepup_verify_email_option'; public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) { @@ -46,13 +46,13 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) throw new ConversionException( sprintf( "Encountered illegal location of type %s '%s', expected a VerifyEmailOption instance", - is_object($value) ? get_class($value) : gettype($value), - is_scalar($value) ? (string) $value : '' - ) + get_debug_type($value), + is_scalar($value) ? (string)$value : '', + ), ); } - return (int) $value->isEnabled(); + return (int)$value->isEnabled(); } public function convertToPHPValue($value, AbstractPlatform $platform) @@ -67,7 +67,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) // get nice standard message, so we can throw it keeping the exception chain $doctrineExceptionMessage = ConversionException::conversionFailed( $value, - $this->getName() + $this->getName(), )->getMessage(); throw new ConversionException($doctrineExceptionMessage, 0, $e); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VettingTypeHintsType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VettingTypeHintsType.php index 7a32fef6d..300b6b6f7 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VettingTypeHintsType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VettingTypeHintsType.php @@ -29,7 +29,7 @@ */ class VettingTypeHintsType extends Type { - const NAME = 'stepup_vetting_type_hints'; + public const NAME = 'stepup_vetting_type_hints'; public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) { @@ -48,13 +48,13 @@ public function convertToPHPValue($value, AbstractPlatform $platform) } try { - $data = json_decode($value, true); + $data = json_decode((string)$value, true); $vettingTypeHints = VettingTypeHintCollection::deserialize($data); } catch (InvalidArgumentException $e) { // get nice standard message, so we can throw it keeping the exception chain $doctrineExceptionMessage = ConversionException::conversionFailed( $value, - $this->getName() + $this->getName(), )->getMessage(); throw new ConversionException($doctrineExceptionMessage, 0, $e); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/EventListener/ExceptionListener.php b/src/Surfnet/StepupMiddleware/ApiBundle/EventListener/ExceptionListener.php index 9eca963dc..c4c3f12f8 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/EventListener/ExceptionListener.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/EventListener/ExceptionListener.php @@ -34,11 +34,9 @@ */ class ExceptionListener { - private LoggerInterface $logger; - - public function __construct(LoggerInterface $logger) - { - $this->logger = $logger; + public function __construct( + private readonly LoggerInterface $logger, + ) { } public function onKernelException(ExceptionEvent $event): void @@ -52,9 +50,9 @@ public function onKernelException(ExceptionEvent $event): void $headers = $throwable->getHeaders(); } else { $statusCode = $throwable instanceof BadApiRequestException - || $throwable instanceof BadCommandRequestException - || $throwable instanceof DomainException - || $throwable instanceof AggregateNotFoundException + || $throwable instanceof BadCommandRequestException + || $throwable instanceof DomainException + || $throwable instanceof AggregateNotFoundException ? 400 : 500; @@ -78,7 +76,6 @@ private function logException(Throwable $throwable): void /** * @param Throwable $exception - * @param int $statusCode * @param array $headers OPTIONAL * @return JsonResponse */ @@ -90,7 +87,7 @@ private function createJsonErrorResponse(Throwable $throwable, int $statusCode, ) { $errors = $throwable->getErrors(); } else { - $errors = [sprintf('%s: %s', get_class($throwable), $throwable->getMessage())]; + $errors = [sprintf('%s: %s', $throwable::class, $throwable->getMessage())]; } return new JsonResponse(['errors' => $errors], $statusCode, $headers); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadApiRequestException.php b/src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadApiRequestException.php index 88cdff575..7d247de8e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadApiRequestException.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadApiRequestException.php @@ -23,26 +23,19 @@ */ class BadApiRequestException extends RuntimeException { - /** - * @var string[] - */ - private array $errors; - /** * @param string[] $errors * @param string $message * @param int $code - * @param \Exception|null $previous + * @param Exception|null $previous */ public function __construct( - array $errors, + private readonly array $errors, $message = 'Invalid Request', $code = 0, - \Exception $previous = null + Exception $previous = null, ) { parent::__construct($message, $code, $previous); - - $this->errors = $errors; } /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadCommandRequestException.php b/src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadCommandRequestException.php index 222fdcc9c..7a91f3b3a 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadCommandRequestException.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadCommandRequestException.php @@ -26,11 +26,6 @@ */ class BadCommandRequestException extends RuntimeException { - /** - * @var string[] - */ - private array $errors; - /** * @param string $message * @return self @@ -62,17 +57,14 @@ private static function convertViolationsToStrings(ConstraintViolationListInterf * @param string[] $errors * @param string $message * @param int $code - * @param \Exception|null $previous */ public function __construct( - array $errors, + private readonly array $errors, $message = 'JSON could not be reconstituted into valid object.', $code = 0, - \Exception $previous = null + Exception $previous = null, ) { parent::__construct($message, $code, $previous); - - $this->errors = $errors; } /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Exception/InvalidArgumentException.php b/src/Surfnet/StepupMiddleware/ApiBundle/Exception/InvalidArgumentException.php index 01f1da28e..1a0a78c36 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Exception/InvalidArgumentException.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Exception/InvalidArgumentException.php @@ -29,13 +29,13 @@ class InvalidArgumentException extends CoreInvalidArgumentException implements E * * @return self */ - public static function invalidType($expected, $parameterName, $parameter): self + public static function invalidType($expected, $parameterName, mixed $parameter): self { $message = sprintf( 'Invalid argument type: "%s" expected, "%s" given for "%s"', $expected, - is_object($parameter) ? get_class($parameter) : gettype($parameter), - $parameterName + get_debug_type($parameter), + $parameterName, ); return new self($message); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/AuditLogEntry.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/AuditLogEntry.php index 052b74783..638a86d1d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/AuditLogEntry.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/AuditLogEntry.php @@ -21,6 +21,41 @@ use Doctrine\ORM\Mapping as ORM; use JsonSerializable; use Surfnet\Stepup\DateTime\DateTime; +use Surfnet\Stepup\Identity\Event\AppointedAsRaaEvent; +use Surfnet\Stepup\Identity\Event\AppointedAsRaaForInstitutionEvent; +use Surfnet\Stepup\Identity\Event\AppointedAsRaEvent; +use Surfnet\Stepup\Identity\Event\AppointedAsRaForInstitutionEvent; +use Surfnet\Stepup\Identity\Event\CompliedWithRecoveryCodeRevocationEvent; +use Surfnet\Stepup\Identity\Event\CompliedWithUnverifiedSecondFactorRevocationEvent; +use Surfnet\Stepup\Identity\Event\CompliedWithVerifiedSecondFactorRevocationEvent; +use Surfnet\Stepup\Identity\Event\CompliedWithVettedSecondFactorRevocationEvent; +use Surfnet\Stepup\Identity\Event\EmailVerifiedEvent; +use Surfnet\Stepup\Identity\Event\GssfPossessionProvenAndVerifiedEvent; +use Surfnet\Stepup\Identity\Event\GssfPossessionProvenEvent; +use Surfnet\Stepup\Identity\Event\IdentityAccreditedAsRaaEvent; +use Surfnet\Stepup\Identity\Event\IdentityAccreditedAsRaaForInstitutionEvent; +use Surfnet\Stepup\Identity\Event\IdentityAccreditedAsRaEvent; +use Surfnet\Stepup\Identity\Event\IdentityAccreditedAsRaForInstitutionEvent; +use Surfnet\Stepup\Identity\Event\IdentityCreatedEvent; +use Surfnet\Stepup\Identity\Event\IdentityEmailChangedEvent; +use Surfnet\Stepup\Identity\Event\IdentityRenamedEvent; +use Surfnet\Stepup\Identity\Event\PhonePossessionProvenAndVerifiedEvent; +use Surfnet\Stepup\Identity\Event\PhonePossessionProvenEvent; +use Surfnet\Stepup\Identity\Event\PhoneRecoveryTokenPossessionProvenEvent; +use Surfnet\Stepup\Identity\Event\RecoveryTokenRevokedEvent; +use Surfnet\Stepup\Identity\Event\RegistrationAuthorityRetractedEvent; +use Surfnet\Stepup\Identity\Event\RegistrationAuthorityRetractedForInstitutionEvent; +use Surfnet\Stepup\Identity\Event\SafeStoreSecretRecoveryTokenPossessionPromisedEvent; +use Surfnet\Stepup\Identity\Event\SecondFactorMigratedEvent; +use Surfnet\Stepup\Identity\Event\SecondFactorMigratedToEvent; +use Surfnet\Stepup\Identity\Event\SecondFactorVettedEvent; +use Surfnet\Stepup\Identity\Event\SecondFactorVettedWithoutTokenProofOfPossession; +use Surfnet\Stepup\Identity\Event\UnverifiedSecondFactorRevokedEvent; +use Surfnet\Stepup\Identity\Event\VerifiedSecondFactorRevokedEvent; +use Surfnet\Stepup\Identity\Event\VettedSecondFactorRevokedEvent; +use Surfnet\Stepup\Identity\Event\YubikeyPossessionProvenAndVerifiedEvent; +use Surfnet\Stepup\Identity\Event\YubikeyPossessionProvenEvent; +use Surfnet\Stepup\Identity\Event\YubikeySecondFactorBootstrappedEvent; use Surfnet\Stepup\Identity\Value\CommonName; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Exception\LogicException; @@ -44,41 +79,41 @@ class AuditLogEntry implements JsonSerializable * @var string[] */ private array $eventActionMap = [ - 'Surfnet\Stepup\Identity\Event\CompliedWithUnverifiedSecondFactorRevocationEvent' => 'revoked_by_ra', - 'Surfnet\Stepup\Identity\Event\CompliedWithVerifiedSecondFactorRevocationEvent' => 'revoked_by_ra', - 'Surfnet\Stepup\Identity\Event\CompliedWithVettedSecondFactorRevocationEvent' => 'revoked_by_ra', - 'Surfnet\Stepup\Identity\Event\EmailVerifiedEvent' => 'email_verified', - 'Surfnet\Stepup\Identity\Event\GssfPossessionProvenEvent' => 'possession_proven', - 'Surfnet\Stepup\Identity\Event\GssfPossessionProvenAndVerifiedEvent' => 'possession_proven', - 'Surfnet\Stepup\Identity\Event\IdentityCreatedEvent' => 'created', - 'Surfnet\Stepup\Identity\Event\IdentityEmailChangedEvent' => 'email_changed', - 'Surfnet\Stepup\Identity\Event\IdentityRenamedEvent' => 'renamed', - 'Surfnet\Stepup\Identity\Event\PhonePossessionProvenEvent' => 'possession_proven', - 'Surfnet\Stepup\Identity\Event\PhonePossessionProvenAndVerifiedEvent' => 'possession_proven', - 'Surfnet\Stepup\Identity\Event\SecondFactorVettedEvent' => 'vetted', - 'Surfnet\Stepup\Identity\Event\SecondFactorVettedWithoutTokenProofOfPossession' => 'vetted_possession_unknown', - 'Surfnet\Stepup\Identity\Event\SecondFactorMigratedToEvent' => 'migrated_to', - 'Surfnet\Stepup\Identity\Event\SecondFactorMigratedEvent' => 'migrated_from', - 'Surfnet\Stepup\Identity\Event\UnverifiedSecondFactorRevokedEvent' => 'revoked', - 'Surfnet\Stepup\Identity\Event\VerifiedSecondFactorRevokedEvent' => 'revoked', - 'Surfnet\Stepup\Identity\Event\VettedSecondFactorRevokedEvent' => 'revoked', - 'Surfnet\Stepup\Identity\Event\YubikeyPossessionProvenEvent' => 'possession_proven', - 'Surfnet\Stepup\Identity\Event\YubikeyPossessionProvenAndVerifiedEvent' => 'possession_proven', - 'Surfnet\Stepup\Identity\Event\YubikeySecondFactorBootstrappedEvent' => 'bootstrapped', - 'Surfnet\Stepup\Identity\Event\IdentityAccreditedAsRaaEvent' => 'accredited_as_raa', - 'Surfnet\Stepup\Identity\Event\IdentityAccreditedAsRaEvent' => 'accredited_as_ra', - 'Surfnet\Stepup\Identity\Event\IdentityAccreditedAsRaForInstitutionEvent' => 'accredited_as_ra', - 'Surfnet\Stepup\Identity\Event\IdentityAccreditedAsRaaForInstitutionEvent' => 'accredited_as_raa', - 'Surfnet\Stepup\Identity\Event\AppointedAsRaaEvent' => 'appointed_as_raa', - 'Surfnet\Stepup\Identity\Event\AppointedAsRaEvent' => 'appointed_as_ra', - 'Surfnet\Stepup\Identity\Event\AppointedAsRaaForInstitutionEvent' => 'appointed_as_raa', - 'Surfnet\Stepup\Identity\Event\AppointedAsRaForInstitutionEvent' => 'appointed_as_ra', - 'Surfnet\Stepup\Identity\Event\RegistrationAuthorityRetractedEvent' => 'retracted_as_ra', - 'Surfnet\Stepup\Identity\Event\RegistrationAuthorityRetractedForInstitutionEvent' => 'retracted_as_ra', - 'Surfnet\Stepup\Identity\Event\SafeStoreSecretRecoveryTokenPossessionPromisedEvent' => 'recovery_token_possession_promised', - 'Surfnet\Stepup\Identity\Event\RecoveryTokenRevokedEvent' => 'recovery_token_revoked', - 'Surfnet\Stepup\Identity\Event\PhoneRecoveryTokenPossessionProvenEvent' => 'recovery_token_possession_proven', - 'Surfnet\Stepup\Identity\Event\CompliedWithRecoveryCodeRevocationEvent' => 'recovery_token_revoked', + CompliedWithUnverifiedSecondFactorRevocationEvent::class => 'revoked_by_ra', + CompliedWithVerifiedSecondFactorRevocationEvent::class => 'revoked_by_ra', + CompliedWithVettedSecondFactorRevocationEvent::class => 'revoked_by_ra', + EmailVerifiedEvent::class => 'email_verified', + GssfPossessionProvenEvent::class => 'possession_proven', + GssfPossessionProvenAndVerifiedEvent::class => 'possession_proven', + IdentityCreatedEvent::class => 'created', + IdentityEmailChangedEvent::class => 'email_changed', + IdentityRenamedEvent::class => 'renamed', + PhonePossessionProvenEvent::class => 'possession_proven', + PhonePossessionProvenAndVerifiedEvent::class => 'possession_proven', + SecondFactorVettedEvent::class => 'vetted', + SecondFactorVettedWithoutTokenProofOfPossession::class => 'vetted_possession_unknown', + SecondFactorMigratedToEvent::class => 'migrated_to', + SecondFactorMigratedEvent::class => 'migrated_from', + UnverifiedSecondFactorRevokedEvent::class => 'revoked', + VerifiedSecondFactorRevokedEvent::class => 'revoked', + VettedSecondFactorRevokedEvent::class => 'revoked', + YubikeyPossessionProvenEvent::class => 'possession_proven', + YubikeyPossessionProvenAndVerifiedEvent::class => 'possession_proven', + YubikeySecondFactorBootstrappedEvent::class => 'bootstrapped', + IdentityAccreditedAsRaaEvent::class => 'accredited_as_raa', + IdentityAccreditedAsRaEvent::class => 'accredited_as_ra', + IdentityAccreditedAsRaForInstitutionEvent::class => 'accredited_as_ra', + IdentityAccreditedAsRaaForInstitutionEvent::class => 'accredited_as_raa', + AppointedAsRaaEvent::class => 'appointed_as_raa', + AppointedAsRaEvent::class => 'appointed_as_ra', + AppointedAsRaaForInstitutionEvent::class => 'appointed_as_raa', + AppointedAsRaForInstitutionEvent::class => 'appointed_as_ra', + RegistrationAuthorityRetractedEvent::class => 'retracted_as_ra', + RegistrationAuthorityRetractedForInstitutionEvent::class => 'retracted_as_ra', + SafeStoreSecretRecoveryTokenPossessionPromisedEvent::class => 'recovery_token_possession_promised', + RecoveryTokenRevokedEvent::class => 'recovery_token_revoked', + PhoneRecoveryTokenPossessionProvenEvent::class => 'recovery_token_possession_proven', + CompliedWithRecoveryCodeRevocationEvent::class => 'recovery_token_revoked', ]; /** @@ -187,7 +222,7 @@ public function jsonSerialize() 'recovery_token_type' => $this->recoveryTokenType, 'recovery_token_identifier' => $this->recoveryTokenIdentifier, 'action' => $this->mapEventToAction($this->event), - 'recorded_on' => (string) $this->recordedOn, + 'recorded_on' => (string)$this->recordedOn, ]; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Identity.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Identity.php index 5c2482244..039709f3f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Identity.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Identity.php @@ -71,6 +71,7 @@ class Identity implements JsonSerializable */ #[ORM\Column(type: 'stepup_locale')] public $preferredLocale; + public null $possessedSelfAssertedToken; public static function create( string $id, @@ -78,7 +79,7 @@ public static function create( NameId $nameId, Email $email, CommonName $commonName, - Locale $preferredLocale + Locale $preferredLocale, ): self { $identity = new self(); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/IdentitySelfAssertedTokenOptions.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/IdentitySelfAssertedTokenOptions.php index 3a579b8d0..8e6bf4240 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/IdentitySelfAssertedTokenOptions.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/IdentitySelfAssertedTokenOptions.php @@ -59,7 +59,7 @@ class IdentitySelfAssertedTokenOptions implements JsonSerializable public static function create( IdentityId $identityId, bool $possessedToken, - bool $possessedSelfAssertedToken + bool $possessedSelfAssertedToken, ): self { $identitySelfAssertedTokenOptions = new self(); @@ -72,7 +72,7 @@ public static function create( public function jsonSerialize() { return [ - 'identity_id' => (string) $this->identityId, + 'identity_id' => (string)$this->identityId, 'possessed_self_asserted_token' => $this->possessedSelfAssertedToken, 'possessed_token' => $this->possessedToken, ]; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaCandidate.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaCandidate.php index 91f47e54e..39477323e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaCandidate.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaCandidate.php @@ -83,14 +83,14 @@ public static function nominate( NameId $nameId, CommonName $commonName, Email $email, - Institution $raInstitution + Institution $raInstitution, ): self { - $candidate = new self(); - $candidate->identityId = (string) $identityId; - $candidate->institution = $institution; - $candidate->nameId = $nameId; - $candidate->commonName = $commonName; - $candidate->email = $email; + $candidate = new self(); + $candidate->identityId = (string)$identityId; + $candidate->institution = $institution; + $candidate->nameId = $nameId; + $candidate->commonName = $commonName; + $candidate->email = $email; $candidate->raInstitution = $raInstitution; return $candidate; @@ -99,11 +99,11 @@ public static function nominate( public function jsonSerialize() { return [ - 'identity_id' => $this->identityId, - 'institution' => $this->institution, - 'common_name' => $this->commonName, - 'email' => $this->email, - 'name_id' => $this->nameId, + 'identity_id' => $this->identityId, + 'institution' => $this->institution, + 'common_name' => $this->commonName, + 'email' => $this->email, + 'name_id' => $this->nameId, 'ra_institution' => $this->raInstitution, ]; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaListing.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaListing.php index 6211ad3fb..75e87cb3d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaListing.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaListing.php @@ -29,7 +29,6 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RaListingRepository; use Surfnet\StepupMiddleware\ApiBundle\Identity\Value\AuthorityRole; - #[ORM\Table] #[ORM\Index(name: 'idx_ra_listing_institution', columns: ['institution'])] #[ORM\Index(name: 'idx_ra_listing_ra_institution', columns: ['ra_institution'])] @@ -102,21 +101,21 @@ public static function create( AuthorityRole $role, Location $location, ContactInformation $contactInformation, - Institution $raInstitution + Institution $raInstitution, ): self { if (!is_string($identityId)) { throw InvalidArgumentException::invalidType('string', 'id', $identityId); } - $entry = new self(); - $entry->identityId = $identityId; - $entry->institution = $institution; - $entry->commonName = $commonName; - $entry->email = $email; - $entry->role = $role; - $entry->location = $location; + $entry = new self(); + $entry->identityId = $identityId; + $entry->institution = $institution; + $entry->commonName = $commonName; + $entry->email = $email; + $entry->role = $role; + $entry->location = $location; $entry->contactInformation = $contactInformation; - $entry->raInstitution = $raInstitution; + $entry->raInstitution = $raInstitution; return $entry; } @@ -124,14 +123,14 @@ public static function create( public function jsonSerialize() { return [ - 'identity_id' => $this->identityId, - 'institution' => (string) $this->institution, - 'ra_institution' => (string) $this->raInstitution, - 'common_name' => (string) $this->commonName, - 'email' => (string) $this->email, - 'role' => (string) $this->role, - 'location' => (string) $this->location, - 'contact_information' => (string) $this->contactInformation, + 'identity_id' => $this->identityId, + 'institution' => (string)$this->institution, + 'ra_institution' => (string)$this->raInstitution, + 'common_name' => (string)$this->commonName, + 'email' => (string)$this->email, + 'role' => (string)$this->role, + 'location' => (string)$this->location, + 'contact_information' => (string)$this->contactInformation, ]; } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaSecondFactor.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaSecondFactor.php index 466208e73..1eaff9796 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaSecondFactor.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaSecondFactor.php @@ -40,32 +40,6 @@ #[ORM\Entity(repositoryClass: RaSecondFactorRepository::class)] class RaSecondFactor implements JsonSerializable { - /** - * - * @var string The second factor's ID (UUID). - */ - #[ORM\Id] - #[ORM\Column(length: 36)] - public $id; - - /** - * @var string - */ - #[ORM\Column(length: 16)] - public $type; - - /** - * @var string The ID of the specific instance of second factor type (ie. phone number, Yubikey public ID). - */ - #[ORM\Column(length: 255)] - public $secondFactorId; - - /** - * @var string - */ - #[ORM\Column(length: 36)] - public $identityId; - /** * @var Institution */ @@ -107,25 +81,23 @@ class RaSecondFactor implements JsonSerializable * @param string $type * @param string $secondFactorId * @param string $identityId - * @param Institution $institution - * @param CommonName $name - * @param Email $email * @param DocumentNumber|null $documentNumber */ public function __construct( - $id, - $type, - $secondFactorId, - $identityId, + #[ORM\Id] + #[ORM\Column(length: 36)] + public $id, + #[ORM\Column(length: 16)] + public $type, + #[ORM\Column(length: 255)] + public $secondFactorId, + #[ORM\Column(length: 36)] + public $identityId, Institution $institution, CommonName $name, Email $email, - DocumentNumber $documentNumber = null + DocumentNumber $documentNumber = null, ) { - $this->id = $id; - $this->type = $type; - $this->secondFactorId = $secondFactorId; - $this->identityId = $identityId; $this->institution = $institution; $this->name = $name; $this->email = $email; @@ -136,15 +108,15 @@ public function __construct( public function jsonSerialize() { return [ - 'id' => $this->id, - 'type' => $this->type, + 'id' => $this->id, + 'type' => $this->type, 'second_factor_id' => $this->secondFactorId, - 'status' => (string) $this->status, - 'identity_id' => $this->identityId, - 'name' => $this->name, - 'document_number' => $this->documentNumber, - 'email' => $this->email, - 'institution' => $this->institution, + 'status' => (string)$this->status, + 'identity_id' => $this->identityId, + 'name' => $this->name, + 'document_number' => $this->documentNumber, + 'email' => $this->email, + 'institution' => $this->institution, ]; } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RecoveryToken.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RecoveryToken.php index 249968ab9..a2a9db843 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RecoveryToken.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RecoveryToken.php @@ -85,9 +85,9 @@ class RecoveryToken implements JsonSerializable public function jsonSerialize() { return [ - 'id' => $this->id, + 'id' => $this->id, 'type' => $this->type, - 'status' => (string) $this->status, + 'status' => (string)$this->status, 'recovery_method_identifier' => $this->recoveryMethodIdentifier, 'identity_id' => $this->identityId, 'name' => $this->name, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Sraa.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Sraa.php index 5e8d39f82..3feafacee 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Sraa.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Sraa.php @@ -25,12 +25,10 @@ #[ORM\Entity(repositoryClass: SraaRepository::class)] class Sraa { - #[ORM\Id] - #[ORM\Column(type: 'stepup_name_id', length: 200)] - public NameId $nameId; - - public function __construct(NameId $nameId) - { - $this->nameId = $nameId; + public function __construct( + #[ORM\Id] + #[ORM\Column(type: 'stepup_name_id', length: 200)] + public NameId $nameId, + ) { } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/UnverifiedSecondFactor.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/UnverifiedSecondFactor.php index 6fdcad6c2..ab6cc27d3 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/UnverifiedSecondFactor.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/UnverifiedSecondFactor.php @@ -61,9 +61,9 @@ class UnverifiedSecondFactor implements JsonSerializable public function jsonSerialize() { return [ - 'id' => $this->id, - 'type' => $this->type, - 'second_factor_identifier' => $this->secondFactorIdentifier + 'id' => $this->id, + 'type' => $this->type, + 'second_factor_identifier' => $this->secondFactorIdentifier, ]; } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VerifiedSecondFactor.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VerifiedSecondFactor.php index 69e174749..50dbb1b09 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VerifiedSecondFactor.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VerifiedSecondFactor.php @@ -81,7 +81,7 @@ class VerifiedSecondFactor implements JsonSerializable public function jsonSerialize() { return [ - 'id' => $this->id, + 'id' => $this->id, 'type' => $this->type, 'second_factor_identifier' => $this->secondFactorIdentifier, 'registration_code' => $this->registrationCode, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettedSecondFactor.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettedSecondFactor.php index a6a5354f1..838dd9784 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettedSecondFactor.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettedSecondFactor.php @@ -62,7 +62,6 @@ class VettedSecondFactor implements JsonSerializable public $vettingType; /** - * @param VettedSecondFactor $vettedSecondFactor * @return bool */ public function isEqual(VettedSecondFactor $vettedSecondFactor): bool @@ -81,7 +80,7 @@ public function vettingType(): string public function jsonSerialize() { return [ - 'id' => $this->id, + 'id' => $this->id, 'type' => $this->type, 'second_factor_identifier' => $this->secondFactorIdentifier, 'vetting_type' => $this->vettingType, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/AuditLogProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/AuditLogProjector.php index 974682f04..e3b56ceb2 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/AuditLogProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/AuditLogProjector.php @@ -42,16 +42,10 @@ */ class AuditLogProjector implements EventListener { - private AuditLogRepository $auditLogRepository; - - private IdentityRepository $identityRepository; - public function __construct( - AuditLogRepository $auditLogRepository, - IdentityRepository $identityRepository + private readonly AuditLogRepository $auditLogRepository, + private readonly IdentityRepository $identityRepository, ) { - $this->auditLogRepository = $auditLogRepository; - $this->identityRepository = $identityRepository; } /** @@ -74,8 +68,6 @@ public function handle(DomainMessage $domainMessage): void } /** - * @param AuditableEvent $event - * @param DomainMessage $domainMessage * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.NPathComplexity) */ @@ -85,19 +77,21 @@ private function applyAuditableEvent(AuditableEvent $event, DomainMessage $domai $metadata = $domainMessage->getMetadata()->serialize(); $entry = new AuditLogEntry(); - $entry->id = (string) Uuid::uuid4(); + $entry->id = (string)Uuid::uuid4(); if (isset($metadata['actorId'])) { $actor = $this->identityRepository->find($metadata['actorId']); if (!$actor instanceof Identity) { - throw new RuntimeException(sprintf( - 'Cannot create AuditLogEntry, given Actor Identity "%s" does not exist', - $metadata['actorId'] - )); + throw new RuntimeException( + sprintf( + 'Cannot create AuditLogEntry, given Actor Identity "%s" does not exist', + $metadata['actorId'], + ), + ); } - $entry->actorId = $metadata['actorId']; + $entry->actorId = $metadata['actorId']; $entry->actorCommonName = $actor->commonName; } @@ -107,36 +101,36 @@ private function applyAuditableEvent(AuditableEvent $event, DomainMessage $domai $entry->actorInstitution = $metadata['actorInstitution']; } - $entry->identityId = (string) $auditLogMetadata->identityId; + $entry->identityId = (string)$auditLogMetadata->identityId; $entry->identityInstitution = $auditLogMetadata->identityInstitution; - $entry->event = get_class($event); - $entry->recordedOn = new DateTime(new CoreDateTime($domainMessage->getRecordedOn()->toString())); + $entry->event = $event::class; + $entry->recordedOn = new DateTime(new CoreDateTime($domainMessage->getRecordedOn()->toString())); if ($auditLogMetadata->secondFactorId) { - $entry->secondFactorId = (string) $auditLogMetadata->secondFactorId; + $entry->secondFactorId = (string)$auditLogMetadata->secondFactorId; } if ($auditLogMetadata->secondFactorType) { - $entry->secondFactorType = (string) $auditLogMetadata->secondFactorType; + $entry->secondFactorType = (string)$auditLogMetadata->secondFactorType; } if (!$event instanceof RecoveryTokenRevokedEvent && !$event instanceof CompliedWithRecoveryCodeRevocationEvent && $auditLogMetadata->recoveryTokenId ) { - $entry->recoveryTokenIdentifier = (string) $auditLogMetadata->recoveryTokenId; + $entry->recoveryTokenIdentifier = (string)$auditLogMetadata->recoveryTokenId; } if ($auditLogMetadata->recoveryTokenType) { - $entry->recoveryTokenType = (string) $auditLogMetadata->recoveryTokenType; + $entry->recoveryTokenType = (string)$auditLogMetadata->recoveryTokenType; } if ($auditLogMetadata->secondFactorIdentifier) { - $entry->secondFactorIdentifier = (string) $auditLogMetadata->secondFactorIdentifier; + $entry->secondFactorIdentifier = (string)$auditLogMetadata->secondFactorIdentifier; } if ($auditLogMetadata->raInstitution) { - $entry->raInstitution = (string) $auditLogMetadata->raInstitution; + $entry->raInstitution = (string)$auditLogMetadata->raInstitution; } $this->auditLogRepository->save($entry); @@ -150,7 +144,7 @@ private function applyIdentityForgottenEvent(IdentityForgottenEvent $event): voi if ($auditLogEntry->recoveryTokenIdentifier) { $auditLogEntry->recoveryTokenIdentifier = RecoveryTokenIdentifierFactory::unknownForType( - new RecoveryTokenType($auditLogEntry->recoveryTokenType) + new RecoveryTokenType($auditLogEntry->recoveryTokenType), ); } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/IdentityProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/IdentityProjector.php index 7f4ef65e3..a6574ab84 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/IdentityProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/IdentityProjector.php @@ -21,7 +21,6 @@ use Broadway\ReadModel\Projector; use Surfnet\Stepup\Identity\Event\IdentityCreatedEvent; use Surfnet\Stepup\Identity\Event\IdentityEmailChangedEvent; -use Surfnet\Stepup\Identity\Event\IdentityForgottenEvent; use Surfnet\Stepup\Identity\Event\IdentityRenamedEvent; use Surfnet\Stepup\Identity\Event\LocalePreferenceExpressedEvent; use Surfnet\Stepup\Identity\Event\SecondFactorVettedEvent; @@ -32,28 +31,28 @@ class IdentityProjector extends Projector { - private IdentityRepository $identityRepository; - - public function __construct(IdentityRepository $identityRepository) - { - $this->identityRepository = $identityRepository; + public function __construct( + private readonly IdentityRepository $identityRepository, + ) { } public function applyIdentityCreatedEvent(IdentityCreatedEvent $event): void { - $this->identityRepository->save(Identity::create( - (string) $event->identityId, - $event->identityInstitution, - $event->nameId, - $event->email, - $event->commonName, - $event->preferredLocale - )); + $this->identityRepository->save( + Identity::create( + (string)$event->identityId, + $event->identityInstitution, + $event->nameId, + $event->email, + $event->commonName, + $event->preferredLocale, + ), + ); } public function applyIdentityRenamedEvent(IdentityRenamedEvent $event): void { - $identity = $this->identityRepository->find((string) $event->identityId); + $identity = $this->identityRepository->find((string)$event->identityId); $identity->commonName = $event->commonName; $this->identityRepository->save($identity); @@ -61,7 +60,7 @@ public function applyIdentityRenamedEvent(IdentityRenamedEvent $event): void public function applyIdentityEmailChangedEvent(IdentityEmailChangedEvent $event): void { - $identity = $this->identityRepository->find((string) $event->identityId); + $identity = $this->identityRepository->find((string)$event->identityId); $identity->email = $event->email; $this->identityRepository->save($identity); @@ -69,7 +68,7 @@ public function applyIdentityEmailChangedEvent(IdentityEmailChangedEvent $event) public function applyLocalePreferenceExpressedEvent(LocalePreferenceExpressedEvent $event): void { - $identity = $this->identityRepository->find((string) $event->identityId); + $identity = $this->identityRepository->find((string)$event->identityId); $identity->preferredLocale = $event->preferredLocale; $this->identityRepository->save($identity); @@ -77,12 +76,13 @@ public function applyLocalePreferenceExpressedEvent(LocalePreferenceExpressedEve public function applySecondFactorVettedEvent(SecondFactorVettedEvent $event): void { - $this->determinePossessionOfSelfAssertedToken($event->vettingType, (string) $event->identityId); + $this->determinePossessionOfSelfAssertedToken($event->vettingType, (string)$event->identityId); } - public function applySecondFactorVettedWithoutTokenProofOfPossession(SecondFactorVettedWithoutTokenProofOfPossession $event): void - { - $this->determinePossessionOfSelfAssertedToken($event->vettingType, (string) $event->identityId); + public function applySecondFactorVettedWithoutTokenProofOfPossession( + SecondFactorVettedWithoutTokenProofOfPossession $event, + ): void { + $this->determinePossessionOfSelfAssertedToken($event->vettingType, (string)$event->identityId); } private function determinePossessionOfSelfAssertedToken(VettingType $vettingType, string $identityId): void diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/IdentitySelfAssertedTokenOptionsProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/IdentitySelfAssertedTokenOptionsProjector.php index e9ce85960..695ec0b37 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/IdentitySelfAssertedTokenOptionsProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/IdentitySelfAssertedTokenOptionsProjector.php @@ -29,11 +29,9 @@ class IdentitySelfAssertedTokenOptionsProjector extends Projector { - private IdentitySelfAssertedTokenOptionsRepository $repository; - - public function __construct(IdentitySelfAssertedTokenOptionsRepository $identitySelfAssertedTokenOptionsRepository) - { - $this->repository = $identitySelfAssertedTokenOptionsRepository; + public function __construct( + private readonly IdentitySelfAssertedTokenOptionsRepository $repository, + ) { } /** @@ -45,7 +43,7 @@ public function applyIdentityCreatedEvent(IdentityCreatedEvent $event): void $identitySelfAssertedTokenOptions = IdentitySelfAssertedTokenOptions::create( $event->identityId, false, - false + false, ); $this->repository->save($identitySelfAssertedTokenOptions); } @@ -55,8 +53,9 @@ public function applySecondFactorVettedEvent(SecondFactorVettedEvent $event): vo $this->determinePossessionOfToken($event->vettingType, $event->identityId); } - public function applySecondFactorVettedWithoutTokenProofOfPossession(SecondFactorVettedWithoutTokenProofOfPossession $event): void - { + public function applySecondFactorVettedWithoutTokenProofOfPossession( + SecondFactorVettedWithoutTokenProofOfPossession $event, + ): void { $this->determinePossessionOfToken($event->vettingType, $event->identityId); } @@ -70,7 +69,7 @@ private function determinePossessionOfToken(VettingType $vettingType, IdentityId $identitySelfAssertedTokenOptions = IdentitySelfAssertedTokenOptions::create( $identityId, true, - $isSelfAssertedToken + $isSelfAssertedToken, ); $this->repository->save($identitySelfAssertedTokenOptions); return; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/InstitutionListingProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/InstitutionListingProjector.php index 367f95281..797a7036c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/InstitutionListingProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/InstitutionListingProjector.php @@ -28,11 +28,8 @@ */ class InstitutionListingProjector extends Projector { - private InstitutionListingRepository $institutionListingRepository; - - public function __construct(InstitutionListingRepository $institutionListingRepository) + public function __construct(private readonly InstitutionListingRepository $institutionListingRepository) { - $this->institutionListingRepository = $institutionListingRepository; } public function applyIdentityCreatedEvent(IdentityCreatedEvent $event): void diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaListingProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaListingProjector.php index 0af361290..611a95757 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaListingProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaListingProjector.php @@ -20,8 +20,8 @@ use Broadway\ReadModel\Projector; use Surfnet\Stepup\Identity\Event\AppointedAsRaaEvent; -use Surfnet\Stepup\Identity\Event\AppointedAsRaEvent; use Surfnet\Stepup\Identity\Event\AppointedAsRaaForInstitutionEvent; +use Surfnet\Stepup\Identity\Event\AppointedAsRaEvent; use Surfnet\Stepup\Identity\Event\AppointedAsRaForInstitutionEvent; use Surfnet\Stepup\Identity\Event\IdentityAccreditedAsRaaEvent; use Surfnet\Stepup\Identity\Event\IdentityAccreditedAsRaaForInstitutionEvent; @@ -44,70 +44,67 @@ */ class RaListingProjector extends Projector { - private RaListingRepository $raListingRepository; - - private IdentityRepository $identityRepository; - - public function __construct(RaListingRepository $raListingRepository, IdentityRepository $identityRepository) - { - $this->raListingRepository = $raListingRepository; - $this->identityRepository = $identityRepository; + public function __construct( + private readonly RaListingRepository $raListingRepository, + private readonly IdentityRepository $identityRepository, + ) { } /** - * @param IdentityAccreditedAsRaForInstitutionEvent $event * @return void */ - public function applyIdentityAccreditedAsRaForInstitutionEvent(IdentityAccreditedAsRaForInstitutionEvent $event): void + public function applyIdentityAccreditedAsRaForInstitutionEvent(IdentityAccreditedAsRaForInstitutionEvent $event,): void { - $identity = $this->identityRepository->find((string) $event->identityId); + $identity = $this->identityRepository->find((string)$event->identityId); $raListing = RaListing::create( - (string) $event->identityId, + (string)$event->identityId, $event->identityInstitution, $identity->commonName, $identity->email, AuthorityRole::fromRegistrationAuthorityRole($event->registrationAuthorityRole), $event->location, $event->contactInformation, - $event->raInstitution + $event->raInstitution, ); $this->raListingRepository->save($raListing); } /** - * @param IdentityAccreditedAsRaaForInstitutionEvent $event * @return void */ - public function applyIdentityAccreditedAsRaaForInstitutionEvent(IdentityAccreditedAsRaaForInstitutionEvent $event): void + public function applyIdentityAccreditedAsRaaForInstitutionEvent(IdentityAccreditedAsRaaForInstitutionEvent $event,): void { - $identity = $this->identityRepository->find((string) $event->identityId); + $identity = $this->identityRepository->find((string)$event->identityId); $raListing = RaListing::create( - (string) $event->identityId, + (string)$event->identityId, $event->identityInstitution, $identity->commonName, $identity->email, AuthorityRole::fromRegistrationAuthorityRole($event->registrationAuthorityRole), $event->location, $event->contactInformation, - $event->raInstitution + $event->raInstitution, ); $this->raListingRepository->save($raListing); } public function applyRegistrationAuthorityInformationAmendedForInstitutionEvent( - RegistrationAuthorityInformationAmendedForInstitutionEvent $event + RegistrationAuthorityInformationAmendedForInstitutionEvent $event, ): void { /** @var RaListing $raListing */ - $raListing = $this->raListingRepository->findByIdentityIdAndRaInstitution($event->identityId, $event->raInstitution); + $raListing = $this->raListingRepository->findByIdentityIdAndRaInstitution( + $event->identityId, + $event->raInstitution, + ); if (!$raListing) { throw new RuntimeException( "Tried to amend an RaListing's registration authority location and contact information, " . - "but the listing could not be found" + "but the listing could not be found", ); } @@ -120,7 +117,10 @@ public function applyRegistrationAuthorityInformationAmendedForInstitutionEvent( public function applyAppointedAsRaForInstitutionEvent(AppointedAsRaForInstitutionEvent $event): void { /** @var RaListing $raListing */ - $raListing = $this->raListingRepository->findByIdentityIdAndRaInstitution($event->identityId, $event->raInstitution); + $raListing = $this->raListingRepository->findByIdentityIdAndRaInstitution( + $event->identityId, + $event->raInstitution, + ); $raListing->role = AuthorityRole::ra(); @@ -130,15 +130,19 @@ public function applyAppointedAsRaForInstitutionEvent(AppointedAsRaForInstitutio public function applyAppointedAsRaaForInstitutionEvent(AppointedAsRaaForInstitutionEvent $event): void { /** @var RaListing $raListing */ - $raListing = $this->raListingRepository->findByIdentityIdAndRaInstitution($event->identityId, $event->raInstitution); + $raListing = $this->raListingRepository->findByIdentityIdAndRaInstitution( + $event->identityId, + $event->raInstitution, + ); $raListing->role = AuthorityRole::raa(); $this->raListingRepository->save($raListing); } - public function applyRegistrationAuthorityRetractedForInstitutionEvent(RegistrationAuthorityRetractedForInstitutionEvent $event): void - { + public function applyRegistrationAuthorityRetractedForInstitutionEvent( + RegistrationAuthorityRetractedForInstitutionEvent $event, + ): void { $this->raListingRepository->removeByIdentityIdAndRaInstitution($event->identityId, $event->raInstitution); } @@ -151,22 +155,21 @@ protected function applyIdentityForgottenEvent(IdentityForgottenEvent $event) /** * This method is kept to be backwards compatible for changes before FGA * - * @param IdentityAccreditedAsRaEvent $event * @return void */ public function applyIdentityAccreditedAsRaEvent(IdentityAccreditedAsRaEvent $event): void { - $identity = $this->identityRepository->find((string) $event->identityId); + $identity = $this->identityRepository->find((string)$event->identityId); $raListing = RaListing::create( - (string) $event->identityId, + (string)$event->identityId, $event->identityInstitution, $identity->commonName, $identity->email, AuthorityRole::fromRegistrationAuthorityRole($event->registrationAuthorityRole), $event->location, $event->contactInformation, - $event->identityInstitution + $event->identityInstitution, ); $this->raListingRepository->save($raListing); @@ -175,22 +178,21 @@ public function applyIdentityAccreditedAsRaEvent(IdentityAccreditedAsRaEvent $ev /** * This method is kept to be backwards compatible for changes before FGA * - * @param IdentityAccreditedAsRaaEvent $event * @return void */ public function applyIdentityAccreditedAsRaaEvent(IdentityAccreditedAsRaaEvent $event): void { - $identity = $this->identityRepository->find((string) $event->identityId); + $identity = $this->identityRepository->find((string)$event->identityId); $raListing = RaListing::create( - (string) $event->identityId, + (string)$event->identityId, $event->identityInstitution, $identity->commonName, $identity->email, AuthorityRole::fromRegistrationAuthorityRole($event->registrationAuthorityRole), $event->location, $event->contactInformation, - $event->identityInstitution + $event->identityInstitution, ); $this->raListingRepository->save($raListing); @@ -198,19 +200,20 @@ public function applyIdentityAccreditedAsRaaEvent(IdentityAccreditedAsRaaEvent $ /** * This method is kept to be backwards compatible for changes before FGA - * - * @param RegistrationAuthorityInformationAmendedEvent $event */ public function applyRegistrationAuthorityInformationAmendedEvent( - RegistrationAuthorityInformationAmendedEvent $event + RegistrationAuthorityInformationAmendedEvent $event, ): void { /** @var RaListing $raListing */ - $raListing = $this->raListingRepository->findByIdentityIdAndRaInstitution($event->identityId, $event->identityInstitution); + $raListing = $this->raListingRepository->findByIdentityIdAndRaInstitution( + $event->identityId, + $event->identityInstitution, + ); if (!$raListing) { throw new RuntimeException( "Tried to amend an RaListing's registration authority location and contact information, " . - "but the listing could not be found" + "but the listing could not be found", ); } @@ -222,13 +225,14 @@ public function applyRegistrationAuthorityInformationAmendedEvent( /** * This method is kept to be backwards compatible for changes before FGA - * - * @param AppointedAsRaEvent $event */ public function applyAppointedAsRaEvent(AppointedAsRaEvent $event): void { /** @var RaListing $raListing */ - $raListing = $this->raListingRepository->findByIdentityIdAndInstitution($event->identityId, $event->identityInstitution); + $raListing = $this->raListingRepository->findByIdentityIdAndInstitution( + $event->identityId, + $event->identityInstitution, + ); $raListing->role = AuthorityRole::ra(); @@ -237,13 +241,14 @@ public function applyAppointedAsRaEvent(AppointedAsRaEvent $event): void /** * This method is kept to be backwards compatible for changes before FGA - * - * @param AppointedAsRaaEvent $event */ public function applyAppointedAsRaaEvent(AppointedAsRaaEvent $event): void { /** @var RaListing $raListing */ - $raListing = $this->raListingRepository->findByIdentityIdAndInstitution($event->identityId, $event->identityInstitution); + $raListing = $this->raListingRepository->findByIdentityIdAndInstitution( + $event->identityId, + $event->identityInstitution, + ); $raListing->role = AuthorityRole::raa(); @@ -252,8 +257,6 @@ public function applyAppointedAsRaaEvent(AppointedAsRaaEvent $event): void /** * This method is kept to be backwards compatible for changes before FGA - * - * @param RegistrationAuthorityRetractedEvent $event */ public function applyRegistrationAuthorityRetractedEvent(RegistrationAuthorityRetractedEvent $event): void { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaSecondFactorProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaSecondFactorProjector.php index 5c4aebf45..6e10f20d0 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaSecondFactorProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaSecondFactorProjector.php @@ -58,21 +58,15 @@ */ class RaSecondFactorProjector extends Projector { - private RaSecondFactorRepository $raSecondFactorRepository; - - private IdentityRepository $identityRepository; - public function __construct( - RaSecondFactorRepository $raSecondFactorRepository, - IdentityRepository $identityRepository + private readonly RaSecondFactorRepository $raSecondFactorRepository, + private readonly IdentityRepository $identityRepository, ) { - $this->raSecondFactorRepository = $raSecondFactorRepository; - $this->identityRepository = $identityRepository; } public function applyIdentityRenamedEvent(IdentityRenamedEvent $event): void { - $secondFactors = $this->raSecondFactorRepository->findByIdentityId((string) $event->identityId); + $secondFactors = $this->raSecondFactorRepository->findByIdentityId((string)$event->identityId); if ($secondFactors === []) { return; @@ -89,7 +83,7 @@ public function applyIdentityRenamedEvent(IdentityRenamedEvent $event): void public function applyIdentityEmailChangedEvent(IdentityEmailChangedEvent $event): void { - $secondFactors = $this->raSecondFactorRepository->findByIdentityId((string) $event->identityId); + $secondFactors = $this->raSecondFactorRepository->findByIdentityId((string)$event->identityId); if ($secondFactors === []) { return; @@ -106,16 +100,16 @@ public function applyIdentityEmailChangedEvent(IdentityEmailChangedEvent $event) public function applyYubikeySecondFactorBootstrappedEvent(YubikeySecondFactorBootstrappedEvent $event): void { - $identity = $this->identityRepository->find((string) $event->identityId); + $identity = $this->identityRepository->find((string)$event->identityId); $secondFactor = new RaSecondFactor( - (string) $event->secondFactorId, + (string)$event->secondFactorId, 'yubikey', - (string) $event->yubikeyPublicId, + (string)$event->yubikeyPublicId, $identity->id, $identity->institution, $event->commonName, - $event->email + $event->email, ); $secondFactor->status = SecondFactorStatus::vetted(); @@ -125,72 +119,72 @@ public function applyYubikeySecondFactorBootstrappedEvent(YubikeySecondFactorBoo public function applyYubikeyPossessionProvenEvent(YubikeyPossessionProvenEvent $event): void { $this->saveRaSecondFactor( - (string) $event->identityId, - (string) $event->secondFactorId, + (string)$event->identityId, + (string)$event->secondFactorId, 'yubikey', - (string) $event->yubikeyPublicId, + (string)$event->yubikeyPublicId, $event->commonName, - $event->email + $event->email, ); } public function applyYubikeyPossessionProvenAndVerifiedEvent(YubikeyPossessionProvenAndVerifiedEvent $event): void { $this->saveRaSecondFactor( - (string) $event->identityId, - (string) $event->secondFactorId, + (string)$event->identityId, + (string)$event->secondFactorId, 'yubikey', - (string) $event->yubikeyPublicId, + (string)$event->yubikeyPublicId, $event->commonName, - $event->email + $event->email, ); } public function applyPhonePossessionProvenEvent(PhonePossessionProvenEvent $event): void { $this->saveRaSecondFactor( - (string) $event->identityId, - (string) $event->secondFactorId, + (string)$event->identityId, + (string)$event->secondFactorId, 'sms', - (string) $event->phoneNumber, + (string)$event->phoneNumber, $event->commonName, - $event->email + $event->email, ); } public function applyPhonePossessionProvenAndVerifiedEvent(PhonePossessionProvenAndVerifiedEvent $event): void { $this->saveRaSecondFactor( - (string) $event->identityId, - (string) $event->secondFactorId, + (string)$event->identityId, + (string)$event->secondFactorId, 'sms', - (string) $event->phoneNumber, + (string)$event->phoneNumber, $event->commonName, - $event->email + $event->email, ); } public function applyGssfPossessionProvenEvent(GssfPossessionProvenEvent $event): void { $this->saveRaSecondFactor( - (string) $event->identityId, - (string) $event->secondFactorId, - (string) $event->stepupProvider, - (string) $event->gssfId, + (string)$event->identityId, + (string)$event->secondFactorId, + (string)$event->stepupProvider, + (string)$event->gssfId, $event->commonName, - $event->email + $event->email, ); } public function applyGssfPossessionProvenAndVerifiedEvent(GssfPossessionProvenAndVerifiedEvent $event): void { $this->saveRaSecondFactor( - (string) $event->identityId, - (string) $event->secondFactorId, - (string) $event->stepupProvider, - (string) $event->gssfId, + (string)$event->identityId, + (string)$event->secondFactorId, + (string)$event->stepupProvider, + (string)$event->gssfId, $event->commonName, - $event->email + $event->email, ); } @@ -200,37 +194,32 @@ public function applyGssfPossessionProvenAndVerifiedEvent(GssfPossessionProvenAn public function applyU2fDevicePossessionProvenEvent(U2fDevicePossessionProvenEvent $event): void { $this->saveRaSecondFactor( - (string) $event->identityId, - (string) $event->secondFactorId, + (string)$event->identityId, + (string)$event->secondFactorId, 'u2f', $event->keyHandle->getValue(), $event->commonName, - $event->email + $event->email, ); } /** * @deprecated Built in U2F support is dropped from StepUp, this was not removed to support event replay */ - public function applyU2fDevicePossessionProvenAndVerifiedEvent(U2fDevicePossessionProvenAndVerifiedEvent $event): void + public function applyU2fDevicePossessionProvenAndVerifiedEvent(U2fDevicePossessionProvenAndVerifiedEvent $event,): void { $this->saveRaSecondFactor( - (string) $event->identityId, - (string) $event->secondFactorId, + (string)$event->identityId, + (string)$event->secondFactorId, 'u2f', $event->keyHandle->getValue(), $event->commonName, - $event->email + $event->email, ); } /** - * @param string $identityId - * @param string $secondFactorId - * @param string $secondFactorType * @param string $secondFactorIdentifier - * @param CommonName $commonName - * @param Email $email * @param SecondFactorStatus|null $status * @param DocumentNumber|null $documentNumber */ @@ -242,19 +231,19 @@ private function saveRaSecondFactor( CommonName $commonName, Email $email, SecondFactorStatus $status = null, - DocumentNumber $documentNumber = null + DocumentNumber $documentNumber = null, ): void { $identity = $this->identityRepository->find($identityId); $secondFactor = new RaSecondFactor( - (string) $secondFactorId, + (string)$secondFactorId, $secondFactorType, $secondFactorIdentifier, $identity->id, $identity->institution, $commonName, $email, - $documentNumber + $documentNumber, ); if ($status instanceof SecondFactorStatus) { @@ -275,32 +264,33 @@ public function applyEmailVerifiedEvent(EmailVerifiedEvent $event): void */ public function applySecondFactorMigratedEvent(SecondFactorMigratedEvent $event): void { - $oldSecondFactor = $this->raSecondFactorRepository->find((string) $event->secondFactorId); + $oldSecondFactor = $this->raSecondFactorRepository->find((string)$event->secondFactorId); $this->saveRaSecondFactor( - (string) $event->identityId, - (string) $event->newSecondFactorId, - (string) $event->secondFactorType, - (string) $event->secondFactorIdentifier, + (string)$event->identityId, + (string)$event->newSecondFactorId, + (string)$event->secondFactorType, + (string)$event->secondFactorIdentifier, $event->commonName, $event->email, $oldSecondFactor->status, - $oldSecondFactor->documentNumber + $oldSecondFactor->documentNumber, ); } public function applySecondFactorVettedEvent(SecondFactorVettedEvent $event): void { - $secondFactor = $this->raSecondFactorRepository->find((string) $event->secondFactorId); + $secondFactor = $this->raSecondFactorRepository->find((string)$event->secondFactorId); $secondFactor->documentNumber = $event->vettingType->getDocumentNumber(); $secondFactor->status = SecondFactorStatus::vetted(); $this->raSecondFactorRepository->save($secondFactor); } - public function applySecondFactorVettedWithoutTokenProofOfPossession(SecondFactorVettedWithoutTokenProofOfPossession $event): void - { - $secondFactor = $this->raSecondFactorRepository->find((string) $event->secondFactorId); + public function applySecondFactorVettedWithoutTokenProofOfPossession( + SecondFactorVettedWithoutTokenProofOfPossession $event, + ): void { + $secondFactor = $this->raSecondFactorRepository->find((string)$event->secondFactorId); $documentNumber = null; if ($event->vettingType instanceof OnPremiseVettingType) { @@ -318,7 +308,7 @@ protected function applyUnverifiedSecondFactorRevokedEvent(UnverifiedSecondFacto } protected function applyCompliedWithUnverifiedSecondFactorRevocationEvent( - CompliedWithUnverifiedSecondFactorRevocationEvent $event + CompliedWithUnverifiedSecondFactorRevocationEvent $event, ) { $this->updateStatus($event->secondFactorId, SecondFactorStatus::revoked()); } @@ -329,7 +319,7 @@ protected function applyVerifiedSecondFactorRevokedEvent(VerifiedSecondFactorRev } protected function applyCompliedWithVerifiedSecondFactorRevocationEvent( - CompliedWithVerifiedSecondFactorRevocationEvent $event + CompliedWithVerifiedSecondFactorRevocationEvent $event, ) { $this->updateStatus($event->secondFactorId, SecondFactorStatus::revoked()); } @@ -340,7 +330,7 @@ protected function applyVettedSecondFactorRevokedEvent(VettedSecondFactorRevoked } protected function applyCompliedWithVettedSecondFactorRevocationEvent( - CompliedWithVettedSecondFactorRevocationEvent $event + CompliedWithVettedSecondFactorRevocationEvent $event, ) { $this->updateStatus($event->secondFactorId, SecondFactorStatus::revoked()); } @@ -350,13 +340,9 @@ protected function applyIdentityForgottenEvent(IdentityForgottenEvent $event) $this->raSecondFactorRepository->updateStatusByIdentityIdToForgotten($event->identityId); } - /** - * @param SecondFactorId $secondFactorId - * @param SecondFactorStatus $status - */ private function updateStatus(SecondFactorId $secondFactorId, SecondFactorStatus $status): void { - $secondFactor = $this->raSecondFactorRepository->find((string) $secondFactorId); + $secondFactor = $this->raSecondFactorRepository->find((string)$secondFactorId); $secondFactor->status = $status; $this->raSecondFactorRepository->save($secondFactor); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RecoveryTokenProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RecoveryTokenProjector.php index 463aab3ab..326454712 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RecoveryTokenProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RecoveryTokenProjector.php @@ -34,12 +34,8 @@ */ class RecoveryTokenProjector extends Projector { - private RecoveryTokenRepository $recoveryTokenRepository; - - public function __construct( - RecoveryTokenRepository $recoveryMethodRepository - ) { - $this->recoveryTokenRepository = $recoveryMethodRepository; + public function __construct(private readonly RecoveryTokenRepository $recoveryTokenRepository) + { } public function applyPhoneRecoveryTokenPossessionProvenEvent(PhoneRecoveryTokenPossessionProvenEvent $event): void @@ -49,7 +45,7 @@ public function applyPhoneRecoveryTokenPossessionProvenEvent(PhoneRecoveryTokenP $recoveryToken->identityId = $event->identityId->getIdentityId(); $recoveryToken->type = RecoveryTokenType::TYPE_SMS; $recoveryToken->status = RecoveryTokenStatus::active(); - $recoveryToken->recoveryMethodIdentifier = (string) $event->phoneNumber; + $recoveryToken->recoveryMethodIdentifier = (string)$event->phoneNumber; $recoveryToken->institution = $event->identityInstitution; $recoveryToken->email = $event->email; $recoveryToken->name = $event->commonName; @@ -57,14 +53,15 @@ public function applyPhoneRecoveryTokenPossessionProvenEvent(PhoneRecoveryTokenP $this->recoveryTokenRepository->save($recoveryToken); } - public function applySafeStoreSecretRecoveryTokenPossessionPromisedEvent(SafeStoreSecretRecoveryTokenPossessionPromisedEvent $event): void - { + public function applySafeStoreSecretRecoveryTokenPossessionPromisedEvent( + SafeStoreSecretRecoveryTokenPossessionPromisedEvent $event, + ): void { $recoveryToken = new RecoveryToken(); $recoveryToken->id = $event->recoveryTokenId->getRecoveryTokenId(); $recoveryToken->identityId = $event->identityId->getIdentityId(); $recoveryToken->type = RecoveryTokenType::TYPE_SAFE_STORE; $recoveryToken->status = RecoveryTokenStatus::active(); - $recoveryToken->recoveryMethodIdentifier = (string) $event->secret; + $recoveryToken->recoveryMethodIdentifier = (string)$event->secret; $recoveryToken->institution = $event->identityInstitution; $recoveryToken->email = $event->email; $recoveryToken->name = $event->commonName; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php index 67e3176ec..23b7f1122 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php @@ -53,20 +53,11 @@ */ class SecondFactorProjector extends Projector { - private UnverifiedSecondFactorRepository $unverifiedRepository; - - private VerifiedSecondFactorRepository $verifiedRepository; - - private VettedSecondFactorRepository $vettedRepository; - public function __construct( - UnverifiedSecondFactorRepository $unverifiedRepository, - VerifiedSecondFactorRepository $verifiedRepository, - VettedSecondFactorRepository $vettedRepository + private readonly UnverifiedSecondFactorRepository $unverifiedRepository, + private readonly VerifiedSecondFactorRepository $verifiedRepository, + private readonly VettedSecondFactorRepository $vettedRepository, ) { - $this->unverifiedRepository = $unverifiedRepository; - $this->verifiedRepository = $verifiedRepository; - $this->vettedRepository = $vettedRepository; } public function applyYubikeySecondFactorBootstrappedEvent(YubikeySecondFactorBootstrappedEvent $event): void @@ -217,8 +208,9 @@ public function applySecondFactorMigratedEvent(SecondFactorMigratedEvent $event) $this->vettedRepository->save($vetted); } - public function applySecondFactorVettedWithoutTokenProofOfPossession(SecondFactorVettedWithoutTokenProofOfPossession $event): void - { + public function applySecondFactorVettedWithoutTokenProofOfPossession( + SecondFactorVettedWithoutTokenProofOfPossession $event, + ): void { $verified = $this->verifiedRepository->find($event->secondFactorId->getSecondFactorId()); $vetted = new VettedSecondFactor(); @@ -240,13 +232,17 @@ public function applySecondFactorVettedWithoutTokenProofOfPossession(SecondFacto protected function applyUnverifiedSecondFactorRevokedEvent(UnverifiedSecondFactorRevokedEvent $event) { - $this->unverifiedRepository->remove($this->unverifiedRepository->find($event->secondFactorId->getSecondFactorId())); + $this->unverifiedRepository->remove( + $this->unverifiedRepository->find($event->secondFactorId->getSecondFactorId()), + ); } protected function applyCompliedWithUnverifiedSecondFactorRevocationEvent( - CompliedWithUnverifiedSecondFactorRevocationEvent $event + CompliedWithUnverifiedSecondFactorRevocationEvent $event, ) { - $this->unverifiedRepository->remove($this->unverifiedRepository->find($event->secondFactorId->getSecondFactorId())); + $this->unverifiedRepository->remove( + $this->unverifiedRepository->find($event->secondFactorId->getSecondFactorId()), + ); } protected function applyVerifiedSecondFactorRevokedEvent(VerifiedSecondFactorRevokedEvent $event) @@ -255,7 +251,7 @@ protected function applyVerifiedSecondFactorRevokedEvent(VerifiedSecondFactorRev } protected function applyCompliedWithVerifiedSecondFactorRevocationEvent( - CompliedWithVerifiedSecondFactorRevocationEvent $event + CompliedWithVerifiedSecondFactorRevocationEvent $event, ) { $this->verifiedRepository->remove($this->verifiedRepository->find($event->secondFactorId->getSecondFactorId())); } @@ -266,7 +262,7 @@ protected function applyVettedSecondFactorRevokedEvent(VettedSecondFactorRevoked } protected function applyCompliedWithVettedSecondFactorRevocationEvent( - CompliedWithVettedSecondFactorRevocationEvent $event + CompliedWithVettedSecondFactorRevocationEvent $event, ) { $this->vettedRepository->remove($this->vettedRepository->find($event->secondFactorId->getSecondFactorId())); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorRevocationProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorRevocationProjector.php index 6c03969d4..52dba6b32 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorRevocationProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorRevocationProjector.php @@ -30,19 +30,16 @@ class SecondFactorRevocationProjector extends Projector { - private SecondFactorRevocationRepository $repository; - - public function __construct(SecondFactorRevocationRepository $repository) + public function __construct(private readonly SecondFactorRevocationRepository $repository) { - $this->repository = $repository; } protected function applyVettedSecondFactorRevokedEvent( VettedSecondFactorRevokedEvent $event, - DomainMessage $domainMessage + DomainMessage $domainMessage, ) { $revocation = new SecondFactorRevocation(); - $revocation->id = (string) Uuid::uuid4(); + $revocation->id = (string)Uuid::uuid4(); $revocation->institution = $event->identityInstitution; $revocation->secondFactorType = $event->secondFactorType->getSecondFactorType(); $revocation->revokedBy = 'self'; @@ -53,10 +50,10 @@ protected function applyVettedSecondFactorRevokedEvent( protected function applyCompliedWithVettedSecondFactorRevocationEvent( CompliedWithVettedSecondFactorRevocationEvent $event, - DomainMessage $domainMessage + DomainMessage $domainMessage, ) { $revocation = new SecondFactorRevocation(); - $revocation->id = (string) Uuid::uuid4(); + $revocation->id = (string)Uuid::uuid4(); $revocation->institution = $event->identityInstitution; $revocation->secondFactorType = $event->secondFactorType->getSecondFactorType(); $revocation->revokedBy = 'ra'; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SraaProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SraaProjector.php index 7faa69105..e4e40341c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SraaProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SraaProjector.php @@ -26,16 +26,10 @@ class SraaProjector extends Projector { - private SraaRepository $sraaRepository; - - public function __construct(SraaRepository $raaRepository) + public function __construct(private readonly SraaRepository $sraaRepository) { - $this->sraaRepository = $raaRepository; } - /** - * @param SraaUpdatedEvent $event - */ public function applySraaUpdatedEvent(SraaUpdatedEvent $event): void { $this->sraaRepository->removeAll(); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/VettingTypeHintProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/VettingTypeHintProjector.php index 2c1fd5727..1c184f337 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/VettingTypeHintProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/VettingTypeHintProjector.php @@ -19,7 +19,6 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Projector; use Broadway\ReadModel\Projector; -use Surfnet\Stepup\Configuration\EventSourcing\InstitutionConfigurationRepository; use Surfnet\Stepup\Identity\Event\VettingTypeHintsSavedEvent; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\VettingTypeHint; use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\VettingTypeHintRepository; @@ -32,11 +31,8 @@ */ class VettingTypeHintProjector extends Projector { - private VettingTypeHintRepository $vettingTypeHintRepository; - - public function __construct(VettingTypeHintRepository $vettingTypeHintRepository) + public function __construct(private readonly VettingTypeHintRepository $vettingTypeHintRepository) { - $this->vettingTypeHintRepository = $vettingTypeHintRepository; } public function applyVettingTypeHintsSavedEvent(VettingTypeHintsSavedEvent $event): void diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/WhitelistProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/WhitelistProjector.php index 4ee82448e..cd87bbfad 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/WhitelistProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/WhitelistProjector.php @@ -28,19 +28,10 @@ class WhitelistProjector extends Projector { - private WhitelistEntryRepository $whitelistEntryRepository; - - /** - * @param WhitelistEntryRepository $whitelistRepository - */ - public function __construct(WhitelistEntryRepository $whitelistRepository) + public function __construct(private readonly WhitelistEntryRepository $whitelistEntryRepository) { - $this->whitelistEntryRepository = $whitelistRepository; } - /** - * @param WhitelistCreatedEvent $event - */ protected function applyWhitelistCreatedEvent(WhitelistCreatedEvent $event) { $whitelistEntries = []; @@ -51,9 +42,6 @@ protected function applyWhitelistCreatedEvent(WhitelistCreatedEvent $event) $this->whitelistEntryRepository->saveEntries($whitelistEntries); } - /** - * @param WhitelistReplacedEvent $event - */ protected function applyWhitelistReplacedEvent(WhitelistReplacedEvent $event) { $this->whitelistEntryRepository->removeAll(); @@ -66,9 +54,6 @@ protected function applyWhitelistReplacedEvent(WhitelistReplacedEvent $event) $this->whitelistEntryRepository->saveEntries($whitelistEntries); } - /** - * @param InstitutionsAddedToWhitelistEvent $event - */ protected function applyInstitutionsAddedToWhitelistEvent(InstitutionsAddedToWhitelistEvent $event) { $whitelistEntries = []; @@ -79,9 +64,6 @@ protected function applyInstitutionsAddedToWhitelistEvent(InstitutionsAddedToWhi $this->whitelistEntryRepository->saveEntries($whitelistEntries); } - /** - * @param InstitutionsRemovedFromWhitelistEvent $event - */ protected function applyInstitutionsRemovedFromWhitelistEvent(InstitutionsRemovedFromWhitelistEvent $event) { $institutions = []; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuditLogRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuditLogRepository.php index 4f748d8c4..0e352473f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuditLogRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuditLogRepository.php @@ -20,6 +20,37 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\ORM\Query; +use Surfnet\Stepup\Identity\Event\AppointedAsRaaEvent; +use Surfnet\Stepup\Identity\Event\AppointedAsRaaForInstitutionEvent; +use Surfnet\Stepup\Identity\Event\AppointedAsRaEvent; +use Surfnet\Stepup\Identity\Event\AppointedAsRaForInstitutionEvent; +use Surfnet\Stepup\Identity\Event\CompliedWithRecoveryCodeRevocationEvent; +use Surfnet\Stepup\Identity\Event\CompliedWithUnverifiedSecondFactorRevocationEvent; +use Surfnet\Stepup\Identity\Event\CompliedWithVerifiedSecondFactorRevocationEvent; +use Surfnet\Stepup\Identity\Event\CompliedWithVettedSecondFactorRevocationEvent; +use Surfnet\Stepup\Identity\Event\EmailVerifiedEvent; +use Surfnet\Stepup\Identity\Event\GssfPossessionProvenAndVerifiedEvent; +use Surfnet\Stepup\Identity\Event\GssfPossessionProvenEvent; +use Surfnet\Stepup\Identity\Event\IdentityAccreditedAsRaaEvent; +use Surfnet\Stepup\Identity\Event\IdentityAccreditedAsRaaForInstitutionEvent; +use Surfnet\Stepup\Identity\Event\IdentityAccreditedAsRaEvent; +use Surfnet\Stepup\Identity\Event\IdentityAccreditedAsRaForInstitutionEvent; +use Surfnet\Stepup\Identity\Event\PhonePossessionProvenAndVerifiedEvent; +use Surfnet\Stepup\Identity\Event\PhonePossessionProvenEvent; +use Surfnet\Stepup\Identity\Event\PhoneRecoveryTokenPossessionProvenEvent; +use Surfnet\Stepup\Identity\Event\RecoveryTokenRevokedEvent; +use Surfnet\Stepup\Identity\Event\RegistrationAuthorityRetractedEvent; +use Surfnet\Stepup\Identity\Event\RegistrationAuthorityRetractedForInstitutionEvent; +use Surfnet\Stepup\Identity\Event\SafeStoreSecretRecoveryTokenPossessionPromisedEvent; +use Surfnet\Stepup\Identity\Event\SecondFactorMigratedEvent; +use Surfnet\Stepup\Identity\Event\SecondFactorMigratedToEvent; +use Surfnet\Stepup\Identity\Event\SecondFactorVettedEvent; +use Surfnet\Stepup\Identity\Event\SecondFactorVettedWithoutTokenProofOfPossession; +use Surfnet\Stepup\Identity\Event\UnverifiedSecondFactorRevokedEvent; +use Surfnet\Stepup\Identity\Event\VerifiedSecondFactorRevokedEvent; +use Surfnet\Stepup\Identity\Event\VettedSecondFactorRevokedEvent; +use Surfnet\Stepup\Identity\Event\YubikeyPossessionProvenAndVerifiedEvent; +use Surfnet\Stepup\Identity\Event\YubikeySecondFactorBootstrappedEvent; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\StepupMiddleware\ApiBundle\Exception\RuntimeException; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\AuditLogEntry; @@ -39,43 +70,42 @@ public function __construct(ManagerRegistry $registry) * @var string[] */ private static array $secondFactorEvents = [ - 'Surfnet\Stepup\Identity\Event\YubikeySecondFactorBootstrappedEvent', - 'Surfnet\Stepup\Identity\Event\GssfPossessionProvenEvent', - 'Surfnet\Stepup\Identity\Event\PhonePossessionProvenEvent', - 'Surfnet\Stepup\Identity\Event\YubikeyPossessionProvenAndVerifiedEvent', - 'Surfnet\Stepup\Identity\Event\GssfPossessionProvenAndVerifiedEvent', - 'Surfnet\Stepup\Identity\Event\PhonePossessionProvenAndVerifiedEvent', - 'Surfnet\Stepup\Identity\Event\EmailVerifiedEvent', - 'Surfnet\Stepup\Identity\Event\SecondFactorVettedEvent', - 'Surfnet\Stepup\Identity\Event\SecondFactorVettedWithoutTokenProofOfPossession', - 'Surfnet\Stepup\Identity\Event\SecondFactorMigratedEvent', - 'Surfnet\Stepup\Identity\Event\SecondFactorMigratedToEvent', - 'Surfnet\Stepup\Identity\Event\UnverifiedSecondFactorRevokedEvent', - 'Surfnet\Stepup\Identity\Event\VerifiedSecondFactorRevokedEvent', - 'Surfnet\Stepup\Identity\Event\VettedSecondFactorRevokedEvent', - 'Surfnet\Stepup\Identity\Event\CompliedWithUnverifiedSecondFactorRevocationEvent', - 'Surfnet\Stepup\Identity\Event\CompliedWithVerifiedSecondFactorRevocationEvent', - 'Surfnet\Stepup\Identity\Event\CompliedWithVettedSecondFactorRevocationEvent', - 'Surfnet\Stepup\Identity\Event\IdentityAccreditedAsRaaEvent', - 'Surfnet\Stepup\Identity\Event\IdentityAccreditedAsRaEvent', - 'Surfnet\Stepup\Identity\Event\IdentityAccreditedAsRaForInstitutionEvent', - 'Surfnet\Stepup\Identity\Event\IdentityAccreditedAsRaaForInstitutionEvent', - 'Surfnet\Stepup\Identity\Event\AppointedAsRaaEvent', - 'Surfnet\Stepup\Identity\Event\AppointedAsRaForInstitutionEvent', - 'Surfnet\Stepup\Identity\Event\AppointedAsRaaForInstitutionEvent', - 'Surfnet\Stepup\Identity\Event\AppointedAsRaEvent', - 'Surfnet\Stepup\Identity\Event\RegistrationAuthorityRetractedEvent', - 'Surfnet\Stepup\Identity\Event\RegistrationAuthorityRetractedForInstitutionEvent', - 'Surfnet\Stepup\Identity\Event\SafeStoreSecretRecoveryTokenPossessionPromisedEvent', - 'Surfnet\Stepup\Identity\Event\RecoveryTokenRevokedEvent', - 'Surfnet\Stepup\Identity\Event\PhoneRecoveryTokenPossessionProvenEvent', - 'Surfnet\Stepup\Identity\Event\CompliedWithRecoveryCodeRevocationEvent', + YubikeySecondFactorBootstrappedEvent::class, + GssfPossessionProvenEvent::class, + PhonePossessionProvenEvent::class, + YubikeyPossessionProvenAndVerifiedEvent::class, + GssfPossessionProvenAndVerifiedEvent::class, + PhonePossessionProvenAndVerifiedEvent::class, + EmailVerifiedEvent::class, + SecondFactorVettedEvent::class, + SecondFactorVettedWithoutTokenProofOfPossession::class, + SecondFactorMigratedEvent::class, + SecondFactorMigratedToEvent::class, + UnverifiedSecondFactorRevokedEvent::class, + VerifiedSecondFactorRevokedEvent::class, + VettedSecondFactorRevokedEvent::class, + CompliedWithUnverifiedSecondFactorRevocationEvent::class, + CompliedWithVerifiedSecondFactorRevocationEvent::class, + CompliedWithVettedSecondFactorRevocationEvent::class, + IdentityAccreditedAsRaaEvent::class, + IdentityAccreditedAsRaEvent::class, + IdentityAccreditedAsRaForInstitutionEvent::class, + IdentityAccreditedAsRaaForInstitutionEvent::class, + AppointedAsRaaEvent::class, + AppointedAsRaForInstitutionEvent::class, + AppointedAsRaaForInstitutionEvent::class, + AppointedAsRaEvent::class, + RegistrationAuthorityRetractedEvent::class, + RegistrationAuthorityRetractedForInstitutionEvent::class, + SafeStoreSecretRecoveryTokenPossessionPromisedEvent::class, + RecoveryTokenRevokedEvent::class, + PhoneRecoveryTokenPossessionProvenEvent::class, + CompliedWithRecoveryCodeRevocationEvent::class, ]; /** * @SuppressWarnings(PHPMD.CyclomaticComplexity) - The filtering switch triggers the CyclomaticComplexity, it does * not actually make the class complex or hard to maintain. - * @param SecondFactorAuditLogQuery $query * @return Query */ public function createSecondFactorSearchQuery(SecondFactorAuditLogQuery $query): Query @@ -89,28 +119,18 @@ public function createSecondFactorSearchQuery(SecondFactorAuditLogQuery $query): ->setParameter('identityId', $query->identityId) ->setParameter('secondFactorEvents', self::$secondFactorEvents); - switch ($query->orderBy) { - case 'secondFactorType': - case 'secondFactorIdentifier': - case 'recoveryTokenType': - case 'recoveryTokenIdentifier': - case 'recordedOn': - case 'actorCommonName': - case 'actorInstitution': - $queryBuilder->orderBy( - sprintf('al.%s', $query->orderBy), - $query->orderDirection === 'desc' ? 'DESC' : 'ASC' - ); - break; - default: - throw new RuntimeException(sprintf('Unknown order by column "%s"', $query->orderBy)); - } + match ($query->orderBy) { + 'secondFactorType', 'secondFactorIdentifier', 'recoveryTokenType', 'recoveryTokenIdentifier', 'recordedOn', 'actorCommonName', 'actorInstitution' => $queryBuilder->orderBy( + sprintf('al.%s', $query->orderBy), + $query->orderDirection === 'desc' ? 'DESC' : 'ASC', + ), + default => throw new RuntimeException(sprintf('Unknown order by column "%s"', $query->orderBy)), + }; return $queryBuilder->getQuery(); } /** - * @param IdentityId $actorId * @return AuditLogEntry[] */ public function findEntriesWhereIdentityIsActorOnly(IdentityId $actorId) @@ -136,9 +156,6 @@ public function findByIdentityId(IdentityId $identityId) ->getResult(); } - /** - * @param AuditLogEntry $entry - */ public function save(AuditLogEntry $entry): void { $entityManager = $this->getEntityManager(); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php index 3afcf801b..a08889abc 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php @@ -39,12 +39,11 @@ */ class AuthorizationRepository extends ServiceEntityRepository { - private LoggerInterface $logger; - - public function __construct(ManagerRegistry $registry, LoggerInterface $logger) - { + public function __construct( + ManagerRegistry $registry, + private readonly LoggerInterface $logger, + ) { parent::__construct($registry, AuditLogEntry::class); - $this->logger = $logger; } /** @@ -53,7 +52,7 @@ public function __construct(ManagerRegistry $registry, LoggerInterface $logger) * * @return InstitutionCollection */ - public function getInstitutionsForRole(RegistrationAuthorityRole $role, IdentityId $actorId) :InstitutionCollection + public function getInstitutionsForRole(RegistrationAuthorityRole $role, IdentityId $actorId): InstitutionCollection { $result = new InstitutionCollection(); $qb = $this->_em->createQueryBuilder() @@ -64,7 +63,7 @@ public function getInstitutionsForRole(RegistrationAuthorityRole $role, Identity InstitutionAuthorization::class, 'a', Join::WITH, - "i.institution = a.institutionRelation AND a.institutionRole IN (:authorizationRoles)" + "i.institution = a.institutionRelation AND a.institutionRole IN (:authorizationRoles)", ) ->where("r.identityId = :identityId AND r.role IN(:roles)") ->groupBy("a.institution"); @@ -72,18 +71,18 @@ public function getInstitutionsForRole(RegistrationAuthorityRole $role, Identity $qb->setParameter('identityId', (string)$actorId); $qb->setParameter( 'authorizationRoles', - $this->getAllowedInstitutionRoles($role) + $this->getAllowedInstitutionRoles($role), ); $identityRoles = $this->getAllowedIdentityRoles($role); $qb->setParameter( 'roles', - $identityRoles + $identityRoles, ); $institutions = $qb->getQuery()->getArrayResult(); foreach ($institutions as $institution) { $this->logger->notice( - sprintf('Adding %s to authorized institutions', $institution['institution']) + sprintf('Adding %s to authorized institutions', $institution['institution']), ); $result->add(new Institution((string)$institution['institution'])); } @@ -97,7 +96,12 @@ public function getInstitutionsForRole(RegistrationAuthorityRole $role, Identity // Filter the RA listing on the authorizations that apply for the RA(A) listed there // For example, when testing a USE_RA institution authorization, the listed RA should have // at least a RA or RAA role - ->join(RaListing::class, 'r', Join::WITH, 'r.raInstitution = ia.institutionRelation AND r.role IN (:identityRoles)') + ->join( + RaListing::class, + 'r', + Join::WITH, + 'r.raInstitution = ia.institutionRelation AND r.role IN (:identityRoles)', + ) ->where('r.identityId = :identityId') ->andWhere("ia.institutionRole = :role") // Only filter on use_ra and use_raa roles here. ->groupBy('ia.institution'); @@ -112,7 +116,11 @@ public function getInstitutionsForRole(RegistrationAuthorityRole $role, Identity if (!$result->contains($institutionVo)) { $result->add($institutionVo); $this->logger->notice( - sprintf('Adding %s to authorized institutions from %s', $role->getType(), $institution['institution']) + sprintf( + 'Adding %s to authorized institutions from %s', + $role->getType(), + $institution['institution'], + ), ); } } @@ -139,12 +147,12 @@ public function getInstitutionsForSelectRaaRole(IdentityId $actorId): Institutio // The identity requires RAA role to perform this search $qb->setParameter( 'authorizationRole', - AuthorityRole::ROLE_RAA + AuthorityRole::ROLE_RAA, ); // Filter on the SELECT_RAA authorization in the institution authorization projection $qb->setParameter( 'institutionRole', - InstitutionRole::ROLE_SELECT_RAA + InstitutionRole::ROLE_SELECT_RAA, ); $institutions = $qb->getQuery()->getArrayResult(); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php index 542eb2600..8e1e9df33 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php @@ -31,12 +31,11 @@ class IdentityRepository extends ServiceEntityRepository { - private InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter; - - public function __construct(ManagerRegistry $registry, InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter) - { + public function __construct( + ManagerRegistry $registry, + private readonly InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter, + ) { parent::__construct($registry, Identity::class); - $this->authorizationRepositoryFilter = $authorizationRepositoryFilter; } public function find(mixed $id, $lockMode = null, $lockVersion = null): ?Identity @@ -47,9 +46,6 @@ public function find(mixed $id, $lockMode = null, $lockVersion = null): ?Identit return $identity; } - /** - * @param Identity $identity - */ public function save(Identity $identity): void { $entityManager = $this->getEntityManager(); @@ -58,11 +54,10 @@ public function save(Identity $identity): void } /** - * @param IdentityQuery $query * @return Query */ public function createSearchQuery( - IdentityQuery $query + IdentityQuery $query, ): Query { $queryBuilder = $this->createQueryBuilder('i'); @@ -101,7 +96,7 @@ public function findByNameIdsIndexed(array $nameIds) { return $this->getEntityManager()->createQueryBuilder() ->select('i') - ->from('Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Identity', 'i', 'i.nameId') + ->from(Identity::class, 'i', 'i.nameId') ->where('i.nameId IN (:nameIds)') ->setParameter('nameIds', $nameIds) ->getQuery() @@ -109,8 +104,6 @@ public function findByNameIdsIndexed(array $nameIds) } /** - * @param NameId $nameId - * @param Institution $institution * * @return bool */ @@ -129,22 +122,20 @@ public function hasIdentityWithNameIdAndInstitution(NameId $nameId, Institution } /** - * @param NameId $nameId - * @param Institution $institution * @return Identity */ public function findOneByNameIdAndInstitution(NameId $nameId, Institution $institution) { return $this->createQueryBuilder('i') - ->where('i.nameId = :nameId') - ->setParameter('nameId', $nameId->getNameId()) - ->andWhere('i.institution = :institution') - ->setParameter('institution', $institution->getInstitution()) - ->getQuery() - ->getSingleResult(); + ->where('i.nameId = :nameId') + ->setParameter('nameId', $nameId->getNameId()) + ->andWhere('i.institution = :institution') + ->setParameter('institution', $institution->getInstitution()) + ->getQuery() + ->getSingleResult(); } - public function findOneByNameId(string $nameId) :? Identity + public function findOneByNameId(string $nameId): ?Identity { return $this->findOneBy(['nameId' => $nameId]); } @@ -160,7 +151,6 @@ public function removeByIdentityId(IdentityId $identityId): void } /** - * @param Institution $institution * @return ArrayCollection|Identity[] */ public function findByInstitution(Institution $institution) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentitySelfAssertedTokenOptionsRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentitySelfAssertedTokenOptionsRepository.php index 45dad4209..f08b8c676 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentitySelfAssertedTokenOptionsRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentitySelfAssertedTokenOptionsRepository.php @@ -25,12 +25,11 @@ class IdentitySelfAssertedTokenOptionsRepository extends ServiceEntityRepository { - private InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter; - - public function __construct(ManagerRegistry $registry, InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter) - { + public function __construct( + ManagerRegistry $registry, + private readonly InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter, + ) { parent::__construct($registry, IdentitySelfAssertedTokenOptions::class); - $this->authorizationRepositoryFilter = $authorizationRepositoryFilter; } public function find(mixed $id, $lockMode = null, $lockVersion = null): ?IdentitySelfAssertedTokenOptions diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaCandidateRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaCandidateRepository.php index f96019750..856c868ca 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaCandidateRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaCandidateRepository.php @@ -38,16 +38,14 @@ */ class RaCandidateRepository extends ServiceEntityRepository { - private InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter; - - public function __construct(ManagerRegistry $registry, InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter) - { + public function __construct( + ManagerRegistry $registry, + private readonly InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter, + ) { parent::__construct($registry, RaCandidate::class); - $this->authorizationRepositoryFilter = $authorizationRepositoryFilter; } /** - * @param RaCandidateQuery $query * @return Query */ public function createSearchQuery(RaCandidateQuery $query): Query @@ -62,7 +60,7 @@ public function createSearchQuery(RaCandidateQuery $query): Query $queryBuilder, $query->authorizationContext, 'i.institution', - 'iac' + 'iac', ); if ($query->institution) { @@ -107,7 +105,6 @@ public function createSearchQuery(RaCandidateQuery $query): Query } /** - * @param RaCandidateQuery $query * @return Query */ public function createOptionsQuery(RaCandidateQuery $query): Query @@ -125,7 +122,7 @@ public function createOptionsQuery(RaCandidateQuery $query): Query $queryBuilder, $query->authorizationContext, 'a.institution', - 'iac' + 'iac', ); return $queryBuilder->getQuery(); @@ -153,14 +150,16 @@ private function getBaseQuery() { // Base query to get all allowed ra candidates $queryBuilder = $this->getEntityManager()->createQueryBuilder() - ->select('i.id as identity_id, i.institution, i.commonName as common_name, i.email, i.nameId AS name_id, a.institution AS ra_institution') + ->select( + 'i.id as identity_id, i.institution, i.commonName as common_name, i.email, i.nameId AS name_id, a.institution AS ra_institution', + ) ->from(VettedSecondFactor::class, 'vsf') ->innerJoin(Identity::class, 'i', Join::WITH, "vsf.identityId = i.id") ->innerJoin( InstitutionAuthorization::class, 'a', Join::WITH, - "a.institutionRole = 'select_raa' AND a.institutionRelation = i.institution" + "a.institutionRole = 'select_raa' AND a.institutionRelation = i.institution", ); // Filter out candidates who are already ra diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php index e73270ada..38d2325bf 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php @@ -35,12 +35,11 @@ */ class RaListingRepository extends ServiceEntityRepository { - private InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter; - - public function __construct(ManagerRegistry $registry, InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter) - { + public function __construct( + ManagerRegistry $registry, + private readonly InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter, + ) { parent::__construct($registry, RaListing::class); - $this->authorizationRepositoryFilter = $authorizationRepositoryFilter; } /** @@ -49,33 +48,30 @@ public function __construct(ManagerRegistry $registry, InstitutionAuthorizationR */ public function findByIdentityId(IdentityId $identityId): array { - return parent::findBy(['identityId' => (string) $identityId]); + return parent::findBy(['identityId' => (string)$identityId]); } /** * @param IdentityId $identityId The RA's identity id. - * @param Institution $raInstitution * @return null|RaListing */ public function findByIdentityIdAndRaInstitution(IdentityId $identityId, Institution $raInstitution): ?object { return parent::findOneBy([ - 'identityId' => (string) $identityId, - 'raInstitution' => (string) $raInstitution, + 'identityId' => (string)$identityId, + 'raInstitution' => (string)$raInstitution, ]); } /** * @param IdentityId $identityId The RA's identity id. - * @param Institution $raInstitution - * @param InstitutionAuthorizationContextInterface $authorizationContext * @return null|RaListing */ public function findByIdentityIdAndRaInstitutionWithContext( IdentityId $identityId, Institution $raInstitution, - InstitutionAuthorizationContextInterface $authorizationContext + InstitutionAuthorizationContextInterface $authorizationContext, ) { $queryBuilder = $this->createQueryBuilder('r') ->where('r.identityId = :identityId') @@ -92,7 +88,7 @@ public function findByIdentityIdAndRaInstitutionWithContext( $queryBuilder, $authorizationContext, 'r.raInstitution', - 'iac' + 'iac', ); return $queryBuilder->getQuery()->getOneOrNullResult(); @@ -100,14 +96,13 @@ public function findByIdentityIdAndRaInstitutionWithContext( /** * @param IdentityId $identityId The RA's identity id. - * @param Institution $institution * @return RaListing[] */ public function findByIdentityIdAndInstitution(IdentityId $identityId, Institution $institution): array { return parent::findBy([ - 'identityId' => (string) $identityId, - 'institution' => (string) $institution, + 'identityId' => (string)$identityId, + 'institution' => (string)$institution, ]); } @@ -121,7 +116,6 @@ public function save(RaListing $raListingEntry): void * @SuppressWarnings(PHPMD.CyclomaticComplexity) The amount of if statements do not necessarily make the method * @SuppressWarnings(PHPMD.NPathComplexity) below complex or hard to maintain. * - * @param RaListingQuery $query * @return Query */ public function createSearchQuery(RaListingQuery $query): Query @@ -137,7 +131,7 @@ public function createSearchQuery(RaListingQuery $query): Query if ($query->identityId) { $queryBuilder ->andWhere('r.identityId = :identityId') - ->setParameter('identityId', (string) $query->identityId); + ->setParameter('identityId', (string)$query->identityId); } if ($query->name) { @@ -155,13 +149,13 @@ public function createSearchQuery(RaListingQuery $query): Query if ($query->role) { $queryBuilder ->andWhere('r.role = :role') - ->setParameter('role', (string) $query->role); + ->setParameter('role', (string)$query->role); } if ($query->raInstitution) { $queryBuilder ->andWhere('r.raInstitution = :raInstitution') - ->setParameter('raInstitution', (string) $query->raInstitution); + ->setParameter('raInstitution', (string)$query->raInstitution); } // Modify query to filter on authorization: @@ -172,7 +166,7 @@ public function createSearchQuery(RaListingQuery $query): Query $queryBuilder, $query->authorizationContext, 'r.raInstitution', - 'iac' + 'iac', ); if (!$query->orderBy) { @@ -181,19 +175,15 @@ public function createSearchQuery(RaListingQuery $query): Query $orderDirection = $query->orderDirection === 'asc' ? 'ASC' : 'DESC'; - switch ($query->orderBy) { - case 'commonName': - $queryBuilder->orderBy('r.commonName', $orderDirection); - break; - default: - throw new RuntimeException(sprintf('Unknown order by column "%s"', $query->orderBy)); - } + match ($query->orderBy) { + 'commonName' => $queryBuilder->orderBy('r.commonName', $orderDirection), + default => throw new RuntimeException(sprintf('Unknown order by column "%s"', $query->orderBy)), + }; return $queryBuilder->getQuery(); } /** - * @param RaListingQuery $query * @return Query */ public function createOptionsQuery(RaListingQuery $query): Query @@ -210,14 +200,13 @@ public function createOptionsQuery(RaListingQuery $query): Query $queryBuilder, $query->authorizationContext, 'r.raInstitution', - 'iac' + 'iac', ); return $queryBuilder->getQuery(); } /** - * @param Institution $raInstitution * @return ArrayCollection */ public function listRasFor(Institution $raInstitution): ArrayCollection @@ -232,7 +221,6 @@ public function listRasFor(Institution $raInstitution): ArrayCollection } /** - * @param IdentityId $identityId * @return void */ public function removeByIdentityId(IdentityId $identityId, Institution $institution): void @@ -248,8 +236,6 @@ public function removeByIdentityId(IdentityId $identityId, Institution $institut } /** - * @param IdentityId $identityId - * @param Institution $raInstitution * @return void */ public function removeByIdentityIdAndRaInstitution(IdentityId $identityId, Institution $raInstitution): void @@ -265,8 +251,6 @@ public function removeByIdentityIdAndRaInstitution(IdentityId $identityId, Insti } /** - * @param IdentityId $identityId - * @param Institution $institution * @return void */ public function removeByIdentityIdAndInstitution(IdentityId $identityId, Institution $institution): void diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php index 81202067e..ad847de26 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php @@ -33,12 +33,11 @@ class RaSecondFactorRepository extends ServiceEntityRepository { - private InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter; - - public function __construct(ManagerRegistry $registry, InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter) - { + public function __construct( + ManagerRegistry $registry, + private readonly InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter, + ) { parent::__construct($registry, RaSecondFactor::class); - $this->authorizationRepositoryFilter = $authorizationRepositoryFilter; } public function find(mixed $id, $lockMode = null, $lockVersion = null): ?RaSecondFactor @@ -73,7 +72,6 @@ public function findByInstitution($institution): array * below complex or hard to maintain. * @SuppressWarnings(PHPMD.NPathComplexity) * - * @param RaSecondFactorQuery $query * @return Query * @throws DBALException */ @@ -88,7 +86,7 @@ public function createSearchQuery(RaSecondFactorQuery $query): Query $queryBuilder, $query->authorizationContext, 'sf.institution', - 'iac' + 'iac', ); if ($query->name) { @@ -116,10 +114,12 @@ public function createSearchQuery(RaSecondFactorQuery $query): Query if ($query->status) { $stringStatus = $query->status; if (!SecondFactorStatus::isValidStatus($stringStatus)) { - throw new RuntimeException(sprintf( - 'Received invalid status "%s" in RaSecondFactorRepository::createSearchQuery', - is_object($stringStatus) ? get_class($stringStatus) : (string) $stringStatus - )); + throw new RuntimeException( + sprintf( + 'Received invalid status "%s" in RaSecondFactorRepository::createSearchQuery', + is_object($stringStatus) ? $stringStatus::class : (string)$stringStatus, + ), + ); } // we need to resolve the string value to database value using the correct doctrine type. Normally this is @@ -130,31 +130,24 @@ public function createSearchQuery(RaSecondFactorQuery $query): Query $databaseValue = $doctrineType->convertToDatabaseValue( $secondFactorStatus, - $this->getEntityManager()->getConnection()->getDatabasePlatform() + $this->getEntityManager()->getConnection()->getDatabasePlatform(), ); $queryBuilder->andWhere('sf.status = :status')->setParameter('status', $databaseValue); } - switch ($query->orderBy) { - case 'name': - case 'type': - case 'secondFactorId': - case 'email': - case 'institution': - case 'status': - $queryBuilder->orderBy( - sprintf('sf.%s', $query->orderBy), - $query->orderDirection === 'desc' ? 'DESC' : 'ASC' - ); - break; - } + match ($query->orderBy) { + 'name', 'type', 'secondFactorId', 'email', 'institution', 'status' => $queryBuilder->orderBy( + sprintf('sf.%s', $query->orderBy), + $query->orderDirection === 'desc' ? 'DESC' : 'ASC', + ), + default => $queryBuilder->getQuery(), + }; return $queryBuilder->getQuery(); } /** - * @param RaSecondFactorQuery $query * @return Query */ public function createOptionsQuery(RaSecondFactorQuery $query): Query @@ -169,14 +162,13 @@ public function createOptionsQuery(RaSecondFactorQuery $query): Query $queryBuilder, $query->authorizationContext, 'sf.institution', - 'iac' + 'iac', ); return $queryBuilder->getQuery(); } /** - * @param IdentityId $identityId * @return void */ public function removeByIdentityId(IdentityId $identityId): void diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RecoveryTokenRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RecoveryTokenRepository.php index 343c5ac4f..796008a80 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RecoveryTokenRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RecoveryTokenRepository.php @@ -32,14 +32,11 @@ class RecoveryTokenRepository extends ServiceEntityRepository { - private InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter; - public function __construct( ManagerRegistry $registry, - InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter + private readonly InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter, ) { parent::__construct($registry, RecoveryToken::class); - $this->authorizationRepositoryFilter = $authorizationRepositoryFilter; } public function save(RecoveryToken $entry): void @@ -70,7 +67,7 @@ public function createSearchQuery(RecoveryTokenQuery $query): Query $queryBuilder, $query->authorizationContext, 'rt.institution', - 'iac' + 'iac', ); } if ($query->identityId) { @@ -86,10 +83,12 @@ public function createSearchQuery(RecoveryTokenQuery $query): Query if ($query->status) { $stringStatus = $query->status; if (!RecoveryTokenStatus::isValidStatus($stringStatus)) { - throw new RuntimeException(sprintf( - 'Received invalid status "%s" in RecoveryTokenRepository::createSearchQuery', - is_object($stringStatus) ? get_class($stringStatus) : (string) $stringStatus - )); + throw new RuntimeException( + sprintf( + 'Received invalid status "%s" in RecoveryTokenRepository::createSearchQuery', + is_object($stringStatus) ? $stringStatus::class : (string)$stringStatus, + ), + ); } // we need to resolve the string value to database value using the correct doctrine type. Normally this is @@ -100,7 +99,7 @@ public function createSearchQuery(RecoveryTokenQuery $query): Query $databaseValue = $doctrineType->convertToDatabaseValue( $secondFactorStatus, - $this->getEntityManager()->getConnection()->getDatabasePlatform() + $this->getEntityManager()->getConnection()->getDatabasePlatform(), ); $queryBuilder->andWhere('rt.status = :status')->setParameter('status', $databaseValue); @@ -120,18 +119,13 @@ public function createSearchQuery(RecoveryTokenQuery $query): Query ->andWhere('rt.institution = :institution') ->setParameter('institution', $query->institution); } - switch ($query->orderBy) { - case 'name': - case 'type': - case 'email': - case 'institution': - case 'status': - $queryBuilder->orderBy( - sprintf('rt.%s', $query->orderBy), - $query->orderDirection === 'desc' ? 'DESC' : 'ASC' - ); - break; - } + match ($query->orderBy) { + 'name', 'type', 'email', 'institution', 'status' => $queryBuilder->orderBy( + sprintf('rt.%s', $query->orderBy), + $query->orderDirection === 'desc' ? 'DESC' : 'ASC', + ), + default => $queryBuilder->getQuery(), + }; return $queryBuilder->getQuery(); } @@ -149,7 +143,7 @@ public function createOptionsQuery(RecoveryTokenQuery $query): Query $queryBuilder, $query->authorizationContext, 'sf.institution', - 'iac' + 'iac', ); } return $queryBuilder->getQuery(); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SecondFactorRevocationRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SecondFactorRevocationRepository.php index 69d99fb12..0ee937c57 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SecondFactorRevocationRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SecondFactorRevocationRepository.php @@ -29,9 +29,6 @@ public function __construct(ManagerRegistry $registry) parent::__construct($registry, SecondFactorRevocation::class); } - /** - * @param SecondFactorRevocation $revocation - */ public function save(SecondFactorRevocation $revocation): void { $entityManager = $this->getEntityManager(); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php index 4e0a086a7..512847459 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php @@ -39,15 +39,13 @@ public function removeAll(): void $this ->getEntityManager() ->createQuery( - 'DELETE FROM Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Sraa' + 'DELETE FROM Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Sraa', ) ->execute(); } /** * Saves all SRAAs to the database, using inserts only - * - * @param array $sraaList */ public function saveAll(array $sraaList): void { @@ -63,15 +61,15 @@ public function saveAll(array $sraaList): void foreach ($invalid as $index => $value) { $invalidIndications[] = sprintf( '"%s" at index "%d"', - is_object($value) ? get_class($value) : gettype($value) + get_debug_type($value), ); } throw new InvalidArgumentException( sprintf( 'Expected array of Raa Objects, got %s', - implode(', ', $invalidIndications) - ) + implode(', ', $invalidIndications), + ), ); } @@ -85,16 +83,14 @@ public function saveAll(array $sraaList): void } /** - * @param NameId $nameId * @return null|Sraa */ public function findByNameId(NameId $nameId): ?object { - return $this->findOneBy(['nameId' => (string) $nameId]); + return $this->findOneBy(['nameId' => (string)$nameId]); } /** - * @param NameId $nameId * @return boolean */ public function contains(NameId $nameId): bool diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/UnverifiedSecondFactorRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/UnverifiedSecondFactorRepository.php index 3e2408949..bf9a49c5e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/UnverifiedSecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/UnverifiedSecondFactorRepository.php @@ -41,7 +41,6 @@ public function find(mixed $id, $lockMode = null, $lockVersion = null): ?Unverif } /** - * @param UnverifiedSecondFactorQuery $query * @return Query */ public function createSearchQuery(UnverifiedSecondFactorQuery $query): Query @@ -51,7 +50,7 @@ public function createSearchQuery(UnverifiedSecondFactorQuery $query): Query if ($query->identityId) { $queryBuilder ->andWhere('sf.identityId = :identityId') - ->setParameter('identityId', (string) $query->identityId); + ->setParameter('identityId', (string)$query->identityId); } if ($query->verificationNonce) { @@ -72,9 +71,6 @@ public function removeByIdentityId(IdentityId $identityId): void ->execute(); } - /** - * @param UnverifiedSecondFactor $secondFactor - */ public function save(UnverifiedSecondFactor $secondFactor): void { $this->getEntityManager()->persist($secondFactor); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VerifiedSecondFactorRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VerifiedSecondFactorRepository.php index 5ffd64235..6cfcc6c60 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VerifiedSecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VerifiedSecondFactorRepository.php @@ -30,12 +30,11 @@ class VerifiedSecondFactorRepository extends ServiceEntityRepository { - private InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter; - - public function __construct(ManagerRegistry $registry, InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter) - { + public function __construct( + ManagerRegistry $registry, + private readonly InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter, + ) { parent::__construct($registry, VerifiedSecondFactor::class); - $this->authorizationRepositoryFilter = $authorizationRepositoryFilter; } public function find(mixed $id, $lockMode = null, $lockVersion = null): ?VerifiedSecondFactor @@ -47,7 +46,6 @@ public function find(mixed $id, $lockMode = null, $lockVersion = null): ?Verifie } /** - * @param DateTime $requestedAt * @return VerifiedSecondFactor[] */ public function findByDate(DateTime $requestedAt) @@ -68,7 +66,6 @@ public function findByDate(DateTime $requestedAt) } /** - * @param VerifiedSecondFactorQuery $query * @return Query */ public function createSearchQuery(VerifiedSecondFactorQuery $query): Query @@ -78,13 +75,13 @@ public function createSearchQuery(VerifiedSecondFactorQuery $query): Query if ($query->identityId) { $queryBuilder ->andWhere('sf.identityId = :identityId') - ->setParameter('identityId', (string) $query->identityId); + ->setParameter('identityId', (string)$query->identityId); } if ($query->secondFactorId) { $queryBuilder ->andWhere('sf.id = :secondFactorId') - ->setParameter('secondFactorId', (string) $query->secondFactorId); + ->setParameter('secondFactorId', (string)$query->secondFactorId); } if (is_string($query->registrationCode)) { @@ -99,14 +96,13 @@ public function createSearchQuery(VerifiedSecondFactorQuery $query): Query $queryBuilder, $query->authorizationContext, 'sf.institution', - 'iac' + 'iac', ); return $queryBuilder->getQuery(); } /** - * @param VerifiedSecondFactorOfIdentityQuery $query * @return Query */ public function createSearchForIdentityQuery(VerifiedSecondFactorOfIdentityQuery $query): Query @@ -115,7 +111,7 @@ public function createSearchForIdentityQuery(VerifiedSecondFactorOfIdentityQuery $queryBuilder ->andWhere('sf.identityId = :identityId') - ->setParameter('identityId', (string) $query->identityId); + ->setParameter('identityId', (string)$query->identityId); return $queryBuilder->getQuery(); } @@ -130,9 +126,6 @@ public function removeByIdentityId(IdentityId $identityId): void ->execute(); } - /** - * @param VerifiedSecondFactor $secondFactor - */ public function save(VerifiedSecondFactor $secondFactor): void { $this->getEntityManager()->persist($secondFactor); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettedSecondFactorRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettedSecondFactorRepository.php index 1c679287c..f9e89ce24 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettedSecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettedSecondFactorRepository.php @@ -40,10 +40,6 @@ public function find(mixed $id, $lockMode = null, $lockVersion = null): ?VettedS return $secondFactor; } - /** - * @param VettedSecondFactorQuery $query - * @return Query - */ public function createSearchQuery(VettedSecondFactorQuery $query): Query { $queryBuilder = $this->createQueryBuilder('sf'); @@ -51,7 +47,7 @@ public function createSearchQuery(VettedSecondFactorQuery $query): Query if ($query->identityId) { $queryBuilder ->andWhere('sf.identityId = :identityId') - ->setParameter('identityId', (string) $query->identityId); + ->setParameter('identityId', (string)$query->identityId); } return $queryBuilder->getQuery(); @@ -67,9 +63,6 @@ public function removeByIdentityId(IdentityId $identityId): void ->execute(); } - /** - * @param VettedSecondFactor $secondFactor - */ public function save(VettedSecondFactor $secondFactor): void { $this->getEntityManager()->persist($secondFactor); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php index d329a9779..485745501 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php @@ -94,7 +94,7 @@ public function hasEntryFor(mixed $institution): bool ->getQuery() ->getSingleScalarResult(); - return (bool) $count; + return (bool)$count; } /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AbstractSearchService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AbstractSearchService.php index c526aea67..8b1919379 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AbstractSearchService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AbstractSearchService.php @@ -27,14 +27,11 @@ class AbstractSearchService { - /** - * @param QueryBuilder|Query $doctrineQuery - * @param AbstractQuery $query - * @param bool $fetchCollection - * @return Pagerfanta - */ - protected function createPaginatorFrom($doctrineQuery, AbstractQuery $query, $fetchCollection = true): Pagerfanta - { + protected function createPaginatorFrom( + $doctrineQuery, + AbstractQuery $query, + bool $fetchCollection = true, + ): Pagerfanta { $queryObject = $doctrineQuery; if ($doctrineQuery instanceof QueryBuilder) { $queryObject = $doctrineQuery->getQuery(); @@ -44,11 +41,11 @@ protected function createPaginatorFrom($doctrineQuery, AbstractQuery $query, $fe throw InvalidArgumentException::invalidType( 'Doctrine\ORM\Query or Doctrine\ORM\QueryBuilder', 'searchQuery', - $doctrineQuery + $doctrineQuery, ); } - $adapter = new DoctrineORMAdapter($doctrineQuery, $fetchCollection); + $adapter = new DoctrineORMAdapter($doctrineQuery, $fetchCollection); $paginator = new Pagerfanta($adapter); $paginator->setMaxPerPage($query->itemsPerPage); $paginator->setCurrentPage($query->pageNumber); @@ -57,10 +54,6 @@ protected function createPaginatorFrom($doctrineQuery, AbstractQuery $query, $fe return $paginator; } - /** - * @param Query $doctrineQuery - * @return array - */ protected function getFilteredQueryOptions(Query $doctrineQuery): array { $filters = []; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AuditLogService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AuditLogService.php index ba5a42054..7293317eb 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AuditLogService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AuditLogService.php @@ -24,15 +24,11 @@ class AuditLogService extends AbstractSearchService { - private AuditLogRepository $repository; - - public function __construct(AuditLogRepository $repository) + public function __construct(private readonly AuditLogRepository $repository) { - $this->repository = $repository; } /** - * @param SecondFactorAuditLogQuery $query * @return Pagerfanta */ public function searchSecondFactorAuditLog(SecondFactorAuditLogQuery $query) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/IdentityService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/IdentityService.php index 8037adebb..01ea58a32 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/IdentityService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/IdentityService.php @@ -38,24 +38,12 @@ */ class IdentityService extends AbstractSearchService { - private IdentityRepository $repository; - - private IdentitySelfAssertedTokenOptionsRepository $identitySelfAssertedTokensOptionsRepository; - - private RaListingRepository $raListingRepository; - - private SraaRepository $sraaRepository; - public function __construct( - IdentityRepository $repository, - IdentitySelfAssertedTokenOptionsRepository $identitySelfAssertedTokenOptionsRepository, - RaListingRepository $raListingRepository, - SraaRepository $sraaRepository + private readonly IdentityRepository $repository, + private readonly IdentitySelfAssertedTokenOptionsRepository $identitySelfAssertedTokensOptionsRepository, + private readonly RaListingRepository $raListingRepository, + private readonly SraaRepository $sraaRepository, ) { - $this->repository = $repository; - $this->identitySelfAssertedTokensOptionsRepository = $identitySelfAssertedTokenOptionsRepository; - $this->raListingRepository = $raListingRepository; - $this->sraaRepository = $sraaRepository; } /** @@ -68,7 +56,6 @@ public function find(mixed $id): ?Identity } /** - * @param IdentityQuery $query * @param InstitutionRoleSet $institutionRoles * @return Pagerfanta */ @@ -80,7 +67,7 @@ public function search(IdentityQuery $query) } /** - * @param string $identityId + * @param string $identityId * @return null|RegistrationAuthorityCredentials */ public function findRegistrationAuthorityCredentialsOf($identityId) @@ -95,8 +82,6 @@ public function findRegistrationAuthorityCredentialsOf($identityId) } /** - * @param NameId $nameId - * @param Institution $institution * @return RegistrationAuthorityCredentials|null */ public function findRegistrationAuthorityCredentialsByNameIdAndInstitution(NameId $nameId, Institution $institution) @@ -115,11 +100,13 @@ public function findRegistrationAuthorityCredentialsByNameIdAndInstitution(NameI } if ($identityCount > 1) { - throw new RuntimeException(sprintf( - 'Found more than one identity matching NameID "%s" within institution "%s"', - $nameId->getNameId(), - $institution->getInstitution() - )); + throw new RuntimeException( + sprintf( + 'Found more than one identity matching NameID "%s" within institution "%s"', + $nameId->getNameId(), + $institution->getInstitution(), + ), + ); } /** @var Identity $identity */ @@ -129,7 +116,6 @@ public function findRegistrationAuthorityCredentialsByNameIdAndInstitution(NameI } /** - * @param Identity $identity * @return null|RegistrationAuthorityCredentials */ private function findRegistrationAuthorityCredentialsByIdentity(Identity $identity) @@ -156,7 +142,7 @@ private function findRegistrationAuthorityCredentialsByIdentity(Identity $identi public function getSelfAssertedTokenRegistrationOptions( Identity $identity, - bool $hasVettedSecondFactor + bool $hasVettedSecondFactor, ): IdentitySelfAssertedTokenOptions { $options = $this->identitySelfAssertedTokensOptionsRepository->find($identity->id); // Backward compatibility for Identities from the pre SAT era diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/ProfileService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/ProfileService.php index a6fed0828..d33bfb444 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/ProfileService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/ProfileService.php @@ -28,20 +28,11 @@ class ProfileService extends AbstractSearchService { - private RaListingRepository $raListingRepository; - - private IdentityService $identityService; - - private AuthorizationContextService $authorizationService; - public function __construct( - RaListingRepository $raListingRepository, - IdentityService $identityService, - AuthorizationContextService $institutionAuthorizationService + private readonly RaListingRepository $raListingRepository, + private readonly IdentityService $identityService, + private readonly AuthorizationContextService $authorizationService, ) { - $this->raListingRepository = $raListingRepository; - $this->identityService = $identityService; - $this->authorizationService = $institutionAuthorizationService; } /** @@ -69,23 +60,23 @@ public function createProfile($identityId): ?Profile $authorizationContextRa = $this->authorizationService->buildInstitutionAuthorizationContext( new IdentityId($identityId), - RegistrationAuthorityRole::ra() + RegistrationAuthorityRole::ra(), ); $authorizationContextRaa = $this->authorizationService->buildInstitutionAuthorizationContext( new IdentityId($identityId), - RegistrationAuthorityRole::raa() + RegistrationAuthorityRole::raa(), ); $authorizations = AuthorizedInstitutionCollection::from( $authorizationContextRa->getInstitutions(), - $authorizationContextRaa->getInstitutions() + $authorizationContextRaa->getInstitutions(), ); return new Profile( $identity, $authorizations, - $authorizationContextRa->isActorSraa() + $authorizationContextRa->isActorSraa(), ); } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaCandidateService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaCandidateService.php index bbe81d9f5..aa95d6390 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaCandidateService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaCandidateService.php @@ -26,18 +26,11 @@ class RaCandidateService extends AbstractSearchService { - private RaCandidateRepository $raCandidateRepository; - - /** - * @param RaCandidateRepository $raCandidateRepository - */ - public function __construct(RaCandidateRepository $raCandidateRepository) + public function __construct(private readonly RaCandidateRepository $raCandidateRepository) { - $this->raCandidateRepository = $raCandidateRepository; } /** - * @param RaCandidateQuery $query * @return Pagerfanta */ public function search(RaCandidateQuery $query) @@ -48,7 +41,6 @@ public function search(RaCandidateQuery $query) } /** - * @param RaCandidateQuery $query * @return array */ public function getFilterOptions(RaCandidateQuery $query) @@ -57,7 +49,6 @@ public function getFilterOptions(RaCandidateQuery $query) } /** - * @param string $identityId * @return null|array */ public function findOneByIdentityId(string $identityId) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaListingService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaListingService.php index 38a5c31b2..333ffa7f5 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaListingService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaListingService.php @@ -29,29 +29,26 @@ class RaListingService extends AbstractSearchService { - private RaListingRepository $raListingRepository; - - public function __construct(RaListingRepository $raListingRepository) + public function __construct(private readonly RaListingRepository $raListingRepository) { - $this->raListingRepository = $raListingRepository; } /** - * @param IdentityId $identityId - * @param Institution $raInstitution - * @param InstitutionAuthorizationContextInterface $authorizationContext * @return null|RaListing */ public function findByIdentityIdAndRaInstitutionWithContext( IdentityId $identityId, Institution $raInstitution, - InstitutionAuthorizationContextInterface $authorizationContext + InstitutionAuthorizationContextInterface $authorizationContext, ) { - return $this->raListingRepository->findByIdentityIdAndRaInstitutionWithContext($identityId, $raInstitution, $authorizationContext); + return $this->raListingRepository->findByIdentityIdAndRaInstitutionWithContext( + $identityId, + $raInstitution, + $authorizationContext, + ); } /** - * @param RaListingQuery $query * @return Pagerfanta */ public function search(RaListingQuery $query) @@ -62,7 +59,6 @@ public function search(RaListingQuery $query) } /** - * @param RaListingQuery $query * @return array */ public function getFilterOptions(RaListingQuery $query) @@ -71,7 +67,6 @@ public function getFilterOptions(RaListingQuery $query) } /** - * @param Institution $institution * @return RegistrationAuthorityCredentials[] */ public function listRegistrationAuthoritiesFor(Institution $institution) @@ -79,9 +74,7 @@ public function listRegistrationAuthoritiesFor(Institution $institution) $raListings = $this->raListingRepository->listRasFor($institution); return $raListings - ->map(function (RaListing $raListing) { - return RegistrationAuthorityCredentials::fromRaListing($raListing); - }) + ->map(fn(RaListing $raListing) => RegistrationAuthorityCredentials::fromRaListing($raListing)) ->toArray(); } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaSecondFactorService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaSecondFactorService.php index ada5eeee9..fab37d0dc 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaSecondFactorService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaSecondFactorService.php @@ -24,18 +24,11 @@ class RaSecondFactorService extends AbstractSearchService { - private RaSecondFactorRepository $repository; - - /** - * @param RaSecondFactorRepository $repository - */ - public function __construct(RaSecondFactorRepository $repository) + public function __construct(private readonly RaSecondFactorRepository $repository) { - $this->repository = $repository; } /** - * @param RaSecondFactorQuery $query * @return Pagerfanta */ public function search(RaSecondFactorQuery $query) @@ -46,7 +39,6 @@ public function search(RaSecondFactorQuery $query) } /** - * @param RaSecondFactorQuery $query * @return array */ public function getFilterOptions(RaSecondFactorQuery $query) @@ -55,7 +47,6 @@ public function getFilterOptions(RaSecondFactorQuery $query) } /** - * @param RaSecondFactorQuery $query * @return array */ public function searchUnpaginated(RaSecondFactorQuery $query) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RecoveryTokenService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RecoveryTokenService.php index 1f6723418..00d275ecc 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RecoveryTokenService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RecoveryTokenService.php @@ -29,11 +29,8 @@ class RecoveryTokenService extends AbstractSearchService { - private RecoveryTokenRepository $recoveryTokenRepository; - - public function __construct(RecoveryTokenRepository $recoveryTokenRepository) + public function __construct(private readonly RecoveryTokenRepository $recoveryTokenRepository) { - $this->recoveryTokenRepository = $recoveryTokenRepository; } public function search(RecoveryTokenQuery $query): Pagerfanta @@ -62,8 +59,8 @@ public function identityHasActiveRecoveryToken(Identity $identity): bool $recoveryTokens = $this->recoveryTokenRepository->findBy( [ 'identityId' => $identity->id, - 'status' => RecoveryTokenStatus::active() - ] + 'status' => RecoveryTokenStatus::active(), + ], ); return $recoveryTokens !== []; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SecondFactorService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SecondFactorService.php index 9aaff914a..626e7be7e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SecondFactorService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SecondFactorService.php @@ -38,29 +38,14 @@ */ class SecondFactorService extends AbstractSearchService { - private UnverifiedSecondFactorRepository $unverifiedRepository; - - private VerifiedSecondFactorRepository $verifiedRepository; - - private VettedSecondFactorRepository $vettedRepository; - - /** - * @param UnverifiedSecondFactorRepository $unverifiedRepository - * @param VerifiedSecondFactorRepository $verifiedRepository - * @param VettedSecondFactorRepository $vettedRepository - */ public function __construct( - UnverifiedSecondFactorRepository $unverifiedRepository, - VerifiedSecondFactorRepository $verifiedRepository, - VettedSecondFactorRepository $vettedRepository + private readonly UnverifiedSecondFactorRepository $unverifiedRepository, + private readonly VerifiedSecondFactorRepository $verifiedRepository, + private readonly VettedSecondFactorRepository $vettedRepository, ) { - $this->unverifiedRepository = $unverifiedRepository; - $this->verifiedRepository = $verifiedRepository; - $this->vettedRepository = $vettedRepository; } /** - * @param UnverifiedSecondFactorQuery $query * @return Pagerfanta */ public function searchUnverifiedSecondFactors(UnverifiedSecondFactorQuery $query) @@ -71,7 +56,6 @@ public function searchUnverifiedSecondFactors(UnverifiedSecondFactorQuery $query } /** - * @param VerifiedSecondFactorQuery $query * @return Pagerfanta */ public function searchVerifiedSecondFactors(VerifiedSecondFactorQuery $query) @@ -83,7 +67,6 @@ public function searchVerifiedSecondFactors(VerifiedSecondFactorQuery $query) /** - * @param VerifiedSecondFactorOfIdentityQuery $query * @return Pagerfanta */ public function searchVerifiedSecondFactorsOfIdentity(VerifiedSecondFactorOfIdentityQuery $query) @@ -94,7 +77,6 @@ public function searchVerifiedSecondFactorsOfIdentity(VerifiedSecondFactorOfIden } /** - * @param VettedSecondFactorQuery $query * @return Pagerfanta */ public function searchVettedSecondFactors(VettedSecondFactorQuery $query) @@ -105,7 +87,6 @@ public function searchVettedSecondFactors(VettedSecondFactorQuery $query) } /** - * @param SecondFactorId $id * @return null|UnverifiedSecondFactor */ public function findUnverified(SecondFactorId $id): ?UnverifiedSecondFactor @@ -115,7 +96,6 @@ public function findUnverified(SecondFactorId $id): ?UnverifiedSecondFactor /** - * @param SecondFactorId $id * @return null|VerifiedSecondFactor */ public function findVerified(SecondFactorId $id): ?VerifiedSecondFactor @@ -125,7 +105,6 @@ public function findVerified(SecondFactorId $id): ?VerifiedSecondFactor /** - * @param SecondFactorId $id * @return null|VettedSecondFactor */ public function findVetted(SecondFactorId $id): ?VettedSecondFactor @@ -135,7 +114,7 @@ public function findVetted(SecondFactorId $id): ?VettedSecondFactor public function hasVettedByIdentity(IdentityId $id): bool { - $vettedSecondFactors = $this->vettedRepository->findBy(['identityId' => (string) $id]); + $vettedSecondFactors = $this->vettedRepository->findBy(['identityId' => (string)$id]); return $vettedSecondFactors !== []; } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SraaService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SraaService.php index 774662d71..ac620af1f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SraaService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SraaService.php @@ -24,15 +24,11 @@ class SraaService { - private SraaRepository $sraaRepository; - - public function __construct(SraaRepository $sraaRepository) + public function __construct(private readonly SraaRepository $sraaRepository) { - $this->sraaRepository = $sraaRepository; } /** - * @param NameId $nameId * @return Sraa|null */ public function findByNameId(NameId $nameId) @@ -49,7 +45,6 @@ public function findAll(): array } /** - * @param NameId $nameId * @return bool */ public function contains(NameId $nameId) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/WhitelistService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/WhitelistService.php index d3dbcace9..4960b1f12 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/WhitelistService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/WhitelistService.php @@ -22,11 +22,8 @@ class WhitelistService { - private WhitelistEntryRepository $whitelistEntryRepository; - - public function __construct(WhitelistEntryRepository $whitelistEntryRepository) + public function __construct(private readonly WhitelistEntryRepository $whitelistEntryRepository) { - $this->whitelistEntryRepository = $whitelistEntryRepository; } public function isWhitelisted($institution) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Specification/SpecificationInterface.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Specification/SpecificationInterface.php index 80bff46e2..942f82938 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Specification/SpecificationInterface.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Specification/SpecificationInterface.php @@ -23,7 +23,6 @@ interface SpecificationInterface { /** - * @param EntityRepository $entityRepository * @return mixed */ public function apply(EntityRepository $entityRepository); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorityRole.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorityRole.php index ad6039d1a..558ac61d1 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorityRole.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorityRole.php @@ -18,15 +18,16 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Value; +use Stringable; use Surfnet\Stepup\Identity\Value\RegistrationAuthorityRole; use Surfnet\StepupMiddleware\ApiBundle\Exception\InvalidArgumentException; use Surfnet\StepupMiddleware\ApiBundle\Exception\RuntimeException; -class AuthorityRole +class AuthorityRole implements Stringable { - const ROLE_RA = 'ra'; - const ROLE_RAA = 'raa'; - const ROLE_SRAA = 'sraa'; + public const ROLE_RA = 'ra'; + public const ROLE_RAA = 'raa'; + public const ROLE_SRAA = 'sraa'; /** * @var string @@ -39,7 +40,7 @@ public function __construct($role) throw InvalidArgumentException::invalidType( 'One of AuthorityRole::ROLE_RA, AuthorityRole::ROLE_RAA or AuthorityRole::ROLE_SRAA', 'role', - $role + $role, ); } @@ -68,7 +69,6 @@ public static function raa(): self } /** - * @param RegistrationAuthorityRole $registrationAuthorityRole * @return AuthorityRole */ public static function fromRegistrationAuthorityRole(RegistrationAuthorityRole $registrationAuthorityRole) @@ -79,14 +79,15 @@ public static function fromRegistrationAuthorityRole(RegistrationAuthorityRole $ return static::raa(); } - throw new RuntimeException(sprintf( - 'AuthorityRole cannot be created from RegistrationAuthorityRole of value "%s"', - (string) $registrationAuthorityRole - )); + throw new RuntimeException( + sprintf( + 'AuthorityRole cannot be created from RegistrationAuthorityRole of value "%s"', + (string)$registrationAuthorityRole, + ), + ); } /** - * @param AuthorityRole $other * @return bool */ public function equals(AuthorityRole $other): bool diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorizedInstitutionCollection.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorizedInstitutionCollection.php index 93c59c2fb..50f726894 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorizedInstitutionCollection.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorizedInstitutionCollection.php @@ -36,22 +36,24 @@ class AuthorizedInstitutionCollection */ private array $authorizations = []; - public static function from(InstitutionCollection $raInstitutions, ?InstitutionCollection $raaInstitutions = null): self - { + public static function from( + InstitutionCollection $raInstitutions, + ?InstitutionCollection $raaInstitutions = null, + ): self { $collection = new self(); foreach ($raInstitutions as $institution) { - $collection->authorizations[(string) $institution][] = (string) AuthorityRole::ROLE_RA; + $collection->authorizations[(string)$institution][] = (string)AuthorityRole::ROLE_RA; } if ($raaInstitutions instanceof InstitutionCollection) { foreach ($raaInstitutions as $institution) { // Override existing lower role - if (isset($collection->authorizations[(string) $institution]) - && in_array(AuthorityRole::ROLE_RA, $collection->authorizations[(string) $institution]) + if (isset($collection->authorizations[(string)$institution]) + && in_array(AuthorityRole::ROLE_RA, $collection->authorizations[(string)$institution]) ) { - $collection->authorizations[(string) $institution] = []; + $collection->authorizations[(string)$institution] = []; } - $collection->authorizations[(string) $institution][] = (string) AuthorityRole::ROLE_RAA; + $collection->authorizations[(string)$institution][] = (string)AuthorityRole::ROLE_RAA; } } return $collection; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/Profile.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/Profile.php index 1716a9971..1936beed5 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/Profile.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/Profile.php @@ -19,34 +19,19 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Value; use JsonSerializable; -use Surfnet\Stepup\Identity\Collection\InstitutionCollection; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Identity; class Profile implements JsonSerializable { - private Identity $identity; - - private AuthorizedInstitutionCollection $authorizedInstitutionCollection; - - /** - * @var bool - */ - private $isSraa; - /** - * @param Identity $identity - * @param AuthorizedInstitutionCollection $authorizedInstitutionCollection * * @param bool $isSraa */ public function __construct( - Identity $identity, - AuthorizedInstitutionCollection $authorizedInstitutionCollection, - $isSraa + private readonly Identity $identity, + private readonly AuthorizedInstitutionCollection $authorizedInstitutionCollection, + private $isSraa, ) { - $this->identity = $identity; - $this->authorizedInstitutionCollection = $authorizedInstitutionCollection; - $this->isSraa = $isSraa; } public function jsonSerialize() diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RecoveryTokenStatus.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RecoveryTokenStatus.php index e68cee705..b12d5c5c2 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RecoveryTokenStatus.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RecoveryTokenStatus.php @@ -18,10 +18,10 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Value; -final class RecoveryTokenStatus -{ - private string $status; +use Stringable; +final readonly class RecoveryTokenStatus implements Stringable +{ public static function active(): self { return new self('active'); @@ -42,9 +42,8 @@ public static function isValidStatus(string $status): bool return in_array($status, ['active', 'revoked', 'forgotten']); } - private function __construct(string $status) + private function __construct(private string $status) { - $this->status = $status; } public function equals(RecoveryTokenStatus $other): bool diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RegistrationAuthorityCredentials.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RegistrationAuthorityCredentials.php index 0d95a54cb..c130df786 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RegistrationAuthorityCredentials.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RegistrationAuthorityCredentials.php @@ -30,11 +30,6 @@ class RegistrationAuthorityCredentials implements JsonSerializable { - /** - * @var string - */ - private $identityId; - /** * @var Institution */ @@ -55,42 +50,17 @@ class RegistrationAuthorityCredentials implements JsonSerializable */ private $contactInformation; - /** - * @var bool - */ - private $isRa; - - /** - * @var bool - */ - private $isRaa; - - /** - * @var bool - */ - private $isSraa; - /** * @param string $identityId - * @param bool $isRa - * @param bool $isRaa - * @param bool $isSraa + * @param bool $isRa + * @param bool $isRaa + * @param bool $isSraa */ - private function __construct( - $identityId, - $isRa, - $isRaa, - $isSraa - ) { - $this->identityId = $identityId; - $this->isRa = $isRa; - $this->isRaa = $isRaa; - $this->isSraa = $isSraa; + private function __construct(private $identityId, private $isRa, private $isRaa, private $isSraa) + { } /** - * @param Sraa $sraa - * @param Identity $identity * @return RegistrationAuthorityCredentials */ public static function fromSraa(Sraa $sraa, Identity $identity): self @@ -127,7 +97,7 @@ public static function fromRaListings(array $raListings): self $raListingCredentials->identityId, $isRa, $isRaa, - false + false, ); $credentials->institution = $raListingCredentials->institution; @@ -140,7 +110,6 @@ public static function fromRaListings(array $raListings): self /** - * @param RaListing $raListing * @return RegistrationAuthorityCredentials */ public static function fromRaListing(RaListing $raListing): self @@ -149,12 +118,12 @@ public static function fromRaListing(RaListing $raListing): self $raListing->identityId, $raListing->role->equals(AuthorityRole::ra()), $raListing->role->equals(AuthorityRole::raa()), - false + false, ); - $credentials->institution = $raListing->institution; - $credentials->commonName = $raListing->commonName; - $credentials->location = $raListing->location; + $credentials->institution = $raListing->institution; + $credentials->commonName = $raListing->commonName; + $credentials->location = $raListing->location; $credentials->contactInformation = $raListing->contactInformation; return $credentials; @@ -182,7 +151,6 @@ public function grantSraa(): static } /** - * @param RegistrationAuthorityCredentials $other * @return bool */ public function equals(RegistrationAuthorityCredentials $other): bool @@ -195,14 +163,14 @@ public function jsonSerialize() return [ 'id' => $this->identityId, 'attributes' => [ - 'institution' => $this->institution, - 'common_name' => $this->commonName, - 'location' => $this->location, + 'institution' => $this->institution, + 'common_name' => $this->commonName, + 'location' => $this->location, 'contact_information' => $this->contactInformation, - 'is_ra' => ($this->isRa || $this->isSraa), - 'is_raa' => ($this->isRaa || $this->isSraa), - 'is_sraa' => $this->isSraa, - ] + 'is_ra' => ($this->isRa || $this->isSraa), + 'is_raa' => ($this->isRaa || $this->isSraa), + 'is_sraa' => $this->isSraa, + ], ]; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/SecondFactorStatus.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/SecondFactorStatus.php index fffe26004..a56b8b548 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/SecondFactorStatus.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/SecondFactorStatus.php @@ -18,13 +18,10 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Value; -final class SecondFactorStatus -{ - /** - * @var string - */ - private $status; +use Stringable; +final class SecondFactorStatus implements Stringable +{ public static function unverified(): self { return new self('unverified'); @@ -62,13 +59,11 @@ public static function isValidStatus($status): bool /** * @param string $status */ - private function __construct($status) + private function __construct(private $status) { - $this->status = $status; } /** - * @param SecondFactorStatus $other * @return bool */ public function equals(SecondFactorStatus $other): bool diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/VerifiedTokenInformation.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/VerifiedTokenInformation.php index 30201953a..89cb3210c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/VerifiedTokenInformation.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/VerifiedTokenInformation.php @@ -23,22 +23,6 @@ class VerifiedTokenInformation { - private $email; - - private $tokenId; - - private $tokenType; - - private $commonName; - - private $requestedAt; - - private $preferredLocale; - - private $institution; - - private $registrationCode; - /** * @param $email * @param $tokenId @@ -50,36 +34,28 @@ class VerifiedTokenInformation * @param $registrationCode */ public function __construct( - $email, - $tokenId, - $tokenType, - $commonName, - $requestedAt, - $preferredLocale, - $institution, - $registrationCode + private $email, + private $tokenId, + private $tokenType, + private $commonName, + private $requestedAt, + private $preferredLocale, + private $institution, + private $registrationCode, ) { - $this->email = $email; - $this->tokenId = $tokenId; - $this->tokenType = $tokenType; - $this->commonName = $commonName; - $this->requestedAt = $requestedAt; - $this->preferredLocale = $preferredLocale; - $this->institution = $institution; - $this->registrationCode = $registrationCode; } public static function fromEntity(VerifiedSecondFactor $token, Identity $identity): self { return new self( - (string) $identity->email, + (string)$identity->email, $token->id, $token->type, - (string) $identity->commonName, + (string)$identity->commonName, $token->registrationRequestedAt, - (string) $identity->preferredLocale, + (string)$identity->preferredLocale, $identity->institution, - $token->registrationCode + $token->registrationCode, ); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php b/src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php index c47dc2837..49ebb5d15 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php @@ -21,6 +21,7 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; use Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\ParamConverterInterface; use Surfnet\StepupMiddleware\ApiBundle\Exception\BadCommandRequestException; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; use Symfony\Component\HttpFoundation\Request; class CommandParamConverter implements ParamConverterInterface @@ -37,18 +38,18 @@ public function apply(Request $request, ParamConverter $configuration): void $this->assertIsValidCommandStructure($data); $commandName = []; - preg_match('~^(\w+):([\w\\.]+)$~', $data['command']['name'], $commandName); + preg_match('~^(\w+):([\w\\.]+)$~', (string)$data['command']['name'], $commandName); $commandClassName = sprintf( 'Surfnet\StepupMiddleware\CommandHandlingBundle\%s\Command\%sCommand', $commandName[1], - str_replace('.', '\\', $commandName[2]) + str_replace('.', '\\', $commandName[2]), ); $command = new $commandClassName; $command->UUID = $data['command']['uuid']; foreach ($data['command']['payload'] as $property => $value) { - $properlyCasedProperty = lcfirst(str_replace(' ', '', ucwords(str_replace('_', ' ', $property)))); + $properlyCasedProperty = lcfirst(str_replace(' ', '', ucwords(str_replace('_', ' ', (string)$property)))); $command->$properlyCasedProperty = $value; } @@ -58,20 +59,19 @@ public function apply(Request $request, ParamConverter $configuration): void public function supports(ParamConverter $configuration): bool { return $configuration->getName() === 'command' - && $configuration->getClass() === 'Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command'; + && $configuration->getClass() === Command::class; } /** - * @param mixed $data * @throws BadCommandRequestException */ - private function assertIsValidCommandStructure($data): void + private function assertIsValidCommandStructure(mixed $data): void { if (!is_array($data)) { $type = gettype($data); throw new BadCommandRequestException( - [sprintf('Command is not valid: body must be a JSON object, but is of type %s', $type)] + [sprintf('Command is not valid: body must be a JSON object, but is of type %s', $type)], ); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionParamConverter.php b/src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionParamConverter.php index b9773aefb..6a1108876 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionParamConverter.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionParamConverter.php @@ -26,7 +26,7 @@ class ConfigurationInstitutionParamConverter implements ParamConverterInterface { - const INSTITUTION = 'institution'; + public const INSTITUTION = 'institution'; public function apply(Request $request, ParamConverter $configuration): void { @@ -36,11 +36,10 @@ public function apply(Request $request, ParamConverter $configuration): void public function supports(ParamConverter $configuration): bool { return $configuration->getName() === self::INSTITUTION - && $configuration->getClass() === 'Surfnet\Stepup\Configuration\Value\Institution'; + && $configuration->getClass() === Institution::class; } /** - * @param Request $request * @return string */ private function getInstitutionFromRequest(Request $request) @@ -59,6 +58,6 @@ private function getInstitutionFromRequest(Request $request) return $institution; } - throw new BadApiRequestException(['This API-call MUST include the institution in the path or query parameters']); + throw new BadApiRequestException(['This API-call MUST include the institution in the path or query parameters'],); } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Request/InstitutionParamConverter.php b/src/Surfnet/StepupMiddleware/ApiBundle/Request/InstitutionParamConverter.php index b4c651d26..5fbba5c92 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Request/InstitutionParamConverter.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Request/InstitutionParamConverter.php @@ -43,6 +43,6 @@ public function apply(Request $request, ParamConverter $configuration): void public function supports(ParamConverter $configuration): bool { return $configuration->getName() === 'institution' - && $configuration->getClass() === 'Surfnet\Stepup\Identity\Value\Institution'; + && $configuration->getClass() === Institution::class; } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Request/MetadataParamConverter.php b/src/Surfnet/StepupMiddleware/ApiBundle/Request/MetadataParamConverter.php index 990b4abf9..7e1704b75 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Request/MetadataParamConverter.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Request/MetadataParamConverter.php @@ -27,11 +27,8 @@ class MetadataParamConverter implements ParamConverterInterface { - private ValidatorInterface $validator; - - public function __construct(ValidatorInterface $validator) + public function __construct(private readonly ValidatorInterface $validator) { - $this->validator = $validator; } public function apply(Request $request, ParamConverter $configuration): void @@ -43,7 +40,7 @@ public function apply(Request $request, ParamConverter $configuration): void $metadata = new Metadata(); foreach ($data->meta as $property => $value) { - $properlyCasedProperty = lcfirst(str_replace(' ', '', ucwords(str_replace('_', ' ', $property)))); + $properlyCasedProperty = lcfirst(str_replace(' ', '', ucwords(str_replace('_', ' ', (string)$property)))); $metadata->$properlyCasedProperty = $value; } @@ -58,20 +55,19 @@ public function apply(Request $request, ParamConverter $configuration): void public function supports(ParamConverter $configuration): bool { return $configuration->getName() === 'metadata' - && $configuration->getClass() === 'Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Metadata'; + && $configuration->getClass() === Metadata::class; } /** - * @param mixed $data * @throws BadCommandRequestException */ - private function assertIsValidMetadataStructure($data): void + private function assertIsValidMetadataStructure(mixed $data): void { if (!is_object($data)) { $type = gettype($data); throw new BadCommandRequestException( - [sprintf('Command metadata is not valid: body must be a JSON object, but is of type %s', $type)] + [sprintf('Command metadata is not valid: body must be a JSON object, but is of type %s', $type)], ); } @@ -85,8 +81,8 @@ private function assertIsValidMetadataStructure($data): void throw new BadCommandRequestException([ sprintf( "Command metadata is not valid: 'meta' key value must be a JSON object, but is of type %s", - $type - ) + $type, + ), ]); } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/projection.yml b/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/projection.yml index c1eaf77bf..0727dd4b0 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/projection.yml +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/projection.yml @@ -1,110 +1,110 @@ services: - surfnet_stepup_middleware_api.projector.identity: - class: Surfnet\StepupMiddleware\ApiBundle\Identity\Projector\IdentityProjector - arguments: - - "@surfnet_stepup_middleware_api.repository.identity" - tags: [{ name: event_bus.event_listener, disable_for_replay: false }] - - surfnet_stepup_middleware_api.projector.identity_self_asserted_token_options: - class: Surfnet\StepupMiddleware\ApiBundle\Identity\Projector\IdentitySelfAssertedTokenOptionsProjector - arguments: - - "@surfnet_stepup_middleware_api.repository.identity_self_asserted_token_options" - tags: [{ name: event_bus.event_listener, disable_for_replay: false }] - - surfnet_stepup_middleware_api.projector.institution_listing: - class: Surfnet\StepupMiddleware\ApiBundle\Identity\Projector\InstitutionListingProjector - arguments: - - "@surfnet_stepup_middleware_api.repository.institution_listing" - tags: [{ name: event_bus.event_listener, disable_for_replay: false }] - - surfnet_stepup_middleware_api.projector.second_factor: - class: Surfnet\StepupMiddleware\ApiBundle\Identity\Projector\SecondFactorProjector - arguments: - - "@surfnet_stepup_middleware_api.repository.unverified_second_factor" - - "@surfnet_stepup_middleware_api.repository.verified_second_factor" - - "@surfnet_stepup_middleware_api.repository.vetted_second_factor" - - "@surfnet_stepup_middleware_api.repository.identity" - tags: [{ name: event_bus.event_listener, disable_for_replay: false }] - - surfnet_stepup_middleware_api.projector.ra_second_factor: - class: Surfnet\StepupMiddleware\ApiBundle\Identity\Projector\RaSecondFactorProjector - arguments: - - "@surfnet_stepup_middleware_api.repository.ra_second_factor" - - "@surfnet_stepup_middleware_api.repository.identity" - tags: [{ name: event_bus.event_listener, disable_for_replay: false }] - - surfnet_stepup_middleware_api.projector.ra_listing: - class: Surfnet\StepupMiddleware\ApiBundle\Identity\Projector\RaListingProjector - arguments: - - "@surfnet_stepup_middleware_api.repository.ra_listing" - - "@surfnet_stepup_middleware_api.repository.identity" - tags: [{ name: event_bus.event_listener, disable_for_replay: false }] - - surfnet_stepup_middleware_api.projector.sraa: - class: Surfnet\StepupMiddleware\ApiBundle\Identity\Projector\SraaProjector - arguments: - - "@surfnet_stepup_middleware_api.repository.sraa" - tags: [{ name: event_bus.event_listener, disable_for_replay: false }] - - surfnet_stepup_middleware_api.projector.recovery_token: - class: Surfnet\StepupMiddleware\ApiBundle\Identity\Projector\RecoveryTokenProjector - arguments: - - "@Surfnet\\StepupMiddleware\\ApiBundle\\Identity\\Repository\\RecoveryTokenRepository" - tags: [{ name: event_bus.event_listener, disable_for_replay: false }] - - surfnet_stepup_middleware_api.projector.vetting_type_hint: - class: Surfnet\StepupMiddleware\ApiBundle\Identity\Projector\VettingTypeHintProjector - arguments: - - '@surfnet_stepup_middleware_api.repository.vetting_type_hint' - tags: [{ name: event_bus.event_listener, disable_for_replay: false }] - - surfnet_stepup_middleware_api.projector.audit_log: - class: Surfnet\StepupMiddleware\ApiBundle\Identity\Projector\AuditLogProjector - arguments: - - "@surfnet_stepup_middleware_api.repository.audit_log" - - "@surfnet_stepup_middleware_api.repository.identity" - tags: [{ name: event_bus.event_listener, disable_for_replay: false }] - - surfnet_stepup_middleware_api.projector.second_factor_revocation: - class: Surfnet\StepupMiddleware\ApiBundle\Identity\Projector\SecondFactorRevocationProjector - arguments: - - "@surfnet_stepup_middleware_api.repository.second_factor_revocation" - tags: [{ name: event_bus.event_listener, disable_for_replay: false }] - - surfnet_stepup_middleware_api.projector.whitelist_entry: - class: Surfnet\StepupMiddleware\ApiBundle\Identity\Projector\WhitelistProjector - arguments: - - "@surfnet_stepup_middleware_api.repository.whitelist_entry" - tags: [{ name: event_bus.event_listener, disable_for_replay: false }] - - surfnet_stepup_middleware_api.projector.ra_location: - class: Surfnet\StepupMiddleware\ApiBundle\Configuration\Projector\RaLocationProjector - arguments: - - "@surfnet_stepup_middleware_api.repository.ra_location" - tags: [{ name: event_bus.event_listener, disable_for_replay: false }] - - surfnet_stepup_middleware_api.projector.configured_institution: - class: Surfnet\StepupMiddleware\ApiBundle\Configuration\Projector\ConfiguredInstitutionProjector - arguments: - - "@surfnet_stepup_middleware_api.repository.configured_institution" - tags: [{ name: event_bus.event_listener, disable_for_replay: false }] - - surfnet_stepup_middleware_api.projector.institution_configuration_options: - class: Surfnet\StepupMiddleware\ApiBundle\Configuration\Projector\InstitutionConfigurationOptionsProjector - arguments: - - "@surfnet_stepup_middleware_api.repository.institution_configuration_options" - - "@surfnet_stepup_middleware_api.repository.allowed_second_factor" - tags: [{ name: event_bus.event_listener, disable_for_replay: false }] - - surfnet_stepup_middleware_api.projector.allowed_second_factor: - class: Surfnet\StepupMiddleware\ApiBundle\Configuration\Projector\AllowedSecondFactorListProjector - arguments: - - "@surfnet_stepup_middleware_api.repository.allowed_second_factor" - tags: [{ name: event_bus.event_listener, disable_for_replay: false }] - - surfnet_stepup_middleware_api.projector.institution_authorization: - class: Surfnet\StepupMiddleware\ApiBundle\Configuration\Projector\InstitutionAuthorizationProjector - arguments: - - "@surfnet_stepup_middleware_api.repository.institution_authorization" - - "@surfnet_stepup_middleware_api.repository.institution_configuration_options" - tags: [{ name: event_bus.event_listener, disable_for_replay: false }] + surfnet_stepup_middleware_api.projector.identity: + class: Surfnet\StepupMiddleware\ApiBundle\Identity\Projector\IdentityProjector + arguments: + - "@surfnet_stepup_middleware_api.repository.identity" + tags: [ { name: event_bus.event_listener, disable_for_replay: false } ] + + surfnet_stepup_middleware_api.projector.identity_self_asserted_token_options: + class: Surfnet\StepupMiddleware\ApiBundle\Identity\Projector\IdentitySelfAssertedTokenOptionsProjector + arguments: + - "@surfnet_stepup_middleware_api.repository.identity_self_asserted_token_options" + tags: [ { name: event_bus.event_listener, disable_for_replay: false } ] + + surfnet_stepup_middleware_api.projector.institution_listing: + class: Surfnet\StepupMiddleware\ApiBundle\Identity\Projector\InstitutionListingProjector + arguments: + - "@surfnet_stepup_middleware_api.repository.institution_listing" + tags: [ { name: event_bus.event_listener, disable_for_replay: false } ] + + surfnet_stepup_middleware_api.projector.second_factor: + class: Surfnet\StepupMiddleware\ApiBundle\Identity\Projector\SecondFactorProjector + arguments: + - "@surfnet_stepup_middleware_api.repository.unverified_second_factor" + - "@surfnet_stepup_middleware_api.repository.verified_second_factor" + - "@surfnet_stepup_middleware_api.repository.vetted_second_factor" + - "@surfnet_stepup_middleware_api.repository.identity" + tags: [ { name: event_bus.event_listener, disable_for_replay: false } ] + + surfnet_stepup_middleware_api.projector.ra_second_factor: + class: Surfnet\StepupMiddleware\ApiBundle\Identity\Projector\RaSecondFactorProjector + arguments: + - "@surfnet_stepup_middleware_api.repository.ra_second_factor" + - "@surfnet_stepup_middleware_api.repository.identity" + tags: [ { name: event_bus.event_listener, disable_for_replay: false } ] + + surfnet_stepup_middleware_api.projector.ra_listing: + class: Surfnet\StepupMiddleware\ApiBundle\Identity\Projector\RaListingProjector + arguments: + - "@surfnet_stepup_middleware_api.repository.ra_listing" + - "@surfnet_stepup_middleware_api.repository.identity" + tags: [ { name: event_bus.event_listener, disable_for_replay: false } ] + + surfnet_stepup_middleware_api.projector.sraa: + class: Surfnet\StepupMiddleware\ApiBundle\Identity\Projector\SraaProjector + arguments: + - "@surfnet_stepup_middleware_api.repository.sraa" + tags: [ { name: event_bus.event_listener, disable_for_replay: false } ] + + surfnet_stepup_middleware_api.projector.recovery_token: + class: Surfnet\StepupMiddleware\ApiBundle\Identity\Projector\RecoveryTokenProjector + arguments: + - "@Surfnet\\StepupMiddleware\\ApiBundle\\Identity\\Repository\\RecoveryTokenRepository" + tags: [ { name: event_bus.event_listener, disable_for_replay: false } ] + + surfnet_stepup_middleware_api.projector.vetting_type_hint: + class: Surfnet\StepupMiddleware\ApiBundle\Identity\Projector\VettingTypeHintProjector + arguments: + - '@surfnet_stepup_middleware_api.repository.vetting_type_hint' + tags: [ { name: event_bus.event_listener, disable_for_replay: false } ] + + surfnet_stepup_middleware_api.projector.audit_log: + class: Surfnet\StepupMiddleware\ApiBundle\Identity\Projector\AuditLogProjector + arguments: + - "@surfnet_stepup_middleware_api.repository.audit_log" + - "@surfnet_stepup_middleware_api.repository.identity" + tags: [ { name: event_bus.event_listener, disable_for_replay: false } ] + + surfnet_stepup_middleware_api.projector.second_factor_revocation: + class: Surfnet\StepupMiddleware\ApiBundle\Identity\Projector\SecondFactorRevocationProjector + arguments: + - "@surfnet_stepup_middleware_api.repository.second_factor_revocation" + tags: [ { name: event_bus.event_listener, disable_for_replay: false } ] + + surfnet_stepup_middleware_api.projector.whitelist_entry: + class: Surfnet\StepupMiddleware\ApiBundle\Identity\Projector\WhitelistProjector + arguments: + - "@surfnet_stepup_middleware_api.repository.whitelist_entry" + tags: [ { name: event_bus.event_listener, disable_for_replay: false } ] + + surfnet_stepup_middleware_api.projector.ra_location: + class: Surfnet\StepupMiddleware\ApiBundle\Configuration\Projector\RaLocationProjector + arguments: + - "@surfnet_stepup_middleware_api.repository.ra_location" + tags: [ { name: event_bus.event_listener, disable_for_replay: false } ] + + surfnet_stepup_middleware_api.projector.configured_institution: + class: Surfnet\StepupMiddleware\ApiBundle\Configuration\Projector\ConfiguredInstitutionProjector + arguments: + - "@surfnet_stepup_middleware_api.repository.configured_institution" + tags: [ { name: event_bus.event_listener, disable_for_replay: false } ] + + surfnet_stepup_middleware_api.projector.institution_configuration_options: + class: Surfnet\StepupMiddleware\ApiBundle\Configuration\Projector\InstitutionConfigurationOptionsProjector + arguments: + - "@surfnet_stepup_middleware_api.repository.institution_configuration_options" + - "@surfnet_stepup_middleware_api.repository.allowed_second_factor" + tags: [ { name: event_bus.event_listener, disable_for_replay: false } ] + + surfnet_stepup_middleware_api.projector.allowed_second_factor: + class: Surfnet\StepupMiddleware\ApiBundle\Configuration\Projector\AllowedSecondFactorListProjector + arguments: + - "@surfnet_stepup_middleware_api.repository.allowed_second_factor" + tags: [ { name: event_bus.event_listener, disable_for_replay: false } ] + + surfnet_stepup_middleware_api.projector.institution_authorization: + class: Surfnet\StepupMiddleware\ApiBundle\Configuration\Projector\InstitutionAuthorizationProjector + arguments: + - "@surfnet_stepup_middleware_api.repository.institution_authorization" + - "@surfnet_stepup_middleware_api.repository.institution_configuration_options" + tags: [ { name: event_bus.event_listener, disable_for_replay: false } ] diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/routing.yml b/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/routing.yml index 050363171..01618e731 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/routing.yml +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/routing.yml @@ -1,243 +1,243 @@ command_handle: - path: /command - defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\CommandController::handleAction } - methods: [POST] - condition: "request.headers.get('Content-Type') == 'application/json' && request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /command + defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\CommandController::handle } + methods: [ POST ] + condition: "request.headers.get('Content-Type') == 'application/json' && request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" authorization_self_asserted_tokens: - path: /authorization/may-register-self-asserted-tokens/{identityId} - defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\AuthorizationController::mayRegisterSelfAssertedTokensAction } - methods: [ GET ] - requirements: - identityId: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}' - condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /authorization/may-register-self-asserted-tokens/{identityId} + defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\AuthorizationController::mayRegisterSelfAssertedTokens } + methods: [ GET ] + requirements: + identityId: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}' + condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" authorization_self_vet_self_asserted_tokens: - path: /authorization/may-self-vet-using-self-asserted-token/{identityId} - defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\AuthorizationController::maySelfVetSelfAssertedTokenAction } - methods: [ GET ] - requirements: - identityId: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}' - condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /authorization/may-self-vet-using-self-asserted-token/{identityId} + defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\AuthorizationController::maySelfVetSelfAssertedToken } + methods: [ GET ] + requirements: + identityId: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}' + condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" authorization_recovery_tokens: - path: /authorization/may-register-recovery-tokens/{identityId} - defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\AuthorizationController::mayRegisterRecoveryTokensAction } - methods: [ GET ] - requirements: - identityId: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}' - condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /authorization/may-register-recovery-tokens/{identityId} + defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\AuthorizationController::mayRegisterRecoveryTokens } + methods: [ GET ] + requirements: + identityId: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}' + condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" deprovision_dry_run: - path: /deprovision/{collabPersonId}/dry-run - requirements: - collabPersonId: .+ - defaults: - _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\DeprovisionController::dryRunAction - _format: json + path: /deprovision/{collabPersonId}/dry-run + requirements: + collabPersonId: .+ + defaults: + _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\DeprovisionController::dryRun + _format: json deprovision: - path: /deprovision/{collabPersonId} - requirements: - collabPersonId: .+ - defaults: - _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\DeprovisionController::deprovisionAction - _format: json - methods: [DELETE] + path: /deprovision/{collabPersonId} + requirements: + collabPersonId: .+ + defaults: + _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\DeprovisionController::deprovision + _format: json + methods: [ DELETE ] identity: - path: /identity/{id} - defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\IdentityController::getAction } - methods: [GET] - requirements: - id: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}' - condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /identity/{id} + defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\IdentityController::get } + methods: [ GET ] + requirements: + id: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}' + condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" identity_collection: - path: /identity - defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\IdentityController::collectionAction } - methods: [GET] - condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /identity + defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\IdentityController::collection } + methods: [ GET ] + condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" profile: - path: /profile/{identityId} - defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\ProfileController::getAction } - methods: [GET] - requirements: - id: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}' - condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /profile/{identityId} + defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\ProfileController::get } + methods: [ GET ] + requirements: + id: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}' + condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" unverified_second_factors: - path: /unverified-second-factors - defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\UnverifiedSecondFactorController::collectionAction } - methods: [GET] - condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /unverified-second-factors + defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\UnverifiedSecondFactorController::collection } + methods: [ GET ] + condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" verified_second_factors: - path: /verified-second-factors - defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\VerifiedSecondFactorController::collectionAction } - methods: [GET] - condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /verified-second-factors + defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\VerifiedSecondFactorController::collection } + methods: [ GET ] + condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" verified_second_factors_of_identity: - path: /verified-second-factors-of-identity - defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\VerifiedSecondFactorController::collectionOfIdentityAction } - methods: [GET] - condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /verified-second-factors-of-identity + defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\VerifiedSecondFactorController::collectionOfIdentity } + methods: [ GET ] + condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" vetted_second_factors: - path: /vetted-second-factors - defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\VettedSecondFactorController::collectionAction } - methods: [GET] - condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /vetted-second-factors + defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\VettedSecondFactorController::collection } + methods: [ GET ] + condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" unverified_second_factor: - path: /unverified-second-factor/{id} - defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\UnverifiedSecondFactorController::getAction } - methods: [GET] - condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /unverified-second-factor/{id} + defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\UnverifiedSecondFactorController::get } + methods: [ GET ] + condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" verified_second_factor: - path: /verified-second-factor/{id} - defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\VerifiedSecondFactorController::getAction } - methods: [GET] - condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /verified-second-factor/{id} + defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\VerifiedSecondFactorController::get } + methods: [ GET ] + condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" verified_second_factor_can_skip_prove_posession: - path: /verified-second-factor/{id}/skip-prove-possession - defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\VerifiedSecondFactorController::getCanSkipProvePossessionAction } - methods: [GET] - condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /verified-second-factor/{id}/skip-prove-possession + defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\VerifiedSecondFactorController::getCanSkipProvePossession } + methods: [ GET ] + condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" vetted_second_factor: - path: /vetted-second-factor/{id} - defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\VettedSecondFactorController::getAction } - methods: [GET] - condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /vetted-second-factor/{id} + defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\VettedSecondFactorController::get } + methods: [ GET ] + condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" recovery_token: - path: /recovery_token/{id} - defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\RecoveryTokenController::getAction } - methods: [GET] - requirements: - id: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}' - condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /recovery_token/{id} + defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\RecoveryTokenController::get } + methods: [ GET ] + requirements: + id: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}' + condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" recovery_tokens: - path: /recovery_tokens - defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\RecoveryTokenController::collectionAction } - methods: [GET] - condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /recovery_tokens + defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\RecoveryTokenController::collection } + methods: [ GET ] + condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" ra_second_factors: - path: /ra-second-factors - defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\RaSecondFactorController::collectionAction } - methods: [GET] - condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /ra-second-factors + defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\RaSecondFactorController::collection } + methods: [ GET ] + condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" ra_second_factors_export: - path: /ra-second-factors-export - defaults: { _controller: SurfnetStepupMiddlewareApiBundle:RaSecondFactor:export } - methods: [GET] - condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /ra-second-factors-export + defaults: { _controller: SurfnetStepupMiddlewareApiBundle:RaSecondFactor:export } + methods: [ GET ] + condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" identity_ra_list: - path: /registration-authority - defaults: { _controller: SurfnetStepupMiddlewareApiBundle:Ra:list } - methods: [GET] - condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /registration-authority + defaults: { _controller: SurfnetStepupMiddlewareApiBundle:Ra:list } + methods: [ GET ] + condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" identity_ra_listing: - path: /ra-listing - defaults: { _controller: SurfnetStepupMiddlewareApiBundle:RaListing:search } - methods: [GET] - condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /ra-listing + defaults: { _controller: SurfnetStepupMiddlewareApiBundle:RaListing:search } + methods: [ GET ] + condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" identity_ra_listing_get: - path: /ra-listing/{identityId}/{institution} - defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\RaListingController::getAction } - methods: [GET] - requirements: - identityId: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}' - institution: '.+' - condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /ra-listing/{identityId}/{institution} + defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\RaListingController::get } + methods: [ GET ] + requirements: + identityId: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}' + institution: '.+' + condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" identity_sraa_list: - path: /sraa - defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\SraaController::listAction } - methods: [GET] - condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /sraa + defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\SraaController::list } + methods: [ GET ] + condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" identity_sraa_get: - path: /sraa/{nameId} - defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\SraaController::getAction } - methods: [GET] - requirements: - nameId: ".+" - condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /sraa/{nameId} + defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\SraaController::get } + methods: [ GET ] + requirements: + nameId: ".+" + condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" audit_log: - path: /audit-log/second-factors - defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\AuditLogController::secondFactorAuditLogAction } - methods: [GET] - requirements: - identityId: ".+" - condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /audit-log/second-factors + defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\AuditLogController::secondFactorAuditLog } + methods: [ GET ] + requirements: + identityId: ".+" + condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" identity_registration_authority_credentials: - path: /registration-authority/{identityId} - defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\IdentityController::getRegistrationAuthorityCredentialsAction } - methods: [GET] - requirements: - identityId: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}' - condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /registration-authority/{identityId} + defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\IdentityController::getRegistrationAuthorityCredentials } + methods: [ GET ] + requirements: + identityId: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}' + condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" institution_listing: - path: /institution-listing - defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\ConfiguredInstitutionController::collectionAction } - methods: [GET] - condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /institution-listing + defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\ConfiguredInstitutionController::collection } + methods: [ GET ] + condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" ra_candidate_search: - path: /ra-candidate - defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\RaCandidateController::searchAction } - methods: [GET] - condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /ra-candidate + defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\RaCandidateController::search } + methods: [ GET ] + condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" ra_candidate: - path: /ra-candidate/{identityId} - defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\RaCandidateController::getAction } - methods: [GET] - requirements: - identityId: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}' - condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /ra-candidate/{identityId} + defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\RaCandidateController::get } + methods: [ GET ] + requirements: + identityId: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}' + condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" ra_location_listing: - path: /ra-location - defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\RaLocationController::searchAction } - methods: [GET] - condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /ra-location + defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\RaLocationController::search } + methods: [ GET ] + condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" ra_location: - path: /ra-location/{raLocationId} - defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\RaLocationController::getAction } - methods: [GET] - requirements: - raLocationId: ".+" - condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /ra-location/{raLocationId} + defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\RaLocationController::get } + methods: [ GET ] + requirements: + raLocationId: ".+" + condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" institution_configuration_options_for_institution: - path: /institution-configuration-options/{institutionName} - defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\InstitutionConfigurationOptionsController::getForInstitutionAction } - methods: [GET] - requirements: - institution: ".+" - condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /institution-configuration-options/{institutionName} + defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\InstitutionConfigurationOptionsController::getForInstitution } + methods: [ GET ] + requirements: + institution: ".+" + condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" vetting_type_hint: - path: /vetting-type-hint/{institution} - defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\VettingTypeHintController::getAction } - methods: [GET] - requirements: - institution: ".+" - condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /vetting-type-hint/{institution} + defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\VettingTypeHintController::get } + methods: [ GET ] + requirements: + institution: ".+" + condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/services.yml b/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/services.yml index d9927a554..b3e057bab 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/services.yml +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/services.yml @@ -1,185 +1,185 @@ services: - _defaults: - bind: - $numberOfTokensPerIdentity: '%number_of_tokens_per_identity%' - - Surfnet\StepupMiddleware\ApiBundle\: - resource: '../../*' - autowire: true - exclude: '../../{DependencyInjection,Entity,Repository,Migrations,Tests,Controller}' - - # The ManagementBundle controllers are available as a service - Surfnet\StepupMiddleware\ApiBundle\Controller\: - resource: '../../Controller' - autowire: true - tags: ['controller.service_arguments'] - - Surfnet\StepupMiddleware\ApiBundle\Controller\DeprovisionController: - arguments: - $deprovisionService: '@Surfnet\StepupMiddleware\ApiBundle\Service\DeprovisionService' - $formatHelper: '@Surfnet\Stepup\Helper\UserDataFormatterInterface' - tags: [ 'controller.service_arguments' ] - - # Repositories - surfnet_stepup_middleware_api.repository.configured_institution: '@Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository\ConfiguredInstitutionRepository' - surfnet_stepup_middleware_api.repository.institution_configuration_options: '@Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository\InstitutionConfigurationOptionsRepository' - surfnet_stepup_middleware_api.repository.allowed_second_factor: '@Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository\AllowedSecondFactorRepository' - surfnet_stepup_middleware_api.repository.institution_authorization: '@Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository\InstitutionAuthorizationRepository' - surfnet_stepup_middleware_api.repository.ra_location: '@Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository\RaLocationRepository' - surfnet_stepup_middleware_api.repository.identity: '@Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\IdentityRepository' - surfnet_stepup_middleware_api.repository.identity_self_asserted_token_options: '@Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\IdentitySelfAssertedTokenOptionsRepository' - surfnet_stepup_middleware_api.repository.institution_listing: '@Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\InstitutionListingRepository' - surfnet_stepup_middleware_api.repository.ra_candidate: '@Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RaCandidateRepository' - surfnet_stepup_middleware_api.repository.ra_listing: '@Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RaListingRepository' - surfnet_stepup_middleware_api.repository.sraa: '@Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\SraaRepository' - surfnet_stepup_middleware_api.repository.unverified_second_factor: '@Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\UnverifiedSecondFactorRepository' - surfnet_stepup_middleware_api.repository.verified_second_factor: '@Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\VerifiedSecondFactorRepository' - surfnet_stepup_middleware_api.repository.vetted_second_factor: '@Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\VettedSecondFactorRepository' - surfnet_stepup_middleware_api.repository.vetting_type_hint: '@Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\VettingTypeHintRepository' - surfnet_stepup_middleware_api.repository.ra_second_factor: '@Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RaSecondFactorRepository' - surfnet_stepup_middleware_api.repository.audit_log: '@Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\AuditLogRepository' - surfnet_stepup_middleware_api.repository.second_factor_revocation: '@Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\SecondFactorRevocationRepository' - surfnet_stepup_middleware_api.repository.whitelist_entry: '@Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\WhitelistEntryRepository' - surfnet_stepup_middleware_api.repository.authorization: '@Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\AuthorizationRepository' - - Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\AuthorizationRepository: - arguments: - - '@Doctrine\Common\Persistence\ManagerRegistry' - - '@logger' - public: true - - # Repository filter - surfnet_stepup_middleware_api.repository_filter.authorization: - class: Surfnet\StepupMiddleware\ApiBundle\Authorization\Filter\InstitutionAuthorizationRepositoryFilter - - # Domain Services - surfnet_stepup_middleware_api.service.institution_configuration_options: - class: Surfnet\StepupMiddleware\ApiBundle\Configuration\Service\InstitutionConfigurationOptionsService - arguments: - - "@surfnet_stepup_middleware_api.repository.institution_configuration_options" - - "%number_of_tokens_per_identity%" - - surfnet_stepup_middleware_api.service.allowed_second_factor_list: - class: Surfnet\StepupMiddleware\ApiBundle\Configuration\Service\AllowedSecondFactorListService - arguments: - - "@surfnet_stepup_middleware_api.repository.allowed_second_factor" - - "@surfnet_stepup_middleware_api.repository.configured_institution" - - surfnet_stepup_middleware_api.service.institution_authorization: - class: Surfnet\StepupMiddleware\ApiBundle\Configuration\Service\InstitutionAuthorizationService - arguments: - - "@surfnet_stepup_middleware_api.repository.institution_authorization" - - surfnet_stepup_middleware_api.service.configured_institutions: - class: Surfnet\StepupMiddleware\ApiBundle\Configuration\Service\ConfiguredInstitutionService - arguments: - - "@surfnet_stepup_middleware_api.repository.configured_institution" - - surfnet_stepup_middleware_api.service.ra_location: - class: Surfnet\StepupMiddleware\ApiBundle\Configuration\Service\RaLocationService - arguments: - - "@surfnet_stepup_middleware_api.repository.ra_location" - - surfnet_stepup_middleware_api.service.second_factor: - class: Surfnet\StepupMiddleware\ApiBundle\Identity\Service\SecondFactorService - arguments: - - "@surfnet_stepup_middleware_api.repository.unverified_second_factor" - - "@surfnet_stepup_middleware_api.repository.verified_second_factor" - - "@surfnet_stepup_middleware_api.repository.vetted_second_factor" - - surfnet_stepup_middleware_api.service.ra_candidate: - class: Surfnet\StepupMiddleware\ApiBundle\Identity\Service\RaCandidateService - arguments: - - "@surfnet_stepup_middleware_api.repository.ra_candidate" - - surfnet_stepup_middleware_api.service.ra_second_factor: - class: Surfnet\StepupMiddleware\ApiBundle\Identity\Service\RaSecondFactorService - arguments: - - "@surfnet_stepup_middleware_api.repository.ra_second_factor" - - surfnet_stepup_middleware_api.service.identity: - class: Surfnet\StepupMiddleware\ApiBundle\Identity\Service\IdentityService - arguments: - - "@surfnet_stepup_middleware_api.repository.identity" - - "@surfnet_stepup_middleware_api.repository.identity_self_asserted_token_options" - - "@surfnet_stepup_middleware_api.repository.ra_listing" - - "@surfnet_stepup_middleware_api.repository.sraa" - - surfnet_stepup_middleware_api.service.ra_listing: - class: Surfnet\StepupMiddleware\ApiBundle\Identity\Service\RaListingService - arguments: - - "@surfnet_stepup_middleware_api.repository.ra_listing" - - surfnet_stepup_middleware_api.service.sraa: - class: Surfnet\StepupMiddleware\ApiBundle\Identity\Service\SraaService - arguments: - - "@surfnet_stepup_middleware_api.repository.sraa" - - surfnet_stepup_middleware_api.service.audit_log: - class: Surfnet\StepupMiddleware\ApiBundle\Identity\Service\AuditLogService - arguments: - - "@surfnet_stepup_middleware_api.repository.audit_log" - - surfnet_stepup_middleware_api.service.whitelist_entry: - class: Surfnet\StepupMiddleware\ApiBundle\Identity\Service\WhitelistService - arguments: - - "@surfnet_stepup_middleware_api.repository.whitelist_entry" - - # Param Converters - surfnet_stepup_middleware_api.request.command_param_converter: - class: Surfnet\StepupMiddleware\ApiBundle\Request\CommandParamConverter - tags: - - { name: request.param_converter, priority: -10, converter: surfnet_stepup_middleware_api.command } - - surfnet_stepup_middleware_api.request.metadata_param_converter: - class: Surfnet\StepupMiddleware\ApiBundle\Request\MetadataParamConverter - arguments: - - "@validator" - tags: - - { name: request.param_converter, priority: -15, converter: surfnet_stepup_middleware_api.metadata } - - surfnet_stepup_middleware_api.request.institution_param_converter: - class: Surfnet\StepupMiddleware\ApiBundle\Request\InstitutionParamConverter - tags: - - { name: request.param_converter, priority: -5, converter: surfnet_step_middleware.institution } - - surfnet_stepup_middleware_api.request.configuration_institution_param_converter: - class: Surfnet\StepupMiddleware\ApiBundle\Request\ConfigurationInstitutionParamConverter - tags: - - name: request.param_converter - priority: -4 - converter: surfnet_stepup_middleware_api.configuration_institution - - # Exception Listeners - surfnet_stepup_middleware_api.listener.exception_listener: - class: Surfnet\StepupMiddleware\ApiBundle\EventListener\ExceptionListener - arguments: - - "@logger" - tags: - - { name: kernel.event_listener, event: kernel.exception} - - # Security Entry Point - surfnet_stepup_middleware_api.security.json_basic_auth_entry_point: - class: Surfnet\StepupMiddleware\ApiBundle\Security\Http\EntryPoint\JsonBasicAuthenticationEntryPoint - arguments: - - ~ # HTTP Basic realm string, see extension - - # Security Services - surfnet_stepup_middleware_api.security.institution_authorization: - class: Surfnet\StepupMiddleware\ApiBundle\Authorization\Service\AuthorizationContextService - arguments: - - '@surfnet_stepup_middleware_api.service.sraa' - - '@surfnet_stepup_middleware_api.service.identity' - - '@Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository\ConfiguredInstitutionRepository' - - '@surfnet_stepup_middleware_api.repository.authorization' - - Surfnet\StepupMiddleware\ApiBundle\Service\DeprovisionService: - arguments: - $pipeline: '@surfnet_stepup_middleware_command_handling.pipeline.transaction_aware_pipeline' - $eventSourcingRepository: '@surfnet_stepup.repository.identity' - $apiRepository: '@surfnet_stepup_middleware_api.repository.identity' - $logger: '@logger' - - Surfnet\Stepup\Helper\RecoveryTokenSecretHelper: - class: Surfnet\Stepup\Helper\RecoveryTokenSecretHelper + _defaults: + bind: + $numberOfTokensPerIdentity: '%number_of_tokens_per_identity%' + + Surfnet\StepupMiddleware\ApiBundle\: + resource: '../../*' + autowire: true + exclude: '../../{DependencyInjection,Entity,Repository,Migrations,Tests,Controller}' + + # The ManagementBundle controllers are available as a service + Surfnet\StepupMiddleware\ApiBundle\Controller\: + resource: '../../Controller' + autowire: true + tags: [ 'controller.service_arguments' ] + + Surfnet\StepupMiddleware\ApiBundle\Controller\DeprovisionController: + arguments: + $deprovisionService: '@Surfnet\StepupMiddleware\ApiBundle\Service\DeprovisionService' + $formatHelper: '@Surfnet\Stepup\Helper\UserDataFormatterInterface' + tags: [ 'controller.service_arguments' ] + + # Repositories + surfnet_stepup_middleware_api.repository.configured_institution: '@Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository\ConfiguredInstitutionRepository' + surfnet_stepup_middleware_api.repository.institution_configuration_options: '@Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository\InstitutionConfigurationOptionsRepository' + surfnet_stepup_middleware_api.repository.allowed_second_factor: '@Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository\AllowedSecondFactorRepository' + surfnet_stepup_middleware_api.repository.institution_authorization: '@Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository\InstitutionAuthorizationRepository' + surfnet_stepup_middleware_api.repository.ra_location: '@Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository\RaLocationRepository' + surfnet_stepup_middleware_api.repository.identity: '@Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\IdentityRepository' + surfnet_stepup_middleware_api.repository.identity_self_asserted_token_options: '@Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\IdentitySelfAssertedTokenOptionsRepository' + surfnet_stepup_middleware_api.repository.institution_listing: '@Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\InstitutionListingRepository' + surfnet_stepup_middleware_api.repository.ra_candidate: '@Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RaCandidateRepository' + surfnet_stepup_middleware_api.repository.ra_listing: '@Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RaListingRepository' + surfnet_stepup_middleware_api.repository.sraa: '@Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\SraaRepository' + surfnet_stepup_middleware_api.repository.unverified_second_factor: '@Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\UnverifiedSecondFactorRepository' + surfnet_stepup_middleware_api.repository.verified_second_factor: '@Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\VerifiedSecondFactorRepository' + surfnet_stepup_middleware_api.repository.vetted_second_factor: '@Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\VettedSecondFactorRepository' + surfnet_stepup_middleware_api.repository.vetting_type_hint: '@Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\VettingTypeHintRepository' + surfnet_stepup_middleware_api.repository.ra_second_factor: '@Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RaSecondFactorRepository' + surfnet_stepup_middleware_api.repository.audit_log: '@Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\AuditLogRepository' + surfnet_stepup_middleware_api.repository.second_factor_revocation: '@Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\SecondFactorRevocationRepository' + surfnet_stepup_middleware_api.repository.whitelist_entry: '@Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\WhitelistEntryRepository' + surfnet_stepup_middleware_api.repository.authorization: '@Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\AuthorizationRepository' + + Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\AuthorizationRepository: + arguments: + - '@Doctrine\Common\Persistence\ManagerRegistry' + - '@logger' + public: true + + # Repository filter + surfnet_stepup_middleware_api.repository_filter.authorization: + class: Surfnet\StepupMiddleware\ApiBundle\Authorization\Filter\InstitutionAuthorizationRepositoryFilter + + # Domain Services + surfnet_stepup_middleware_api.service.institution_configuration_options: + class: Surfnet\StepupMiddleware\ApiBundle\Configuration\Service\InstitutionConfigurationOptionsService + arguments: + - "@surfnet_stepup_middleware_api.repository.institution_configuration_options" + - "%number_of_tokens_per_identity%" + + surfnet_stepup_middleware_api.service.allowed_second_factor_list: + class: Surfnet\StepupMiddleware\ApiBundle\Configuration\Service\AllowedSecondFactorListService + arguments: + - "@surfnet_stepup_middleware_api.repository.allowed_second_factor" + - "@surfnet_stepup_middleware_api.repository.configured_institution" + + surfnet_stepup_middleware_api.service.institution_authorization: + class: Surfnet\StepupMiddleware\ApiBundle\Configuration\Service\InstitutionAuthorizationService + arguments: + - "@surfnet_stepup_middleware_api.repository.institution_authorization" + + surfnet_stepup_middleware_api.service.configured_institutions: + class: Surfnet\StepupMiddleware\ApiBundle\Configuration\Service\ConfiguredInstitutionService + arguments: + - "@surfnet_stepup_middleware_api.repository.configured_institution" + + surfnet_stepup_middleware_api.service.ra_location: + class: Surfnet\StepupMiddleware\ApiBundle\Configuration\Service\RaLocationService + arguments: + - "@surfnet_stepup_middleware_api.repository.ra_location" + + surfnet_stepup_middleware_api.service.second_factor: + class: Surfnet\StepupMiddleware\ApiBundle\Identity\Service\SecondFactorService + arguments: + - "@surfnet_stepup_middleware_api.repository.unverified_second_factor" + - "@surfnet_stepup_middleware_api.repository.verified_second_factor" + - "@surfnet_stepup_middleware_api.repository.vetted_second_factor" + + surfnet_stepup_middleware_api.service.ra_candidate: + class: Surfnet\StepupMiddleware\ApiBundle\Identity\Service\RaCandidateService + arguments: + - "@surfnet_stepup_middleware_api.repository.ra_candidate" + + surfnet_stepup_middleware_api.service.ra_second_factor: + class: Surfnet\StepupMiddleware\ApiBundle\Identity\Service\RaSecondFactorService + arguments: + - "@surfnet_stepup_middleware_api.repository.ra_second_factor" + + surfnet_stepup_middleware_api.service.identity: + class: Surfnet\StepupMiddleware\ApiBundle\Identity\Service\IdentityService + arguments: + - "@surfnet_stepup_middleware_api.repository.identity" + - "@surfnet_stepup_middleware_api.repository.identity_self_asserted_token_options" + - "@surfnet_stepup_middleware_api.repository.ra_listing" + - "@surfnet_stepup_middleware_api.repository.sraa" + + surfnet_stepup_middleware_api.service.ra_listing: + class: Surfnet\StepupMiddleware\ApiBundle\Identity\Service\RaListingService + arguments: + - "@surfnet_stepup_middleware_api.repository.ra_listing" + + surfnet_stepup_middleware_api.service.sraa: + class: Surfnet\StepupMiddleware\ApiBundle\Identity\Service\SraaService + arguments: + - "@surfnet_stepup_middleware_api.repository.sraa" + + surfnet_stepup_middleware_api.service.audit_log: + class: Surfnet\StepupMiddleware\ApiBundle\Identity\Service\AuditLogService + arguments: + - "@surfnet_stepup_middleware_api.repository.audit_log" + + surfnet_stepup_middleware_api.service.whitelist_entry: + class: Surfnet\StepupMiddleware\ApiBundle\Identity\Service\WhitelistService + arguments: + - "@surfnet_stepup_middleware_api.repository.whitelist_entry" + + # Param Converters + surfnet_stepup_middleware_api.request.command_param_converter: + class: Surfnet\StepupMiddleware\ApiBundle\Request\CommandParamConverter + tags: + - { name: request.param_converter, priority: -10, converter: surfnet_stepup_middleware_api.command } + + surfnet_stepup_middleware_api.request.metadata_param_converter: + class: Surfnet\StepupMiddleware\ApiBundle\Request\MetadataParamConverter + arguments: + - "@validator" + tags: + - { name: request.param_converter, priority: -15, converter: surfnet_stepup_middleware_api.metadata } + + surfnet_stepup_middleware_api.request.institution_param_converter: + class: Surfnet\StepupMiddleware\ApiBundle\Request\InstitutionParamConverter + tags: + - { name: request.param_converter, priority: -5, converter: surfnet_step_middleware.institution } + + surfnet_stepup_middleware_api.request.configuration_institution_param_converter: + class: Surfnet\StepupMiddleware\ApiBundle\Request\ConfigurationInstitutionParamConverter + tags: + - name: request.param_converter + priority: -4 + converter: surfnet_stepup_middleware_api.configuration_institution + + # Exception Listeners + surfnet_stepup_middleware_api.listener.exception_listener: + class: Surfnet\StepupMiddleware\ApiBundle\EventListener\ExceptionListener + arguments: + - "@logger" + tags: + - { name: kernel.event_listener, event: kernel.exception } + + # Security Entry Point + surfnet_stepup_middleware_api.security.json_basic_auth_entry_point: + class: Surfnet\StepupMiddleware\ApiBundle\Security\Http\EntryPoint\JsonBasicAuthenticationEntryPoint + arguments: + - ~ # HTTP Basic realm string, see extension + + # Security Services + surfnet_stepup_middleware_api.security.institution_authorization: + class: Surfnet\StepupMiddleware\ApiBundle\Authorization\Service\AuthorizationContextService + arguments: + - '@surfnet_stepup_middleware_api.service.sraa' + - '@surfnet_stepup_middleware_api.service.identity' + - '@Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository\ConfiguredInstitutionRepository' + - '@surfnet_stepup_middleware_api.repository.authorization' + + Surfnet\StepupMiddleware\ApiBundle\Service\DeprovisionService: + arguments: + $pipeline: '@surfnet_stepup_middleware_command_handling.pipeline.transaction_aware_pipeline' + $eventSourcingRepository: '@surfnet_stepup.repository.identity' + $apiRepository: '@surfnet_stepup_middleware_api.repository.identity' + $logger: '@logger' + + Surfnet\Stepup\Helper\RecoveryTokenSecretHelper: + class: Surfnet\Stepup\Helper\RecoveryTokenSecretHelper diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonAuthorizationResponse.php b/src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonAuthorizationResponse.php index 936884344..de44f9381 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonAuthorizationResponse.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonAuthorizationResponse.php @@ -30,7 +30,7 @@ public function __construct(int $code, array $errors = []) Assertion::allString($errors, 'The error messages should all be strings'); $data = [ - 'code' => $code + 'code' => $code, ]; if ($errors !== []) { $data['errors'] = $errors; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonCollectionResponse.php b/src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonCollectionResponse.php index c7c3c4574..deac4f0ff 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonCollectionResponse.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonCollectionResponse.php @@ -23,15 +23,15 @@ class JsonCollectionResponse extends JsonResponse { - public static function fromPaginator(Pagerfanta $paginator, $filters = array()): self + public static function fromPaginator(Pagerfanta $paginator, $filters = []): self { return new self( $paginator->getNbResults(), $paginator->getCurrentPage(), $paginator->getMaxPerPage(), - (array) $paginator->getCurrentPageResults(), - array(), - $filters + (array)$paginator->getCurrentPageResults(), + [], + $filters, ); } @@ -43,17 +43,13 @@ public static function fromPaginator(Pagerfanta $paginator, $filters = array()): * @param array $headers * @param array $filters */ - public function __construct($totalItems, $page, $pageSize, array $collection, array $headers = array(), $filters = array()) + public function __construct($totalItems, $page, $pageSize, array $collection, array $headers = [], $filters = []) { - $data = array( - 'collection' => array( - 'total_items' => $totalItems, - 'page' => $page, - 'page_size' => $pageSize, - ), - 'items' => $collection, - 'filters' => $filters, - ); + $data = [ + 'collection' => ['total_items' => $totalItems, 'page' => $page, 'page_size' => $pageSize], + 'items' => $collection, + 'filters' => $filters, + ]; parent::__construct($data, 200, $headers); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonNotFoundResponse.php b/src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonNotFoundResponse.php index 7b6666650..eacecf54a 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonNotFoundResponse.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonNotFoundResponse.php @@ -25,7 +25,7 @@ class JsonNotFoundResponse extends JsonResponse /** * @param array $headers */ - public function __construct(array $headers = array()) + public function __construct(array $headers = []) { parent::__construct(null, 404, $headers); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Security/Http/EntryPoint/JsonBasicAuthenticationEntryPoint.php b/src/Surfnet/StepupMiddleware/ApiBundle/Security/Http/EntryPoint/JsonBasicAuthenticationEntryPoint.php index 4e32a996d..bfd192695 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Security/Http/EntryPoint/JsonBasicAuthenticationEntryPoint.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Security/Http/EntryPoint/JsonBasicAuthenticationEntryPoint.php @@ -29,11 +29,8 @@ */ class JsonBasicAuthenticationEntryPoint implements AuthenticationEntryPointInterface { - private $realmName; - - public function __construct($realmName) + public function __construct(private $realmName) { - $this->realmName = $realmName; } /** @@ -47,7 +44,7 @@ public function start(Request $request, AuthenticationException $authException = return new JsonResponse( ['errors' => [$error]], Response::HTTP_UNAUTHORIZED, - ['WWW-Authenticate' => sprintf('Basic realm="%s"', $this->realmName)] + ['WWW-Authenticate' => sprintf('Basic realm="%s"', $this->realmName)], ); } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Service/DeprovisionService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Service/DeprovisionService.php index 49eee9f27..2340cdd87 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Service/DeprovisionService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Service/DeprovisionService.php @@ -27,31 +27,17 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\IdentityRepository as ApiIdentityRepository; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\ForgetIdentityCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\Pipeline; + use function sprintf; class DeprovisionService implements DeprovisionServiceInterface { - private Pipeline $pipeline; - - private IdentityRepository $eventSourcingRepository; - - /** - * @var ApiIdentityRepository - */ - private ApiIdentityRepository $apiRepository; - - private LoggerInterface $logger; - public function __construct( - Pipeline $pipeline, - IdentityRepository $eventSourcingRepository, - ApiIdentityRepository $apiRepository, - LoggerInterface $logger + private readonly Pipeline $pipeline, + private readonly IdentityRepository $eventSourcingRepository, + private readonly ApiIdentityRepository $apiRepository, + private readonly LoggerInterface $logger, ) { - $this->pipeline = $pipeline; - $this->eventSourcingRepository = $eventSourcingRepository; - $this->apiRepository = $apiRepository; - $this->logger = $logger; } public function readUserData(string $collabPersonId): array @@ -62,7 +48,7 @@ public function readUserData(string $collabPersonId): array return $this->eventSourcingRepository->obtainInformation(new IdentityId($identity->id)); } catch (UserNotFoundException $e) { $this->logger->notice( - $e->getMessage() + $e->getMessage(), ); return []; } @@ -75,7 +61,7 @@ public function deprovision(string $collabPersonId): void $user = $this->getIdentityByNameId($collabPersonId); } catch (UserNotFoundException $e) { $this->logger->notice( - $e->getMessage() + $e->getMessage(), ); return; } @@ -94,8 +80,8 @@ private function getIdentityByNameId(string $collabPersonId): Identity throw new UserNotFoundException( sprintf( 'User identified by: %s was not found. Unable to provide deprovision data.', - $collabPersonId - ) + $collabPersonId, + ), ); } return $user; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Filter/InstitutionAuthorizationRepositoryFilterTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Filter/InstitutionAuthorizationRepositoryFilterTest.php index e60179e36..83910f3e6 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Filter/InstitutionAuthorizationRepositoryFilterTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Filter/InstitutionAuthorizationRepositoryFilterTest.php @@ -18,7 +18,6 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Authorization\Filter; - use Doctrine\ORM\EntityManager; use Doctrine\ORM\QueryBuilder; use PHPUnit\Framework\MockObject\MockObject; @@ -50,7 +49,7 @@ public function setUp(): void { $this->mockedAuthorizationContext = $this->createMock(InstitutionAuthorizationContextInterface::class); - $this->entityManager = $this->getMockBuilder(EntityManager::class) + $this->entityManager = $this->getMockBuilder(EntityManager::class) ->disableOriginalConstructor() ->getMock(); @@ -65,17 +64,29 @@ public function setUp(): void public function a_querybuilder_object_is_filtered_with_an_institution_authorization_context(): void { $this->mockedAuthorizationContext->method('getInstitutions') - ->willReturn(new InstitutionCollection([ - new InstitutionValue('institution-a'), - new InstitutionValue('institution-c'), - ])); + ->willReturn( + new InstitutionCollection([ + new InstitutionValue('institution-a'), + new InstitutionValue('institution-c'), + ]), + ); $authorizationRepositoryFilter = new InstitutionAuthorizationRepositoryFilter(); - $authorizationRepositoryFilter->filter($this->queryBuilder, $this->mockedAuthorizationContext, 'i.institution', 'iacalias'); + $authorizationRepositoryFilter->filter( + $this->queryBuilder, + $this->mockedAuthorizationContext, + 'i.institution', + 'iacalias', + ); - $this->assertEquals('SELECT FROM institution i WHERE i.institution IN (:iacalias_institutions)', $this->queryBuilder->getDQL()); + $this->assertEquals( + 'SELECT FROM institution i WHERE i.institution IN (:iacalias_institutions)', + $this->queryBuilder->getDQL(), + ); $this->assertEquals(1, $this->queryBuilder->getParameters()->count()); - $this->assertEquals(['institution-a','institution-c'], $this->queryBuilder->getParameter('iacalias_institutions')->getValue()); + $this->assertEquals( + ['institution-a', 'institution-c'], + $this->queryBuilder->getParameter('iacalias_institutions')->getValue() + ); } - } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationContextServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationContextServiceTest.php index 6a30d2591..77529f425 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationContextServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationContextServiceTest.php @@ -71,7 +71,7 @@ public function setUp(): void $sraaService, $identityService, $this->institutionRepo, - $authorizationRepository + $authorizationRepository, ); $this->identityService = $identityService; @@ -104,7 +104,7 @@ public function it_can_build_a_context(): void $arbitraryNameId, new Email('foo@bar.com'), new CommonName('Foobar'), - new Locale('en_GB') + new Locale('en_GB'), ); $identityId = new IdentityId($arbitraryId); @@ -126,7 +126,7 @@ public function it_can_build_a_context(): void $context = $this->service->buildInstitutionAuthorizationContext( $identityId, - $role + $role, ); $this->assertEquals($institutions, $context->getInstitutions()); @@ -157,7 +157,7 @@ public function it_can_build_a_context_with_sraa_actor(): void $adminNameId, new Email('foo@bar.com'), new CommonName('Foobar'), - new Locale('en_GB') + new Locale('en_GB'), ); $sraa = m::mock(Sraa::class); @@ -188,7 +188,7 @@ public function it_can_build_a_context_with_sraa_actor(): void $context = $this->service->buildInstitutionAuthorizationContext( $identityId, - $role + $role, ); $this->assertEquals($institutions, $context->getInstitutions()); @@ -214,7 +214,7 @@ public function test_it_can_retrieve_select_raa_institutions(): void $arbitraryNameId, new Email('foo@bar.com'), new CommonName('Foobar'), - new Locale('en_GB') + new Locale('en_GB'), ); $identityId = new IdentityId($arbitraryId); @@ -235,7 +235,7 @@ public function test_it_can_retrieve_select_raa_institutions(): void ->andReturn($institutions); $context = $this->service->buildSelectRaaInstitutionAuthorizationContext( - $identityId + $identityId, ); $this->assertEquals($institutions, $context->getInstitutions()); @@ -262,7 +262,7 @@ public function it_rejects_unknown_actor(): void $this->service->buildInstitutionAuthorizationContext( new IdentityId($actorId), - $role + $role, ); } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationServiceTest.php index 59928a75c..c0fa759f6 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationServiceTest.php @@ -75,7 +75,7 @@ protected function setUp(): void $this->identityService, $this->institutionConfigurationService, $this->secondFactorService, - $this->recoveryTokenService + $this->recoveryTokenService, ); } @@ -112,7 +112,10 @@ public function test_it_rejects_unknown_institution_configuration(): void $messages = $decision->getErrorMessages(); $this->assertEquals(403, $decision->getCode()); - $this->assertEquals('Institution configuration could not be found, unable to ascertain if self-asserted tokens feature is enabled', reset($messages)); + $this->assertEquals( + 'Institution configuration could not be found, unable to ascertain if self-asserted tokens feature is enabled', + reset($messages), + ); } public function test_it_rejects_disabled_self_asserted_tokens_feature_flag_on_institution(): void @@ -216,7 +219,10 @@ public function test_it_rejects_when_identity_had_prior_non_sat_token(): void $messages = $decision->getErrorMessages(); $this->assertEquals(403, $decision->getCode()); - $this->assertEquals('Identity never possessed a self-asserted token, but did/does possess one of the other types', reset($messages)); + $this->assertEquals( + 'Identity never possessed a self-asserted token, but did/does possess one of the other types', + reset($messages), + ); } public function test_recovery_tokens_never_owned_a_sat_token_but_did_own_other_token_type(): void @@ -256,7 +262,10 @@ public function test_recovery_tokens_never_owned_a_sat_token_but_did_own_other_t $messages = $decision->getErrorMessages(); $this->assertEquals(403, $decision->getCode()); - $this->assertEquals('Identity never possessed a self-asserted token, deny access to recovery token CRUD actions', reset($messages)); + $this->assertEquals( + 'Identity never possessed a self-asserted token, deny access to recovery token CRUD actions', + reset($messages), + ); } public function test_you_cant_sat_when_you_lost_both_rt_and_sf_tokens(): void @@ -302,7 +311,10 @@ public function test_you_cant_sat_when_you_lost_both_rt_and_sf_tokens(): void $messages = $decision->getErrorMessages(); $this->assertEquals(403, $decision->getCode()); - $this->assertEquals('Identity lost both Recovery and Second Factor token, SAT is not allowed', reset($messages)); + $this->assertEquals( + 'Identity lost both Recovery and Second Factor token, SAT is not allowed', + reset($messages), + ); } public function test_recovery_tokens_all_requirements_met(): void @@ -510,7 +522,7 @@ public function test_it_allows_self_vetting_when_multiple_sat_present(): void $this->assertEmpty($messages); } - public function test_it_denies_self_vetting_when_other_vetting_type(): void + public function test_it_denies_self_vetting_when_other_vetting_type(): void { $identity = new Identity(); $identity->institution = new Institution('Known institution'); @@ -544,6 +556,9 @@ public function test_it_denies_self_vetting_when_other_vetting_type(): void $messages = $decision->getErrorMessages(); $this->assertEquals(403, $decision->getCode()); - $this->assertEquals('Self-vetting using SAT is only allowed when only SAT tokens are in possession', reset($messages)); + $this->assertEquals( + 'Self-vetting using SAT is only allowed when only SAT tokens are in possession', + reset($messages), + ); } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php index a0dc9a7a9..0f9227e8c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php @@ -37,12 +37,44 @@ use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\RaExecutable; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\SelfAsserted; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\SelfServiceExecutable; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\Command\AddRaLocationCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\Command\ChangeRaLocationCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\Command\CreateInstitutionConfigurationCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\Command\ReconfigureInstitutionConfigurationOptionsCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\Command\RemoveInstitutionConfigurationByUnnormalizedIdCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\Command\RemoveRaLocationCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\Command\UpdateConfigurationCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\AccreditIdentityCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\AddToWhitelistCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\AmendRegistrationAuthorityInformationCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\AppointRoleCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\BootstrapIdentityWithYubikeySecondFactorCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\CreateIdentityCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\ExpressLocalePreferenceCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\ForgetIdentityCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\MigrateVettedSecondFactorCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\PromiseSafeStoreSecretTokenPossessionCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\ProveGssfPossessionCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\ProvePhonePossessionCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\ProvePhoneRecoveryTokenPossessionCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\ProveU2fDevicePossessionCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\ProveYubikeyPossessionCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\RegisterSelfAssertedSecondFactorCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\RemoveFromWhitelistCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\ReplaceWhitelistCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\RetractRegistrationAuthorityCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\RevokeOwnRecoveryTokenCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\RevokeOwnSecondFactorCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\RevokeRegistrantsRecoveryTokenCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\RevokeRegistrantsSecondFactorCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\SaveVettingTypeHintCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\SelfVetSecondFactorCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\SendSecondFactorRegistrationEmailCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\SendVerifiedSecondFactorRemindersCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\UpdateIdentityCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\VerifyEmailCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\VetSecondFactorCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\Command\FixedUuidStubCommand; class CommandAuthorizationServiceTest extends TestCase { @@ -75,7 +107,12 @@ public function setUp(): void $logger = m::mock(LoggerInterface::class); $authorizationContextService = m::mock(AuthorizationContextService::class); - $service = new CommandAuthorizationService($whitelistService, $identityService, $logger, $authorizationContextService); + $service = new CommandAuthorizationService( + $whitelistService, + $identityService, + $logger, + $authorizationContextService, + ); $this->whitelistService = $whitelistService; $this->identityService = $identityService; @@ -146,8 +183,7 @@ public function an_identity_should_be_able_to_execute_own_selfservice_commands($ { $this->assertInstanceOf(Command::class, $command); - if ($command instanceof SelfServiceExecutable && !$command instanceof RaExecutable) { - + if ($command instanceof SelfServiceExecutable && !$command instanceof RaExecutable) { $actorId = new IdentityId('123'); $actorInstitution = new Institution('institution'); @@ -181,8 +217,7 @@ public function an_identity_should_be_able_to_execute_configured_ra_commands($fi { $this->assertInstanceOf(Command::class, $command); - if ($command instanceof RaExecutable && !$command instanceof SelfServiceExecutable) { - + if ($command instanceof RaExecutable && !$command instanceof SelfServiceExecutable) { $actorId = new IdentityId('123'); $actorInstitution = new Institution('institution'); @@ -207,7 +242,7 @@ public function an_identity_should_be_able_to_execute_configured_ra_commands($fi $authorizationContext = new InstitutionAuthorizationContext( $institutionCollection, - false + false, ); $role = RegistrationAuthorityRole::raa(); @@ -225,9 +260,7 @@ public function an_identity_should_be_able_to_execute_configured_ra_commands($fi } $this->authorizationContextService->shouldReceive('buildInstitutionAuthorizationContext') - ->with($actorId, m::on(function($arg) use ($role): bool{ - return $arg == $role; - })) + ->with($actorId, m::on(fn($arg): bool => $arg == $role)) ->andReturn($authorizationContext); $this->assertTrue($this->service->maySelfServiceCommandBeExecutedOnBehalfOf($command, $actorId)); @@ -246,8 +279,7 @@ public function an_identity_should_be_able_to_execute_configured_ra_and_selfserv { $this->assertInstanceOf(Command::class, $command); - if ($command instanceof RaExecutable && $command instanceof SelfServiceExecutable) { - + if ($command instanceof RaExecutable && $command instanceof SelfServiceExecutable) { $actorId = new IdentityId('123'); $actorInstitution = new Institution('institution'); @@ -275,7 +307,7 @@ public function an_identity_should_be_able_to_execute_configured_ra_and_selfserv $authorizationContext = new InstitutionAuthorizationContext( $institutionCollection, - false + false, ); $role = RegistrationAuthorityRole::raa(); @@ -285,9 +317,7 @@ public function an_identity_should_be_able_to_execute_configured_ra_and_selfserv } $this->authorizationContextService->shouldReceive('buildInstitutionAuthorizationContext') - ->with($actorId, m::on(function($arg) use ($role): bool{ - return $arg == $role; - })) + ->with($actorId, m::on(fn($arg): bool => $arg == $role)) ->andReturn($authorizationContext); @@ -307,8 +337,7 @@ public function an_identity_should_not_be_able_to_execute_someone_elses_selfserv { $this->assertInstanceOf(Command::class, $command); - if ($command instanceof SelfServiceExecutable && !$command instanceof RaExecutable) { - + if ($command instanceof SelfServiceExecutable && !$command instanceof RaExecutable) { $actorId = new IdentityId('123'); $actorInstitution = new Institution('institution'); @@ -350,8 +379,7 @@ public function an_identity_should_be_able_to_execute_unconfigured_ra_commands($ { $this->assertInstanceOf(Command::class, $command); - if ($command instanceof RaExecutable && !$command instanceof SelfServiceExecutable) { - + if ($command instanceof RaExecutable && !$command instanceof SelfServiceExecutable) { $actorId = new IdentityId('123'); $actorInstitution = new Institution('institution'); @@ -375,7 +403,7 @@ public function an_identity_should_be_able_to_execute_unconfigured_ra_commands($ $authorizationContext = new InstitutionAuthorizationContext( $institutionCollection, - false + false, ); $role = RegistrationAuthorityRole::raa(); @@ -393,9 +421,7 @@ public function an_identity_should_be_able_to_execute_unconfigured_ra_commands($ } $this->authorizationContextService->shouldReceive('buildInstitutionAuthorizationContext') - ->with($actorId, m::on(function($arg) use ($role): bool { - return $arg == $role; - })) + ->with($actorId, m::on(fn($arg): bool => $arg == $role)) ->andReturn($authorizationContext); $this->assertTrue($this->service->maySelfServiceCommandBeExecutedOnBehalfOf($command, $actorId)); @@ -411,52 +437,52 @@ public function an_identity_should_be_able_to_execute_unconfigured_ra_commands($ */ public function all_available_commands_should_be_tested(): void { - $tested = array ( - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Configuration\\Command\\AddRaLocationCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Configuration\\Command\\ChangeRaLocationCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Configuration\\Command\\CreateInstitutionConfigurationCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Configuration\\Command\\ReconfigureInstitutionConfigurationOptionsCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Configuration\\Command\\RemoveInstitutionConfigurationByUnnormalizedIdCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Configuration\\Command\\RemoveRaLocationCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Configuration\\Command\\UpdateConfigurationCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Identity\\Command\\AccreditIdentityCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Identity\\Command\\AddToWhitelistCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Identity\\Command\\AmendRegistrationAuthorityInformationCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Identity\\Command\\AppointRoleCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Identity\\Command\\BootstrapIdentityWithYubikeySecondFactorCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Identity\\Command\\CreateIdentityCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Identity\\Command\\ExpressLocalePreferenceCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Identity\\Command\\ForgetIdentityCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Identity\\Command\\MigrateVettedSecondFactorCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Identity\\Command\\PromiseSafeStoreSecretTokenPossessionCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Identity\\Command\\ProveGssfPossessionCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Identity\\Command\\ProvePhonePossessionCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Identity\\Command\\ProvePhoneRecoveryTokenPossessionCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Identity\\Command\\ProveU2fDevicePossessionCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Identity\\Command\\ProveYubikeyPossessionCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Identity\\Command\\RegisterSelfAssertedSecondFactorCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Identity\\Command\\RemoveFromWhitelistCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Identity\\Command\\ReplaceWhitelistCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Identity\\Command\\RetractRegistrationAuthorityCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Identity\\Command\\RevokeOwnRecoveryTokenCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Identity\\Command\\RevokeOwnSecondFactorCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Identity\\Command\\RevokeRegistrantsRecoveryTokenCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Identity\\Command\\RevokeRegistrantsSecondFactorCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Identity\\Command\\SaveVettingTypeHintCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Identity\\Command\\SelfVetSecondFactorCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Identity\\Command\\SendSecondFactorRegistrationEmailCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Identity\\Command\\SendVerifiedSecondFactorRemindersCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Identity\\Command\\UpdateIdentityCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Identity\\Command\\VerifyEmailCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Identity\\Command\\VetSecondFactorCommand', - 'Surfnet\\StepupMiddleware\\CommandHandlingBundle\\Tests\\Command\\FixedUuidStubCommand', - ); + $tested = [ + AddRaLocationCommand::class, + ChangeRaLocationCommand::class, + CreateInstitutionConfigurationCommand::class, + ReconfigureInstitutionConfigurationOptionsCommand::class, + RemoveInstitutionConfigurationByUnnormalizedIdCommand::class, + RemoveRaLocationCommand::class, + UpdateConfigurationCommand::class, + AccreditIdentityCommand::class, + AddToWhitelistCommand::class, + AmendRegistrationAuthorityInformationCommand::class, + AppointRoleCommand::class, + BootstrapIdentityWithYubikeySecondFactorCommand::class, + CreateIdentityCommand::class, + ExpressLocalePreferenceCommand::class, + ForgetIdentityCommand::class, + MigrateVettedSecondFactorCommand::class, + PromiseSafeStoreSecretTokenPossessionCommand::class, + ProveGssfPossessionCommand::class, + ProvePhonePossessionCommand::class, + ProvePhoneRecoveryTokenPossessionCommand::class, + ProveU2fDevicePossessionCommand::class, + ProveYubikeyPossessionCommand::class, + RegisterSelfAssertedSecondFactorCommand::class, + RemoveFromWhitelistCommand::class, + ReplaceWhitelistCommand::class, + RetractRegistrationAuthorityCommand::class, + RevokeOwnRecoveryTokenCommand::class, + RevokeOwnSecondFactorCommand::class, + RevokeRegistrantsRecoveryTokenCommand::class, + RevokeRegistrantsSecondFactorCommand::class, + SaveVettingTypeHintCommand::class, + SelfVetSecondFactorCommand::class, + SendSecondFactorRegistrationEmailCommand::class, + SendVerifiedSecondFactorRemindersCommand::class, + UpdateIdentityCommand::class, + VerifyEmailCommand::class, + VetSecondFactorCommand::class, + FixedUuidStubCommand::class, + ]; $available = $this->availableCommands(); $classNames = []; foreach ($available as $command) { - $classNames[] = get_class($command[1]); + $classNames[] = $command[1]::class; } $this->assertSame($tested, $classNames); @@ -469,14 +495,13 @@ public function all_available_commands_should_be_tested(): void public function availableCommands(): array { $rootPath = realpath(__DIR__ . '/../../../../../../../src'); - $basePath = realPath($rootPath . '/Surfnet/StepupMiddleware/CommandHandlingBundle').'/*'; + $basePath = realPath($rootPath . '/Surfnet/StepupMiddleware/CommandHandlingBundle') . '/*'; $commands = []; // get folders $folders = glob($basePath, GLOB_ONLYDIR); foreach ($folders as $folder) { - $commandPath = $folder . '/Command/*Command.php'; $files = glob($commandPath); if ($files === false) { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Entity/ConfiguredInstitutionTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Entity/ConfiguredInstitutionTest.php index 6934fef92..2ab7ce74c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Entity/ConfiguredInstitutionTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Entity/ConfiguredInstitutionTest.php @@ -32,11 +32,11 @@ public function a_configured_institution_is_correctly_serialized_to_json(): void { $deserializedConfiguredInstitution = ['institution' => 'surfnet.nl']; $configuredInstitution = ConfiguredInstitution::createFrom( - new Institution($deserializedConfiguredInstitution['institution']) + new Institution($deserializedConfiguredInstitution['institution']), ); $expectedSerializedConfiguredInstitution = json_encode($deserializedConfiguredInstitution); - $actualSerializedConfiguredInstitution = json_encode($configuredInstitution); + $actualSerializedConfiguredInstitution = json_encode($configuredInstitution); $this->assertSame($expectedSerializedConfiguredInstitution, $actualSerializedConfiguredInstitution); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Entity/RaLocationTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Entity/RaLocationTest.php index d68e47ade..453c5502e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Entity/RaLocationTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Entity/RaLocationTest.php @@ -34,10 +34,10 @@ class RaLocationTest extends TestCase public function an_ra_location_is_correctly_serialized_to_json(): void { $deserializedRaLocation = [ - 'id' => 'An id', - 'institution' => 'surfnet.nl', - 'name' => 'An RA location', - 'location' => 'A location', + 'id' => 'An id', + 'institution' => 'surfnet.nl', + 'name' => 'An RA location', + 'location' => 'A location', 'contact_information' => 'Contact information', ]; @@ -46,12 +46,12 @@ public function an_ra_location_is_correctly_serialized_to_json(): void new Institution($deserializedRaLocation['institution']), new RaLocationName($deserializedRaLocation['name']), new Location($deserializedRaLocation['location']), - new ContactInformation($deserializedRaLocation['contact_information']) + new ContactInformation($deserializedRaLocation['contact_information']), ); $expectedSerialization = json_encode($deserializedRaLocation); - $actualSerialization = json_encode($raLocation); + $actualSerialization = json_encode($raLocation); - $this->assertSame($expectedSerialization, $actualSerialization); + $this->assertSame($expectedSerialization, $actualSerialization); } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationOptionMapTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationOptionMapTest.php index b7652a806..d3cdbd950 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationOptionMapTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationOptionMapTest.php @@ -18,7 +18,6 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Configuration\Service; - use PHPUnit\Framework\TestCase; use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\Stepup\Configuration\Value\InstitutionRole; @@ -57,14 +56,36 @@ public function an_array_initialized_with_authorizations_should_return_valid_ins $institutionAuthorizations = []; foreach ($testData as $data) { - $institutionAuthorizations[] = InstitutionAuthorization::create(new Institution($data[0]), new Institution($data[1]), new InstitutionRole($data[2])); + $institutionAuthorizations[] = InstitutionAuthorization::create( + new Institution($data[0]), + new Institution($data[1]), + new InstitutionRole($data[2]), + ); } - $institutionAuthorizationMap = InstitutionAuthorizationOptionMap::fromInstitutionAuthorizations($this->institution, $institutionAuthorizations); + $institutionAuthorizationMap = InstitutionAuthorizationOptionMap::fromInstitutionAuthorizations( + $this->institution, + $institutionAuthorizations, + ); - $this->assertEquals(['inst','insta','instb'], $institutionAuthorizationMap->getAuthorizationOptionsByRole(InstitutionRole::useRa())->getInstitutions($this->institution)); - $this->assertEquals(['insta','instb'], $institutionAuthorizationMap->getAuthorizationOptionsByRole(InstitutionRole::useRaa())->getInstitutions($this->institution)); - $this->assertEquals(['insta'], $institutionAuthorizationMap->getAuthorizationOptionsByRole(InstitutionRole::selectRaa())->getInstitutions($this->institution)); + $this->assertEquals( + ['inst', 'insta', 'instb'], + $institutionAuthorizationMap->getAuthorizationOptionsByRole(InstitutionRole::useRa())->getInstitutions( + $this->institution, + ) + ); + $this->assertEquals( + ['insta', 'instb'], + $institutionAuthorizationMap->getAuthorizationOptionsByRole(InstitutionRole::useRaa())->getInstitutions( + $this->institution, + ) + ); + $this->assertEquals( + ['insta'], + $institutionAuthorizationMap->getAuthorizationOptionsByRole(InstitutionRole::selectRaa())->getInstitutions( + $this->institution, + ) + ); } /** @@ -73,10 +94,28 @@ public function an_array_initialized_with_authorizations_should_return_valid_ins */ public function an_array_initialized_with_no_authorizations_should_return_valid_institutions_per_role(): void { - $institutionAuthorizationMap = InstitutionAuthorizationOptionMap::fromInstitutionAuthorizations($this->institution, []); + $institutionAuthorizationMap = InstitutionAuthorizationOptionMap::fromInstitutionAuthorizations( + $this->institution, + [], + ); - $this->assertEquals([], $institutionAuthorizationMap->getAuthorizationOptionsByRole(InstitutionRole::useRa())->getInstitutions($this->institution)); - $this->assertEquals([], $institutionAuthorizationMap->getAuthorizationOptionsByRole(InstitutionRole::useRaa())->getInstitutions($this->institution)); - $this->assertEquals([], $institutionAuthorizationMap->getAuthorizationOptionsByRole(InstitutionRole::selectRaa())->getInstitutions($this->institution)); + $this->assertEquals( + [], + $institutionAuthorizationMap->getAuthorizationOptionsByRole(InstitutionRole::useRa())->getInstitutions( + $this->institution, + ) + ); + $this->assertEquals( + [], + $institutionAuthorizationMap->getAuthorizationOptionsByRole(InstitutionRole::useRaa())->getInstitutions( + $this->institution, + ) + ); + $this->assertEquals( + [], + $institutionAuthorizationMap->getAuthorizationOptionsByRole(InstitutionRole::selectRaa())->getInstitutions( + $this->institution, + ) + ); } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationServiceTest.php index 3921de14e..b98bc4ad9 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationServiceTest.php @@ -43,7 +43,7 @@ public function setUp(): void $this->repository = m::mock(InstitutionAuthorizationRepository::class); $this->service = new InstitutionAuthorizationService( - $this->repository + $this->repository, ); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionConfigurationOptionsServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionConfigurationOptionsServiceTest.php index 464ff1d2c..ee17f9ba4 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionConfigurationOptionsServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionConfigurationOptionsServiceTest.php @@ -50,7 +50,7 @@ public function setUp(): void $this->service = new InstitutionConfigurationOptionsService( $this->repository, - $this->numberOfTokensPerIdentityDefault + $this->numberOfTokensPerIdentityDefault, ); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/AuthorityRoleTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/AuthorityRoleTypeTest.php index 3cbed1a99..e547efacf 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/AuthorityRoleTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/AuthorityRoleTypeTest.php @@ -34,7 +34,7 @@ class AuthorityRoleTypeTest extends UnitTest */ public static function setUpBeforeClass(): void { - Type::addType(AuthorityRoleType::NAME, 'Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\AuthorityRoleType'); + Type::addType(AuthorityRoleType::NAME, AuthorityRoleType::class); } public function setUp(): void @@ -63,7 +63,7 @@ public function a_non_null_value_is_converted_to_the_correct_format(): void { $authorityRole = Type::getType(AuthorityRoleType::NAME); - $input = AuthorityRole::raa(); + $input = AuthorityRole::raa(); $output = $authorityRole->convertToDatabaseValue($input, $this->platform); $this->assertTrue(is_string($output)); @@ -95,7 +95,7 @@ public function a_non_null_value_is_converted_to_an_authority_role_value_object( $output = $authorityRole->convertToPHPValue($input, $this->platform); - $this->assertInstanceOf('Surfnet\StepupMiddleware\ApiBundle\Identity\Value\AuthorityRole', $output); + $this->assertInstanceOf(AuthorityRole::class, $output); $this->assertEquals(new AuthorityRole($input), $output); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/CommonNameTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/CommonNameTypeTest.php index cce7ad129..cfdd80c10 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/CommonNameTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/CommonNameTypeTest.php @@ -37,7 +37,7 @@ class CommonNameTypeTest extends UnitTest */ public static function setUpBeforeClass(): void { - Type::addType(CommonNameType::NAME, 'Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\CommonNameType'); + Type::addType(CommonNameType::NAME, CommonNameType::class); } public function setUp(): void @@ -66,7 +66,7 @@ public function a_non_null_value_is_converted_to_the_correct_format(): void { $commonName = Type::getType(CommonNameType::NAME); - $input = new CommonName('Arthur Dent'); + $input = new CommonName('Arthur Dent'); $output = $commonName->convertToDatabaseValue($input, $this->platform); $this->assertTrue(is_string($output)); @@ -94,11 +94,11 @@ public function a_non_null_value_is_converted_to_the_stepup_common_name_object() { $commonName = Type::getType(CommonNameType::NAME); - $input = 'Arthur Dent'; + $input = 'Arthur Dent'; $output = $commonName->convertToPHPValue($input, $this->platform); - $this->assertInstanceOf('Surfnet\Stepup\Identity\Value\CommonName', $output); + $this->assertInstanceOf(CommonName::class, $output); $this->assertEquals(new CommonName($input), $output); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationContactInformationTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationContactInformationTypeTest.php index 768af88a2..21f5e25b2 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationContactInformationTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationContactInformationTypeTest.php @@ -39,7 +39,7 @@ public static function setUpBeforeClass(): void { Type::addType( ConfigurationContactInformationType::NAME, - 'Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\ConfigurationContactInformationType' + ConfigurationContactInformationType::class, ); } @@ -57,7 +57,7 @@ public function setUp(): void */ public function a_value_can_only_be_converted_to_sql_if_it_is_contact_information_or_null($incorrectValue): void { - $this->expectException('Doctrine\DBAL\Types\ConversionException'); + $this->expectException(ConversionException::class); $configurationContactInformation = Type::getType(ConfigurationContactInformationType::NAME); $configurationContactInformation->convertToDatabaseValue($incorrectValue, $this->platform); @@ -85,7 +85,7 @@ public function a_non_null_value_is_converted_to_the_correct_format(): void $configurationContactInformation = Type::getType(ConfigurationContactInformationType::NAME); $expected = 'Call me maybe'; - $input = new ContactInformation($expected); + $input = new ContactInformation($expected); $output = $configurationContactInformation->convertToDatabaseValue($input, $this->platform); $this->assertTrue(is_string($output)); @@ -117,7 +117,7 @@ public function a_non_null_value_is_converted_to_a_contact_information_value_obj $output = $configurationContactInformation->convertToPHPValue($input, $this->platform); - $this->assertInstanceOf('Surfnet\Stepup\Configuration\Value\ContactInformation', $output); + $this->assertInstanceOf(ContactInformation::class, $output); $this->assertEquals(new ContactInformation($input), $output); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationInstitutionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationInstitutionTypeTest.php index e3c451322..39a4e6cad 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationInstitutionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationInstitutionTypeTest.php @@ -39,7 +39,7 @@ public static function setUpBeforeClass(): void { Type::addType( ConfigurationInstitutionType::NAME, - 'Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\ConfigurationInstitutionType' + ConfigurationInstitutionType::class, ); } @@ -70,7 +70,7 @@ public function a_null_value_remains_null_in_to_sql_conversion(): void */ public function a_value_can_only_be_converted_to_sql_if_it_is_an_institution_or_null($incorrectValue): void { - $this->expectException('Doctrine\DBAL\Types\ConversionException'); + $this->expectException(ConversionException::class); $configurationContactInformation = Type::getType(ConfigurationInstitutionType::NAME); $configurationContactInformation->convertToDatabaseValue($incorrectValue, $this->platform); @@ -86,8 +86,8 @@ public function a_non_null_value_is_converted_to_the_correct_format(): void $input = 'An institution'; $expected = 'an institution'; - $input = new Institution($input); - $output = $configurationInstitution->convertToDatabaseValue($input, $this->platform); + $input = new Institution($input); + $output = $configurationInstitution->convertToDatabaseValue($input, $this->platform); $this->assertTrue(is_string($output)); $this->assertEquals($expected, $output); @@ -118,7 +118,7 @@ public function a_non_null_value_is_converted_to_a_configuration_institution_val $output = $configurationInstitution->convertToPHPValue($input, $this->platform); - $this->assertInstanceOf('Surfnet\Stepup\Configuration\Value\Institution', $output); + $this->assertInstanceOf(Institution::class, $output); $this->assertEquals(new Institution($input), $output); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationLocationTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationLocationTypeTest.php index b89e0a147..a6c761eaf 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationLocationTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationLocationTypeTest.php @@ -39,7 +39,7 @@ public static function setUpBeforeClass(): void { Type::addType( ConfigurationLocationType::NAME, - 'Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\ConfigurationLocationType' + ConfigurationLocationType::class, ); } @@ -85,8 +85,8 @@ public function a_non_null_value_is_converted_to_the_correct_format(): void $configurationLocation = Type::getType(ConfigurationLocationType::NAME); $expected = 'Somewhere behind you'; - $input = new Location($expected); - $output = $configurationLocation->convertToDatabaseValue($input, $this->platform); + $input = new Location($expected); + $output = $configurationLocation->convertToDatabaseValue($input, $this->platform); $this->assertTrue(is_string($output)); $this->assertEquals($expected, $output); @@ -117,7 +117,7 @@ public function a_non_null_value_is_converted_to_a_configuration_location_value_ $output = $configurationLocation->convertToPHPValue($input, $this->platform); - $this->assertInstanceOf('Surfnet\Stepup\Configuration\Value\Location', $output); + $this->assertInstanceOf(Location::class, $output); $this->assertEquals(new Location($input), $output); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ContactInformationTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ContactInformationTypeTest.php index 6b8cb1475..05519f160 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ContactInformationTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ContactInformationTypeTest.php @@ -39,7 +39,7 @@ public static function setUpBeforeClass(): void { Type::addType( ContactInformationType::NAME, - 'Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\ContactInformationType' + ContactInformationType::class, ); } @@ -70,7 +70,7 @@ public function a_non_null_value_is_converted_to_the_correct_format(): void $contactInformation = Type::getType(ContactInformationType::NAME); $expected = 'Call me maybe'; - $input = new ContactInformation($expected); + $input = new ContactInformation($expected); $output = $contactInformation->convertToDatabaseValue($input, $this->platform); $this->assertTrue(is_string($output)); @@ -102,7 +102,7 @@ public function a_non_null_value_is_converted_to_a_contact_information_value_obj $output = $contactInformation->convertToPHPValue($input, $this->platform); - $this->assertInstanceOf('Surfnet\Stepup\Identity\Value\ContactInformation', $output); + $this->assertInstanceOf(ContactInformation::class, $output); $this->assertEquals(new ContactInformation($input), $output); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DateTimeTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DateTimeTypeTest.php index 255933b60..4addec7aa 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DateTimeTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DateTimeTypeTest.php @@ -39,7 +39,7 @@ class DateTimeTypeTest extends UnitTest */ public static function setUpBeforeClass(): void { - Type::addType(DateTimeType::NAME, 'Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\DateTimeType'); + Type::addType(DateTimeType::NAME, DateTimeType::class); } public function setUp(): void @@ -96,13 +96,13 @@ public function a_string_is_converted_to_the_stepup_datetime_object(): void { $dateTime = Type::getType(DateTimeType::NAME); - $databaseValue = '2015-02-17 10:48:22'; - $actualDateTime = $dateTime->convertToPHPValue($databaseValue, $this->platform); + $databaseValue = '2015-02-17 10:48:22'; + $actualDateTime = $dateTime->convertToPHPValue($databaseValue, $this->platform); $expectedDateTime = new DateTime( - CoreDateTime::createFromFormat('Y-m-d H:i:s', $databaseValue, new DateTimeZone('UTC')) + CoreDateTime::createFromFormat('Y-m-d H:i:s', $databaseValue, new DateTimeZone('UTC')), ); - $this->assertInstanceOf('Surfnet\Stepup\DateTime\DateTime', $actualDateTime); + $this->assertInstanceOf(DateTime::class, $actualDateTime); $this->assertEquals($expectedDateTime, $actualDateTime); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DocumentNumberTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DocumentNumberTypeTest.php index dbd59fec2..26823f250 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DocumentNumberTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DocumentNumberTypeTest.php @@ -38,7 +38,7 @@ class DocumentNumberTypeTest extends UnitTest */ public static function setUpBeforeClass(): void { - Type::addType(DocumentNumberType::NAME, 'Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\DocumentNumberType'); + Type::addType(DocumentNumberType::NAME, DocumentNumberType::class); } public function setUp(): void @@ -113,7 +113,7 @@ public function a_non_null_value_is_converted_to_the_stepup_document_number_obje $input = '12345'; $output = $type->convertToPHPValue($input, $this->platform); - $this->assertInstanceOf('Surfnet\Stepup\Identity\Value\DocumentNumber', $output); + $this->assertInstanceOf(DocumentNumber::class, $output); $this->assertTrue((new DocumentNumber($input))->equals($output)); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/EmailTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/EmailTypeTest.php index 0539f5ae9..04a8a92ea 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/EmailTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/EmailTypeTest.php @@ -37,7 +37,7 @@ class EmailTypeTest extends UnitTest */ public static function setUpBeforeClass(): void { - Type::addType(EmailType::NAME, 'Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\EmailType'); + Type::addType(EmailType::NAME, EmailType::class); } public function setUp(): void @@ -66,7 +66,7 @@ public function a_non_null_value_is_converted_to_the_correct_format(): void { $email = Type::getType(EmailType::NAME); - $input = new Email('arthur@babelfish.invalid'); + $input = new Email('arthur@babelfish.invalid'); $output = $email->convertToDatabaseValue($input, $this->platform); $this->assertTrue(is_string($output)); @@ -98,7 +98,7 @@ public function a_non_null_value_is_converted_to_the_stepup_email_object(): void $output = $email->convertToPHPValue($input, $this->platform); - $this->assertInstanceOf('Surfnet\Stepup\Identity\Value\Email', $output); + $this->assertInstanceOf(Email::class, $output); $this->assertEquals(new Email($input), $output); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionRoleTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionRoleTypeTest.php index 297342535..71ce66c9a 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionRoleTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionRoleTypeTest.php @@ -23,7 +23,6 @@ use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Configuration\Value\InstitutionRole; -use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\InstitutionRoleType; class InstitutionRoleTypeTest extends UnitTest @@ -40,7 +39,7 @@ public static function setUpBeforeClass(): void { Type::addType( InstitutionRoleType::NAME, - 'Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\InstitutionRoleType' + InstitutionRoleType::class, ); } @@ -71,8 +70,8 @@ public function a_non_null_value_is_converted_to_the_correct_format(): void $configurationInstitution = Type::getType(InstitutionRoleType::NAME); $expected = 'use_ra'; - $input = new InstitutionRole($expected); - $output = $configurationInstitution->convertToDatabaseValue($input, $this->platform); + $input = new InstitutionRole($expected); + $output = $configurationInstitution->convertToDatabaseValue($input, $this->platform); $this->assertTrue(is_string($output)); $this->assertEquals($expected, $output); @@ -103,7 +102,7 @@ public function a_non_null_value_is_converted_to_a_configuration_institution_val $output = $configurationInstitution->convertToPHPValue($input, $this->platform); - $this->assertInstanceOf('Surfnet\Stepup\Configuration\Value\InstitutionRole', $output); + $this->assertInstanceOf(InstitutionRole::class, $output); $this->assertEquals(new InstitutionRole($input), $output); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionTypeTest.php index b042520b0..04d25cb44 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionTypeTest.php @@ -39,7 +39,7 @@ public static function setUpBeforeClass(): void { Type::addType( InstitutionType::NAME, - 'Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\InstitutionType' + InstitutionType::class, ); } @@ -70,8 +70,8 @@ public function a_non_null_value_is_converted_to_the_correct_format(): void $configurationInstitution = Type::getType(InstitutionType::NAME); $expected = 'an institution'; - $input = new Institution($expected); - $output = $configurationInstitution->convertToDatabaseValue($input, $this->platform); + $input = new Institution($expected); + $output = $configurationInstitution->convertToDatabaseValue($input, $this->platform); $this->assertTrue(is_string($output)); $this->assertEquals($expected, $output); @@ -102,7 +102,7 @@ public function a_non_null_value_is_converted_to_a_configuration_institution_val $output = $configurationInstitution->convertToPHPValue($input, $this->platform); - $this->assertInstanceOf('Surfnet\Stepup\Identity\Value\Institution', $output); + $this->assertInstanceOf(Institution::class, $output); $this->assertEquals(new Institution($input), $output); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocaleTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocaleTypeTest.php index bbdd2a4d3..9ca377acb 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocaleTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocaleTypeTest.php @@ -37,7 +37,7 @@ class LocaleTypeTest extends UnitTest */ public static function setUpBeforeClass(): void { - Type::addType(LocaleType::NAME, 'Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\LocaleType'); + Type::addType(LocaleType::NAME, LocaleType::class); } public function setUp(): void @@ -67,7 +67,7 @@ public function a_non_null_value_is_converted_to_the_correct_format(): void $locale = Type::getType(LocaleType::NAME); $expected = 'en_GB'; - $input = new Locale('en_GB'); + $input = new Locale('en_GB'); $output = $locale->convertToDatabaseValue($input, $this->platform); $this->assertTrue(is_string($output)); @@ -99,7 +99,7 @@ public function a_non_null_value_is_converted_to_a_locale_value_object(): void $output = $locale->convertToPHPValue($input, $this->platform); - $this->assertInstanceOf('Surfnet\Stepup\Identity\Value\Locale', $output); + $this->assertInstanceOf(Locale::class, $output); $this->assertEquals(new Locale($input), $output); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocationTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocationTypeTest.php index 19606dbe2..35b2af61f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocationTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocationTypeTest.php @@ -39,7 +39,7 @@ public static function setUpBeforeClass(): void { Type::addType( LocationType::NAME, - 'Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\LocationType' + LocationType::class, ); } @@ -70,8 +70,8 @@ public function a_non_null_value_is_converted_to_the_correct_format(): void $location = Type::getType(LocationType::NAME); $expected = 'Somewhere behind you'; - $input = new Location($expected); - $output = $location->convertToDatabaseValue($input, $this->platform); + $input = new Location($expected); + $output = $location->convertToDatabaseValue($input, $this->platform); $this->assertTrue(is_string($output)); $this->assertEquals($expected, $output); @@ -102,7 +102,7 @@ public function a_non_null_value_is_converted_to_a_location_value_object(): void $output = $location->convertToPHPValue($input, $this->platform); - $this->assertInstanceOf('Surfnet\Stepup\Identity\Value\Location', $output); + $this->assertInstanceOf(Location::class, $output); $this->assertEquals(new Location($input), $output); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NameIdTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NameIdTypeTest.php index 5a7da7af7..0f49db10d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NameIdTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NameIdTypeTest.php @@ -37,7 +37,7 @@ class NameIdTypeTest extends UnitTest */ public static function setUpBeforeClass(): void { - Type::addType(NameIdType::NAME, 'Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\NameIdType'); + Type::addType(NameIdType::NAME, NameIdType::class); } public function setUp(): void @@ -67,7 +67,7 @@ public function a_non_null_value_is_converted_to_the_correct_format(): void $nameId = Type::getType(NameIdType::NAME); $expected = md5('someNameId'); - $input = new NameId($expected); + $input = new NameId($expected); $output = $nameId->convertToDatabaseValue($input, $this->platform); $this->assertTrue(is_string($output)); @@ -99,7 +99,7 @@ public function a_non_null_value_is_converted_to_a_name_id_value_object(): void $output = $nameId->convertToPHPValue($input, $this->platform); - $this->assertInstanceOf('Surfnet\Stepup\Identity\Value\NameId', $output); + $this->assertInstanceOf(NameId::class, $output); $this->assertEquals(new NameId($input), $output); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NumberOfTokensPerIdentityTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NumberOfTokensPerIdentityTypeTest.php index 546e14e22..757559693 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NumberOfTokensPerIdentityTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NumberOfTokensPerIdentityTypeTest.php @@ -25,7 +25,6 @@ use Surfnet\Stepup\Configuration\Value\NumberOfTokensPerIdentityOption; use Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\NumberOfTokensPerIdentityType; - class NumberOfTokensPerIdentityTypeTest extends UnitTest { /** @@ -40,7 +39,7 @@ public static function setUpBeforeClass(): void { Type::addType( NumberOfTokensPerIdentityType::NAME, - 'Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\NumberOfTokensPerIdentityType' + NumberOfTokensPerIdentityType::class, ); } @@ -86,8 +85,8 @@ public function a_non_null_value_is_converted_to_the_correct_format(): void $numberOfTokensPerIdentity = Type::getType(NumberOfTokensPerIdentityType::NAME); $expected = 4; - $input = new NumberOfTokensPerIdentityOption($expected); - $output = $numberOfTokensPerIdentity->convertToDatabaseValue($input, $this->platform); + $input = new NumberOfTokensPerIdentityOption($expected); + $output = $numberOfTokensPerIdentity->convertToDatabaseValue($input, $this->platform); $this->assertTrue(is_numeric($output)); $this->assertEquals($expected, $output); @@ -118,7 +117,7 @@ public function a_non_null_value_is_converted_to_an_option_value_object(): void $output = $numberOfTokensPerIdentity->convertToPHPValue($input, $this->platform); - $this->assertInstanceOf('Surfnet\Stepup\Configuration\Value\NumberOfTokensPerIdentityOption', $output); + $this->assertInstanceOf(NumberOfTokensPerIdentityOption::class, $output); $this->assertEquals(new NumberOfTokensPerIdentityOption(2), $output); } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RaLocationNameTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RaLocationNameTypeTest.php index 923cc3580..9927ed939 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RaLocationNameTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RaLocationNameTypeTest.php @@ -39,7 +39,7 @@ public static function setUpBeforeClass(): void { Type::addType( RaLocationNameType::NAME, - 'Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\RaLocationNameType' + RaLocationNameType::class, ); } @@ -70,8 +70,8 @@ public function a_non_null_value_is_converted_to_the_correct_format(): void $raLocationName = Type::getType(RaLocationNameType::NAME); $expected = 'An RA Location Name'; - $input = new RaLocationName($expected); - $output = $raLocationName->convertToDatabaseValue($input, $this->platform); + $input = new RaLocationName($expected); + $output = $raLocationName->convertToDatabaseValue($input, $this->platform); $this->assertTrue(is_string($output)); $this->assertEquals($expected, $output); @@ -117,7 +117,7 @@ public function a_non_null_value_is_converted_to_a_ra_location_name_value_object $output = $raLocationName->convertToPHPValue($input, $this->platform); - $this->assertInstanceOf('Surfnet\Stepup\Configuration\Value\RaLocationName', $output); + $this->assertInstanceOf(RaLocationName::class, $output); $this->assertEquals(new RaLocationName($input), $output); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RecoveryTokenStatusTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RecoveryTokenStatusTypeTest.php index d4508bcb4..eed9555e0 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RecoveryTokenStatusTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RecoveryTokenStatusTypeTest.php @@ -53,7 +53,7 @@ public function invalidPhpValues(): array 'string' => ['string'], 'int' => [9], 'float' => [9.1], - 'array' => [array()], + 'array' => [[]], 'object of a different type' => [new stdClass], 'resource' => [fopen('php://memory', 'w')], ]; @@ -63,10 +63,8 @@ public function invalidPhpValues(): array * @test * @dataProvider invalidPhpValues * @group doctrine - * - * @param mixed $value */ - public function an_invalid_php_value_is_not_accepted_in_to_sql_conversion($value): void + public function an_invalid_php_value_is_not_accepted_in_to_sql_conversion(mixed $value): void { $this->expectException(ConversionException::class); @@ -91,8 +89,10 @@ public function validPhpValues(): array * @param mixed $phpValue * @param mixed $databaseValue */ - public function a_valid_php_value_is_converted_to_a_sql_value(RecoveryTokenStatus $phpValue, int $databaseValue): void - { + public function a_valid_php_value_is_converted_to_a_sql_value( + RecoveryTokenStatus $phpValue, + int $databaseValue, + ): void { $type = Type::getType(RecoveryTokenStatusType::NAME); $this->assertSame($databaseValue, $type->convertToDatabaseValue($phpValue, $this->platform)); } @@ -104,7 +104,7 @@ public function invalidDatabaseValues(): array 'invalid string' => ['string'], 'int' => [9], 'float' => [9.1], - 'array' => [array()], + 'array' => [[]], 'object of a different type' => [new stdClass], 'resource' => [fopen('php://memory', 'w')], ]; @@ -114,10 +114,8 @@ public function invalidDatabaseValues(): array * @test * @dataProvider invalidDatabaseValues * @group doctrine - * - * @param mixed $input */ - public function an_invalid_database_value_causes_an_exception_upon_conversion($input): void + public function an_invalid_database_value_causes_an_exception_upon_conversion(mixed $input): void { $this->expectException(ConversionException::class); @@ -139,11 +137,12 @@ public function validDatabaseValues(): array * @dataProvider validDatabaseValues * @group doctrine * - * @param int $databaseValue * @param mixed $phpValue */ - public function a_valid_database_value_is_converted_to_a_sql_value(string $databaseValue, RecoveryTokenStatus $phpValue): void - { + public function a_valid_database_value_is_converted_to_a_sql_value( + string $databaseValue, + RecoveryTokenStatus $phpValue, + ): void { $type = Type::getType(RecoveryTokenStatusType::NAME); $this->assertTrue($phpValue->equals($type->convertToPHPValue($databaseValue, $this->platform))); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SecondFactorStatusTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SecondFactorStatusTypeTest.php index d0b0a20ad..9496ca03e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SecondFactorStatusTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SecondFactorStatusTypeTest.php @@ -38,7 +38,7 @@ class SecondFactorStatusTypeTest extends UnitTest */ public static function setUpBeforeClass(): void { - Type::addType(SecondFactorStatusType::NAME, 'Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\SecondFactorStatusType'); + Type::addType(SecondFactorStatusType::NAME, SecondFactorStatusType::class); } public function setUp(): void @@ -53,7 +53,7 @@ public function invalidPhpValues(): array 'string' => ['string'], 'int' => [9], 'float' => [9.1], - 'array' => [array()], + 'array' => [[]], 'object of a different type' => [new stdClass], 'resource' => [fopen('php://memory', 'w')], ]; @@ -63,10 +63,8 @@ public function invalidPhpValues(): array * @test * @dataProvider invalidPhpValues * @group doctrine - * - * @param mixed $value */ - public function an_invalid_php_value_is_not_accepted_in_to_sql_conversion($value): void + public function an_invalid_php_value_is_not_accepted_in_to_sql_conversion(mixed $value): void { $this->expectException(ConversionException::class); @@ -89,11 +87,8 @@ public function validPhpValues(): array * @test * @dataProvider validPhpValues * @group doctrine - * - * @param mixed $phpValue - * @param int $databaseValue */ - public function a_valid_php_value_is_converted_to_a_sql_value($phpValue, int $databaseValue): void + public function a_valid_php_value_is_converted_to_a_sql_value(mixed $phpValue, int $databaseValue): void { $type = Type::getType(SecondFactorStatusType::NAME); $this->assertSame($databaseValue, $type->convertToDatabaseValue($phpValue, $this->platform)); @@ -106,7 +101,7 @@ public function invalidDatabaseValues(): array 'invalid string' => ['string'], 'int' => [9], 'float' => [9.1], - 'array' => [array()], + 'array' => [[]], 'object of a different type' => [new stdClass], 'resource' => [fopen('php://memory', 'w')], ]; @@ -116,10 +111,8 @@ public function invalidDatabaseValues(): array * @test * @dataProvider invalidDatabaseValues * @group doctrine - * - * @param mixed $input */ - public function an_invalid_database_value_causes_an_exception_upon_conversion($input): void + public function an_invalid_database_value_causes_an_exception_upon_conversion(mixed $input): void { $this->expectException(ConversionException::class); @@ -142,11 +135,8 @@ public function validDatabaseValues(): array * @test * @dataProvider validDatabaseValues * @group doctrine - * - * @param int $databaseValue - * @param mixed $phpValue */ - public function a_valid_database_value_is_converted_to_a_sql_value(string $databaseValue, $phpValue): void + public function a_valid_database_value_is_converted_to_a_sql_value(string $databaseValue, mixed $phpValue): void { $type = Type::getType(SecondFactorStatusType::NAME); $this->assertTrue($phpValue->equals($type->convertToPHPValue($databaseValue, $this->platform))); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SelfVetOptionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SelfVetOptionTypeTest.php index 4ab4b14ad..bc62712e2 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SelfVetOptionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SelfVetOptionTypeTest.php @@ -39,7 +39,7 @@ public static function setUpBeforeClass(): void { Type::addType( SelfVetOptionType::NAME, - 'Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\SelfVetOptionType' + \Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\SelfVetOptionType::class, ); } @@ -85,8 +85,8 @@ public function a_non_null_value_is_converted_to_the_correct_format(): void $configurationInstitution = Type::getType(SelfVetOptionType::NAME); $expected = true; - $input = new SelfVetOption($expected); - $output = $configurationInstitution->convertToDatabaseValue($input, $this->platform); + $input = new SelfVetOption($expected); + $output = $configurationInstitution->convertToDatabaseValue($input, $this->platform); $this->assertTrue(is_numeric($output)); $this->assertEquals($expected, $output); @@ -117,7 +117,7 @@ public function a_non_null_value_is_converted_to_an_option_valu_object(): void $output = $configurationInstitution->convertToPHPValue($input, $this->platform); - $this->assertInstanceOf('Surfnet\Stepup\Configuration\Value\SelfVetOption', $output); + $this->assertInstanceOf(\Surfnet\Stepup\Configuration\Value\SelfVetOption::class, $output); $this->assertEquals(new SelfVetOption($input), $output); } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ShowRaaContactInformationOptionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ShowRaaContactInformationOptionTypeTest.php index 7ee9882d5..8d90790e5 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ShowRaaContactInformationOptionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ShowRaaContactInformationOptionTypeTest.php @@ -24,6 +24,7 @@ use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Configuration\Value\ShowRaaContactInformationOption; use Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\ShowRaaContactInformationOptionType; + use function is_numeric; class ShowRaaContactInformationOptionTypeTest extends UnitTest @@ -40,7 +41,7 @@ public static function setUpBeforeClass(): void { Type::addType( ShowRaaContactInformationOptionType::NAME, - 'Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\ShowRaaContactInformationOptionType' + ShowRaaContactInformationOptionType::class, ); } @@ -69,8 +70,9 @@ public function a_null_value_remains_null_in_to_sql_conversion(): void * @dataProvider \Surfnet\StepupMiddleware\ApiBundle\Tests\TestDataProvider::notNull * @param $incorrectValue */ - public function a_value_can_only_be_converted_to_sql_if_it_is_a_show_raa_contact_information_option_or_null($incorrectValue): void - { + public function a_value_can_only_be_converted_to_sql_if_it_is_a_show_raa_contact_information_option_or_null( + $incorrectValue, + ): void { $this->expectException(ConversionException::class); $configurationContactInformation = Type::getType(ShowRaaContactInformationOptionType::NAME); @@ -86,8 +88,8 @@ public function a_non_null_value_is_converted_to_the_correct_format(): void $configurationInstitution = Type::getType(ShowRaaContactInformationOptionType::NAME); $expected = true; - $input = new ShowRaaContactInformationOption($expected); - $output = $configurationInstitution->convertToDatabaseValue($input, $this->platform); + $input = new ShowRaaContactInformationOption($expected); + $output = $configurationInstitution->convertToDatabaseValue($input, $this->platform); $this->assertTrue(is_numeric($output)); $this->assertEquals($expected, $output); @@ -118,7 +120,7 @@ public function a_non_null_value_is_converted_to_a_show_raa_contact_information_ $output = $configurationInstitution->convertToPHPValue($input, $this->platform); - $this->assertInstanceOf('Surfnet\Stepup\Configuration\Value\ShowRaaContactInformationOption', $output); + $this->assertInstanceOf(ShowRaaContactInformationOption::class, $output); $this->assertEquals(new ShowRaaContactInformationOption($input), $output); } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/UseRaLocationsOptionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/UseRaLocationsOptionTypeTest.php index fa9b13556..3ebe0e69c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/UseRaLocationsOptionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/UseRaLocationsOptionTypeTest.php @@ -39,7 +39,7 @@ public static function setUpBeforeClass(): void { Type::addType( UseRaLocationsOptionType::NAME, - 'Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\UseRaLocationsOptionType' + UseRaLocationsOptionType::class, ); } @@ -68,7 +68,7 @@ public function a_null_value_remains_null_in_to_sql_conversion(): void * @dataProvider \Surfnet\StepupMiddleware\ApiBundle\Tests\TestDataProvider::notNull * @param $incorrectValue */ - public function a_value_can_only_be_converted_to_sql_if_it_is_a_use_ra_locations_option_or_null($incorrectValue): void + public function a_value_can_only_be_converted_to_sql_if_it_is_a_use_ra_locations_option_or_null($incorrectValue,): void { $this->expectException(ConversionException::class); @@ -85,8 +85,8 @@ public function a_non_null_value_is_converted_to_the_correct_format(): void $configurationInstitution = Type::getType(UseRaLocationsOptionType::NAME); $expected = true; - $input = new UseRaLocationsOption($expected); - $output = $configurationInstitution->convertToDatabaseValue($input, $this->platform); + $input = new UseRaLocationsOption($expected); + $output = $configurationInstitution->convertToDatabaseValue($input, $this->platform); $this->assertTrue(is_numeric($output)); $this->assertEquals($expected, $output); @@ -117,7 +117,7 @@ public function a_non_null_value_is_converted_to_a_use_ra_locations_option_value $output = $configurationInstitution->convertToPHPValue($input, $this->platform); - $this->assertInstanceOf('Surfnet\Stepup\Configuration\Value\UseRaLocationsOption', $output); + $this->assertInstanceOf(UseRaLocationsOption::class, $output); $this->assertEquals(new UseRaLocationsOption($input), $output); } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/VerifyEmailOptionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/VerifyEmailOptionTypeTest.php index 0cd1f921e..9642b9a28 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/VerifyEmailOptionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/VerifyEmailOptionTypeTest.php @@ -39,7 +39,7 @@ public static function setUpBeforeClass(): void { Type::addType( VerifyEmailOptionType::NAME, - 'Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\VerifyEmailOptionType' + VerifyEmailOptionType::class, ); } @@ -85,8 +85,8 @@ public function a_non_null_value_is_converted_to_the_correct_format(): void $configurationInstitution = Type::getType(VerifyEmailOptionType::NAME); $expected = true; - $input = new VerifyEmailOption($expected); - $output = $configurationInstitution->convertToDatabaseValue($input, $this->platform); + $input = new VerifyEmailOption($expected); + $output = $configurationInstitution->convertToDatabaseValue($input, $this->platform); $this->assertTrue(is_numeric($output)); $this->assertEquals($expected, $output); @@ -117,7 +117,7 @@ public function a_non_null_value_is_converted_to_an_option_valu_object(): void $output = $configurationInstitution->convertToPHPValue($input, $this->platform); - $this->assertInstanceOf('Surfnet\Stepup\Configuration\Value\VerifyEmailOption', $output); + $this->assertInstanceOf(VerifyEmailOption::class, $output); $this->assertEquals(new VerifyEmailOption($input), $output); } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php index b87579d60..ed9ab3d53 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php @@ -80,10 +80,10 @@ public function only_get_requests_are_accepted(string $invalidHttpMethod): void [], [], [ - 'HTTP_ACCEPT' => 'application/json', - 'CONTENT_TYPE' => 'application/json' + 'HTTP_ACCEPT' => 'application/json', + 'CONTENT_TYPE' => 'application/json', ], - json_encode([]) + json_encode([]), ); $this->assertEquals(Response::HTTP_METHOD_NOT_ALLOWED, $this->client->getResponse()->getStatusCode()); @@ -102,12 +102,12 @@ public function no_access_for_not_allowed_account(string $account): void [], [], [ - 'HTTP_ACCEPT' => 'application/json', - 'CONTENT_TYPE' => 'application/json', + 'HTTP_ACCEPT' => 'application/json', + 'CONTENT_TYPE' => 'application/json', 'PHP_AUTH_USER' => $account, - 'PHP_AUTH_PW' => $this->accounts[$account], + 'PHP_AUTH_PW' => $this->accounts[$account], ], - json_encode([]) + json_encode([]), ); $this->assertEquals(Response::HTTP_FORBIDDEN, $this->client->getResponse()->getStatusCode()); @@ -125,19 +125,19 @@ public function json_is_returned_from_the_api(): void [], [], [ - 'HTTP_ACCEPT' => 'application/json', - 'CONTENT_TYPE' => 'application/json', + 'HTTP_ACCEPT' => 'application/json', + 'CONTENT_TYPE' => 'application/json', 'PHP_AUTH_USER' => 'ra', - 'PHP_AUTH_PW' => $this->accounts['ra'], + 'PHP_AUTH_PW' => $this->accounts['ra'], ], - json_encode([]) + json_encode([]), ); $this->assertTrue( $this->client->getResponse()->headers->contains( 'Content-Type', - 'application/json' - ) + 'application/json', + ), ); } @@ -154,12 +154,12 @@ public function correct_institutions_are_returned(string $account): void [], [], [ - 'HTTP_ACCEPT' => 'application/json', - 'CONTENT_TYPE' => 'application/json', + 'HTTP_ACCEPT' => 'application/json', + 'CONTENT_TYPE' => 'application/json', 'PHP_AUTH_USER' => $account, - 'PHP_AUTH_PW' => $this->accounts[$account], + 'PHP_AUTH_PW' => $this->accounts[$account], ], - json_encode([]) + json_encode([]), ); $this->assertEquals(Response::HTTP_OK, $this->client->getResponse()->getStatusCode()); @@ -176,7 +176,7 @@ public function invalidHttpMethodProvider(): array 'POST' => ['POST'], 'DELETE' => ['DELETE'], 'PUT' => ['PUT'], - 'OPTIONS' => ['OPTIONS'] + 'OPTIONS' => ['OPTIONS'], ]; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php index 9b1d0ed1d..bc76481fb 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php @@ -82,10 +82,10 @@ public function only_get_requests_are_accepted(string $invalidHttpMethod): void [], [], [ - 'HTTP_ACCEPT' => 'application/json', - 'CONTENT_TYPE' => 'application/json' + 'HTTP_ACCEPT' => 'application/json', + 'CONTENT_TYPE' => 'application/json', ], - json_encode([]) + json_encode([]), ); $this->assertEquals(Response::HTTP_METHOD_NOT_ALLOWED, $this->client->getResponse()->getStatusCode()); @@ -104,12 +104,12 @@ public function no_access_for_not_allowed_account(string $account): void [], [], [ - 'HTTP_ACCEPT' => 'application/json', - 'CONTENT_TYPE' => 'application/json', + 'HTTP_ACCEPT' => 'application/json', + 'CONTENT_TYPE' => 'application/json', 'PHP_AUTH_USER' => $account, - 'PHP_AUTH_PW' => $this->accounts[$account], + 'PHP_AUTH_PW' => $this->accounts[$account], ], - json_encode([]) + json_encode([]), ); $this->assertEquals(Response::HTTP_FORBIDDEN, $this->client->getResponse()->getStatusCode()); @@ -127,19 +127,19 @@ public function json_is_returned_from_the_api(): void [], [], [ - 'HTTP_ACCEPT' => 'application/json', - 'CONTENT_TYPE' => 'application/json', + 'HTTP_ACCEPT' => 'application/json', + 'CONTENT_TYPE' => 'application/json', 'PHP_AUTH_USER' => 'ra', - 'PHP_AUTH_PW' => $this->accounts['ra'], + 'PHP_AUTH_PW' => $this->accounts['ra'], ], - json_encode([]) + json_encode([]), ); $this->assertTrue( $this->client->getResponse()->headers->contains( 'Content-Type', - 'application/json' - ) + 'application/json', + ), ); } @@ -156,12 +156,12 @@ public function correct_institutions_are_returned(string $account): void [], [], [ - 'HTTP_ACCEPT' => 'application/json', - 'CONTENT_TYPE' => 'application/json', + 'HTTP_ACCEPT' => 'application/json', + 'CONTENT_TYPE' => 'application/json', 'PHP_AUTH_USER' => $account, - 'PHP_AUTH_PW' => $this->accounts[$account], + 'PHP_AUTH_PW' => $this->accounts[$account], ], - json_encode([]) + json_encode([]), ); $this->assertEquals(Response::HTTP_OK, $this->client->getResponse()->getStatusCode()); @@ -178,7 +178,7 @@ public function invalidHttpMethodProvider(): array 'POST' => ['POST'], 'DELETE' => ['DELETE'], 'PUT' => ['PUT'], - 'OPTIONS' => ['OPTIONS'] + 'OPTIONS' => ['OPTIONS'], ]; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/AuditLogProjectorTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/AuditLogProjectorTest.php index 3676bd3c0..83c60f80f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/AuditLogProjectorTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/AuditLogProjectorTest.php @@ -36,6 +36,8 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\AuditLogEntry; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Identity; use Surfnet\StepupMiddleware\ApiBundle\Identity\Projector\AuditLogProjector; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\AuditLogRepository; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\IdentityRepository; use Surfnet\StepupMiddleware\ApiBundle\Tests\Identity\Projector\Event\EventStub; final class AuditLogProjectorTest extends TestCase @@ -50,51 +52,55 @@ public function auditable_events(): array 'id', 0, new MessageMetadata(), - new EventStub($this->createAuditLogMetadata( - new IdentityId('abcd'), - new Institution('efgh'), - new SecondFactorId('ijkl'), - new SecondFactorType('yubikey'), - new YubikeyPublicId('99992222') - )), - BroadwayDateTime::fromString('1970-01-01H00:00:00.000') + new EventStub( + $this->createAuditLogMetadata( + new IdentityId('abcd'), + new Institution('efgh'), + new SecondFactorId('ijkl'), + new SecondFactorType('yubikey'), + new YubikeyPublicId('99992222'), + ), + ), + BroadwayDateTime::fromString('1970-01-01H00:00:00.000'), ), $this->createExpectedAuditLogEntry( new IdentityId('abcd'), new Institution('efgh'), - 'Surfnet\StepupMiddleware\ApiBundle\Tests\Identity\Projector\Event\EventStub', + EventStub::class, new StepupDateTime(new CoreDateTime('1970-01-01H00:00:00.000')), null, null, new SecondFactorId('ijkl'), new SecondFactorType('yubikey'), - new YubikeyPublicId('99992222') - ) + new YubikeyPublicId('99992222'), + ), ], 'no actor, without second factor' => [ new DomainMessage( 'id', 0, new MessageMetadata(), - new EventStub($this->createAuditLogMetadata( - new IdentityId('abcd'), - new Institution('efgh'), - null, - null - )), - BroadwayDateTime::fromString('1970-01-01H00:00:00.000') + new EventStub( + $this->createAuditLogMetadata( + new IdentityId('abcd'), + new Institution('efgh'), + null, + null, + ), + ), + BroadwayDateTime::fromString('1970-01-01H00:00:00.000'), ), $this->createExpectedAuditLogEntry( new IdentityId('abcd'), new Institution('efgh'), - 'Surfnet\StepupMiddleware\ApiBundle\Tests\Identity\Projector\Event\EventStub', + EventStub::class, new StepupDateTime(new CoreDateTime('1970-01-01H00:00:00.000')), null, null, null, null, - null - ) + null, + ), ], 'with actor, with second factor' => [ new DomainMessage( @@ -104,27 +110,29 @@ public function auditable_events(): array 'actorId' => '0123', 'actorInstitution' => '4567', ]), - new EventStub($this->createAuditLogMetadata( - new IdentityId('abcd'), - new Institution('efgh'), - new SecondFactorId('ijkl'), - new SecondFactorType('yubikey'), - new YubikeyPublicId('99992222') - )), - BroadwayDateTime::fromString('1970-01-01H00:00:00.000') + new EventStub( + $this->createAuditLogMetadata( + new IdentityId('abcd'), + new Institution('efgh'), + new SecondFactorId('ijkl'), + new SecondFactorType('yubikey'), + new YubikeyPublicId('99992222'), + ), + ), + BroadwayDateTime::fromString('1970-01-01H00:00:00.000'), ), $this->createExpectedAuditLogEntry( new IdentityId('abcd'), new Institution('efgh'), - 'Surfnet\StepupMiddleware\ApiBundle\Tests\Identity\Projector\Event\EventStub', + EventStub::class, new StepupDateTime(new CoreDateTime('1970-01-01H00:00:00.000')), new IdentityId('0123'), new Institution('4567'), new SecondFactorId('ijkl'), new SecondFactorType('yubikey'), new YubikeyPublicId('99992222'), - self::$actorCommonName - ) + self::$actorCommonName, + ), ], ]; } @@ -133,18 +141,15 @@ public function auditable_events(): array * @test * @group api-projector * @dataProvider auditable_events - * - * @param DomainMessage $message - * @param AuditLogEntry $expectedEntry */ public function it_creates_entries_for_auditable_events(DomainMessage $message, AuditLogEntry $expectedEntry): void { - $repository = m::mock('Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\AuditLogRepository'); + $repository = m::mock(AuditLogRepository::class); $repository->shouldReceive('save')->once()->with($this->spy($actualEntry)); - $identityRepository = m::mock('Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\IdentityRepository'); + $identityRepository = m::mock(IdentityRepository::class); - $identity = new Identity(); + $identity = new Identity(); $identity->commonName = self::$actorCommonName; $identityRepository->shouldReceive('find')->between(0, 1)->andReturn($identity); @@ -163,9 +168,8 @@ private function createAuditLogMetadata( Institution $institution, SecondFactorId $secondFactorId = null, SecondFactorType $secondFactorType = null, - SecondFactorIdentifier $secondFactorIdentifier = null - ): Metadata - { + SecondFactorIdentifier $secondFactorIdentifier = null, + ): Metadata { $metadata = new Metadata(); $metadata->identityId = $identityId; $metadata->identityInstitution = $institution; @@ -177,25 +181,25 @@ private function createAuditLogMetadata( } private function createExpectedAuditLogEntry( - IdentityId $identityId, - Institution $identityInstitution, - string $event, - StepupDateTime $recordedOn, - IdentityId $actorId = null, - Institution $actorInstitution = null, - SecondFactorId $secondFactorId = null, + IdentityId $identityId, + Institution $identityInstitution, + string $event, + StepupDateTime $recordedOn, + IdentityId $actorId = null, + Institution $actorInstitution = null, + SecondFactorId $secondFactorId = null, SecondFactorType $secondFactorType = null, ?YubikeyPublicId $secondFactorIdentifier = null, - $actorCommonName = null + $actorCommonName = null, ): AuditLogEntry { $entry = new AuditLogEntry(); - $entry->actorId = $actorId instanceof IdentityId ? (string) $actorId : null; - $entry->actorInstitution = $actorInstitution instanceof Institution ? (string) $actorInstitution : null; - $entry->identityId = (string) $identityId; + $entry->actorId = $actorId instanceof IdentityId ? (string)$actorId : null; + $entry->actorInstitution = $actorInstitution instanceof Institution ? (string)$actorInstitution : null; + $entry->identityId = (string)$identityId; $entry->identityInstitution = $identityInstitution; - $entry->secondFactorId = $secondFactorId instanceof SecondFactorId ? (string) $secondFactorId : null; - $entry->secondFactorType = $secondFactorType instanceof SecondFactorType ? (string) $secondFactorType : null; - $entry->secondFactorIdentifier = $secondFactorIdentifier instanceof YubikeyPublicId ? (string) $secondFactorIdentifier : null; + $entry->secondFactorId = $secondFactorId instanceof SecondFactorId ? (string)$secondFactorId : null; + $entry->secondFactorType = $secondFactorType instanceof SecondFactorType ? (string)$secondFactorType : null; + $entry->secondFactorIdentifier = $secondFactorIdentifier instanceof YubikeyPublicId ? (string)$secondFactorIdentifier : null; $entry->event = $event; $entry->recordedOn = $recordedOn; $entry->actorCommonName = $actorCommonName; @@ -204,17 +208,16 @@ private function createExpectedAuditLogEntry( } /** - * @param mixed &$spy * @return MatcherAbstract */ - private function spy(&$spy) + private function spy(mixed &$spy) { return m::on( function ($value) use (&$spy): bool { $spy = $value; return true; - } + }, ); } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/Event/EventStub.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/Event/EventStub.php index 0d3653bab..5d1650014 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/Event/EventStub.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/Event/EventStub.php @@ -21,13 +21,11 @@ use Surfnet\Stepup\Identity\AuditLog\Metadata; use Surfnet\Stepup\Identity\Event\AuditableEvent; -final class EventStub implements AuditableEvent +final readonly class EventStub implements AuditableEvent { - private Metadata $metadata; - - public function __construct(Metadata $metadata) - { - $this->metadata = $metadata; + public function __construct( + private Metadata $metadata, + ) { } public function getAuditLogMetadata() diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Value/AuthorizedInstitutionCollectionTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Value/AuthorizedInstitutionCollectionTest.php index d06bb4ebb..5e8552627 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Value/AuthorizedInstitutionCollectionTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Value/AuthorizedInstitutionCollectionTest.php @@ -41,7 +41,7 @@ public function retrieve_institutions(): void { $collection = AuthorizedInstitutionCollection::from( $this->buildInstitutionCollection(['a', 'b']), - $this->buildInstitutionCollection(['a', 'b']) + $this->buildInstitutionCollection(['a', 'b']), ); $this->assertCount(2, $collection->getAuthorizations()); @@ -58,7 +58,7 @@ public function retrieve_institutions_only_raa(): void { $collection = AuthorizedInstitutionCollection::from( $this->buildInstitutionCollection([]), - $this->buildInstitutionCollection(['a', 'b']) + $this->buildInstitutionCollection(['a', 'b']), ); $this->assertCount(2, $collection->getAuthorizations()); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php index a2ba8b99c..e6a8a30b9 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php @@ -24,6 +24,9 @@ use stdClass; use Surfnet\StepupMiddleware\ApiBundle\Exception\BadCommandRequestException; use Surfnet\StepupMiddleware\ApiBundle\Request\CommandParamConverter; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Root\Command\FooBarCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Root\Command\Ns\QuuxCommand; +use Symfony\Component\HttpFoundation\Request; class CommandParamConverterTest extends TestCase { @@ -37,7 +40,7 @@ public function it_validates_the_command_structure($commandJson): void { $this->expectException(BadCommandRequestException::class); - $request = m::mock('Symfony\Component\HttpFoundation\Request') + $request = m::mock(Request::class) ->shouldReceive('getContent')->with()->andReturn($commandJson) ->getMock(); $configuration = m::mock('Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter'); @@ -51,13 +54,12 @@ public function it_validates_the_command_structure($commandJson): void * @group api-bundle * @dataProvider convertibleCommandNames * @param string $expectedCommandClass - * @param string $commandName */ public function it_can_convert_command_name_notation($expectedCommandClass, string $commandName): void { $command = ['command' => ['name' => $commandName, 'uuid' => 'abcdef', 'payload' => new stdClass]]; - $request = m::mock('Symfony\Component\HttpFoundation\Request') + $request = m::mock(Request::class) ->shouldReceive('getContent')->with()->andReturn(json_encode($command)) ->getMock(); $request->attributes = m::mock() @@ -79,7 +81,7 @@ public function it_sets_uuid(): void { $command = ['command' => ['name' => 'Root:FooBar', 'uuid' => 'abcdef', 'payload' => new stdClass]]; - $request = m::mock('Symfony\Component\HttpFoundation\Request') + $request = m::mock(Request::class) ->shouldReceive('getContent')->with()->andReturn(json_encode($command)) ->getMock(); $request->attributes = m::mock() @@ -101,7 +103,7 @@ public function it_sets_payload(): void { $command = ['command' => ['name' => 'Root:FooBar', 'uuid' => 'abcdef', 'payload' => ['snake_case' => true]]]; - $request = m::mock('Symfony\Component\HttpFoundation\Request') + $request = m::mock(Request::class) ->shouldReceive('getContent')->with()->andReturn(json_encode($command)) ->getMock(); $request->attributes = m::mock() @@ -112,7 +114,7 @@ public function it_sets_payload(): void $converter = new CommandParamConverter(); $converter->apply($request, $configuration); - $spiedPayload = (array) $spiedCommand; + $spiedPayload = (array)$spiedCommand; unset($spiedPayload['UUID']); $this->assertSame(['snakeCase' => true], $spiedPayload, 'Payload mismatch'); } @@ -120,9 +122,7 @@ public function it_sets_payload(): void public function invalidCommandJsonStructures(): array { return array_map( - function ($command): array { - return [json_encode($command)]; - }, + fn($command): array => [json_encode($command)], [ 'Body may not be null' => null, 'Body may not be integer' => 1, @@ -140,7 +140,7 @@ function ($command): array { 'Command payload may not be integer' => ['command' => ['payload' => 1]], 'Command payload may not be float' => ['command' => ['payload' => 1.1]], 'Command payload may not be array' => ['command' => ['payload' => []]], - ] + ], ); } @@ -148,29 +148,31 @@ public function convertibleCommandNames(): array { return [ 'It can convert simple command notation with a namespace' => [ - 'Surfnet\StepupMiddleware\CommandHandlingBundle\Root\Command\FooBarCommand', 'Root:FooBar', + FooBarCommand::class, + 'Root:FooBar', ], 'It can convert simple command notation with a namespace with trailing backslash' => [ - 'Surfnet\StepupMiddleware\CommandHandlingBundle\Root\Command\FooBarCommand', 'Root:FooBar', + FooBarCommand::class, + 'Root:FooBar', ], 'It can convert namespaced command notation with a namespace' => [ - 'Surfnet\StepupMiddleware\CommandHandlingBundle\Root\Command\Ns\QuuxCommand', 'Root:Ns.Quux', + QuuxCommand::class, + 'Root:Ns.Quux', ], ]; } /** - * @param mixed &$spy * @return MatcherAbstract */ - private function spy(&$spy) + private function spy(mixed &$spy) { return m::on( function ($value) use (&$spy): bool { $spy = $value; return true; - } + }, ); } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php index 76cd8040f..39325e12a 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php @@ -25,6 +25,7 @@ use Surfnet\StepupMiddleware\ApiBundle\Exception\BadApiRequestException; use Surfnet\StepupMiddleware\ApiBundle\Request\InstitutionParamConverter; use Symfony\Component\HttpFoundation\ParameterBag; +use Symfony\Component\HttpFoundation\Request; class InstitutionParamConverterTest extends UnitTest { @@ -40,7 +41,7 @@ class InstitutionParamConverterTest extends UnitTest public function setUp(): void { - $this->request = m::mock('Symfony\Component\HttpFoundation\Request'); + $this->request = m::mock(Request::class); $this->paramConverterConfig = m::mock('Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter'); } @@ -83,7 +84,7 @@ public function an_institution_is_set_as_attribute(): void private function mockQuery(bool|string $returnValue) { - $query = m::mock('Symfony\Component\HttpFoundation\ParameterBag'); + $query = m::mock(ParameterBag::class); $query ->shouldReceive('get') ->once() diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/commands.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/commands.php index 284afcd5f..42ccb1d3b 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/commands.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/commands.php @@ -16,15 +16,15 @@ * limitations under the License. */ -namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Root\Command -{ +namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Root\Command { + class FooBarCommand { } } -namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Root\Command\Ns -{ +namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Root\Command\Ns { + class QuuxCommand { } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Response/JsonAuthorizationResponseTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Response/JsonAuthorizationResponseTest.php index 0c2fe18c8..194844f28 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Response/JsonAuthorizationResponseTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Response/JsonAuthorizationResponseTest.php @@ -25,31 +25,36 @@ class JsonAuthorizationResponseTest extends TestCase { - public function test_happy_flow(): void { + public function test_happy_flow(): void + { $response = new JsonAuthorizationResponse(200); - $this->assertEquals('{"code":200}',$response->getContent()); + $this->assertEquals('{"code":200}', $response->getContent()); $this->assertEquals(Response::HTTP_OK, $response->getStatusCode()); } - public function test_happy_flow_error_response(): void { + public function test_happy_flow_error_response(): void + { $response = new JsonAuthorizationResponse(403); - $this->assertEquals('{"code":403}',$response->getContent()); + $this->assertEquals('{"code":403}', $response->getContent()); $this->assertEquals(Response::HTTP_OK, $response->getStatusCode()); } - public function test_happy_flow_error_response_with_error_message(): void { + public function test_happy_flow_error_response_with_error_message(): void + { $response = new JsonAuthorizationResponse(403, ['Not allowed']); - $this->assertEquals('{"code":403,"errors":["Not allowed"]}',$response->getContent()); + $this->assertEquals('{"code":403,"errors":["Not allowed"]}', $response->getContent()); $this->assertEquals(Response::HTTP_OK, $response->getStatusCode()); } - public function test_response_code_can_be_one_of_200_or_403(): void { + public function test_response_code_can_be_one_of_200_or_403(): void + { $this->expectException(InvalidArgumentException::class); $this->expectExceptionMessage('The status code can be either 200 or 403'); new JsonAuthorizationResponse(402); } - public function test_all_errors_should_be_string(): void { + public function test_all_errors_should_be_string(): void + { $this->expectException(InvalidArgumentException::class); $this->expectExceptionMessage('The error messages should all be strings'); new JsonAuthorizationResponse(403, ['Test', false]); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Service/DeprovisionServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Service/DeprovisionServiceTest.php index 694087c42..fd2ec28a7 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Service/DeprovisionServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Service/DeprovisionServiceTest.php @@ -24,7 +24,6 @@ use Psr\Log\LoggerInterface; use Surfnet\Stepup\Identity\EventSourcing\IdentityRepository; use Surfnet\Stepup\Identity\Value\Institution; -use Surfnet\StepupMiddleware\ApiBundle\Exception\UserNotFoundException; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Identity; use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\IdentityRepository as ApiIdentityRepository; use Surfnet\StepupMiddleware\ApiBundle\Service\DeprovisionService; @@ -130,7 +129,7 @@ public function test_deprovision_method_performs_the_right_to_be_forgotten_comma ->andReturn($identity); $this->pipeline ->shouldReceive('process') - ->withArgs(function(ForgetIdentityCommand $command): bool{ + ->withArgs(function (ForgetIdentityCommand $command): bool { $this->assertEquals($command->nameId, 'urn:collab:person:example.com:maynard_keenan'); $this->assertEquals($command->institution, 'tool'); return true; diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/AbstractCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/AbstractCommand.php index 9fb2cf987..cc0430ea4 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/AbstractCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/AbstractCommand.php @@ -37,6 +37,6 @@ abstract class AbstractCommand implements Command public function __toString(): string { - return get_class($this) . '[' . $this->UUID . ']'; + return static::class . '[' . $this->UUID . ']'; } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/ConfigurationCommandHandler.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/ConfigurationCommandHandler.php index 40b42fe39..e4e3a091c 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/ConfigurationCommandHandler.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/ConfigurationCommandHandler.php @@ -26,14 +26,9 @@ class ConfigurationCommandHandler extends SimpleCommandHandler { - private ConfigurationRepository $repository; - - /** - * @param ConfigurationRepository $repository - */ - public function __construct(ConfigurationRepository $repository) - { - $this->repository = $repository; + public function __construct( + private readonly ConfigurationRepository $repository, + ) { } public function handleUpdateConfigurationCommand(UpdateConfigurationCommand $command): void @@ -55,7 +50,7 @@ private function getConfiguration() { try { return $this->repository->load(Configuration::CONFIGURATION_ID); - } catch (AggregateNotFoundException $e) { + } catch (AggregateNotFoundException) { return null; } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/InstitutionConfigurationCommandHandler.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/InstitutionConfigurationCommandHandler.php index 2fccba359..1bcd65ef7 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/InstitutionConfigurationCommandHandler.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/InstitutionConfigurationCommandHandler.php @@ -25,6 +25,7 @@ use Surfnet\Stepup\Configuration\Value\AllowedSecondFactorList; use Surfnet\Stepup\Configuration\Value\ContactInformation; use Surfnet\Stepup\Configuration\Value\Institution; +use Surfnet\Stepup\Configuration\Value\InstitutionAuthorizationOption; use Surfnet\Stepup\Configuration\Value\InstitutionConfigurationId; use Surfnet\Stepup\Configuration\Value\InstitutionRole; use Surfnet\Stepup\Configuration\Value\Location; @@ -36,7 +37,6 @@ use Surfnet\Stepup\Configuration\Value\ShowRaaContactInformationOption; use Surfnet\Stepup\Configuration\Value\SsoOn2faOption; use Surfnet\Stepup\Configuration\Value\UseRaLocationsOption; -use Surfnet\Stepup\Configuration\Value\InstitutionAuthorizationOption; use Surfnet\Stepup\Configuration\Value\VerifyEmailOption; use Surfnet\StepupBundle\Value\SecondFactorType; use Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\Command\AddRaLocationCommand; @@ -51,14 +51,8 @@ */ class InstitutionConfigurationCommandHandler extends SimpleCommandHandler { - /** - * @var RepositoryInterface - */ - private RepositoryInterface $repository; - - public function __construct(RepositoryInterface $repository) + public function __construct(private readonly RepositoryInterface $repository) { - $this->repository = $repository; } public function handleCreateInstitutionConfigurationCommand(CreateInstitutionConfigurationCommand $command): void @@ -69,11 +63,11 @@ public function handleCreateInstitutionConfigurationCommand(CreateInstitutionCon try { /** @var InstitutionConfiguration $institutionConfiguration */ $institutionConfiguration = $this->repository->load( - $institutionConfigurationId->getInstitutionConfigurationId() + $institutionConfigurationId->getInstitutionConfigurationId(), ); $institutionConfiguration->rebuild(); - } catch (AggregateNotFoundException $exception) { + } catch (AggregateNotFoundException) { $institutionConfiguration = InstitutionConfiguration::create($institutionConfigurationId, $institution); } @@ -81,45 +75,52 @@ public function handleCreateInstitutionConfigurationCommand(CreateInstitutionCon } public function handleReconfigureInstitutionConfigurationOptionsCommand( - ReconfigureInstitutionConfigurationOptionsCommand $command + ReconfigureInstitutionConfigurationOptionsCommand $command, ): void { $institution = new Institution($command->institution); - $allowedSecondFactors = array_map(function ($allowedSecondFactor): SecondFactorType { - return new SecondFactorType($allowedSecondFactor); - }, $command->allowedSecondFactors); + $allowedSecondFactors = array_map( + fn($allowedSecondFactor): SecondFactorType => new SecondFactorType($allowedSecondFactor), + $command->allowedSecondFactors, + ); $institutionConfiguration = $this->loadInstitutionConfigurationFor($institution); $institutionConfiguration->configureUseRaLocationsOption( - new UseRaLocationsOption($command->useRaLocationsOption) + new UseRaLocationsOption($command->useRaLocationsOption), ); $institutionConfiguration->configureVerifyEmailOption( - new VerifyEmailOption($command->verifyEmailOption) + new VerifyEmailOption($command->verifyEmailOption), ); $institutionConfiguration->configureNumberOfTokensPerIdentityOption( - new NumberOfTokensPerIdentityOption($command->numberOfTokensPerIdentityOption) + new NumberOfTokensPerIdentityOption($command->numberOfTokensPerIdentityOption), ); $institutionConfiguration->configureShowRaaContactInformationOption( - new ShowRaaContactInformationOption($command->showRaaContactInformationOption) + new ShowRaaContactInformationOption($command->showRaaContactInformationOption), ); // Configure the authorization options on the aggregate - $institutionConfiguration->updateUseRaOption(InstitutionAuthorizationOption::fromInstitutionConfig( - InstitutionRole::useRa(), - $command->useRaOption - )); - $institutionConfiguration->updateUseRaaOption(InstitutionAuthorizationOption::fromInstitutionConfig( - InstitutionRole::useRaa(), - $command->useRaaOption - )); - $institutionConfiguration->updateSelectRaaOption(InstitutionAuthorizationOption::fromInstitutionConfig( - InstitutionRole::selectRaa(), - $command->selectRaaOption - )); + $institutionConfiguration->updateUseRaOption( + InstitutionAuthorizationOption::fromInstitutionConfig( + InstitutionRole::useRa(), + $command->useRaOption, + ), + ); + $institutionConfiguration->updateUseRaaOption( + InstitutionAuthorizationOption::fromInstitutionConfig( + InstitutionRole::useRaa(), + $command->useRaaOption, + ), + ); + $institutionConfiguration->updateSelectRaaOption( + InstitutionAuthorizationOption::fromInstitutionConfig( + InstitutionRole::selectRaa(), + $command->selectRaaOption, + ), + ); $institutionConfiguration->updateAllowedSecondFactorList( - AllowedSecondFactorList::ofTypes($allowedSecondFactors) + AllowedSecondFactorList::ofTypes($allowedSecondFactors), ); // Handle optional options @@ -131,7 +132,7 @@ public function handleReconfigureInstitutionConfigurationOptionsCommand( $satOption = $command->selfAssertedTokensOption ?? SelfAssertedTokensOption::getDefault()->isEnabled(); $institutionConfiguration->configureSelfAssertedTokensOption( - new SelfAssertedTokensOption($satOption) + new SelfAssertedTokensOption($satOption), ); $this->repository->save($institutionConfiguration); @@ -146,7 +147,7 @@ public function handleAddRaLocationCommand(AddRaLocationCommand $command): void new RaLocationId($command->raLocationId), new RaLocationName($command->raLocationName), new Location($command->location), - new ContactInformation($command->contactInformation) + new ContactInformation($command->contactInformation), ); $this->repository->save($institutionConfiguration); @@ -161,7 +162,7 @@ public function handleChangeRaLocationCommand(ChangeRaLocationCommand $command): new RaLocationId($command->raLocationId), new RaLocationName($command->raLocationName), new Location($command->location), - new ContactInformation($command->contactInformation) + new ContactInformation($command->contactInformation), ); $this->repository->save($institutionConfiguration); @@ -178,13 +179,13 @@ public function handleRemoveRaLocationCommand(RemoveRaLocationCommand $command): } public function handleRemoveInstitutionConfigurationByUnnormalizedIdCommand( - RemoveInstitutionConfigurationByUnnormalizedIdCommand $command + RemoveInstitutionConfigurationByUnnormalizedIdCommand $command, ): void { $institution = new Institution($command->institution); $institutionConfigurationId = InstitutionConfigurationId::from($institution); $institutionConfiguration = $this->repository->load( - $institutionConfigurationId->getInstitutionConfigurationId() + $institutionConfigurationId->getInstitutionConfigurationId(), ); $institutionConfiguration->destroy(); @@ -192,22 +193,21 @@ public function handleRemoveInstitutionConfigurationByUnnormalizedIdCommand( } /** + * @return InstitutionConfiguration * @deprecated Should be used until existing institution configurations have been migrated to using normalized ids * - * @param Institution $institution - * @return InstitutionConfiguration */ private function loadInstitutionConfigurationFor(Institution $institution) { try { $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); $institutionConfiguration = $this->repository->load( - $institutionConfigurationId->getInstitutionConfigurationId() + $institutionConfigurationId->getInstitutionConfigurationId(), ); - } catch (AggregateNotFoundException $exception) { + } catch (AggregateNotFoundException) { $institutionConfigurationId = InstitutionConfigurationId::from($institution); $institutionConfiguration = $this->repository->load( - $institutionConfigurationId->getInstitutionConfigurationId() + $institutionConfigurationId->getInstitutionConfigurationId(), ); } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Processor/InstitutionConfigurationProcessor.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Processor/InstitutionConfigurationProcessor.php index 9cd2a8f43..bbdeac85a 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Processor/InstitutionConfigurationProcessor.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Processor/InstitutionConfigurationProcessor.php @@ -31,23 +31,14 @@ final class InstitutionConfigurationProcessor extends Processor { - private ConfiguredInstitutionRepository $configuredInstitutionRepository; - - private ContainerInterface $container; - /** * The container needs to be called during runtime in order to prevent a circular reference * during container compilation. - * - * @param ConfiguredInstitutionRepository $configuredInstitutionRepository - * @param ContainerInterface $container */ public function __construct( - ConfiguredInstitutionRepository $configuredInstitutionRepository, - ContainerInterface $container + private readonly ConfiguredInstitutionRepository $configuredInstitutionRepository, + private readonly ContainerInterface $container, ) { - $this->configuredInstitutionRepository = $configuredInstitutionRepository; - $this->container = $container; } public function handleIdentityCreatedEvent(IdentityCreatedEvent $event): void @@ -100,13 +91,10 @@ public function handleInstitutionsAddedToWhitelistEvent(InstitutionsAddedToWhite } } - /** - * @param Institution $institution - */ private function createConfigurationFor(Institution $institution): void { - $command = new CreateInstitutionConfigurationCommand(); - $command->UUID = (string) Uuid::uuid4(); + $command = new CreateInstitutionConfigurationCommand(); + $command->UUID = (string)Uuid::uuid4(); $command->institution = $institution->getInstitution(); $this->container->get('pipeline')->process($command); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/CompilerPass/AddEventBusListenersCompilerPass.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/CompilerPass/AddEventBusListenersCompilerPass.php index 517db3dd1..f6c2161ef 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/CompilerPass/AddEventBusListenersCompilerPass.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/CompilerPass/AddEventBusListenersCompilerPass.php @@ -32,7 +32,10 @@ public function process(ContainerBuilder $container): void // When replaying events, certain listeners should not be allowed to run again, for instance // when they are no longer relevant at the time of replaying (i.e. sending emails) - if (!in_array($container->getParameter('kernel.environment'), ['dev_event_replay', 'prod_event_replay', 'smoketest_event_replay'])) { + if (!in_array( + $container->getParameter('kernel.environment'), + ['dev_event_replay', 'prod_event_replay', 'smoketest_event_replay'], + )) { foreach (array_keys($eventListenerDefinitions) as $serviceId) { $definition->addMethodCall('subscribe', [new Reference($serviceId)]); } @@ -43,10 +46,12 @@ public function process(ContainerBuilder $container): void foreach ($eventListenerDefinitions as $serviceId => $tags) { foreach ($tags as $attributes) { if (!isset($attributes['disable_for_replay'])) { - throw new LogicException(sprintf( - 'Cannot replay events: Expected option "disable_for_replay" to be set for service id "%s"', - $serviceId - )); + throw new LogicException( + sprintf( + 'Cannot replay events: Expected option "disable_for_replay" to be set for service id "%s"', + $serviceId, + ), + ); } if ($attributes['disable_for_replay']) { diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/CompilerPass/AddPipelineStagesCompilerPass.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/CompilerPass/AddPipelineStagesCompilerPass.php index 5a7d23ab7..f1f95c04c 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/CompilerPass/AddPipelineStagesCompilerPass.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/CompilerPass/AddPipelineStagesCompilerPass.php @@ -39,13 +39,15 @@ public function process(ContainerBuilder $container): void foreach ($stageDefinitions as $stageServiceId => $tagAttributes) { $priority = $tagAttributes[0]['priority']; if (isset($prioritized[$priority])) { - throw new InvalidConfigurationException(sprintf( - 'Cannot add stage with service_id "%s" to StagedPipeline at priority "%d", Stage with service_id ' - . '"%s" is already registered at that position', - $stageServiceId, - $tagAttributes['priority'], - (string) $prioritized[$priority] - )); + throw new InvalidConfigurationException( + sprintf( + 'Cannot add stage with service_id "%s" to StagedPipeline at priority "%d", Stage with service_id ' + . '"%s" is already registered at that position', + $stageServiceId, + $tagAttributes['priority'], + (string)$prioritized[$priority], + ), + ); } $prioritized[$priority] = new Reference($stageServiceId); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/Configuration.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/Configuration.php index 64c916f20..b0019bee2 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/Configuration.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/Configuration.php @@ -29,59 +29,53 @@ public function getConfigTreeBuilder(): TreeBuilder $rootNode = $treeBuilder->getRootNode(); $rootNode ->children() - ->scalarNode('self_service_email_verification_url_template') - ->isRequired() - ->info('Configures the URL where registrants can verify e-mail address ownership.') - ->validate() - ->ifTrue(function ($url): bool { - $parts = parse_url($url); + ->scalarNode('self_service_email_verification_url_template') + ->isRequired() + ->info('Configures the URL where registrants can verify e-mail address ownership.') + ->validate() + ->ifTrue(function ($url): bool { + $parts = parse_url($url); - return empty($parts['scheme']) || empty($parts['host']) || empty($parts['path']); - }) - ->thenInvalid( - 'Invalid Self-Service e-mail verification URL template: ' . - "must be full Self-Service URL with scheme, host and path, '%s' given." . - "The URL should contain a '{identityId}', '{secondFactorId}' and '{nonce}' parameter." - ) - ->end() - ->end() - ->scalarNode('self_service_url') - ->isRequired() - ->info('Configures the URL for Self Service.') - ->validate() - ->ifTrue( - function ($url): bool { - return filter_var($url, FILTER_VALIDATE_URL) === false; - } - ) - ->thenInvalid('self_service_url must be a valid url') - ->end() - ->end() - ->arrayNode('email_sender') - ->isRequired() - ->info('Configures the sender used for all outgoing e-mail messages') - ->children() - ->scalarNode('name') - ->isRequired() - ->validate() - ->ifTrue(function ($name): bool { - return !is_string($name) || empty($name); - }) - ->thenInvalid("E-mail sender name must be non-empty string, got '%s'") - ->end() - ->end() - ->scalarNode('email') - ->isRequired() - ->validate() - ->ifTrue(function ($name): bool { - return !is_string($name) || empty($name); - }) - ->thenInvalid("E-mail sender e-mail must be non-empty string, got '%s'") - ->end() - ->end() - ->end() - ->end() - ->scalarNode('email_fallback_locale')->isRequired()->end() + return empty($parts['scheme']) || empty($parts['host']) || empty($parts['path']); + }) + ->thenInvalid( + 'Invalid Self-Service e-mail verification URL template: ' . + "must be full Self-Service URL with scheme, host and path, '%s' given." . + "The URL should contain a '{identityId}', '{secondFactorId}' and '{nonce}' parameter.", + ) + ->end() + ->end() + ->scalarNode('self_service_url') + ->isRequired() + ->info('Configures the URL for Self Service.') + ->validate() + ->ifTrue( + fn($url): bool => filter_var($url, FILTER_VALIDATE_URL) === false, + ) + ->thenInvalid('self_service_url must be a valid url') + ->end() + ->end() + ->arrayNode('email_sender') + ->isRequired() + ->info('Configures the sender used for all outgoing e-mail messages') + ->children() + ->scalarNode('name') + ->isRequired() + ->validate() + ->ifTrue(fn($name): bool => !is_string($name) || empty($name)) + ->thenInvalid("E-mail sender name must be non-empty string, got '%s'") + ->end() + ->end() + ->scalarNode('email') + ->isRequired() + ->validate() + ->ifTrue(fn($name): bool => !is_string($name) || empty($name)) + ->thenInvalid("E-mail sender e-mail must be non-empty string, got '%s'") + ->end() + ->end() + ->end() + ->end() + ->scalarNode('email_fallback_locale')->isRequired()->end() ->end(); return $treeBuilder; diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/SurfnetStepupMiddlewareCommandHandlingExtension.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/SurfnetStepupMiddlewareCommandHandlingExtension.php index 402ae7ba0..ba0f37992 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/SurfnetStepupMiddlewareCommandHandlingExtension.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/SurfnetStepupMiddlewareCommandHandlingExtension.php @@ -30,7 +30,7 @@ public function load(array $config, ContainerBuilder $container): void { $loader = new YamlFileLoader( $container, - new FileLocator(__DIR__ . '/../Resources/config') + new FileLocator(__DIR__ . '/../Resources/config'), ); $loader->load('command_handlers.yml'); $loader->load('event_sourcing.yml'); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Dto/VettingLocation.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Dto/VettingLocation.php index 2de1829dd..dcc458642 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Dto/VettingLocation.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Dto/VettingLocation.php @@ -21,25 +21,11 @@ class VettingLocation { /** - * @var string + * @param string $name + * @param string $location + * @param string $contactInformation */ - public $name; - - /** - * @var string - */ - public $location; - - /** - * @var string - */ - public $contactInformation; - - - public function __construct($name, $location, $contactInformation) + public function __construct(public $name, public $location, public $contactInformation) { - $this->name = $name; - $this->location = $location; - $this->contactInformation = $contactInformation; } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php index ca8daafd3..426819c6e 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php @@ -42,11 +42,9 @@ class BufferedEventBus implements EventBusInterface */ private bool $isFlushing = false; - private EntityManagerInterface $entityManager; - - public function __construct(EntityManagerInterface $entityManager) - { - $this->entityManager = $entityManager; + public function __construct( + private readonly EntityManagerInterface $entityManager, + ) { } public function subscribe(EventListenerInterface $eventListener): void diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventListener/ProcessingAbortedExceptionListener.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventListener/ProcessingAbortedExceptionListener.php index 7b8811bd5..0d4b12188 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventListener/ProcessingAbortedExceptionListener.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventListener/ProcessingAbortedExceptionListener.php @@ -40,12 +40,14 @@ public function onKernelException(ExceptionEvent $event): void return; } - $event->setResponse(new JsonResponse( - [ - 'exception' => get_class($throwable), - 'errors' => $throwable->getErrors(), - ], - Response::HTTP_BAD_REQUEST - )); + $event->setResponse( + new JsonResponse( + [ + 'exception' => $throwable::class, + 'errors' => $throwable->getErrors(), + ], + Response::HTTP_BAD_REQUEST, + ), + ); } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventSourcing/MetadataEnrichingEventStreamDecorator.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventSourcing/MetadataEnrichingEventStreamDecorator.php index 7be81c86a..15d3f0ed7 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventSourcing/MetadataEnrichingEventStreamDecorator.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventSourcing/MetadataEnrichingEventStreamDecorator.php @@ -36,7 +36,7 @@ public function setMetadata(Metadata $metadata = null): void public function decorateForWrite( $aggregateType, $aggregateIdentifier, - DomainEventStream $eventStream + DomainEventStream $eventStream, ): DomainEventStream { if (!$this->metadata instanceof Metadata) { return $eventStream; @@ -48,9 +48,9 @@ public function decorateForWrite( /** @var DomainMessage $domainMessage */ $domainMessages[] = $domainMessage->andMetadata( new BroadwayMetadata([ - 'actorId' => $this->metadata->actorId, - 'actorInstitution' => $this->metadata->actorInstitution - ]) + 'actorId' => $this->metadata->actorId, + 'actorInstitution' => $this->metadata->actorInstitution, + ]), ); } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Exception/InvalidArgumentException.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Exception/InvalidArgumentException.php index b927c6d10..9aceca79b 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Exception/InvalidArgumentException.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Exception/InvalidArgumentException.php @@ -27,13 +27,13 @@ class InvalidArgumentException extends \InvalidArgumentException implements Exce * * @return self */ - public static function invalidType($expected, $parameterName, $parameter): self + public static function invalidType($expected, $parameterName, mixed $parameter): self { $message = sprintf( 'Invalid argument type: "%s" expected, "%s" given for "%s"', $expected, - is_object($parameter) ? get_class($parameter) : gettype($parameter), - $parameterName + get_debug_type($parameter), + $parameterName, ); return new self($message); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SaveVettingTypeHintCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SaveVettingTypeHintCommand.php index 581cab2ba..8ead1d738 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SaveVettingTypeHintCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SaveVettingTypeHintCommand.php @@ -49,7 +49,7 @@ class SaveVettingTypeHintCommand extends AbstractCommand implements RaExecutable #[Assert\Type(type: 'array')] #[Assert\All([ - new Assert\Type("string") + new Assert\Type("string"), ])] public array $hints; diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SelfVetSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SelfVetSecondFactorCommand.php index debdb3a37..8b14c5ad3 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SelfVetSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SelfVetSecondFactorCommand.php @@ -19,7 +19,6 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\AbstractCommand; -use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\RaExecutable; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\SelfAsserted; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\SelfServiceExecutable; use Symfony\Component\Validator\Constraints as Assert; diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/Exception/DuplicateIdentityException.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/Exception/DuplicateIdentityException.php index 758bb14ae..1716f2637 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/Exception/DuplicateIdentityException.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/Exception/DuplicateIdentityException.php @@ -30,8 +30,6 @@ public function __construct($message = "", $code = 0, Exception $previous = null } /** - * @param NameId $nameId - * @param Institution $institution * * @return DuplicateIdentityException */ @@ -41,8 +39,8 @@ public static function forBootstrappingWithYubikeySecondFactor(NameId $nameId, I sprintf( 'Trying to bootstrap a duplicate identity: an identity with name ID "%s" from institution "%s" already exists.', $nameId->getNameId(), - $institution->getInstitution() - ) + $institution->getInstitution(), + ), ); } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/IdentityCommandHandler.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/IdentityCommandHandler.php index e96ef2c17..a2a77123b 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/IdentityCommandHandler.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/IdentityCommandHandler.php @@ -83,54 +83,21 @@ */ class IdentityCommandHandler extends SimpleCommandHandler { - /** - * @var \Surfnet\Stepup\Identity\EventSourcing\IdentityRepository - */ - private RepositoryInterface $eventSourcedRepository; - - private IdentityRepository $identityProjectionRepository; - - private ConfigurableSettings $configurableSettings; - - private AllowedSecondFactorListService $allowedSecondFactorListService; - - private SecondFactorTypeService $secondFactorTypeService; - - private InstitutionConfigurationOptionsService $institutionConfigurationOptionsService; - - private LoaResolutionService $loaResolutionService; - - private SecondFactorProvePossessionHelper $provePossessionHelper; - - private RecoveryTokenSecretHelper $recoveryTokenSecretHelper; - - private RegistrationMailService $registrationMailService; - /** * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function __construct( - RepositoryInterface $eventSourcedRepository, - IdentityRepository $identityProjectionRepository, - ConfigurableSettings $configurableSettings, - AllowedSecondFactorListService $allowedSecondFactorListService, - SecondFactorTypeService $secondFactorTypeService, - SecondFactorProvePossessionHelper $provePossessionHelper, - InstitutionConfigurationOptionsService $institutionConfigurationOptionsService, - LoaResolutionService $loaResolutionService, - RecoveryTokenSecretHelper $recoveryTokenSecretHelper, - RegistrationMailService $registrationMailService + private readonly RepositoryInterface $eventSourcedRepository, + private readonly IdentityRepository $identityProjectionRepository, + private readonly ConfigurableSettings $configurableSettings, + private readonly AllowedSecondFactorListService $allowedSecondFactorListService, + private readonly SecondFactorTypeService $secondFactorTypeService, + private readonly SecondFactorProvePossessionHelper $provePossessionHelper, + private readonly InstitutionConfigurationOptionsService $institutionConfigurationOptionsService, + private readonly LoaResolutionService $loaResolutionService, + private readonly RecoveryTokenSecretHelper $recoveryTokenSecretHelper, + private readonly RegistrationMailService $registrationMailService, ) { - $this->eventSourcedRepository = $eventSourcedRepository; - $this->identityProjectionRepository = $identityProjectionRepository; - $this->configurableSettings = $configurableSettings; - $this->allowedSecondFactorListService = $allowedSecondFactorListService; - $this->secondFactorTypeService = $secondFactorTypeService; - $this->provePossessionHelper = $provePossessionHelper; - $this->institutionConfigurationOptionsService = $institutionConfigurationOptionsService; - $this->loaResolutionService = $loaResolutionService; - $this->recoveryTokenSecretHelper = $recoveryTokenSecretHelper; - $this->registrationMailService = $registrationMailService; } public function handleCreateIdentityCommand(CreateIdentityCommand $command): void @@ -144,7 +111,7 @@ public function handleCreateIdentityCommand(CreateIdentityCommand $command): voi new NameId($command->nameId), new CommonName($command->commonName), new Email($command->email), - $preferredLocale + $preferredLocale, ); $this->eventSourcedRepository->save($identity); @@ -162,7 +129,7 @@ public function handleUpdateIdentityCommand(UpdateIdentityCommand $command): voi } public function handleBootstrapIdentityWithYubikeySecondFactorCommand( - BootstrapIdentityWithYubikeySecondFactorCommand $command + BootstrapIdentityWithYubikeySecondFactorCommand $command, ): void { $preferredLocale = new Locale($command->preferredLocale); $this->assertIsValidLocale($preferredLocale); @@ -180,11 +147,11 @@ public function handleBootstrapIdentityWithYubikeySecondFactorCommand( $nameId, new CommonName($command->commonName), new Email($command->email), - $preferredLocale + $preferredLocale, ); $configurationInstitution = new ConfigurationInstitution( - (string) $identity->getInstitution() + (string)$identity->getInstitution(), ); $tokenCount = $this->institutionConfigurationOptionsService->getMaxNumberOfTokensFor($configurationInstitution); @@ -192,7 +159,7 @@ public function handleBootstrapIdentityWithYubikeySecondFactorCommand( $identity->bootstrapYubikeySecondFactor( new SecondFactorId($command->secondFactorId), new YubikeyPublicId($command->yubikeyPublicId), - $tokenCount + $tokenCount, ); $this->eventSourcedRepository->save($identity); @@ -206,7 +173,7 @@ public function handleProveYubikeyPossessionCommand(ProveYubikeyPossessionComman $this->assertSecondFactorIsAllowedFor(new SecondFactorType('yubikey'), $identity->getInstitution()); $configurationInstitution = new ConfigurationInstitution( - (string) $identity->getInstitution() + (string)$identity->getInstitution(), ); $tokenCount = $this->institutionConfigurationOptionsService->getMaxNumberOfTokensFor($configurationInstitution); @@ -215,15 +182,12 @@ public function handleProveYubikeyPossessionCommand(ProveYubikeyPossessionComman new YubikeyPublicId($command->yubikeyPublicId), $this->emailVerificationIsRequired($identity), $this->configurableSettings->createNewEmailVerificationWindow(), - $tokenCount + $tokenCount, ); $this->eventSourcedRepository->save($identity); } - /** - * @param ProvePhonePossessionCommand $command - */ public function handleProvePhonePossessionCommand(ProvePhonePossessionCommand $command): void { /** @var IdentityApi $identity */ @@ -232,7 +196,7 @@ public function handleProvePhonePossessionCommand(ProvePhonePossessionCommand $c $this->assertSecondFactorIsAllowedFor(new SecondFactorType('sms'), $identity->getInstitution()); $configurationInstitution = new ConfigurationInstitution( - (string) $identity->getInstitution() + (string)$identity->getInstitution(), ); $tokenCount = $this->institutionConfigurationOptionsService->getMaxNumberOfTokensFor($configurationInstitution); @@ -242,15 +206,12 @@ public function handleProvePhonePossessionCommand(ProvePhonePossessionCommand $c new PhoneNumber($command->phoneNumber), $this->emailVerificationIsRequired($identity), $this->configurableSettings->createNewEmailVerificationWindow(), - $tokenCount + $tokenCount, ); $this->eventSourcedRepository->save($identity); } - /** - * @param ProveGssfPossessionCommand $command - */ public function handleProveGssfPossessionCommand(ProveGssfPossessionCommand $command): void { /** @var IdentityApi $identity */ @@ -261,7 +222,7 @@ public function handleProveGssfPossessionCommand(ProveGssfPossessionCommand $com $this->assertSecondFactorIsAllowedFor(new SecondFactorType($secondFactorType), $identity->getInstitution()); $configurationInstitution = new ConfigurationInstitution( - (string) $identity->getInstitution() + (string)$identity->getInstitution(), ); $tokenCount = $this->institutionConfigurationOptionsService->getMaxNumberOfTokensFor($configurationInstitution); @@ -272,7 +233,7 @@ public function handleProveGssfPossessionCommand(ProveGssfPossessionCommand $com new GssfId($command->gssfId), $this->emailVerificationIsRequired($identity), $this->configurableSettings->createNewEmailVerificationWindow(), - $tokenCount + $tokenCount, ); $this->eventSourcedRepository->save($identity); @@ -286,7 +247,7 @@ public function handleProveU2fDevicePossessionCommand(ProveU2fDevicePossessionCo $this->assertSecondFactorIsAllowedFor(new SecondFactorType('u2f'), $identity->getInstitution()); $configurationInstitution = new ConfigurationInstitution( - (string) $identity->getInstitution() + (string)$identity->getInstitution(), ); $tokenCount = $this->institutionConfigurationOptionsService->getMaxNumberOfTokensFor($configurationInstitution); @@ -296,15 +257,12 @@ public function handleProveU2fDevicePossessionCommand(ProveU2fDevicePossessionCo new U2fKeyHandle($command->keyHandle), $this->emailVerificationIsRequired($identity), $this->configurableSettings->createNewEmailVerificationWindow(), - $tokenCount + $tokenCount, ); $this->eventSourcedRepository->save($identity); } - /** - * @param VerifyEmailCommand $command - */ public function handleVerifyEmailCommand(VerifyEmailCommand $command): void { /** @var IdentityApi $identity */ @@ -316,7 +274,7 @@ public function handleVerifyEmailCommand(VerifyEmailCommand $command): void } - public function handleProvePhoneRecoveryTokenPossessionCommand(ProvePhoneRecoveryTokenPossessionCommand $command): void + public function handleProvePhoneRecoveryTokenPossessionCommand(ProvePhoneRecoveryTokenPossessionCommand $command,): void { /** @var IdentityApi $identity */ $identity = $this->eventSourcedRepository->load(new IdentityId($command->identityId)); @@ -324,14 +282,15 @@ public function handleProvePhoneRecoveryTokenPossessionCommand(ProvePhoneRecover $this->assertSelfAssertedTokensEnabled($identity->getInstitution()); $identity->provePossessionOfPhoneRecoveryToken( new RecoveryTokenId($command->recoveryTokenId), - new PhoneNumber($command->phoneNumber) + new PhoneNumber($command->phoneNumber), ); $this->eventSourcedRepository->save($identity); } - public function handlePromiseSafeStoreSecretTokenPossessionCommand(PromiseSafeStoreSecretTokenPossessionCommand $command): void - { + public function handlePromiseSafeStoreSecretTokenPossessionCommand( + PromiseSafeStoreSecretTokenPossessionCommand $command, + ): void { /** @var IdentityApi $identity */ $identity = $this->eventSourcedRepository->load(new IdentityId($command->identityId)); @@ -339,7 +298,7 @@ public function handlePromiseSafeStoreSecretTokenPossessionCommand(PromiseSafeSt $secret = $this->recoveryTokenSecretHelper->hash(new UnhashedSecret($command->secret)); $identity->promisePossessionOfSafeStoreSecretRecoveryToken( new RecoveryTokenId($command->recoveryTokenId), - new SafeStore($secret) + new SafeStore($secret), ); $this->eventSourcedRepository->save($identity); @@ -355,7 +314,7 @@ public function handleVetSecondFactorCommand(VetSecondFactorCommand $command): v $secondFactorType = new SecondFactorType($command->secondFactorType); $secondFactorIdentifier = SecondFactorIdentifierFactory::forType( $secondFactorType, - $command->secondFactorIdentifier + $command->secondFactorIdentifier, ); $authority->vetSecondFactor( @@ -368,26 +327,26 @@ public function handleVetSecondFactorCommand(VetSecondFactorCommand $command): v $command->identityVerified, $this->secondFactorTypeService, $this->provePossessionHelper, - $command->provePossessionSkipped + $command->provePossessionSkipped, ); $this->eventSourcedRepository->save($authority); $this->eventSourcedRepository->save($registrant); } - public function handleRegisterSelfAssertedSecondFactorCommand(RegisterSelfAssertedSecondFactorCommand $command): void + public function handleRegisterSelfAssertedSecondFactorCommand(RegisterSelfAssertedSecondFactorCommand $command,): void { /** @var IdentityApi $identity */ $identity = $this->eventSourcedRepository->load(new IdentityId($command->identityId)); $secondFactorIdentifier = SecondFactorIdentifierFactory::forType( new SecondFactorType($command->secondFactorType), - $command->secondFactorIdentifier + $command->secondFactorIdentifier, ); $identity->registerSelfAssertedSecondFactor( $secondFactorIdentifier, $this->secondFactorTypeService, - new RecoveryTokenId($command->authoringRecoveryTokenId) + new RecoveryTokenId($command->authoringRecoveryTokenId), ); $this->eventSourcedRepository->save($identity); @@ -399,7 +358,7 @@ public function handleSelfVetSecondFactorCommand(SelfVetSecondFactorCommand $com $identity = $this->eventSourcedRepository->load(new IdentityId($command->identityId)); $secondFactorIdentifier = SecondFactorIdentifierFactory::forType( new SecondFactorType($command->secondFactorType), - $command->secondFactorId + $command->secondFactorId, ); $loaIdentifier = null; @@ -423,8 +382,8 @@ public function handleSelfVetSecondFactorCommand(SelfVetSecondFactorCommand $com throw new UnknownLoaException( sprintf( 'Authorizing second factor with LoA %s can not be resolved', - $command->authoringSecondFactorLoa - ) + $command->authoringSecondFactorLoa, + ), ); } @@ -432,7 +391,7 @@ public function handleSelfVetSecondFactorCommand(SelfVetSecondFactorCommand $com $loa, $command->registrationCode, $secondFactorIdentifier, - $this->secondFactorTypeService + $this->secondFactorTypeService, ); $this->eventSourcedRepository->save($identity); } @@ -450,7 +409,7 @@ public function handleMigrateVettedSecondFactorCommand(MigrateVettedSecondFactor // Determine the maximum number of allowed tokens for the institution $configurationInstitution = new ConfigurationInstitution( - (string) $targetIdentity->getInstitution() + (string)$targetIdentity->getInstitution(), ); $tokenCount = $this->institutionConfigurationOptionsService->getMaxNumberOfTokensFor($configurationInstitution); @@ -459,7 +418,7 @@ public function handleMigrateVettedSecondFactorCommand(MigrateVettedSecondFactor $sourceIdentity, new SecondFactorId($command->sourceSecondFactorId), $command->targetSecondFactorId, - $tokenCount + $tokenCount, ); $this->eventSourcedRepository->save($targetIdentity); } @@ -479,7 +438,7 @@ public function handleRevokeRegistrantsSecondFactorCommand(RevokeRegistrantsSeco $identity = $this->eventSourcedRepository->load(new IdentityId($command->identityId)); $identity->complyWithSecondFactorRevocation( new SecondFactorId($command->secondFactorId), - new IdentityId($command->authorityId) + new IdentityId($command->authorityId), ); $this->eventSourcedRepository->save($identity); @@ -500,13 +459,13 @@ public function handleRevokeRegistrantsRecoveryTokenCommand(RevokeRegistrantsRec $identity = $this->eventSourcedRepository->load(new IdentityId($command->identityId)); $identity->complyWithRecoveryTokenRevocation( new RecoveryTokenId($command->recoveryTokenId), - new IdentityId($command->authorityId) + new IdentityId($command->authorityId), ); $this->eventSourcedRepository->save($identity); } - public function handleSendSecondFactorRegistrationEmailCommand(SendSecondFactorRegistrationEmailCommand $command): void + public function handleSendSecondFactorRegistrationEmailCommand(SendSecondFactorRegistrationEmailCommand $command,): void { $this->registrationMailService->send($command->identityId, $command->secondFactorId); } @@ -523,14 +482,11 @@ public function handleExpressLocalePreferenceCommand(ExpressLocalePreferenceComm $this->eventSourcedRepository->save($identity); } - /** - * @param Locale $locale - */ private function assertIsValidLocale(Locale $locale): void { if (!$this->configurableSettings->isSupportedLocale($locale)) { throw new UnsupportedLocaleException( - sprintf('Given locale "%s" is not a supported locale', (string) $locale) + sprintf('Given locale "%s" is not a supported locale', (string)$locale), ); } } @@ -538,22 +494,24 @@ private function assertIsValidLocale(Locale $locale): void private function assertSecondFactorIsAllowedFor(SecondFactorType $secondFactor, Institution $institution): void { $allowedSecondFactorList = $this->allowedSecondFactorListService->getAllowedSecondFactorListFor( - new ConfigurationInstitution($institution->getInstitution()) + new ConfigurationInstitution($institution->getInstitution()), ); if (!$allowedSecondFactorList->allows($secondFactor)) { - throw new SecondFactorNotAllowedException(sprintf( - 'Institution "%s" does not support second factor "%s"', - $institution->getInstitution(), - $secondFactor->getSecondFactorType() - )); + throw new SecondFactorNotAllowedException( + sprintf( + 'Institution "%s" does not support second factor "%s"', + $institution->getInstitution(), + $secondFactor->getSecondFactorType(), + ), + ); } } public function assertSelfAssertedTokensEnabled(Institution $institution): void { $configurationInstitution = new ConfigurationInstitution( - (string) $institution + (string)$institution, ); $institutionConfiguration = $this->institutionConfigurationOptionsService @@ -562,20 +520,19 @@ public function assertSelfAssertedTokensEnabled(Institution $institution): void throw new RuntimeException( sprintf( 'Registration of self-asserted tokens is not allowed for this institution "%s".', - (string) $institution - ) + (string)$institution, + ), ); } } /** - * @param IdentityApi $identity * @return bool */ private function emailVerificationIsRequired(IdentityApi $identity) { $institution = new ConfigurationInstitution( - (string) $identity->getInstitution() + (string)$identity->getInstitution(), ); $configuration = $this->institutionConfigurationOptionsService diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/RegistrationAuthorityCommandHandler.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/RegistrationAuthorityCommandHandler.php index e4923c128..136952a54 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/RegistrationAuthorityCommandHandler.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/RegistrationAuthorityCommandHandler.php @@ -23,10 +23,9 @@ use Broadway\Repository\Repository as RepositoryInterface; use Surfnet\Stepup\Configuration\EventSourcing\InstitutionConfigurationRepository; use Surfnet\Stepup\Configuration\InstitutionConfiguration; -use Surfnet\Stepup\Configuration\Value\InstitutionConfigurationId; use Surfnet\Stepup\Configuration\Value\Institution as ConfigurationInstitution; +use Surfnet\Stepup\Configuration\Value\InstitutionConfigurationId; use Surfnet\Stepup\Identity\Api\Identity; -use Surfnet\Stepup\Identity\EventSourcing\IdentityRepository; use Surfnet\Stepup\Identity\Value\ContactInformation; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\Institution; @@ -45,25 +44,14 @@ */ class RegistrationAuthorityCommandHandler extends SimpleCommandHandler { - /** - * @var IdentityRepository - */ - private RepositoryInterface $repository; - private InstitutionConfigurationRepository $institutionConfigurationRepository; - - /** - * @var VettingTypeHintService; - */ - private VettingTypeHintService $vettingTypeHintService; - public function __construct( - RepositoryInterface $repository, - InstitutionConfigurationRepository $institutionConfigurationRepository, - VettingTypeHintService $hintService + private readonly RepositoryInterface $repository, + private readonly InstitutionConfigurationRepository $institutionConfigurationRepository, + /** + * @var VettingTypeHintService; + */ + private readonly VettingTypeHintService $vettingTypeHintService, ) { - $this->repository = $repository; - $this->institutionConfigurationRepository = $institutionConfigurationRepository; - $this->vettingTypeHintService = $hintService; } public function handleAccreditIdentityCommand(AccreditIdentityCommand $command): void @@ -80,21 +68,22 @@ public function handleAccreditIdentityCommand(AccreditIdentityCommand $command): new Institution($command->raInstitution), new Location($command->location), new ContactInformation($command->contactInformation), - $institutionConfiguration + $institutionConfiguration, ); $this->repository->save($identity); } - public function handleAmendRegistrationAuthorityInformationCommand(AmendRegistrationAuthorityInformationCommand $command): void - { + public function handleAmendRegistrationAuthorityInformationCommand( + AmendRegistrationAuthorityInformationCommand $command, + ): void { /** @var Identity $identity */ $identity = $this->repository->load(new IdentityId($command->identityId)); $identity->amendRegistrationAuthorityInformation( new Institution($command->raInstitution), new Location($command->location), - new ContactInformation($command->contactInformation) + new ContactInformation($command->contactInformation), ); $this->repository->save($identity); @@ -130,7 +119,7 @@ public function handleSaveVettingTypeHintCommand(SaveVettingTypeHintCommand $com $collection = $this->vettingTypeHintService->collectionFrom($command->hints); $identity->saveVettingTypeHints( new Institution($command->institution), - $collection + $collection, ); $this->repository->save($identity); } @@ -148,18 +137,19 @@ private function assertValidRoleAndConvertIfValid($role, $commandId): Registrati return new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RAA); } - throw new RuntimeException(sprintf( - 'Unknown role "%s" given by AccreditIdentityCommand "%s", must be "ra" or "raa"', - $role, - $commandId - )); + throw new RuntimeException( + sprintf( + 'Unknown role "%s" given by AccreditIdentityCommand "%s", must be "ra" or "raa"', + $role, + $commandId, + ), + ); } /** + * @return InstitutionConfiguration * @deprecated Should be used until existing institution configurations have been migrated to using normalized ids * - * @param Institution $institution - * @return InstitutionConfiguration */ private function loadInstitutionConfigurationFor(Institution $institution) { @@ -167,12 +157,12 @@ private function loadInstitutionConfigurationFor(Institution $institution) try { $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); $institutionConfiguration = $this->institutionConfigurationRepository->load( - $institutionConfigurationId->getInstitutionConfigurationId() + $institutionConfigurationId->getInstitutionConfigurationId(), ); - } catch (AggregateNotFoundException $exception) { + } catch (AggregateNotFoundException) { $institutionConfigurationId = InstitutionConfigurationId::from($institution); $institutionConfiguration = $this->institutionConfigurationRepository->load( - $institutionConfigurationId->getInstitutionConfigurationId() + $institutionConfigurationId->getInstitutionConfigurationId(), ); } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/ReminderEmailCommandHandler.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/ReminderEmailCommandHandler.php index 59a5a6395..df010dcff 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/ReminderEmailCommandHandler.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/ReminderEmailCommandHandler.php @@ -24,21 +24,16 @@ class ReminderEmailCommandHandler extends SimpleCommandHandler { - private VerifiedSecondFactorReminderService $verifiedSecondFactorReminderService; - - /** - * @param VerifiedSecondFactorReminderService $verifiedSecondFactorReminderService - */ - public function __construct(VerifiedSecondFactorReminderService $verifiedSecondFactorReminderService) - { - $this->verifiedSecondFactorReminderService = $verifiedSecondFactorReminderService; + public function __construct( + private readonly VerifiedSecondFactorReminderService $verifiedSecondFactorReminderService, + ) { } - public function handleSendVerifiedSecondFactorRemindersCommand(SendVerifiedSecondFactorRemindersCommand $command): void + public function handleSendVerifiedSecondFactorRemindersCommand(SendVerifiedSecondFactorRemindersCommand $command,): void { $this->verifiedSecondFactorReminderService->sendReminders( $command->requestedAt, - $command->dryRun + $command->dryRun, ); } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/RightToBeForgottenCommandHandler.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/RightToBeForgottenCommandHandler.php index b781e728e..19aae954d 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/RightToBeForgottenCommandHandler.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/RightToBeForgottenCommandHandler.php @@ -32,33 +32,12 @@ final class RightToBeForgottenCommandHandler extends SimpleCommandHandler { - private IdentityRepository $repository; - - /** - * @var ApiIdentityRepository - */ - private ApiIdentityRepository $apiIdentityRepository; - - private SensitiveDataService $sensitiveDataService; - - private SraaRepository $sraaRepository; - - /** - * @param IdentityRepository $repository - * @param ApiIdentityRepository $apiIdentityRepository - * @param SensitiveDataService $sensitiveDataService - * @param SraaRepository $sraaRepository - */ public function __construct( - IdentityRepository $repository, - ApiIdentityRepository $apiIdentityRepository, - SensitiveDataService $sensitiveDataService, - SraaRepository $sraaRepository + private readonly IdentityRepository $repository, + private readonly ApiIdentityRepository $apiIdentityRepository, + private readonly SensitiveDataService $sensitiveDataService, + private readonly SraaRepository $sraaRepository, ) { - $this->repository = $repository; - $this->apiIdentityRepository = $apiIdentityRepository; - $this->sensitiveDataService = $sensitiveDataService; - $this->sraaRepository = $sraaRepository; } public function handleForgetIdentityCommand(ForgetIdentityCommand $command): void @@ -71,7 +50,7 @@ public function handleForgetIdentityCommand(ForgetIdentityCommand $command): voi $apiIdentity = $this->apiIdentityRepository->findOneByNameIdAndInstitution( $nameId, - new Institution($command->institution) + new Institution($command->institution), ); $identityId = new IdentityId($apiIdentity->id); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/WhitelistCommandHandler.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/WhitelistCommandHandler.php index f318414d6..f69e572e3 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/WhitelistCommandHandler.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/WhitelistCommandHandler.php @@ -23,7 +23,6 @@ use Broadway\Repository\AggregateNotFoundException; use Broadway\Repository\Repository as RepositoryInterface; use Surfnet\Stepup\Identity\Collection\InstitutionCollection; -use Surfnet\Stepup\Identity\EventSourcing\WhitelistRepository; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\Stepup\Identity\Whitelist; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\AddToWhitelistCommand; @@ -32,22 +31,11 @@ class WhitelistCommandHandler extends SimpleCommandHandler { - /** - * @var WhitelistRepository - */ - private RepositoryInterface $repository; - - /** - * @param RepositoryInterface $repository - */ - public function __construct(RepositoryInterface $repository) - { - $this->repository = $repository; + public function __construct( + private readonly RepositoryInterface $repository, + ) { } - /** - * @param ReplaceWhitelistCommand $command - */ public function handleReplaceWhitelistCommand(ReplaceWhitelistCommand $command): void { $whitelist = $this->getWhitelist(); @@ -58,9 +46,6 @@ public function handleReplaceWhitelistCommand(ReplaceWhitelistCommand $command): $this->repository->save($whitelist); } - /** - * @param AddToWhitelistCommand $command - */ public function handleAddToWhitelistCommand(AddToWhitelistCommand $command): void { $whitelist = $this->getWhitelist(); @@ -71,9 +56,6 @@ public function handleAddToWhitelistCommand(AddToWhitelistCommand $command): voi $this->repository->save($whitelist); } - /** - * @param RemoveFromWhitelistCommand $command - */ public function handleRemoveFromWhitelistCommand(RemoveFromWhitelistCommand $command): void { $whitelist = $this->getWhitelist(); @@ -91,19 +73,16 @@ private function getWhitelist(): AggregateRoot|Whitelist { try { return $this->repository->load(Whitelist::WHITELIST_AGGREGATE_ID); - } catch (AggregateNotFoundException $e) { + } catch (AggregateNotFoundException) { return Whitelist::create(new InstitutionCollection()); } } /** - * @param array $institutions * @return Institution[] */ private function mapArrayToInstitutions(array $institutions): array { - return array_map(function ($institutionName): Institution { - return new Institution($institutionName); - }, $institutions); + return array_map(fn($institutionName): Institution => new Institution($institutionName), $institutions); } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/EmailVerificationMailService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/EmailVerificationMailService.php index fa58e935f..9af9c9f71 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/EmailVerificationMailService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/EmailVerificationMailService.php @@ -35,45 +35,26 @@ final class EmailVerificationMailService */ private $translator; - private EmailTemplateService $emailTemplateService; - - private string $emailVerificationUrlTemplate; - - private string $fallbackLocale; - - /** - * @var Mailer - */ - private Mailer $mailer; - - private Sender $sender; - - private string $selfServiceUrl; + private readonly string $emailVerificationUrlTemplate; /** * @throws AssertionFailedException */ public function __construct( - Mailer $mailer, - Sender $sender, + private readonly Mailer $mailer, + private readonly Sender $sender, TranslatorInterface $translator, string $emailVerificationUrlTemplate, - EmailTemplateService $emailTemplateService, - string $fallbackLocale, - string $selfServiceUrl + private readonly EmailTemplateService $emailTemplateService, + private readonly string $fallbackLocale, + private readonly string $selfServiceUrl, ) { Assertion::string( $emailVerificationUrlTemplate, - 'Email verification URL template "%s" expected to be string, type %s given' + 'Email verification URL template "%s" expected to be string, type %s given', ); - - $this->mailer = $mailer; - $this->sender = $sender; $this->translator = $translator; $this->emailVerificationUrlTemplate = $emailVerificationUrlTemplate; - $this->emailTemplateService = $emailTemplateService; - $this->fallbackLocale = $fallbackLocale; - $this->selfServiceUrl = $selfServiceUrl; } /** @@ -83,19 +64,19 @@ public function sendEmailVerificationEmail( string $locale, string $commonName, string $email, - string $verificationNonce + string $verificationNonce, ): void { $subject = $this->translator->trans( 'ss.mail.email_verification_email.subject', ['%commonName%' => $commonName], 'messages', - $locale + $locale, ); $verificationUrl = str_replace( '{nonce}', urlencode($verificationNonce), - $this->emailVerificationUrlTemplate + $this->emailVerificationUrlTemplate, ); // In TemplatedEmail email is a reserved keyword, we also use it as a parameter that can be used in the mail @@ -105,7 +86,7 @@ public function sendEmailVerificationEmail( $emailTemplate->htmlContent = str_replace( '{email}', '{emailAddress}', - $emailTemplate->htmlContent + $emailTemplate->htmlContent, ); $parameters = [ diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RecoveryTokenMailService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RecoveryTokenMailService.php index fb11deb8e..4a287c787 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RecoveryTokenMailService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RecoveryTokenMailService.php @@ -30,7 +30,8 @@ use Symfony\Bridge\Twig\Mime\TemplatedEmail; use Symfony\Component\Mailer\Mailer; use Symfony\Component\Mime\Address; -use Symfony\Component\Translation\TranslatorInterface; +use Symfony\Contracts\Translation\TranslatorInterface; + use function str_replace; /** @@ -38,41 +39,25 @@ */ class RecoveryTokenMailService { - private Mailer $mailer; - - private Sender $sender; - /** * @var TranslatorInterface */ private $translator; - private EmailTemplateService $emailTemplateService; - - private string $fallbackLocale; - - private string $selfServiceUrl; - - private LoggerInterface $logger; + private readonly string $fallbackLocale; public function __construct( - Mailer $mailer, - Sender $sender, + private readonly Mailer $mailer, + private readonly Sender $sender, TranslatorInterface $translator, - EmailTemplateService $emailTemplateService, + private readonly EmailTemplateService $emailTemplateService, string $fallbackLocale, - string $selfServiceUrl, - LoggerInterface $logger + private readonly string $selfServiceUrl, + private readonly LoggerInterface $logger, ) { Assertion::string($fallbackLocale, 'Fallback locale "%s" expected to be string, type %s given'); - - $this->mailer = $mailer; - $this->sender = $sender; $this->translator = $translator; - $this->emailTemplateService = $emailTemplateService; $this->fallbackLocale = $fallbackLocale; - $this->selfServiceUrl = $selfServiceUrl; - $this->logger = $logger; } public function sendRevoked( @@ -81,10 +66,10 @@ public function sendRevoked( Email $email, RecoveryTokenType $recoveryTokenType, RecoveryTokenId $tokenId, - bool $revokedByRa + bool $revokedByRa, ): void { $this->logger->notice( - sprintf('Sending a recovery token revoked mail message for token type %s', $recoveryTokenType) + sprintf('Sending a recovery token revoked mail message for token type %s', $recoveryTokenType), ); $subjectParameters = [ @@ -97,13 +82,13 @@ public function sendRevoked( 'ss.mail.recovery_token_revoked_email.subject', $subjectParameters, 'messages', - $locale->getLocale() + $locale->getLocale(), ); $emailTemplate = $this->emailTemplateService->findByName( 'recovery_token_revoked', $locale->getLocale(), - $this->fallbackLocale + $this->fallbackLocale, ); // In TemplatedEmail email is a reserved keyword, we also use it as a parameter that can be used in the mail @@ -112,7 +97,7 @@ public function sendRevoked( $emailTemplate->htmlContent = str_replace( '{email}', '{emailAddress}', - $emailTemplate->htmlContent + $emailTemplate->htmlContent, ); $parameters = [ @@ -150,13 +135,13 @@ public function sendCreated(Locale $locale, CommonName $commonName, Email $email 'ss.mail.recovery_token_created_email.subject', $subjectParameters, 'messages', - $locale->getLocale() + $locale->getLocale(), ); $emailTemplate = $this->emailTemplateService->findByName( 'recovery_token_created', $locale->getLocale(), - $this->fallbackLocale + $this->fallbackLocale, ); // In TemplatedEmail email is a reserved keyword, we also use it as a parameter that can be used in the mail @@ -165,7 +150,7 @@ public function sendCreated(Locale $locale, CommonName $commonName, Email $email $emailTemplate->htmlContent = str_replace( '{email}', '{emailAddress}', - $emailTemplate->htmlContent + $emailTemplate->htmlContent, ); $parameters = [ diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php index fffc647a5..6b19ce8d0 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php @@ -43,65 +43,35 @@ class RegistrationMailService { public $institutionConfigurationOptionsService; - /** - * @var Mailer - */ - private Mailer $mailer; - - private Sender $sender; /** * @var TranslatorInterface */ private $translator; - private EmailTemplateService $emailTemplateService; - - private string $fallbackLocale; - - private string $selfServiceUrl; - - private IdentityService $identityService; - - private SecondFactorService $secondFactorService; - - private RaLocationService $raLocationsService; - - private RaListingService $raListingService; - - private LoggerInterface $logger; + private readonly string $fallbackLocale; /** * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function __construct( - Mailer $mailer, - Sender $sender, + private readonly Mailer $mailer, + private readonly Sender $sender, TranslatorInterface $translator, - EmailTemplateService $emailTemplateService, + private readonly EmailTemplateService $emailTemplateService, string $fallbackLocale, - string $selfServiceUrl, + private readonly string $selfServiceUrl, InstitutionConfigurationOptionsService $institutionConfigurationOptionsService, - IdentityService $identityService, - SecondFactorService $secondFactorService, - RaLocationService $raLocationService, - RaListingService $raListingService, - LoggerInterface $logger + private readonly IdentityService $identityService, + private readonly SecondFactorService $secondFactorService, + private readonly RaLocationService $raLocationsService, + private readonly RaListingService $raListingService, + private readonly LoggerInterface $logger, ) { Assertion::string($fallbackLocale, 'Fallback locale "%s" expected to be string, type %s given'); - - $this->mailer = $mailer; - $this->sender = $sender; $this->translator = $translator; - $this->emailTemplateService = $emailTemplateService; $this->fallbackLocale = $fallbackLocale; - $this->selfServiceUrl = $selfServiceUrl; $this->institutionConfigurationOptionsService = $institutionConfigurationOptionsService; - $this->identityService = $identityService; - $this->secondFactorService = $secondFactorService; - $this->raLocationsService = $raLocationService; - $this->raListingService = $raListingService; - $this->logger = $logger; } public function send(string $identityId, string $secondFactorId): void @@ -122,9 +92,9 @@ public function send(string $identityId, string $secondFactorId): void $identity->email->getEmail(), $verifiedSecondFactor->registrationCode, $this->getExpirationDateOfRegistration( - DateTime::fromString($verifiedSecondFactor->registrationRequestedAt->format(DateTime::FORMAT)) + DateTime::fromString($verifiedSecondFactor->registrationRequestedAt->format(DateTime::FORMAT)), ), - $this->raLocationsService->listRaLocationsFor($institution) + $this->raLocationsService->listRaLocationsFor($institution), ); return; @@ -139,18 +109,16 @@ public function send(string $identityId, string $secondFactorId): void $identity->email->getEmail(), $verifiedSecondFactor->registrationCode, $this->getExpirationDateOfRegistration( - DateTime::fromString($verifiedSecondFactor->registrationRequestedAt->format(DateTime::FORMAT)) + DateTime::fromString($verifiedSecondFactor->registrationRequestedAt->format(DateTime::FORMAT)), ), - $ras + $ras, ); return; } - $rasWithoutRaas = array_filter($ras, function (RegistrationAuthorityCredentials $ra): bool { - return !$ra->isRaa(); - }); + $rasWithoutRaas = array_filter($ras, fn(RegistrationAuthorityCredentials $ra): bool => !$ra->isRaa()); $this->logger->notice( - 'Sending a registration mail with ra contact information as there are no RAAs at this location' + 'Sending a registration mail with ra contact information as there are no RAAs at this location', ); $this->sendRegistrationEmailWithRas( $identity->preferredLocale->getLocale(), @@ -158,9 +126,9 @@ public function send(string $identityId, string $secondFactorId): void $identity->email->getEmail(), $verifiedSecondFactor->registrationCode, $this->getExpirationDateOfRegistration( - DateTime::fromString($verifiedSecondFactor->registrationRequestedAt->format(DateTime::FORMAT)) + DateTime::fromString($verifiedSecondFactor->registrationRequestedAt->format(DateTime::FORMAT)), ), - $rasWithoutRaas + $rasWithoutRaas, ); } @@ -170,19 +138,19 @@ private function sendRegistrationEmailWithRas( string $email, string $registrationCode, DateTime $expirationDate, - array $ras + array $ras, ): void { $subject = $this->translator->trans( 'ss.mail.registration_email.subject', ['%commonName%' => $commonName], 'messages', - $locale + $locale, ); $emailTemplate = $this->emailTemplateService->findByName( 'registration_code_with_ras', $locale, - $this->fallbackLocale + $this->fallbackLocale, ); // In TemplatedEmail email is a reserved keyword, we also use it as a parameter that can be used in the mail @@ -191,7 +159,7 @@ private function sendRegistrationEmailWithRas( $emailTemplate->htmlContent = str_replace( '{email}', '{emailAddress}', - $emailTemplate->htmlContent + $emailTemplate->htmlContent, ); $parameters = [ 'templateString' => $emailTemplate->htmlContent, @@ -220,19 +188,19 @@ private function sendRegistrationEmailWithRaLocations( string $email, string $registrationCode, DateTime $expirationDate, - array $raLocations + array $raLocations, ): void { $subject = $this->translator->trans( 'ss.mail.registration_email.subject', ['%commonName%' => $commonName], 'messages', - $locale + $locale, ); $emailTemplate = $this->emailTemplateService->findByName( 'registration_code_with_ra_locations', $locale, - $this->fallbackLocale + $this->fallbackLocale, ); // In TemplatedEmail email is a reserved keyword, we also use it as a parameter that can be used in the mail // message, to prevent having to update all templates, and prevent a 500 error from the mailer, we perform a @@ -240,7 +208,7 @@ private function sendRegistrationEmailWithRaLocations( $emailTemplate->htmlContent = str_replace( '{email}', '{emailAddress}', - $emailTemplate->htmlContent + $emailTemplate->htmlContent, ); $parameters = [ @@ -267,7 +235,7 @@ private function sendRegistrationEmailWithRaLocations( private function getExpirationDateOfRegistration(DateTime $date) { return $date->add( - new DateInterval('P14D') + new DateInterval('P14D'), )->endOfDay(); } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorRevocationMailService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorRevocationMailService.php index f733d0534..77c92626f 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorRevocationMailService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorRevocationMailService.php @@ -39,48 +39,32 @@ */ final class SecondFactorRevocationMailService { - /** - * @var Mailer - */ - private Mailer $mailer; - - private Sender $sender; - /** * @var TranslatorInterface */ private $translator; - private EmailTemplateService $emailTemplateService; - - private string $fallbackLocale; + private readonly string $fallbackLocale; - private string $selfServiceUrl; - - private SecondFactorDisplayNameResolverService $displayNameResolver; + private readonly string $selfServiceUrl; /** * @throws AssertionFailedException */ public function __construct( - Mailer $mailer, - Sender $sender, + private readonly Mailer $mailer, + private readonly Sender $sender, TranslatorInterface $translator, - EmailTemplateService $emailTemplateService, + private readonly EmailTemplateService $emailTemplateService, string $fallbackLocale, string $selfServiceUrl, - SecondFactorDisplayNameResolverService $displayNameResolver + private readonly SecondFactorDisplayNameResolverService $displayNameResolver, ) { Assertion::string($fallbackLocale, 'Fallback locale "%s" expected to be string, type %s given'); Assertion::string($selfServiceUrl, 'Self Service URL "%s" expected to be string, type %s given'); - - $this->mailer = $mailer; - $this->sender = $sender; $this->translator = $translator; - $this->emailTemplateService = $emailTemplateService; $this->fallbackLocale = $fallbackLocale; $this->selfServiceUrl = $selfServiceUrl; - $this->displayNameResolver = $displayNameResolver; } /** @@ -91,21 +75,21 @@ public function sendVettedSecondFactorRevokedByRaEmail( CommonName $commonName, Email $email, SecondFactorType $secondFactorType, - SecondFactorIdentifier $secondFactorIdentifier + SecondFactorIdentifier $secondFactorIdentifier, ): void { $subject = $this->translator->trans( 'mw.mail.second_factor_revoked.subject', [ - '%tokenType%' => $this->displayNameResolver->resolveByType($secondFactorType) + '%tokenType%' => $this->displayNameResolver->resolveByType($secondFactorType), ], 'messages', - $locale->getLocale() + $locale->getLocale(), ); $emailTemplate = $this->emailTemplateService->findByName( 'second_factor_revoked', $locale->getLocale(), - $this->fallbackLocale + $this->fallbackLocale, ); $parameters = [ @@ -136,21 +120,21 @@ public function sendVettedSecondFactorRevokedByRegistrantEmail( CommonName $commonName, Email $email, SecondFactorType $secondFactorType, - SecondFactorIdentifier $secondFactorIdentifier + SecondFactorIdentifier $secondFactorIdentifier, ): void { $subject = $this->translator->trans( 'mw.mail.second_factor_revoked.subject', [ - '%tokenType%' => $this->displayNameResolver->resolveByType($secondFactorType) + '%tokenType%' => $this->displayNameResolver->resolveByType($secondFactorType), ], 'messages', - $locale->getLocale() + $locale->getLocale(), ); $emailTemplate = $this->emailTemplateService->findByName( 'second_factor_revoked', $locale->getLocale(), - $this->fallbackLocale + $this->fallbackLocale, ); $parameters = [ 'isRevokedByRa' => false, diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorVettedMailService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorVettedMailService.php index 1844e7ec9..38989e35a 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorVettedMailService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorVettedMailService.php @@ -32,55 +32,39 @@ final class SecondFactorVettedMailService { - /** - * @var Mailer - */ - private Mailer $mailer; - - private Sender $sender; - /** * @var TranslatorInterface */ private $translator; - private EmailTemplateService $emailTemplateService; - - private string $fallbackLocale; - - private string $selfServiceUrl; + private readonly string $fallbackLocale; /** * @throws AssertionFailedException */ public function __construct( - Mailer $mailer, - Sender $sender, + private readonly Mailer $mailer, + private readonly Sender $sender, TranslatorInterface $translator, - EmailTemplateService $emailTemplateService, + private readonly EmailTemplateService $emailTemplateService, string $fallbackLocale, - string $selfServiceUrl + private readonly string $selfServiceUrl, ) { Assertion::string($fallbackLocale, 'Fallback locale "%s" expected to be string, type %s given'); - - $this->mailer = $mailer; - $this->sender = $sender; $this->translator = $translator; - $this->emailTemplateService = $emailTemplateService; $this->fallbackLocale = $fallbackLocale; - $this->selfServiceUrl = $selfServiceUrl; } public function sendVettedEmail( Locale $locale, CommonName $commonName, - Email $email + Email $email, ): void { $subject = $this->translator->trans( 'ss.mail.vetted_email.subject', ['%commonName%' => $commonName->getCommonName(), '%email%' => $email->getEmail()], 'messages', - $locale->getLocale() + $locale->getLocale(), ); $emailTemplate = $this->emailTemplateService->findByName('vetted', $locale->getLocale(), $this->fallbackLocale); @@ -91,7 +75,7 @@ public function sendVettedEmail( $emailTemplate->htmlContent = str_replace( '{email}', '{emailAddress}', - $emailTemplate->htmlContent + $emailTemplate->htmlContent, ); $parameters = [ 'templateString' => $emailTemplate->htmlContent, diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/VettingTypeHintService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/VettingTypeHintService.php index 2c65e635c..1d225515f 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/VettingTypeHintService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/VettingTypeHintService.php @@ -28,20 +28,11 @@ class VettingTypeHintService { - private VettingTypeHintRepository $repository; - - private array $locales; - - private LoggerInterface $logger; - public function __construct( - VettingTypeHintRepository $repository, - array $locales, - LoggerInterface $logger + private readonly VettingTypeHintRepository $repository, + private readonly array $locales, + private readonly LoggerInterface $logger, ) { - $this->repository = $repository; - $this->locales = $locales; - $this->logger = $logger; } public function collectionFrom(array $hints): VettingTypeHintCollection @@ -53,8 +44,8 @@ public function collectionFrom(array $hints): VettingTypeHintCollection sprintf( 'Received unsupported locale %s while processing the vetting type hints. Allowed locales are: %s.', $locale, - implode(', ', $this->locales) - ) + implode(', ', $this->locales), + ), ); continue; } @@ -70,7 +61,7 @@ private function unknownLocale(string $locale): bool public function findBy(Institution $institution): VettingTypeHintEntity { - $result = $this->repository->find((string) $institution); + $result = $this->repository->find((string)$institution); if (!$result) { throw new NotFoundException(sprintf('Vetting type hint not found for institution %s', $institution)); } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/AuthorizingStage.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/AuthorizingStage.php index 022d0be23..b6defca0b 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/AuthorizingStage.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/AuthorizingStage.php @@ -29,18 +29,10 @@ class AuthorizingStage implements Stage { - private LoggerInterface $logger; - - private AuthorizationCheckerInterface $authorizationChecker; - - /** - * @param LoggerInterface $logger - * @param AuthorizationCheckerInterface $authorizationChecker - */ - public function __construct(LoggerInterface $logger, AuthorizationCheckerInterface $authorizationChecker) - { - $this->logger = $logger; - $this->authorizationChecker = $authorizationChecker; + public function __construct( + private readonly LoggerInterface $logger, + private readonly AuthorizationCheckerInterface $authorizationChecker, + ) { } public function process(Command $command): Command @@ -71,11 +63,13 @@ public function process(Command $command): Command } if (!$this->clientHasAtLeastOneRole($allowedRoles)) { - $this->logger->error(sprintf( - 'Client is not authorized to execute command "%s", it does not have (one of) the required role(s) "%s"', - $command, - implode(', ', $allowedRoles) - )); + $this->logger->error( + sprintf( + 'Client is not authorized to execute command "%s", it does not have (one of) the required role(s) "%s"', + $command, + implode(', ', $allowedRoles), + ), + ); throw new ForbiddenException(sprintf('Processing of Command "%s" is forbidden.', $command)); } @@ -86,7 +80,6 @@ public function process(Command $command): Command } /** - * @param array $rolesToCheck * @return bool */ private function clientHasAtLeastOneRole(array $rolesToCheck): bool diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/DispatchStage.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/DispatchStage.php index 4c3f3f3e4..4fef41161 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/DispatchStage.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/DispatchStage.php @@ -24,18 +24,10 @@ class DispatchStage implements Stage { - private CommandBus $commandBus; - - private LoggerInterface $logger; - - /** - * @param LoggerInterface $logger - * @param CommandBus $commandBus - */ - public function __construct(LoggerInterface $logger, CommandBus $commandBus) - { - $this->logger = $logger; - $this->commandBus = $commandBus; + public function __construct( + private readonly LoggerInterface $logger, + private readonly CommandBus $commandBus, + ) { } public function process(Command $command): Command diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/EventDispatchingStage.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/EventDispatchingStage.php index 4bc560c41..c694681e2 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/EventDispatchingStage.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/EventDispatchingStage.php @@ -24,14 +24,10 @@ class EventDispatchingStage implements Stage { - private LoggerInterface $logger; - - private BufferedEventBus $bufferedEventBus; - - public function __construct(LoggerInterface $logger, BufferedEventBus $bufferedEventBus) - { - $this->logger = $logger; - $this->bufferedEventBus = $bufferedEventBus; + public function __construct( + private readonly LoggerInterface $logger, + private readonly BufferedEventBus $bufferedEventBus, + ) { } public function process(Command $command): Command diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Exception/InvalidCommandException.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Exception/InvalidCommandException.php index 08a6d68c0..c523bce62 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Exception/InvalidCommandException.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Exception/InvalidCommandException.php @@ -28,7 +28,7 @@ class InvalidCommandException extends RuntimeException implements ProcessingAbor /** * @var string[] */ - private array $errors; + private readonly array $errors; public static function createFromViolations(ConstraintViolationListInterface $violations): self { @@ -51,7 +51,6 @@ public function getErrors() } /** - * @param ConstraintViolationListInterface $violations * @return array */ private static function mapViolationsToErrorStrings(ConstraintViolationListInterface $violations): array diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Pipeline.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Pipeline.php index b08719555..fbdb8d1ac 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Pipeline.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Pipeline.php @@ -27,7 +27,6 @@ interface Pipeline { /** - * @param Command $command * @return Command */ public function process(Command $command); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Stage.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Stage.php index 4d7e35d12..c96c25dbe 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Stage.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Stage.php @@ -27,7 +27,6 @@ interface Stage { /** - * @param Command $command * @return Command */ public function process(Command $command); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/StagedPipeline.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/StagedPipeline.php index d63b49d06..d5aaa6b0f 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/StagedPipeline.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/StagedPipeline.php @@ -28,11 +28,8 @@ class StagedPipeline implements Pipeline */ private array $stages = []; - private LoggerInterface $logger; - - public function __construct(LoggerInterface $logger) + public function __construct(private readonly LoggerInterface $logger) { - $this->logger = $logger; } public function process(Command $command) @@ -40,11 +37,11 @@ public function process(Command $command) $this->logger->debug(sprintf('Processing "%s"', $command)); foreach ($this->stages as $stage) { - $this->logger->debug(sprintf('Invoking stage "%s" for "%s"', get_class($stage), $command)); + $this->logger->debug(sprintf('Invoking stage "%s" for "%s"', $stage::class, $command)); $command = $stage->process($command); - $this->logger->debug(sprintf('Stage "%s" finished processing "%s"', get_class($stage), $command)); + $this->logger->debug(sprintf('Stage "%s" finished processing "%s"', $stage::class, $command)); } $this->logger->debug(sprintf('Done processing "%s" in StagedPipeline', $command)); @@ -55,8 +52,6 @@ public function process(Command $command) /** * Adds a strage to the pipeling. Sorting of the stages based on priority has already been done in the * \Surfnet\StepupMiddleware\CommandHandlingBundle\DependencyInjection\CompilerPass\AddPipelineStagesCompilerPass - * - * @param Stage $stage */ public function addStage(Stage $stage): void { diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/TransactionAwarePipeline.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/TransactionAwarePipeline.php index 401f4486c..78ba8e629 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/TransactionAwarePipeline.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/TransactionAwarePipeline.php @@ -25,38 +25,22 @@ class TransactionAwarePipeline implements Pipeline { - private Pipeline $innerPipeline; - - private Connection $middlewareConnection; - - private Connection $gatewayConnection; - - private LoggerInterface $logger; - - /** - * @param LoggerInterface $logger - * @param Pipeline $innerPipeline - * @param Connection $middlewareConnection - * @param Connection $gatewayConnection - */ public function __construct( - LoggerInterface $logger, - Pipeline $innerPipeline, - Connection $middlewareConnection, - Connection $gatewayConnection + private readonly LoggerInterface $logger, + private readonly Pipeline $innerPipeline, + private readonly Connection $middlewareConnection, + private readonly Connection $gatewayConnection, ) { - $this->logger = $logger; - $this->innerPipeline = $innerPipeline; - $this->middlewareConnection = $middlewareConnection; - $this->gatewayConnection = $gatewayConnection; } public function process(Command $command) { - $this->logger->debug(sprintf( - 'Starting Transaction in TransactionAwarePipeline for processing command "%s"', - $command - )); + $this->logger->debug( + sprintf( + 'Starting Transaction in TransactionAwarePipeline for processing command "%s"', + $command, + ), + ); $this->middlewareConnection->beginTransaction(); $this->gatewayConnection->beginTransaction(); @@ -77,28 +61,30 @@ public function process(Command $command) sprintf( '[!!!] Critical Database Exception while processing command "%s": "%s"', $command, - $e->getMessage() + $e->getMessage(), ), - ['exception' => $e] + ['exception' => $e], ); } else { $this->logger->error( sprintf( 'Exception occurred while processing command "%s": "%s", rolling back transaction', $command, - $e->getMessage() + $e->getMessage(), ), - ['exception' => $e] + ['exception' => $e], ); } $this->middlewareConnection->rollBack(); $this->gatewayConnection->rollBack(); - $this->logger->debug(sprintf( - 'Transaction for command "%s" rolled back, re-throwing exception', - $command - )); + $this->logger->debug( + sprintf( + 'Transaction for command "%s" rolled back, re-throwing exception', + $command, + ), + ); throw $e; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/ValidationStage.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/ValidationStage.php index d1e9b254d..89267cdac 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/ValidationStage.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/ValidationStage.php @@ -25,18 +25,10 @@ class ValidationStage implements Stage { - private LoggerInterface $logger; - - private ValidatorInterface $validator; - - /** - * @param LoggerInterface $logger - * @param ValidatorInterface $validator - */ - public function __construct(LoggerInterface $logger, ValidatorInterface $validator) - { - $this->logger = $logger; - $this->validator = $validator; + public function __construct( + private readonly LoggerInterface $logger, + private readonly ValidatorInterface $validator, + ) { } public function process(Command $command): Command diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/EmailVerificationEmailProcessor.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/EmailVerificationEmailProcessor.php index cfd4222be..f39bcd505 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/EmailVerificationEmailProcessor.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/EmailVerificationEmailProcessor.php @@ -26,21 +26,19 @@ final class EmailVerificationEmailProcessor extends Processor { - private EmailVerificationMailService $emailVerificationMailService; - - public function __construct(EmailVerificationMailService $emailVerificationMailService) - { - $this->emailVerificationMailService = $emailVerificationMailService; + public function __construct( + private readonly EmailVerificationMailService $emailVerificationMailService, + ) { } public function handlePhonePossessionProvenEvent(PhonePossessionProvenEvent $event): void { if ($event->emailVerificationRequired !== false) { $this->emailVerificationMailService->sendEmailVerificationEmail( - (string) $event->preferredLocale, - (string) $event->commonName, - (string) $event->email, - $event->emailVerificationNonce + (string)$event->preferredLocale, + (string)$event->commonName, + (string)$event->email, + $event->emailVerificationNonce, ); } } @@ -49,10 +47,10 @@ public function handleYubikeyPossessionProvenEvent(YubikeyPossessionProvenEvent { if ($event->emailVerificationRequired !== false) { $this->emailVerificationMailService->sendEmailVerificationEmail( - (string) $event->preferredLocale, - (string) $event->commonName, - (string) $event->email, - $event->emailVerificationNonce + (string)$event->preferredLocale, + (string)$event->commonName, + (string)$event->email, + $event->emailVerificationNonce, ); } } @@ -61,10 +59,10 @@ public function handleGssfPossessionProvenEvent(GssfPossessionProvenEvent $event { if ($event->emailVerificationRequired !== false) { $this->emailVerificationMailService->sendEmailVerificationEmail( - (string) $event->preferredLocale, - (string) $event->commonName, - (string) $event->email, - $event->emailVerificationNonce + (string)$event->preferredLocale, + (string)$event->commonName, + (string)$event->email, + $event->emailVerificationNonce, ); } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/RecoveryTokenEmailProcessor.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/RecoveryTokenEmailProcessor.php index 99966d71c..6fbc27c32 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/RecoveryTokenEmailProcessor.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/RecoveryTokenEmailProcessor.php @@ -29,20 +29,14 @@ final class RecoveryTokenEmailProcessor extends Processor { - private RecoveryTokenMailService $mailService; - - private IdentityService $identityService; - public function __construct( - RecoveryTokenMailService $recoveryTokenMailService, - IdentityService $identityService + private readonly RecoveryTokenMailService $mailService, + private readonly IdentityService $identityService, ) { - $this->mailService = $recoveryTokenMailService; - $this->identityService = $identityService; } public function handleCompliedWithRecoveryCodeRevocationEvent( - CompliedWithRecoveryCodeRevocationEvent $event + CompliedWithRecoveryCodeRevocationEvent $event, ): void { $identity = $this->identityService->find($event->identityId->getIdentityId()); @@ -56,7 +50,7 @@ public function handleCompliedWithRecoveryCodeRevocationEvent( $identity->email, $event->recoveryTokenType, $event->recoveryTokenId, - true + true, ); } @@ -74,7 +68,7 @@ public function handleRecoveryTokenRevokedEvent(RecoveryTokenRevokedEvent $event $identity->email, $event->recoveryTokenType, $event->recoveryTokenId, - false + false, ); } @@ -88,12 +82,12 @@ public function handlePhoneRecoveryTokenPossessionProvenEvent(PhoneRecoveryToken $this->mailService->sendCreated( $identity->preferredLocale, $event->commonName, - $event->email + $event->email, ); } public function handleSafeStoreSecretRecoveryTokenPossessionPromisedEvent( - SafeStoreSecretRecoveryTokenPossessionPromisedEvent $event + SafeStoreSecretRecoveryTokenPossessionPromisedEvent $event, ): void { $identity = $this->identityService->find($event->identityId->getIdentityId()); @@ -103,7 +97,7 @@ public function handleSafeStoreSecretRecoveryTokenPossessionPromisedEvent( $this->mailService->sendCreated( $identity->preferredLocale, $event->commonName, - $event->email + $event->email, ); } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/SecondFactorRevocationEmailProcessor.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/SecondFactorRevocationEmailProcessor.php index b3151bbc4..c415836ae 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/SecondFactorRevocationEmailProcessor.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/SecondFactorRevocationEmailProcessor.php @@ -27,24 +27,14 @@ final class SecondFactorRevocationEmailProcessor extends Processor { - private SecondFactorRevocationMailService $mailService; - - private IdentityService $identityService; - - /** - * @param SecondFactorRevocationMailService $secondFactorRevocationMailService - * @param IdentityService $identityService - */ public function __construct( - SecondFactorRevocationMailService $secondFactorRevocationMailService, - IdentityService $identityService + private readonly SecondFactorRevocationMailService $mailService, + private readonly IdentityService $identityService, ) { - $this->mailService = $secondFactorRevocationMailService; - $this->identityService = $identityService; } public function handleCompliedWithVettedSecondFactorRevocationEvent( - CompliedWithVettedSecondFactorRevocationEvent $event + CompliedWithVettedSecondFactorRevocationEvent $event, ): void { $identity = $this->identityService->find($event->identityId->getIdentityId()); @@ -57,7 +47,7 @@ public function handleCompliedWithVettedSecondFactorRevocationEvent( $identity->commonName, $identity->email, $event->secondFactorType, - $event->secondFactorIdentifier + $event->secondFactorIdentifier, ); } @@ -74,7 +64,7 @@ public function handleVettedSecondFactorRevokedEvent(SecondFactorRevokedEvent $e $identity->commonName, $identity->email, $event->secondFactorType, - $event->secondFactorIdentifier + $event->secondFactorIdentifier, ); } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/SecondFactorVettedEmailProcessor.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/SecondFactorVettedEmailProcessor.php index d9eef78d9..b02bcf55b 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/SecondFactorVettedEmailProcessor.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/SecondFactorVettedEmailProcessor.php @@ -19,26 +19,32 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Processor; use Broadway\Processor\Processor; -use Surfnet\Stepup\Identity\Event\SecondFactorVettedWithoutTokenProofOfPossession; use Surfnet\Stepup\Identity\Event\SecondFactorVettedEvent; +use Surfnet\Stepup\Identity\Event\SecondFactorVettedWithoutTokenProofOfPossession; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Service\SecondFactorVettedMailService; final class SecondFactorVettedEmailProcessor extends Processor { - private SecondFactorVettedMailService $secondFactorVettedMailService; - - public function __construct(SecondFactorVettedMailService $secondFactorVettedMailService) + public function __construct(private readonly SecondFactorVettedMailService $secondFactorVettedMailService) { - $this->secondFactorVettedMailService = $secondFactorVettedMailService; } public function handleSecondFactorVettedEvent(SecondFactorVettedEvent $event): void { - $this->secondFactorVettedMailService->sendVettedEmail($event->preferredLocale, $event->commonName, $event->email); + $this->secondFactorVettedMailService->sendVettedEmail( + $event->preferredLocale, + $event->commonName, + $event->email, + ); } - public function handleSecondFactorVettedWithoutTokenProofOfPossession(SecondFactorVettedWithoutTokenProofOfPossession $event): void - { - $this->secondFactorVettedMailService->sendVettedEmail($event->preferredLocale, $event->commonName, $event->email); + public function handleSecondFactorVettedWithoutTokenProofOfPossession( + SecondFactorVettedWithoutTokenProofOfPossession $event, + ): void { + $this->secondFactorVettedMailService->sendVettedEmail( + $event->preferredLocale, + $event->commonName, + $event->email, + ); } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Resources/config/command_handlers.yml b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Resources/config/command_handlers.yml index b12484be9..1e630ee48 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Resources/config/command_handlers.yml +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Resources/config/command_handlers.yml @@ -1,64 +1,64 @@ services: - surfnet_stepup_middleware_command_handling.command_handler.identity_command_handler: - class: Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\CommandHandler\IdentityCommandHandler - arguments: - - "@surfnet_stepup.repository.identity" - - "@surfnet_stepup_middleware_api.repository.identity" - - "@identity.entity.configurable_settings" - - "@surfnet_stepup_middleware_api.service.allowed_second_factor_list" - - "@surfnet_stepup.service.second_factor_type" - - '@Surfnet\Stepup\Helper\SecondFactorProvePossessionHelper' - - "@surfnet_stepup_middleware_api.service.institution_configuration_options" - - "@surfnet_stepup.service.loa_resolution" - - '@Surfnet\Stepup\Helper\RecoveryTokenSecretHelper' - - '@surfnet_stepup_middleware_command_handling.service.registration_mail' - tags: [{ name: command_bus.command_handler }] + surfnet_stepup_middleware_command_handling.command_handler.identity_command_handler: + class: Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\CommandHandler\IdentityCommandHandler + arguments: + - "@surfnet_stepup.repository.identity" + - "@surfnet_stepup_middleware_api.repository.identity" + - "@identity.entity.configurable_settings" + - "@surfnet_stepup_middleware_api.service.allowed_second_factor_list" + - "@surfnet_stepup.service.second_factor_type" + - '@Surfnet\Stepup\Helper\SecondFactorProvePossessionHelper' + - "@surfnet_stepup_middleware_api.service.institution_configuration_options" + - "@surfnet_stepup.service.loa_resolution" + - '@Surfnet\Stepup\Helper\RecoveryTokenSecretHelper' + - '@surfnet_stepup_middleware_command_handling.service.registration_mail' + tags: [ { name: command_bus.command_handler } ] - surfnet_stepup_middleware_command_handling.command_handler.registration_authority_command_handler: - class: Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\CommandHandler\RegistrationAuthorityCommandHandler - arguments: - - "@surfnet_stepup.repository.identity" - - "@surfnet_stepup.repository.institution_configuration" - - '@Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Service\VettingTypeHintService' - tags: [{ name: command_bus.command_handler }] + surfnet_stepup_middleware_command_handling.command_handler.registration_authority_command_handler: + class: Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\CommandHandler\RegistrationAuthorityCommandHandler + arguments: + - "@surfnet_stepup.repository.identity" + - "@surfnet_stepup.repository.institution_configuration" + - '@Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Service\VettingTypeHintService' + tags: [ { name: command_bus.command_handler } ] - surfnet_stepup_middleware_command_handling.command_handler.configuration: - class: Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\CommandHandler\ConfigurationCommandHandler - arguments: - - "@surfnet_stepup.repository.configuration" - tags: [{ name: command_bus.command_handler }] + surfnet_stepup_middleware_command_handling.command_handler.configuration: + class: Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\CommandHandler\ConfigurationCommandHandler + arguments: + - "@surfnet_stepup.repository.configuration" + tags: [ { name: command_bus.command_handler } ] - surfnet_stepup_middleware_command_handling.command_handler.institution_configuration: - class: Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\CommandHandler\InstitutionConfigurationCommandHandler - arguments: - - "@surfnet_stepup.repository.institution_configuration" - tags: [{ name: command_bus.command_handler }] + surfnet_stepup_middleware_command_handling.command_handler.institution_configuration: + class: Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\CommandHandler\InstitutionConfigurationCommandHandler + arguments: + - "@surfnet_stepup.repository.institution_configuration" + tags: [ { name: command_bus.command_handler } ] - surfnet_stepup_middleware_command_handling.command_handler.whitelist: - class: Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\CommandHandler\WhitelistCommandHandler - arguments: - - "@surfnet_stepup.repository.whitelist" - tags: [{ name: command_bus.command_handler }] + surfnet_stepup_middleware_command_handling.command_handler.whitelist: + class: Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\CommandHandler\WhitelistCommandHandler + arguments: + - "@surfnet_stepup.repository.whitelist" + tags: [ { name: command_bus.command_handler } ] - surfnet_stepup_middleware_command_handling.command_handler.right_to_be_forgotten_command_handler: - class: Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\CommandHandler\RightToBeForgottenCommandHandler - arguments: - - "@surfnet_stepup.repository.identity" - - "@surfnet_stepup_middleware_api.repository.identity" - - "@surfnet_stepup_middleware_command_handling.service.sensitive_data" - - "@surfnet_stepup_middleware_api.repository.sraa" - tags: [{ name: command_bus.command_handler }] + surfnet_stepup_middleware_command_handling.command_handler.right_to_be_forgotten_command_handler: + class: Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\CommandHandler\RightToBeForgottenCommandHandler + arguments: + - "@surfnet_stepup.repository.identity" + - "@surfnet_stepup_middleware_api.repository.identity" + - "@surfnet_stepup_middleware_command_handling.service.sensitive_data" + - "@surfnet_stepup_middleware_api.repository.sraa" + tags: [ { name: command_bus.command_handler } ] - surfnet_stepup_middleware_command_handling.command_handler.reminder_email: - class: Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\CommandHandler\ReminderEmailCommandHandler - arguments: - - "@surfnet_stepup_middleware_middleware.verfied_second_factor_reminder" - tags: [{ name: command_bus.command_handler }] + surfnet_stepup_middleware_command_handling.command_handler.reminder_email: + class: Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\CommandHandler\ReminderEmailCommandHandler + arguments: + - "@surfnet_stepup_middleware_middleware.verfied_second_factor_reminder" + tags: [ { name: command_bus.command_handler } ] - # Helper services for command handlers - Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Service\VettingTypeHintService: - arguments: - - '@Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\VettingTypeHintRepository' - - '%locales%' - - '@logger' + # Helper services for command handlers + Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Service\VettingTypeHintService: + arguments: + - '@Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\VettingTypeHintRepository' + - '%locales%' + - '@logger' diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Resources/config/event_sourcing.yml b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Resources/config/event_sourcing.yml index 9a009896d..520cd0786 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Resources/config/event_sourcing.yml +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Resources/config/event_sourcing.yml @@ -1,91 +1,91 @@ services: - # BC aliases - Surfnet\StepupMiddleware\CommandHandlingBundle\EventSourcing\MetadataEnricher: "@surfnet_stepup_middleware_command_handling.metadata_enricher.actor" - - Surfnet\Stepup\Helper\UserDataFilterInterface: - class: Surfnet\Stepup\Helper\UserDataFilter - - Surfnet\Stepup\Helper\UserDataFormatterInterface: - class: Surfnet\Stepup\Helper\UserDataFormatter - arguments: - $applicationName: '%application_name%' - - surfnet_stepup.repository.identity: - class: Surfnet\Stepup\Identity\EventSourcing\IdentityRepository - arguments: - - "@surfnet_stepup_middleware_command_handling.event_store.sensitive_data" - - "@surfnet_stepup_middleware_command_handling.event_bus.buffered" - - "@surfnet_stepup.aggregate_factory.public_constructor" - - '@Surfnet\Stepup\Helper\UserDataFilterInterface' - - "@logger" - - ["@surfnet_stepup_middleware_command_handling.metadata_enricher.actor"] - - surfnet_stepup_middleware_command_handling.metadata_enricher.actor: - class: Surfnet\StepupMiddleware\CommandHandlingBundle\EventSourcing\MetadataEnrichingEventStreamDecorator - - surfnet_stepup.repository.configuration: - class: Surfnet\Stepup\Configuration\EventSourcing\ConfigurationRepository - arguments: - - "@surfnet_stepup.event_store.dbal" - - "@surfnet_stepup_middleware_command_handling.event_bus.buffered" - - "@surfnet_stepup.aggregate_factory.public_constructor" - - surfnet_stepup.repository.institution_configuration: - class: Surfnet\Stepup\Configuration\EventSourcing\InstitutionConfigurationRepository - arguments: - - "@surfnet_stepup.event_store.dbal" - - "@surfnet_stepup_middleware_command_handling.event_bus.buffered" - - "@surfnet_stepup.aggregate_factory.public_constructor" - - surfnet_stepup.repository.whitelist: - class: Surfnet\Stepup\Identity\EventSourcing\WhitelistRepository - arguments: - - "@surfnet_stepup.event_store.dbal" - - "@surfnet_stepup_middleware_command_handling.event_bus.buffered" - - "@surfnet_stepup.aggregate_factory.public_constructor" - - surfnet_stepup.aggregate_factory.public_constructor: - public: false - class: Broadway\EventSourcing\AggregateFactory\PublicConstructorAggregateFactory - - surfnet_stepup.event_store.in_memory: - public: false - class: Broadway\EventStore\InMemoryEventStore - - surfnet_stepup.event_store.dbal: - public: false - class: Broadway\EventStore\Dbal\DBALEventStore - arguments: - - "@doctrine.dbal.middleware_connection" - - "@surfnet_stepup.event_store.simple_serializer" - - "@surfnet_stepup.event_store.simple_serializer" - - 'event_stream' - - false - - surfnet_stepup.event_store.simple_serializer: - public: false - class: Broadway\Serializer\SimpleInterfaceSerializer - - surfnet_stepup_middleware_command_handling.event_bus.buffered: - public: false - class: Surfnet\StepupMiddleware\CommandHandlingBundle\EventHandling\BufferedEventBus - arguments: - - "@doctrine.orm.entity_manager" - - # Sensitive data - surfnet_stepup_middleware_command_handling.repository.sensitive_data_message: - class: Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Repository\SensitiveDataMessageRepository - arguments: - - "@doctrine.dbal.middleware_connection" - - surfnet_stepup_middleware_command_handling.event_store.sensitive_data: - class: Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\EventStore\SensitiveDataEventStoreDecorator - arguments: - - "@surfnet_stepup.event_store.dbal" - - "@surfnet_stepup_middleware_command_handling.repository.sensitive_data_message" - - surfnet_stepup_middleware_command_handling.service.sensitive_data: - class: Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Service\SensitiveDataService - arguments: - - "@surfnet_stepup_middleware_command_handling.repository.sensitive_data_message" + # BC aliases + Surfnet\StepupMiddleware\CommandHandlingBundle\EventSourcing\MetadataEnricher: "@surfnet_stepup_middleware_command_handling.metadata_enricher.actor" + + Surfnet\Stepup\Helper\UserDataFilterInterface: + class: Surfnet\Stepup\Helper\UserDataFilter + + Surfnet\Stepup\Helper\UserDataFormatterInterface: + class: Surfnet\Stepup\Helper\UserDataFormatter + arguments: + $applicationName: '%application_name%' + + surfnet_stepup.repository.identity: + class: Surfnet\Stepup\Identity\EventSourcing\IdentityRepository + arguments: + - "@surfnet_stepup_middleware_command_handling.event_store.sensitive_data" + - "@surfnet_stepup_middleware_command_handling.event_bus.buffered" + - "@surfnet_stepup.aggregate_factory.public_constructor" + - '@Surfnet\Stepup\Helper\UserDataFilterInterface' + - "@logger" + - [ "@surfnet_stepup_middleware_command_handling.metadata_enricher.actor" ] + + surfnet_stepup_middleware_command_handling.metadata_enricher.actor: + class: Surfnet\StepupMiddleware\CommandHandlingBundle\EventSourcing\MetadataEnrichingEventStreamDecorator + + surfnet_stepup.repository.configuration: + class: Surfnet\Stepup\Configuration\EventSourcing\ConfigurationRepository + arguments: + - "@surfnet_stepup.event_store.dbal" + - "@surfnet_stepup_middleware_command_handling.event_bus.buffered" + - "@surfnet_stepup.aggregate_factory.public_constructor" + + surfnet_stepup.repository.institution_configuration: + class: Surfnet\Stepup\Configuration\EventSourcing\InstitutionConfigurationRepository + arguments: + - "@surfnet_stepup.event_store.dbal" + - "@surfnet_stepup_middleware_command_handling.event_bus.buffered" + - "@surfnet_stepup.aggregate_factory.public_constructor" + + surfnet_stepup.repository.whitelist: + class: Surfnet\Stepup\Identity\EventSourcing\WhitelistRepository + arguments: + - "@surfnet_stepup.event_store.dbal" + - "@surfnet_stepup_middleware_command_handling.event_bus.buffered" + - "@surfnet_stepup.aggregate_factory.public_constructor" + + surfnet_stepup.aggregate_factory.public_constructor: + public: false + class: Broadway\EventSourcing\AggregateFactory\PublicConstructorAggregateFactory + + surfnet_stepup.event_store.in_memory: + public: false + class: Broadway\EventStore\InMemoryEventStore + + surfnet_stepup.event_store.dbal: + public: false + class: Broadway\EventStore\Dbal\DBALEventStore + arguments: + - "@doctrine.dbal.middleware_connection" + - "@surfnet_stepup.event_store.simple_serializer" + - "@surfnet_stepup.event_store.simple_serializer" + - 'event_stream' + - false + + surfnet_stepup.event_store.simple_serializer: + public: false + class: Broadway\Serializer\SimpleInterfaceSerializer + + surfnet_stepup_middleware_command_handling.event_bus.buffered: + public: false + class: Surfnet\StepupMiddleware\CommandHandlingBundle\EventHandling\BufferedEventBus + arguments: + - "@doctrine.orm.entity_manager" + + # Sensitive data + surfnet_stepup_middleware_command_handling.repository.sensitive_data_message: + class: Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Repository\SensitiveDataMessageRepository + arguments: + - "@doctrine.dbal.middleware_connection" + + surfnet_stepup_middleware_command_handling.event_store.sensitive_data: + class: Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\EventStore\SensitiveDataEventStoreDecorator + arguments: + - "@surfnet_stepup.event_store.dbal" + - "@surfnet_stepup_middleware_command_handling.repository.sensitive_data_message" + + surfnet_stepup_middleware_command_handling.service.sensitive_data: + class: Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Service\SensitiveDataService + arguments: + - "@surfnet_stepup_middleware_command_handling.repository.sensitive_data_message" diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Resources/config/pipeline.yml b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Resources/config/pipeline.yml index 682ae20ac..7ccdae563 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Resources/config/pipeline.yml +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Resources/config/pipeline.yml @@ -1,64 +1,64 @@ services: - pipeline: - alias: surfnet_stepup_middleware_command_handling.pipeline.transaction_aware_pipeline - public: true + pipeline: + alias: surfnet_stepup_middleware_command_handling.pipeline.transaction_aware_pipeline + public: true - # BC aliases - Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\TransactionAwarePipeline: "@surfnet_stepup_middleware_command_handling.pipeline.transaction_aware_pipeline" - Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\StagedPipeline: "@surfnet_stepup_middleware_command_handling.pipeline.staged_pipeline" - Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\AuthorizingStage: "@surfnet_stepup_middleware_command_handling.pipeline.stage.authorizing" - Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\ValidationStage: "@surfnet_stepup_middleware_command_handling.pipeline.stage.validation" - Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\DispatchStage: "@surfnet_stepup_middleware_command_handling.pipeline.stage.dispatch" - Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\EventDispatchingStage: "@surfnet_stepup_middleware_command_handling.pipeline.stage.event_dispatching" - Broadway\CommandHandling\SimpleCommandBus: "@surfnet_stepup_middleware_command_handling.command_bus" - Surfnet\StepupMiddleware\CommandHandlingBundle\EventListener\ProcessingAbortedExceptionListener: "@surfnet_stepup_middleware_command_handling.listener.invalid_command_exception_listener" + # BC aliases + Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\TransactionAwarePipeline: "@surfnet_stepup_middleware_command_handling.pipeline.transaction_aware_pipeline" + Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\StagedPipeline: "@surfnet_stepup_middleware_command_handling.pipeline.staged_pipeline" + Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\AuthorizingStage: "@surfnet_stepup_middleware_command_handling.pipeline.stage.authorizing" + Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\ValidationStage: "@surfnet_stepup_middleware_command_handling.pipeline.stage.validation" + Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\DispatchStage: "@surfnet_stepup_middleware_command_handling.pipeline.stage.dispatch" + Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\EventDispatchingStage: "@surfnet_stepup_middleware_command_handling.pipeline.stage.event_dispatching" + Broadway\CommandHandling\SimpleCommandBus: "@surfnet_stepup_middleware_command_handling.command_bus" + Surfnet\StepupMiddleware\CommandHandlingBundle\EventListener\ProcessingAbortedExceptionListener: "@surfnet_stepup_middleware_command_handling.listener.invalid_command_exception_listener" - surfnet_stepup_middleware_command_handling.pipeline.transaction_aware_pipeline: - class: Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\TransactionAwarePipeline - public: true - arguments: - - "@logger" - - "@surfnet_stepup_middleware_command_handling.pipeline.staged_pipeline" - - "@doctrine.dbal.middleware_connection" - - "@doctrine.dbal.gateway_connection" + surfnet_stepup_middleware_command_handling.pipeline.transaction_aware_pipeline: + class: Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\TransactionAwarePipeline + public: true + arguments: + - "@logger" + - "@surfnet_stepup_middleware_command_handling.pipeline.staged_pipeline" + - "@doctrine.dbal.middleware_connection" + - "@doctrine.dbal.gateway_connection" - surfnet_stepup_middleware_command_handling.pipeline.staged_pipeline: - class: Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\StagedPipeline - arguments: - - "@logger" + surfnet_stepup_middleware_command_handling.pipeline.staged_pipeline: + class: Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\StagedPipeline + arguments: + - "@logger" - surfnet_stepup_middleware_command_handling.pipeline.stage.authorizing: - class: Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\AuthorizingStage - arguments: - - "@logger" - - "@security.authorization_checker" - tags: [{ name: pipeline.stage, priority: 100 }] + surfnet_stepup_middleware_command_handling.pipeline.stage.authorizing: + class: Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\AuthorizingStage + arguments: + - "@logger" + - "@security.authorization_checker" + tags: [ { name: pipeline.stage, priority: 100 } ] - surfnet_stepup_middleware_command_handling.pipeline.stage.validation: - class: Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\ValidationStage - arguments: - - "@logger" - - "@validator" - tags: [{ name: pipeline.stage, priority: 75 }] + surfnet_stepup_middleware_command_handling.pipeline.stage.validation: + class: Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\ValidationStage + arguments: + - "@logger" + - "@validator" + tags: [ { name: pipeline.stage, priority: 75 } ] - surfnet_stepup_middleware_command_handling.pipeline.stage.dispatch: - class: Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\DispatchStage - arguments: - - "@logger" - - "@surfnet_stepup_middleware_command_handling.command_bus" - tags: [{ name: pipeline.stage, priority: 50 }] + surfnet_stepup_middleware_command_handling.pipeline.stage.dispatch: + class: Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\DispatchStage + arguments: + - "@logger" + - "@surfnet_stepup_middleware_command_handling.command_bus" + tags: [ { name: pipeline.stage, priority: 50 } ] - surfnet_stepup_middleware_command_handling.pipeline.stage.event_dispatching: - class: Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\EventDispatchingStage - arguments: - - "@logger" - - "@surfnet_stepup_middleware_command_handling.event_bus.buffered" - tags: [{ name: pipeline.stage, priority: 25 }] + surfnet_stepup_middleware_command_handling.pipeline.stage.event_dispatching: + class: Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\EventDispatchingStage + arguments: + - "@logger" + - "@surfnet_stepup_middleware_command_handling.event_bus.buffered" + tags: [ { name: pipeline.stage, priority: 25 } ] - surfnet_stepup_middleware_command_handling.command_bus: - class: Broadway\CommandHandling\SimpleCommandBus + surfnet_stepup_middleware_command_handling.command_bus: + class: Broadway\CommandHandling\SimpleCommandBus - surfnet_stepup_middleware_command_handling.listener.invalid_command_exception_listener: - class: Surfnet\StepupMiddleware\CommandHandlingBundle\EventListener\ProcessingAbortedExceptionListener - tags: - - { name: kernel.event_listener, event: kernel.exception, priority: 10 } + surfnet_stepup_middleware_command_handling.listener.invalid_command_exception_listener: + class: Surfnet\StepupMiddleware\CommandHandlingBundle\EventListener\ProcessingAbortedExceptionListener + tags: + - { name: kernel.event_listener, event: kernel.exception, priority: 10 } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Resources/config/processors.yml b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Resources/config/processors.yml index ad865cffc..0b3bde601 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Resources/config/processors.yml +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Resources/config/processors.yml @@ -1,104 +1,104 @@ services: - surfnet_stepup_middleware_command_handling.processor.email_verification_email: - class: Surfnet\StepupMiddleware\CommandHandlingBundle\Processor\EmailVerificationEmailProcessor - arguments: - - "@surfnet_stepup_middleware_command_handling.service.email_verification_mail" - tags: [{ name: event_bus.event_listener, disable_for_replay: true }] + surfnet_stepup_middleware_command_handling.processor.email_verification_email: + class: Surfnet\StepupMiddleware\CommandHandlingBundle\Processor\EmailVerificationEmailProcessor + arguments: + - "@surfnet_stepup_middleware_command_handling.service.email_verification_mail" + tags: [ { name: event_bus.event_listener, disable_for_replay: true } ] - surfnet_stepup_middleware_command_handling.processor.second_factor_revocation_email: - class: Surfnet\StepupMiddleware\CommandHandlingBundle\Processor\SecondFactorRevocationEmailProcessor - arguments: - - "@surfnet_stepup_middleware_command_handling.service.second_factor_revocation_mail" - - "@surfnet_stepup_middleware_api.service.identity" - tags: [{ name: event_bus.event_listener, disable_for_replay: true }] + surfnet_stepup_middleware_command_handling.processor.second_factor_revocation_email: + class: Surfnet\StepupMiddleware\CommandHandlingBundle\Processor\SecondFactorRevocationEmailProcessor + arguments: + - "@surfnet_stepup_middleware_command_handling.service.second_factor_revocation_mail" + - "@surfnet_stepup_middleware_api.service.identity" + tags: [ { name: event_bus.event_listener, disable_for_replay: true } ] - surfnet_stepup_middleware_command_handling.processor.recovery_token_email: - class: Surfnet\StepupMiddleware\CommandHandlingBundle\Processor\RecoveryTokenEmailProcessor - arguments: - - "@surfnet_stepup_middleware_command_handling.service.recovery_token_mail" - - "@surfnet_stepup_middleware_api.service.identity" - tags: [{ name: event_bus.event_listener, disable_for_replay: true }] + surfnet_stepup_middleware_command_handling.processor.recovery_token_email: + class: Surfnet\StepupMiddleware\CommandHandlingBundle\Processor\RecoveryTokenEmailProcessor + arguments: + - "@surfnet_stepup_middleware_command_handling.service.recovery_token_mail" + - "@surfnet_stepup_middleware_api.service.identity" + tags: [ { name: event_bus.event_listener, disable_for_replay: true } ] - surfnet_stepup_middleware_command_handling.processor.second_factor_vetted_email: - class: Surfnet\StepupMiddleware\CommandHandlingBundle\Processor\SecondFactorVettedEmailProcessor - arguments: - - "@surfnet_stepup_middleware_command_handling.service.second_factor_vetted_mail" - tags: [{ name: event_bus.event_listener, disable_for_replay: true }] + surfnet_stepup_middleware_command_handling.processor.second_factor_vetted_email: + class: Surfnet\StepupMiddleware\CommandHandlingBundle\Processor\SecondFactorVettedEmailProcessor + arguments: + - "@surfnet_stepup_middleware_command_handling.service.second_factor_vetted_mail" + tags: [ { name: event_bus.event_listener, disable_for_replay: true } ] - surfnet_stepup_middleware_command_handling.service.email_verification_mail: - public: false - class: Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Service\EmailVerificationMailService - arguments: - - "@mailer.mailer" - - "@surfnet_stepup_middleware_command_handling.email_sender" - - "@translator" - - "" # Verification URL set in bundle extension - - "@surfnet_stepup_middleware_management.service.email_template" - - "" # Fallback locale - - "" # Self service url is set in bundle extension + surfnet_stepup_middleware_command_handling.service.email_verification_mail: + public: false + class: Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Service\EmailVerificationMailService + arguments: + - "@mailer.mailer" + - "@surfnet_stepup_middleware_command_handling.email_sender" + - "@translator" + - "" # Verification URL set in bundle extension + - "@surfnet_stepup_middleware_management.service.email_template" + - "" # Fallback locale + - "" # Self service url is set in bundle extension - surfnet_stepup_middleware_command_handling.service.registration_mail: - public: false - class: Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Service\RegistrationMailService - arguments: - - "@mailer.mailer" - - "@surfnet_stepup_middleware_command_handling.email_sender" - - "@translator" - - "@surfnet_stepup_middleware_management.service.email_template" - - "" # Fallback locale - - "" # Self service url is set in bundle extension - - '@Surfnet\StepupMiddleware\ApiBundle\Configuration\Service\InstitutionConfigurationOptionsService' - - '@Surfnet\StepupMiddleware\ApiBundle\Identity\Service\IdentityService' - - '@Surfnet\StepupMiddleware\ApiBundle\Identity\Service\SecondFactorService' - - '@Surfnet\StepupMiddleware\ApiBundle\Configuration\Service\RaLocationService' - - '@Surfnet\StepupMiddleware\ApiBundle\Identity\Service\RaListingService' - - '@logger' + surfnet_stepup_middleware_command_handling.service.registration_mail: + public: false + class: Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Service\RegistrationMailService + arguments: + - "@mailer.mailer" + - "@surfnet_stepup_middleware_command_handling.email_sender" + - "@translator" + - "@surfnet_stepup_middleware_management.service.email_template" + - "" # Fallback locale + - "" # Self service url is set in bundle extension + - '@Surfnet\StepupMiddleware\ApiBundle\Configuration\Service\InstitutionConfigurationOptionsService' + - '@Surfnet\StepupMiddleware\ApiBundle\Identity\Service\IdentityService' + - '@Surfnet\StepupMiddleware\ApiBundle\Identity\Service\SecondFactorService' + - '@Surfnet\StepupMiddleware\ApiBundle\Configuration\Service\RaLocationService' + - '@Surfnet\StepupMiddleware\ApiBundle\Identity\Service\RaListingService' + - '@logger' - surfnet_stepup_middleware_command_handling.service.second_factor_revocation_mail: - public: false - class: Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Service\SecondFactorRevocationMailService - arguments: - - "@mailer.mailer" - - "@surfnet_stepup_middleware_command_handling.email_sender" - - "@translator" - - "@surfnet_stepup_middleware_management.service.email_template" - - "" # Fallback locale - - "" # Self service url is set in bundle extension - - "@surfnet_stepup_middleware_middleware.second_factor_display_name_resolver" + surfnet_stepup_middleware_command_handling.service.second_factor_revocation_mail: + public: false + class: Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Service\SecondFactorRevocationMailService + arguments: + - "@mailer.mailer" + - "@surfnet_stepup_middleware_command_handling.email_sender" + - "@translator" + - "@surfnet_stepup_middleware_management.service.email_template" + - "" # Fallback locale + - "" # Self service url is set in bundle extension + - "@surfnet_stepup_middleware_middleware.second_factor_display_name_resolver" - surfnet_stepup_middleware_command_handling.service.recovery_token_mail: - public: false - class: Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Service\RecoveryTokenMailService - arguments: - - "@mailer.mailer" - - "@surfnet_stepup_middleware_command_handling.email_sender" - - "@translator" - - "@surfnet_stepup_middleware_management.service.email_template" - - "" # Fallback locale - - "" # Self service url is set in bundle extension - - "@logger" + surfnet_stepup_middleware_command_handling.service.recovery_token_mail: + public: false + class: Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Service\RecoveryTokenMailService + arguments: + - "@mailer.mailer" + - "@surfnet_stepup_middleware_command_handling.email_sender" + - "@translator" + - "@surfnet_stepup_middleware_management.service.email_template" + - "" # Fallback locale + - "" # Self service url is set in bundle extension + - "@logger" - surfnet_stepup_middleware_command_handling.service.second_factor_vetted_mail: - public: false - class: Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Service\SecondFactorVettedMailService - arguments: - - "@mailer.mailer" - - "@surfnet_stepup_middleware_command_handling.email_sender" - - "@translator" - - "@surfnet_stepup_middleware_management.service.email_template" - - "" # Fallback locale - - "" # Self service url is set in bundle extension + surfnet_stepup_middleware_command_handling.service.second_factor_vetted_mail: + public: false + class: Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Service\SecondFactorVettedMailService + arguments: + - "@mailer.mailer" + - "@surfnet_stepup_middleware_command_handling.email_sender" + - "@translator" + - "@surfnet_stepup_middleware_management.service.email_template" + - "" # Fallback locale + - "" # Self service url is set in bundle extension - surfnet_stepup_middleware_command_handling.email_sender: - public: false - class: Surfnet\StepupMiddleware\CommandHandlingBundle\Value\Sender - arguments: - - "" # Name is set in bundle extension - - "" # Email is set in bundle extension + surfnet_stepup_middleware_command_handling.email_sender: + public: false + class: Surfnet\StepupMiddleware\CommandHandlingBundle\Value\Sender + arguments: + - "" # Name is set in bundle extension + - "" # Email is set in bundle extension - surfnet_stepup_middleware_command_handling.processor.institution_configuration: - class: Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\Processor\InstitutionConfigurationProcessor - arguments: - - "@surfnet_stepup_middleware_api.repository.configured_institution" - - "@service_container" - tags: [{ name: event_bus.event_listener, disable_for_replay: true }] + surfnet_stepup_middleware_command_handling.processor.institution_configuration: + class: Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\Processor\InstitutionConfigurationProcessor + arguments: + - "@surfnet_stepup_middleware_api.repository.configured_institution" + - "@service_container" + tags: [ { name: event_bus.event_listener, disable_for_replay: true } ] diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessage.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessage.php index 7ad325ef3..d5b256908 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessage.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessage.php @@ -24,21 +24,15 @@ class SensitiveDataMessage { - private IdentityId $identityId; + private readonly IdentityId $identityId; - private int $playhead; - - /** - * @var SensitiveData - */ - private $sensitiveData; + private readonly int $playhead; /** * @param IdentityId $identityId * @param int $playhead The associated broadway domain message's playhead. - * @param SensitiveData $sensitiveData */ - public function __construct(string $identityId, $playhead, SensitiveData $sensitiveData) + public function __construct(string $identityId, $playhead, private SensitiveData $sensitiveData) { if (!is_int($playhead)) { throw InvalidArgumentException::invalidType('int', 'playhead', $playhead); @@ -46,7 +40,6 @@ public function __construct(string $identityId, $playhead, SensitiveData $sensit $this->identityId = new IdentityId($identityId); $this->playhead = $playhead; - $this->sensitiveData = $sensitiveData; } /** diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessageStream.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessageStream.php index 5ee41434b..ae5abf850 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessageStream.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessageStream.php @@ -27,14 +27,11 @@ class SensitiveDataMessageStream implements IteratorAggregate { - private array $messages; - /** * @param SensitiveDataMessage[] $messages */ - public function __construct(array $messages) + public function __construct(private readonly array $messages) { - $this->messages = $messages; } public function applyToDomainEventStream(DomainEventStream $domainEventStream): void @@ -43,19 +40,19 @@ public function applyToDomainEventStream(DomainEventStream $domainEventStream): /** @var DomainMessage $domainMessage */ foreach ($domainEventStream as $domainMessage) { - $sensitiveDataMessage = isset($sensitiveDataMap[$domainMessage->getPlayhead()]) - ? $sensitiveDataMap[$domainMessage->getPlayhead()] - : null; + $sensitiveDataMessage = $sensitiveDataMap[$domainMessage->getPlayhead()] ?? null; unset($sensitiveDataMap[$domainMessage->getPlayhead()]); $this->setSensitiveData($domainMessage, $sensitiveDataMessage); } if ($sensitiveDataMap !== []) { - throw new SensitiveDataApplicationException(sprintf( - '%d sensitive data messages are still to be matched to events', - count($sensitiveDataMap) - )); + throw new SensitiveDataApplicationException( + sprintf( + '%d sensitive data messages are still to be matched to events', + count($sensitiveDataMap), + ), + ); } } @@ -72,11 +69,12 @@ public function getIterator() } /** - * @param DomainMessage $domainMessage * @param SensitiveDataMessage|null $sensitiveDataMessage */ - private function setSensitiveData(DomainMessage $domainMessage, SensitiveDataMessage $sensitiveDataMessage = null): void - { + private function setSensitiveData( + DomainMessage $domainMessage, + SensitiveDataMessage $sensitiveDataMessage = null, + ): void { $event = $domainMessage->getPayload(); $eventIsForgettable = $event instanceof Forgettable; @@ -85,27 +83,33 @@ private function setSensitiveData(DomainMessage $domainMessage, SensitiveDataMes } if ($eventIsForgettable && !$sensitiveDataMessage) { - throw new SensitiveDataApplicationException(sprintf( - 'Sensitive data is missing for event with UUID %s, playhead %d', - $domainMessage->getId(), - $domainMessage->getPlayhead() - )); + throw new SensitiveDataApplicationException( + sprintf( + 'Sensitive data is missing for event with UUID %s, playhead %d', + $domainMessage->getId(), + $domainMessage->getPlayhead(), + ), + ); } if (!$eventIsForgettable && $sensitiveDataMessage) { - throw new SensitiveDataApplicationException(sprintf( - 'Encountered sensitive data for event which does not support sensitive data, UUID %s, playhead %d', - $domainMessage->getId(), - $domainMessage->getPlayhead() - )); + throw new SensitiveDataApplicationException( + sprintf( + 'Encountered sensitive data for event which does not support sensitive data, UUID %s, playhead %d', + $domainMessage->getId(), + $domainMessage->getPlayhead(), + ), + ); } if ($domainMessage->getId() != $sensitiveDataMessage->getIdentityId()) { - throw new SensitiveDataApplicationException(sprintf( - 'Encountered sensitive data from stream %s for event from stream %s', - $sensitiveDataMessage->getIdentityId(), - $domainMessage->getId() - )); + throw new SensitiveDataApplicationException( + sprintf( + 'Encountered sensitive data from stream %s for event from stream %s', + $sensitiveDataMessage->getIdentityId(), + $domainMessage->getId(), + ), + ); } $event->setSensitiveData($sensitiveDataMessage->getSensitiveData()); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventStore/SensitiveDataEventStoreDecorator.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventStore/SensitiveDataEventStoreDecorator.php index a3ac8abce..4e6a442fb 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventStore/SensitiveDataEventStoreDecorator.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventStore/SensitiveDataEventStoreDecorator.php @@ -31,25 +31,12 @@ /** * Event store decorator that loads and appends the sensitive data of events into a separate data store. */ -final class SensitiveDataEventStoreDecorator implements EventStoreInterface +final readonly class SensitiveDataEventStoreDecorator implements EventStoreInterface { - /** - * @var EventStoreInterface - */ - private EventStoreInterface $decoratedEventStore; - - private SensitiveDataMessageRepository $sensitiveDataMessageRepository; - - /** - * @param EventStoreInterface $decoratedEventStore - * @param SensitiveDataMessageRepository $sensitiveDataMessageRepository - */ public function __construct( - EventStoreInterface $decoratedEventStore, - SensitiveDataMessageRepository $sensitiveDataMessageRepository + private EventStoreInterface $decoratedEventStore, + private SensitiveDataMessageRepository $sensitiveDataMessageRepository, ) { - $this->decoratedEventStore = $decoratedEventStore; - $this->sensitiveDataMessageRepository = $sensitiveDataMessageRepository; } public function load($id): DomainEventStreamInterface @@ -82,7 +69,7 @@ public function append($id, DomainEventStreamInterface $eventStream): void $sensitiveDataMessages[] = new SensitiveDataMessage( $id, $message->getPlayhead(), - $event->getSensitiveData() + $event->getSensitiveData(), ); } @@ -106,15 +93,12 @@ public function loadFromPlayhead($id, int $playhead): DomainEventStreamInterface return $domainEventStream; } - /** - * @param DomainEventStreamInterface $stream - */ public function assertIdentityAggregate(DomainEventStreamInterface $stream): void { foreach ($stream as $message) { if (!$message->getPayload() instanceof IdentityEvent) { throw new InvalidArgumentException( - 'The SensitiveDataEventStoreDecorator only works with Identities, please pass in an IdentityId $id' + 'The SensitiveDataEventStoreDecorator only works with Identities, please pass in an IdentityId $id', ); } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/Forgettable.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/Forgettable.php index 108f647de..ac6e0e269 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/Forgettable.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/Forgettable.php @@ -26,7 +26,6 @@ interface Forgettable public function getSensitiveData(); /** - * @param SensitiveData $sensitiveData * @return void */ public function setSensitiveData(SensitiveData $sensitiveData); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/Repository/SensitiveDataMessageRepository.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/Repository/SensitiveDataMessageRepository.php index dac1d9eca..fc2124445 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/Repository/SensitiveDataMessageRepository.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/Repository/SensitiveDataMessageRepository.php @@ -29,17 +29,13 @@ class SensitiveDataMessageRepository { - private Connection $connection; - - public function __construct(Connection $connection) + public function __construct(private readonly Connection $connection) { - $this->connection = $connection; } /** * Finds all sensitive data records for a given Identity, ordered by playhead. * - * @param IdentityId $identityId * @return SensitiveDataMessageStream */ public function findByIdentityId(IdentityId $identityId): SensitiveDataMessageStream @@ -49,20 +45,17 @@ public function findByIdentityId(IdentityId $identityId): SensitiveDataMessageSt WHERE identity_id = :identity_id ORDER BY playhead ASC'; - $rows = $this->connection->fetchAll($sql, ['identity_id' => (string) $identityId]); - $messages = array_map(function (array $row) use ($identityId): SensitiveDataMessage { - return new SensitiveDataMessage( - $identityId, - (int) $row['playhead'], - SensitiveData::deserialize(JsonHelper::decode($row['sensitive_data'])) - ); - }, $rows); + $rows = $this->connection->fetchAll($sql, ['identity_id' => (string)$identityId]); + $messages = array_map(fn(array $row): SensitiveDataMessage => new SensitiveDataMessage( + $identityId, + (int)$row['playhead'], + SensitiveData::deserialize(JsonHelper::decode($row['sensitive_data'])), + ), $rows); return new SensitiveDataMessageStream($messages); } /** - * @param SensitiveDataMessageStream $sensitiveDataMessageStream * @return void */ public function append(SensitiveDataMessageStream $sensitiveDataMessageStream): void @@ -73,9 +66,9 @@ public function append(SensitiveDataMessageStream $sensitiveDataMessageStream): foreach ($sensitiveDataMessageStream as $sensitiveDataMessage) { /** @var SensitiveDataMessage $sensitiveDataMessage */ $this->connection->insert('event_stream_sensitive_data', [ - 'identity_id' => (string) $sensitiveDataMessage->getIdentityId(), - 'playhead' => $sensitiveDataMessage->getPlayhead(), - 'sensitive_data' => json_encode((object) $sensitiveDataMessage->getSensitiveData()->serialize()), + 'identity_id' => (string)$sensitiveDataMessage->getIdentityId(), + 'playhead' => $sensitiveDataMessage->getPlayhead(), + 'sensitive_data' => json_encode((object)$sensitiveDataMessage->getSensitiveData()->serialize()), ]); } $this->connection->commit(); @@ -86,7 +79,6 @@ public function append(SensitiveDataMessageStream $sensitiveDataMessageStream): } /** - * @param SensitiveDataMessageStream $sensitiveDataMessageStream * @return void */ public function modify(SensitiveDataMessageStream $sensitiveDataMessageStream): void @@ -98,11 +90,11 @@ public function modify(SensitiveDataMessageStream $sensitiveDataMessageStream): /** @var SensitiveDataMessage $sensitiveDataMessage */ $this->connection->update( 'event_stream_sensitive_data', - ['sensitive_data' => json_encode((object) $sensitiveDataMessage->getSensitiveData()->serialize())], + ['sensitive_data' => json_encode((object)$sensitiveDataMessage->getSensitiveData()->serialize())], [ - 'identity_id' => (string) $sensitiveDataMessage->getIdentityId(), - 'playhead' => $sensitiveDataMessage->getPlayhead(), - ] + 'identity_id' => (string)$sensitiveDataMessage->getIdentityId(), + 'playhead' => $sensitiveDataMessage->getPlayhead(), + ], ); } $this->connection->commit(); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/SensitiveData.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/SensitiveData.php index 4329a7708..180092508 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/SensitiveData.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/SensitiveData.php @@ -19,7 +19,6 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData; use Broadway\Serializer\Serializable as SerializableInterface; -use Surfnet\Stepup\Exception\InvalidArgumentException; use Surfnet\Stepup\Identity\Value\CommonName; use Surfnet\Stepup\Identity\Value\Email; use Surfnet\Stepup\Identity\Value\RecoveryTokenIdentifier; @@ -52,7 +51,6 @@ class SensitiveData implements SerializableInterface private ?RecoveryTokenIdentifier $recoveryTokenIdentifier = null; /** - * @param CommonName $commonName * @return SensitiveData */ public function withCommonName(CommonName $commonName): static @@ -64,7 +62,6 @@ public function withCommonName(CommonName $commonName): static } /** - * @param Email $email * @return SensitiveData */ public function withEmail(Email $email): static @@ -76,13 +73,11 @@ public function withEmail(Email $email): static } /** - * @param SecondFactorIdentifier $secondFactorIdentifier - * @param SecondFactorType $secondFactorType * @return SensitiveData */ public function withSecondFactorIdentifier( SecondFactorIdentifier $secondFactorIdentifier, - SecondFactorType $secondFactorType + SecondFactorType $secondFactorType, ): static { $clone = clone $this; $clone->secondFactorType = $secondFactorType; @@ -93,7 +88,7 @@ public function withSecondFactorIdentifier( public function withRecoveryTokenSecret( RecoveryTokenIdentifier $recoveryTokenIdentifier, - RecoveryTokenType $type + RecoveryTokenType $type, ): SensitiveData { $clone = clone $this; $clone->recoveryTokenType = $type; @@ -193,7 +188,7 @@ public static function deserialize(array $data) if (isset($data['recovery_token_identifier'])) { $self->recoveryTokenIdentifier = RecoveryTokenIdentifierFactory::forType( $self->recoveryTokenType, - $data['recovery_token_identifier'] + $data['recovery_token_identifier'], ); } @@ -208,13 +203,13 @@ public function serialize(): array { $vettingType = (is_null($this->vettingType)) ? null : $this->vettingType->jsonSerialize(); return array_filter([ - 'common_name' => $this->commonName, - 'email' => $this->email, - 'second_factor_type' => $this->secondFactorType, + 'common_name' => $this->commonName, + 'email' => $this->email, + 'second_factor_type' => $this->secondFactorType, 'second_factor_identifier' => $this->secondFactorIdentifier, - 'recovery_token_type' => (string) $this->recoveryTokenType, + 'recovery_token_type' => (string)$this->recoveryTokenType, 'recovery_token_identifier' => $this->recoveryTokenIdentifier, - 'vetting_type' => $vettingType + 'vetting_type' => $vettingType, ]); } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/Service/SensitiveDataService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/Service/SensitiveDataService.php index 95812739a..a8be3e229 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/Service/SensitiveDataService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/Service/SensitiveDataService.php @@ -23,11 +23,8 @@ class SensitiveDataService { - private SensitiveDataMessageRepository $sensitiveDataMessageRepository; - - public function __construct(SensitiveDataMessageRepository $sensitiveDataMessageRepository) + public function __construct(private readonly SensitiveDataMessageRepository $sensitiveDataMessageRepository) { - $this->sensitiveDataMessageRepository = $sensitiveDataMessageRepository; } public function forgetSensitiveData(IdentityId $identityId): void diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Command/AbstractCommandTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Command/AbstractCommandTest.php index ce5689d20..658c971df 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Command/AbstractCommandTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Command/AbstractCommandTest.php @@ -33,8 +33,8 @@ public function to_string_generates_command_identifiable_information(): void $this->assertEquals( 'Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\Command\FixedUuidStubCommand[' . $uuid . ']', - (string) $command, - 'Command cast to string should give F\Q\C\N[UuidOfCommand]' + (string)$command, + 'Command cast to string should give F\Q\C\N[UuidOfCommand]', ); } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/CommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/CommandHandlerTest.php index 4033f298c..b2eff853a 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/CommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/CommandHandlerTest.php @@ -28,6 +28,6 @@ abstract class CommandHandlerTest extends CommandHandlerScenarioTestCase */ protected static function uuid(): string { - return (string) Uuid::uuid4(); + return (string)Uuid::uuid4(); } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php index ee7ff6396..d99d6fbb6 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php @@ -39,7 +39,7 @@ final class ConfigurationCommandHandlerTest extends CommandHandlerTest /** * Shorthand for fixed Configuration ID. */ - const CID = Configuration::CONFIGURATION_ID; + public const CID = Configuration::CONFIGURATION_ID; /** * @test @@ -48,13 +48,13 @@ final class ConfigurationCommandHandlerTest extends CommandHandlerTest public function configuration_can_be_initialised(): void { $configuration = [ - 'gateway' => [ + 'gateway' => [ 'identity_providers' => [], 'service_providers' => [], ], - 'sraa' => [], + 'sraa' => [], 'email_templates' => [ - 'confirm_email' => ['en_GB' => ''], + 'confirm_email' => ['en_GB' => ''], 'registration_code' => ['en_GB' => ''], ], ]; @@ -73,26 +73,26 @@ public function configuration_can_be_initialised(): void public function configuration_can_be_updated(): void { $configuration1 = [ - 'gateway' => [ + 'gateway' => [ 'identity_providers' => [], 'service_providers' => [], ], - 'sraa' => [], + 'sraa' => [], 'email_templates' => [ - 'confirm_email' => ['en_GB' => ''], + 'confirm_email' => ['en_GB' => ''], 'registration_code' => ['en_GB' => ''], ], ]; $configuration2 = [ - 'gateway' => [ + 'gateway' => [ 'identity_providers' => [ [ "entity_id" => "https://entity.tld/id", "loa" => [ "__default__" => "https://entity.tld/authentication/loa2", ], - ] + ], ], 'service_providers' => [ [ @@ -103,45 +103,48 @@ public function configuration_can_be_updated(): void "__default__" => "https://entity.tld/authentication/loa2", ], "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [] - ] + "blacklisted_encryption_algorithms" => [], + ], ], ], - 'sraa' => [ + 'sraa' => [ 'SURFnet bv' => [ [ 'name_id' => 'ddfd', - ] + ], ], ], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], ]; $this->scenario ->withAggregateId(self::CID) - ->given(array_merge( - [$this->createNewConfigurationCreatedEvent()], - $this->createConfigurationUpdatedEvents($configuration1, null) - )) + ->given( + array_merge( + [$this->createNewConfigurationCreatedEvent()], + $this->createConfigurationUpdatedEvents($configuration1, null), + ), + ) ->when($this->createUpdateCommand($configuration2)) ->then($this->createConfigurationUpdatedEvents($configuration2, $configuration1)); } - protected function createCommandHandler(EventStoreInterface $eventStore, EventBusInterface $eventBus): CommandHandler - { + protected function createCommandHandler( + EventStoreInterface $eventStore, + EventBusInterface $eventBus, + ): CommandHandler { $aggregateFactory = new PublicConstructorAggregateFactory(); return new ConfigurationCommandHandler( - new ConfigurationRepository($eventStore, $eventBus, $aggregateFactory) + new ConfigurationRepository($eventStore, $eventBus, $aggregateFactory), ); } /** - * @param array $configuration * @return UpdateConfigurationCommand */ private function createUpdateCommand(array $configuration): UpdateConfigurationCommand @@ -161,8 +164,6 @@ private function createNewConfigurationCreatedEvent(): NewConfigurationCreatedEv } /** - * @param array $newConfiguration - * @param array $oldConfiguration * @return array */ private function createConfigurationUpdatedEvents(array $newConfiguration, array $oldConfiguration = null): array diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/InstitutionConfigurationCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/InstitutionConfigurationCommandHandlerTest.php index 957515742..b6b62bc5e 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/InstitutionConfigurationCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/InstitutionConfigurationCommandHandlerTest.php @@ -42,6 +42,7 @@ use Surfnet\Stepup\Configuration\Value\AllowedSecondFactorList; use Surfnet\Stepup\Configuration\Value\ContactInformation; use Surfnet\Stepup\Configuration\Value\Institution; +use Surfnet\Stepup\Configuration\Value\InstitutionAuthorizationOption; use Surfnet\Stepup\Configuration\Value\InstitutionConfigurationId; use Surfnet\Stepup\Configuration\Value\InstitutionRole; use Surfnet\Stepup\Configuration\Value\Location; @@ -53,7 +54,6 @@ use Surfnet\Stepup\Configuration\Value\ShowRaaContactInformationOption; use Surfnet\Stepup\Configuration\Value\SsoOn2faOption; use Surfnet\Stepup\Configuration\Value\UseRaLocationsOption; -use Surfnet\Stepup\Configuration\Value\InstitutionAuthorizationOption; use Surfnet\Stepup\Configuration\Value\VerifyEmailOption; use Surfnet\Stepup\Exception\DomainException; use Surfnet\StepupBundle\Value\SecondFactorType; @@ -74,16 +74,16 @@ class InstitutionConfigurationCommandHandlerTest extends CommandHandlerTest */ public function an_institution_configuration_is_created_when_there_is_none_for_a_given_institution(): void { - $command = new CreateInstitutionConfigurationCommand(); + $command = new CreateInstitutionConfigurationCommand(); $command->institution = 'An institution'; - $institution = new Institution($command->institution); - $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); - $defaultUseRaLocationsOption = UseRaLocationsOption::getDefault(); + $institution = new Institution($command->institution); + $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); + $defaultUseRaLocationsOption = UseRaLocationsOption::getDefault(); $defaultShowRaaContactInformationOption = ShowRaaContactInformationOption::getDefault(); - $defaultVerifyEmailOption = VerifyEmailOption::getDefault(); - $numberOfTokensPerIdentityOption = new NumberOfTokensPerIdentityOption(0); - $defaultAllowedSecondFactorList = AllowedSecondFactorList::blank(); + $defaultVerifyEmailOption = VerifyEmailOption::getDefault(); + $numberOfTokensPerIdentityOption = new NumberOfTokensPerIdentityOption(0); + $defaultAllowedSecondFactorList = AllowedSecondFactorList::blank(); $ssoOn2faOption = SsoOn2faOption::getDefault(); $selfVetOption = SelfVetOption::getDefault(); $selfAssertedTokensOption = SelfAssertedTokensOption::getDefault(); @@ -104,27 +104,27 @@ public function an_institution_configuration_is_created_when_there_is_none_for_a $numberOfTokensPerIdentityOption, $ssoOn2faOption, $selfVetOption, - $selfAssertedTokensOption + $selfAssertedTokensOption, ), new AllowedSecondFactorListUpdatedEvent( $institutionConfigurationId, $institution, - $defaultAllowedSecondFactorList + $defaultAllowedSecondFactorList, ), new UseRaOptionChangedEvent( $institutionConfigurationId, $institution, - $useRaOption + $useRaOption, ), new UseRaaOptionChangedEvent( $institutionConfigurationId, $institution, - $useRaaOption + $useRaaOption, ), new SelectRaaOptionChangedEvent( $institutionConfigurationId, $institution, - $selectRaaOption + $selectRaaOption, ), ]); } @@ -138,14 +138,14 @@ public function an_institution_configuration_cannot_be_created_when_there_alread $this->expectException(DomainException::class); $this->expectExceptionMessage('Cannot rebuild InstitutionConfiguration as it has not been destroyed'); - $command = new CreateInstitutionConfigurationCommand(); - $command->institution = 'An institution'; + $command = new CreateInstitutionConfigurationCommand(); + $command->institution = 'An institution'; - $institution = new Institution($command->institution); - $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); - $useRaLocationsOption = new UseRaLocationsOption(false); + $institution = new Institution($command->institution); + $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); + $useRaLocationsOption = new UseRaLocationsOption(false); $showRaaContactInformationOption = new ShowRaaContactInformationOption(true); - $verifyEmailOption = new VerifyEmailOption(true); + $verifyEmailOption = new VerifyEmailOption(true); $numberOfTokensPerIdentityOption = new NumberOfTokensPerIdentityOption(0); $ssoOn2faOption = SsoOn2faOption::getDefault(); $selfVetOption = SelfVetOption::getDefault(); @@ -166,22 +166,22 @@ public function an_institution_configuration_cannot_be_created_when_there_alread $numberOfTokensPerIdentityOption, $ssoOn2faOption, $selfVetOption, - $selfAssertedTokensOption + $selfAssertedTokensOption, ), new UseRaOptionChangedEvent( $institutionConfigurationId, $institution, - $useRaOption + $useRaOption, ), new UseRaaOptionChangedEvent( $institutionConfigurationId, $institution, - $useRaaOption + $useRaaOption, ), new SelectRaaOptionChangedEvent( $institutionConfigurationId, $institution, - $selectRaaOption + $selectRaaOption, ), ]) ->when($command); @@ -193,13 +193,13 @@ public function an_institution_configuration_cannot_be_created_when_there_alread */ public function institution_configuration_options_are_not_changed_if_their_given_value_is_not_different_from_their_current_value(): void { - $institution = new Institution('Institution'); - $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); - $useRaLocationsOption = new UseRaLocationsOption(false); + $institution = new Institution('Institution'); + $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); + $useRaLocationsOption = new UseRaLocationsOption(false); $showRaaContactInformationOption = new ShowRaaContactInformationOption(true); - $verifyEmailOption = new VerifyEmailOption(true); + $verifyEmailOption = new VerifyEmailOption(true); $numberOfTokensPerIdentityOption = new NumberOfTokensPerIdentityOption(1); - $defaultAllowedSecondFactorList = AllowedSecondFactorList::blank(); + $defaultAllowedSecondFactorList = AllowedSecondFactorList::blank(); $selfVetOption = SelfVetOption::getDefault(); $selfAssertedTokensOption = SelfAssertedTokensOption::getDefault(); $ssoOn2faOption = SsoOn2faOption::getDefault(); @@ -207,18 +207,18 @@ public function institution_configuration_options_are_not_changed_if_their_given $useRaaOption = InstitutionAuthorizationOption::getDefault(InstitutionRole::useRaa()); $selectRaaOption = InstitutionAuthorizationOption::getDefault(InstitutionRole::selectRaa()); - $command = new ReconfigureInstitutionConfigurationOptionsCommand(); - $command->institution = $institution->getInstitution(); - $command->useRaLocationsOption = $useRaLocationsOption->isEnabled(); + $command = new ReconfigureInstitutionConfigurationOptionsCommand(); + $command->institution = $institution->getInstitution(); + $command->useRaLocationsOption = $useRaLocationsOption->isEnabled(); $command->showRaaContactInformationOption = $showRaaContactInformationOption->isEnabled(); - $command->verifyEmailOption = $verifyEmailOption->isEnabled(); + $command->verifyEmailOption = $verifyEmailOption->isEnabled(); $command->selfVetOption = $selfVetOption->isEnabled(); $command->allowedSecondFactors = $selfAssertedTokensOption->isEnabled(); $command->numberOfTokensPerIdentityOption = $numberOfTokensPerIdentityOption->getNumberOfTokensPerIdentity(); $command->useRaOption = $useRaOption->jsonSerialize(); $command->useRaaOption = $useRaaOption->jsonSerialize(); $command->selectRaaOption = $selectRaaOption->jsonSerialize(); - $command->allowedSecondFactors = []; + $command->allowedSecondFactors = []; $this->scenario ->withAggregateId($institutionConfigurationId) @@ -232,27 +232,27 @@ public function institution_configuration_options_are_not_changed_if_their_given $numberOfTokensPerIdentityOption, $ssoOn2faOption, $selfVetOption, - $selfAssertedTokensOption + $selfAssertedTokensOption, ), new AllowedSecondFactorListUpdatedEvent( $institutionConfigurationId, $institution, - $defaultAllowedSecondFactorList + $defaultAllowedSecondFactorList, ), new UseRaOptionChangedEvent( $institutionConfigurationId, $institution, - $useRaOption + $useRaOption, ), new UseRaaOptionChangedEvent( $institutionConfigurationId, $institution, - $useRaaOption + $useRaaOption, ), new SelectRaaOptionChangedEvent( $institutionConfigurationId, $institution, - $selectRaaOption + $selectRaaOption, ), ]) ->when($command) @@ -265,11 +265,11 @@ public function institution_configuration_options_are_not_changed_if_their_given */ public function use_ra_locations_option_is_changed_if_its_given_value_is_different_from_the_current_value(): void { - $institution = new Institution('Institution'); - $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); - $useRaLocationsOption = new UseRaLocationsOption(false); + $institution = new Institution('Institution'); + $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); + $useRaLocationsOption = new UseRaLocationsOption(false); $showRaaContactInformationOption = new ShowRaaContactInformationOption(true); - $verifyEmailOption = new VerifyEmailOption(true); + $verifyEmailOption = new VerifyEmailOption(true); $numberOfTokensPerIdentityOption = new NumberOfTokensPerIdentityOption(0); $ssoOn2faOption = SsoOn2faOption::getDefault(); $selfVetOption = SelfVetOption::getDefault(); @@ -279,22 +279,22 @@ public function use_ra_locations_option_is_changed_if_its_given_value_is_differe $useRaaOption = InstitutionAuthorizationOption::getDefault(InstitutionRole::useRaa()); $selectRaaOption = InstitutionAuthorizationOption::getDefault(InstitutionRole::selectRaa()); - $defaultAllowedSecondFactorList = AllowedSecondFactorList::blank(); + $defaultAllowedSecondFactorList = AllowedSecondFactorList::blank(); $differentUseRaLocationsOptionValue = true; - $command = new ReconfigureInstitutionConfigurationOptionsCommand(); - $command->institution = $institution->getInstitution(); - $command->useRaLocationsOption = $differentUseRaLocationsOptionValue; + $command = new ReconfigureInstitutionConfigurationOptionsCommand(); + $command->institution = $institution->getInstitution(); + $command->useRaLocationsOption = $differentUseRaLocationsOptionValue; $command->showRaaContactInformationOption = $showRaaContactInformationOption->isEnabled(); - $command->verifyEmailOption = $verifyEmailOption->isEnabled(); + $command->verifyEmailOption = $verifyEmailOption->isEnabled(); $command->selfVetOption = $selfVetOption->isEnabled(); $command->allowedSecondFactors = $selfAssertedTokensOption->isEnabled(); $command->numberOfTokensPerIdentityOption = $numberOfTokensPerIdentityOption->getNumberOfTokensPerIdentity(); $command->useRaOption = $useRaOption->jsonSerialize(); $command->useRaaOption = $useRaaOption->jsonSerialize(); $command->selectRaaOption = $selectRaaOption->jsonSerialize(); - $command->allowedSecondFactors = []; + $command->allowedSecondFactors = []; $this->scenario ->withAggregateId($institutionConfigurationId) @@ -308,27 +308,27 @@ public function use_ra_locations_option_is_changed_if_its_given_value_is_differe $numberOfTokensPerIdentityOption, $ssoOn2faOption, $selfVetOption, - $selfAssertedTokensOption + $selfAssertedTokensOption, ), new AllowedSecondFactorListUpdatedEvent( $institutionConfigurationId, $institution, - $defaultAllowedSecondFactorList + $defaultAllowedSecondFactorList, ), new UseRaOptionChangedEvent( $institutionConfigurationId, $institution, - $useRaOption + $useRaOption, ), new UseRaaOptionChangedEvent( $institutionConfigurationId, $institution, - $useRaaOption + $useRaaOption, ), new SelectRaaOptionChangedEvent( $institutionConfigurationId, $institution, - $selectRaaOption + $selectRaaOption, ), ]) ->when($command) @@ -336,8 +336,8 @@ public function use_ra_locations_option_is_changed_if_its_given_value_is_differe new UseRaLocationsOptionChangedEvent( $institutionConfigurationId, $institution, - new UseRaLocationsOption($differentUseRaLocationsOptionValue) - ) + new UseRaLocationsOption($differentUseRaLocationsOptionValue), + ), ]); } @@ -347,11 +347,11 @@ public function use_ra_locations_option_is_changed_if_its_given_value_is_differe */ public function show_raa_contact_information_option_is_changed_if_its_given_value_is_different_from_the_current_value(): void { - $institution = new Institution('Institution'); - $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); - $useRaLocationsOption = new UseRaLocationsOption(true); + $institution = new Institution('Institution'); + $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); + $useRaLocationsOption = new UseRaLocationsOption(true); $showRaaContactInformationOption = new ShowRaaContactInformationOption(true); - $verifyEmailOption = new VerifyEmailOption(true); + $verifyEmailOption = new VerifyEmailOption(true); $numberOfTokensPerIdentityOption = new NumberOfTokensPerIdentityOption(0); $ssoOn2faOption = SsoOn2faOption::getDefault(); $selfVetOption = SelfVetOption::getDefault(); @@ -360,19 +360,19 @@ public function show_raa_contact_information_option_is_changed_if_its_given_valu $useRaaOption = InstitutionAuthorizationOption::getDefault(InstitutionRole::useRaa()); $selectRaaOption = InstitutionAuthorizationOption::getDefault(InstitutionRole::selectRaa()); - $defaultAllowedSecondFactorList = AllowedSecondFactorList::blank(); + $defaultAllowedSecondFactorList = AllowedSecondFactorList::blank(); $differentShowRaaContactInformationOptionValue = false; - $command = new ReconfigureInstitutionConfigurationOptionsCommand(); - $command->institution = $institution->getInstitution(); + $command = new ReconfigureInstitutionConfigurationOptionsCommand(); + $command->institution = $institution->getInstitution(); $command->showRaaContactInformationOption = $differentShowRaaContactInformationOptionValue; - $command->useRaLocationsOption = $useRaLocationsOption->isEnabled(); - $command->verifyEmailOption = $verifyEmailOption->isEnabled(); + $command->useRaLocationsOption = $useRaLocationsOption->isEnabled(); + $command->verifyEmailOption = $verifyEmailOption->isEnabled(); $command->selfVetOption = $selfVetOption->isEnabled(); $command->allowedSecondFactors = $selfAssertedTokensOption->isEnabled(); $command->numberOfTokensPerIdentityOption = $numberOfTokensPerIdentityOption->getNumberOfTokensPerIdentity(); - $command->allowedSecondFactors = []; + $command->allowedSecondFactors = []; $this->scenario ->withAggregateId($institutionConfigurationId) @@ -386,27 +386,27 @@ public function show_raa_contact_information_option_is_changed_if_its_given_valu $numberOfTokensPerIdentityOption, $ssoOn2faOption, $selfVetOption, - $selfAssertedTokensOption + $selfAssertedTokensOption, ), new AllowedSecondFactorListUpdatedEvent( $institutionConfigurationId, $institution, - $defaultAllowedSecondFactorList + $defaultAllowedSecondFactorList, ), new UseRaOptionChangedEvent( $institutionConfigurationId, $institution, - $useRaOption + $useRaOption, ), new UseRaaOptionChangedEvent( $institutionConfigurationId, $institution, - $useRaaOption + $useRaaOption, ), new SelectRaaOptionChangedEvent( $institutionConfigurationId, $institution, - $selectRaaOption + $selectRaaOption, ), ]) ->when($command) @@ -414,8 +414,8 @@ public function show_raa_contact_information_option_is_changed_if_its_given_valu new ShowRaaContactInformationOptionChangedEvent( $institutionConfigurationId, $institution, - new ShowRaaContactInformationOption($differentShowRaaContactInformationOptionValue) - ) + new ShowRaaContactInformationOption($differentShowRaaContactInformationOptionValue), + ), ]); } @@ -425,11 +425,11 @@ public function show_raa_contact_information_option_is_changed_if_its_given_valu */ public function allowed_second_factor_list_is_changed_if_its_values_are_different_than_the_current_list(): void { - $institution = new Institution('Institution'); - $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); - $useRaLocationsOption = UseRaLocationsOption::getDefault(); + $institution = new Institution('Institution'); + $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); + $useRaLocationsOption = UseRaLocationsOption::getDefault(); $showRaaContactInformationOption = ShowRaaContactInformationOption::getDefault(); - $verifyEmailOption = new VerifyEmailOption(true); + $verifyEmailOption = new VerifyEmailOption(true); $numberOfTokensPerIdentityOption = new NumberOfTokensPerIdentityOption(0); $ssoOn2faOption = SsoOn2faOption::getDefault(); $selfVetOption = SelfVetOption::getDefault(); @@ -444,14 +444,14 @@ public function allowed_second_factor_list_is_changed_if_its_values_are_differen $secondFactorsToAllow = ['sms', 'yubikey']; $updatedAllowedSecondFactorList = AllowedSecondFactorList::ofTypes([ new SecondFactorType($secondFactorsToAllow[0]), - new SecondFactorType($secondFactorsToAllow[1]) + new SecondFactorType($secondFactorsToAllow[1]), ]); $command = new ReconfigureInstitutionConfigurationOptionsCommand(); $command->institution = $institution->getInstitution(); $command->useRaLocationsOption = $useRaLocationsOption->isEnabled(); $command->showRaaContactInformationOption = $showRaaContactInformationOption->isEnabled(); - $command->verifyEmailOption = $verifyEmailOption->isEnabled(); + $command->verifyEmailOption = $verifyEmailOption->isEnabled(); $command->selfVetOption = $selfVetOption->isEnabled(); $command->allowedSecondFactors = $selfAssertedTokensOption->isEnabled(); $command->numberOfTokensPerIdentityOption = $numberOfTokensPerIdentityOption->getNumberOfTokensPerIdentity(); @@ -469,27 +469,27 @@ public function allowed_second_factor_list_is_changed_if_its_values_are_differen $numberOfTokensPerIdentityOption, $ssoOn2faOption, $selfVetOption, - $selfAssertedTokensOption + $selfAssertedTokensOption, ), new AllowedSecondFactorListUpdatedEvent( $institutionConfigurationId, $institution, - $originalAllowedSecondFactorList + $originalAllowedSecondFactorList, ), new UseRaOptionChangedEvent( $institutionConfigurationId, $institution, - $useRaOption + $useRaOption, ), new UseRaaOptionChangedEvent( $institutionConfigurationId, $institution, - $useRaaOption + $useRaaOption, ), new SelectRaaOptionChangedEvent( $institutionConfigurationId, $institution, - $selectRaaOption + $selectRaaOption, ), ]) ->when($command) @@ -497,7 +497,7 @@ public function allowed_second_factor_list_is_changed_if_its_values_are_differen new AllowedSecondFactorListUpdatedEvent( $institutionConfigurationId, $institution, - $updatedAllowedSecondFactorList + $updatedAllowedSecondFactorList, ), ]); } @@ -511,14 +511,14 @@ public function allowed_second_factor_list_is_not_changed_if_its_values_are_the_ $secondFactorsToAllow = ['sms', 'yubikey']; $allowedSecondFactorList = AllowedSecondFactorList::ofTypes([ new SecondFactorType($secondFactorsToAllow[0]), - new SecondFactorType($secondFactorsToAllow[1]) + new SecondFactorType($secondFactorsToAllow[1]), ]); - $institution = new Institution('Institution'); - $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); - $useRaLocationsOption = UseRaLocationsOption::getDefault(); + $institution = new Institution('Institution'); + $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); + $useRaLocationsOption = UseRaLocationsOption::getDefault(); $showRaaContactInformationOption = ShowRaaContactInformationOption::getDefault(); - $verifyEmailOption = new VerifyEmailOption(true); + $verifyEmailOption = new VerifyEmailOption(true); $numberOfTokensPerIdentityOption = new NumberOfTokensPerIdentityOption(0); $ssoOn2faOption = SsoOn2faOption::getDefault(); $selfVetOption = SelfVetOption::getDefault(); @@ -533,7 +533,7 @@ public function allowed_second_factor_list_is_not_changed_if_its_values_are_the_ $command->institution = $institution->getInstitution(); $command->useRaLocationsOption = $useRaLocationsOption->isEnabled(); $command->showRaaContactInformationOption = $showRaaContactInformationOption->isEnabled(); - $command->verifyEmailOption = $verifyEmailOption->isEnabled(); + $command->verifyEmailOption = $verifyEmailOption->isEnabled(); $command->selfVetOption = $selfVetOption->isEnabled(); $command->allowedSecondFactors = $selfAssertedTokensOption->isEnabled(); $command->numberOfTokensPerIdentityOption = $numberOfTokensPerIdentityOption->getNumberOfTokensPerIdentity(); @@ -551,28 +551,28 @@ public function allowed_second_factor_list_is_not_changed_if_its_values_are_the_ $numberOfTokensPerIdentityOption, $ssoOn2faOption, $selfVetOption, - $selfAssertedTokensOption + $selfAssertedTokensOption, ), new UseRaOptionChangedEvent( $institutionConfigurationId, $institution, - $useRaOption + $useRaOption, ), new UseRaaOptionChangedEvent( $institutionConfigurationId, $institution, - $useRaaOption + $useRaaOption, ), new SelectRaaOptionChangedEvent( $institutionConfigurationId, $institution, - $selectRaaOption + $selectRaaOption, ), new AllowedSecondFactorListUpdatedEvent( $institutionConfigurationId, $institution, - $originalAllowedSecondFactorList - ) + $originalAllowedSecondFactorList, + ), ]) ->when($command) ->then([]); @@ -584,19 +584,19 @@ public function allowed_second_factor_list_is_not_changed_if_its_values_are_the_ */ public function an_ra_location_can_be_added_to_an_existing_institution_configuration(): void { - $command = new AddRaLocationCommand(); - $command->raLocationId = self::uuid(); - $command->institution = 'An institution'; - $command->raLocationName = 'An RA location name'; - $command->location = 'A location'; + $command = new AddRaLocationCommand(); + $command->raLocationId = self::uuid(); + $command->institution = 'An institution'; + $command->raLocationName = 'An RA location name'; + $command->location = 'A location'; $command->contactInformation = 'Some contact information'; - $institution = new Institution($command->institution); - $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); - $useRaLocationsOption = new UseRaLocationsOption(true); + $institution = new Institution($command->institution); + $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); + $useRaLocationsOption = new UseRaLocationsOption(true); $showRaaContactInformationOption = new ShowRaaContactInformationOption(true); $ssoOn2faOption = SsoOn2faOption::getDefault(); - $verifyEmailOption = new VerifyEmailOption(true); + $verifyEmailOption = new VerifyEmailOption(true); $numberOfTokensPerIdentityOption = new NumberOfTokensPerIdentityOption(0); $selfVetOption = SelfVetOption::getDefault(); $selfAssertedTokensOption = SelfAssertedTokensOption::getDefault(); @@ -613,7 +613,7 @@ public function an_ra_location_can_be_added_to_an_existing_institution_configura $numberOfTokensPerIdentityOption, $ssoOn2faOption, $selfVetOption, - $selfAssertedTokensOption + $selfAssertedTokensOption, ), ]) ->when($command) @@ -624,8 +624,8 @@ public function an_ra_location_can_be_added_to_an_existing_institution_configura new RaLocationId($command->raLocationId), new RaLocationName($command->raLocationName), new Location($command->location), - new ContactInformation($command->contactInformation) - ) + new ContactInformation($command->contactInformation), + ), ]); } @@ -638,18 +638,18 @@ public function the_same_ra_location_cannot_be_added_twice(): void $this->expectException(DomainException::class); $this->expectExceptionMessage('already present'); - $command = new AddRaLocationCommand(); - $command->raLocationId = self::uuid(); - $command->institution = 'An institution'; - $command->raLocationName = 'An RA location name'; - $command->location = 'A location'; + $command = new AddRaLocationCommand(); + $command->raLocationId = self::uuid(); + $command->institution = 'An institution'; + $command->raLocationName = 'An RA location name'; + $command->location = 'A location'; $command->contactInformation = 'Some contact information'; - $institution = new Institution($command->institution); - $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); - $useRaLocationsOption = new UseRaLocationsOption(true); + $institution = new Institution($command->institution); + $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); + $useRaLocationsOption = new UseRaLocationsOption(true); $showRaaContactInformationOption = new ShowRaaContactInformationOption(true); - $verifyEmailOption = new VerifyEmailOption(true); + $verifyEmailOption = new VerifyEmailOption(true); $ssoOn2faOption = SsoOn2faOption::getDefault(); $selfVetOption = SelfVetOption::getDefault(); $selfAssertedTokensOption = SelfAssertedTokensOption::getDefault(); @@ -667,7 +667,7 @@ public function the_same_ra_location_cannot_be_added_twice(): void $numberOfTokensPerIdentityOption, $ssoOn2faOption, $selfVetOption, - $selfAssertedTokensOption + $selfAssertedTokensOption, ), new RaLocationAddedEvent( $institutionConfigurationId, @@ -675,8 +675,8 @@ public function the_same_ra_location_cannot_be_added_twice(): void new RaLocationId($command->raLocationId), new RaLocationName($command->raLocationName), new Location($command->location), - new ContactInformation($command->contactInformation) - ) + new ContactInformation($command->contactInformation), + ), ]) ->when($command); } @@ -689,18 +689,18 @@ public function an_ra_location_can_be_renamed(): void { $originalRaLocationName = new RaLocationName('An old RA location name'); - $command = new ChangeRaLocationCommand(); - $command->raLocationId = self::uuid(); - $command->institution = 'An institution'; - $command->raLocationName = 'An RA location name'; - $command->location = 'A location'; + $command = new ChangeRaLocationCommand(); + $command->raLocationId = self::uuid(); + $command->institution = 'An institution'; + $command->raLocationName = 'An RA location name'; + $command->location = 'A location'; $command->contactInformation = 'Some contact information'; - $institution = new Institution($command->institution); - $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); - $useRaLocationsOption = new UseRaLocationsOption(true); + $institution = new Institution($command->institution); + $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); + $useRaLocationsOption = new UseRaLocationsOption(true); $showRaaContactInformationOption = new ShowRaaContactInformationOption(true); - $verifyEmailOption = new VerifyEmailOption(true); + $verifyEmailOption = new VerifyEmailOption(true); $ssoOn2faOption = SsoOn2faOption::getDefault(); $selfVetOption = SelfVetOption::getDefault(); $selfAssertedTokensOption = SelfAssertedTokensOption::getDefault(); @@ -718,7 +718,7 @@ public function an_ra_location_can_be_renamed(): void $numberOfTokensPerIdentityOption, $ssoOn2faOption, $selfVetOption, - $selfAssertedTokensOption + $selfAssertedTokensOption, ), new RaLocationAddedEvent( $institutionConfigurationId, @@ -726,16 +726,16 @@ public function an_ra_location_can_be_renamed(): void new RaLocationId($command->raLocationId), $originalRaLocationName, new Location($command->location), - new ContactInformation($command->contactInformation) - ) + new ContactInformation($command->contactInformation), + ), ]) ->when($command) ->then([ new RaLocationRenamedEvent( $institutionConfigurationId, new RaLocationId($command->raLocationId), - new RaLocationName($command->raLocationName) - ) + new RaLocationName($command->raLocationName), + ), ]); } @@ -745,21 +745,21 @@ public function an_ra_location_can_be_renamed(): void */ public function an_ra_location_cannot_be_changed_if_it_is_not_present_within_an_institution_configuration(): void { - $this->expectException('Surfnet\Stepup\Exception\DomainException'); + $this->expectException(DomainException::class); $this->expectExceptionMessage('not present'); - $command = new ChangeRaLocationCommand(); - $command->raLocationId = self::uuid(); - $command->institution = 'An institution'; - $command->raLocationName = 'An RA location name'; - $command->location = 'A location'; + $command = new ChangeRaLocationCommand(); + $command->raLocationId = self::uuid(); + $command->institution = 'An institution'; + $command->raLocationName = 'An RA location name'; + $command->location = 'A location'; $command->contactInformation = 'Some contact information'; - $institution = new Institution($command->institution); - $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); - $useRaLocationsOption = new UseRaLocationsOption(true); + $institution = new Institution($command->institution); + $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); + $useRaLocationsOption = new UseRaLocationsOption(true); $showRaaContactInformationOption = new ShowRaaContactInformationOption(true); - $verifyEmailOption = new VerifyEmailOption(true); + $verifyEmailOption = new VerifyEmailOption(true); $ssoOn2faOption = SsoOn2faOption::getDefault(); $selfVetOption = SelfVetOption::getDefault(); $selfAssertedTokensOption = SelfAssertedTokensOption::getDefault(); @@ -777,8 +777,8 @@ public function an_ra_location_cannot_be_changed_if_it_is_not_present_within_an_ $numberOfTokensPerIdentityOption, $ssoOn2faOption, $selfVetOption, - $selfAssertedTokensOption - ) + $selfAssertedTokensOption, + ), ]) ->when($command); } @@ -792,18 +792,18 @@ public function an_ra_location_cannot_be_changed_if_its_institution_configuratio $this->expectException(AggregateNotFoundException::class); $this->expectExceptionMessage('not found'); - $command = new ChangeRaLocationCommand(); - $command->raLocationId = self::uuid(); - $command->institution = 'An institution'; - $command->raLocationName = 'An RA location name'; - $command->location = 'A location'; + $command = new ChangeRaLocationCommand(); + $command->raLocationId = self::uuid(); + $command->institution = 'An institution'; + $command->raLocationName = 'An RA location name'; + $command->location = 'A location'; $command->contactInformation = 'Some contact information'; - $institution = new Institution($command->institution); - $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); - $useRaLocationsOption = new UseRaLocationsOption(true); + $institution = new Institution($command->institution); + $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); + $useRaLocationsOption = new UseRaLocationsOption(true); $showRaaContactInformationOption = new ShowRaaContactInformationOption(true); - $verifyEmailOption = new VerifyEmailOption(true); + $verifyEmailOption = new VerifyEmailOption(true); $ssoOn2faOption = SsoOn2faOption::getDefault(); $selfVetOption = SelfVetOption::getDefault(); $selfAssertedTokensOption = SelfAssertedTokensOption::getDefault(); @@ -821,8 +821,8 @@ public function an_ra_location_cannot_be_changed_if_its_institution_configuratio $numberOfTokensPerIdentityOption, $ssoOn2faOption, $selfVetOption, - $selfAssertedTokensOption - ) + $selfAssertedTokensOption, + ), ]) ->when($command); } @@ -834,20 +834,20 @@ public function an_ra_location_cannot_be_changed_if_its_institution_configuratio */ public function an_ra_location_can_be_relocated(): void { - $originalLocation= new Location('An old location'); + $originalLocation = new Location('An old location'); - $command = new ChangeRaLocationCommand(); - $command->raLocationId = self::uuid(); - $command->institution = 'An institution'; - $command->raLocationName = 'An RA location name'; - $command->location = 'A location'; + $command = new ChangeRaLocationCommand(); + $command->raLocationId = self::uuid(); + $command->institution = 'An institution'; + $command->raLocationName = 'An RA location name'; + $command->location = 'A location'; $command->contactInformation = 'Some contact information'; - $institution = new Institution($command->institution); - $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); - $useRaLocationsOption = new UseRaLocationsOption(true); + $institution = new Institution($command->institution); + $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); + $useRaLocationsOption = new UseRaLocationsOption(true); $showRaaContactInformationOption = new ShowRaaContactInformationOption(true); - $verifyEmailOption = new VerifyEmailOption(true); + $verifyEmailOption = new VerifyEmailOption(true); $ssoOn2faOption = SsoOn2faOption::getDefault(); $selfVetOption = SelfVetOption::getDefault(); $selfAssertedTokensOption = SelfAssertedTokensOption::getDefault(); @@ -865,7 +865,7 @@ public function an_ra_location_can_be_relocated(): void $numberOfTokensPerIdentityOption, $ssoOn2faOption, $selfVetOption, - $selfAssertedTokensOption + $selfAssertedTokensOption, ), new RaLocationAddedEvent( $institutionConfigurationId, @@ -873,16 +873,16 @@ public function an_ra_location_can_be_relocated(): void new RaLocationId($command->raLocationId), new RaLocationName($command->raLocationName), $originalLocation, - new ContactInformation($command->contactInformation) - ) + new ContactInformation($command->contactInformation), + ), ]) ->when($command) ->then([ new RaLocationRelocatedEvent( $institutionConfigurationId, new RaLocationId($command->raLocationId), - new Location($command->location) - ) + new Location($command->location), + ), ]); } @@ -893,20 +893,20 @@ public function an_ra_location_can_be_relocated(): void */ public function an_ra_locations_contact_information_can_be_changed(): void { - $originalContactInformation= new ContactInformation('Old contact information'); + $originalContactInformation = new ContactInformation('Old contact information'); - $command = new ChangeRaLocationCommand(); - $command->raLocationId = self::uuid(); - $command->institution = 'An institution'; - $command->raLocationName = 'An RA location name'; - $command->location = 'A location'; + $command = new ChangeRaLocationCommand(); + $command->raLocationId = self::uuid(); + $command->institution = 'An institution'; + $command->raLocationName = 'An RA location name'; + $command->location = 'A location'; $command->contactInformation = 'Some contact information'; - $institution = new Institution($command->institution); - $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); - $useRaLocationsOption = new UseRaLocationsOption(true); + $institution = new Institution($command->institution); + $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); + $useRaLocationsOption = new UseRaLocationsOption(true); $showRaaContactInformationOption = new ShowRaaContactInformationOption(true); - $verifyEmailOption = new VerifyEmailOption(true); + $verifyEmailOption = new VerifyEmailOption(true); $ssoOn2faOption = SsoOn2faOption::getDefault(); $selfVetOption = SelfVetOption::getDefault(); $selfAssertedTokensOption = SelfAssertedTokensOption::getDefault(); @@ -924,7 +924,7 @@ public function an_ra_locations_contact_information_can_be_changed(): void $numberOfTokensPerIdentityOption, $ssoOn2faOption, $selfVetOption, - $selfAssertedTokensOption + $selfAssertedTokensOption, ), new RaLocationAddedEvent( $institutionConfigurationId, @@ -932,19 +932,19 @@ public function an_ra_locations_contact_information_can_be_changed(): void new RaLocationId($command->raLocationId), new RaLocationName($command->raLocationName), new Location($command->location), - $originalContactInformation - ) + $originalContactInformation, + ), ]) ->when($command) ->then([ new RaLocationContactInformationChangedEvent( $institutionConfigurationId, new RaLocationId($command->raLocationId), - new ContactInformation($command->contactInformation) - ) + new ContactInformation($command->contactInformation), + ), ]); } - + /** * @test * @group command-handler @@ -952,11 +952,11 @@ public function an_ra_locations_contact_information_can_be_changed(): void */ public function the_self_vet_option_can_be_changed(): void { - $institution = new Institution('Institution'); - $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); - $useRaLocationsOption = UseRaLocationsOption::getDefault(); + $institution = new Institution('Institution'); + $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); + $useRaLocationsOption = UseRaLocationsOption::getDefault(); $showRaaContactInformationOption = ShowRaaContactInformationOption::getDefault(); - $verifyEmailOption = new VerifyEmailOption(true); + $verifyEmailOption = new VerifyEmailOption(true); $numberOfTokensPerIdentityOption = new NumberOfTokensPerIdentityOption(0); $ssoOn2faOption = SsoOn2faOption::getDefault(); $selfVetOption = SelfVetOption::getDefault(); @@ -971,7 +971,7 @@ public function the_self_vet_option_can_be_changed(): void $command->institution = $institution->getInstitution(); $command->useRaLocationsOption = $useRaLocationsOption->isEnabled(); $command->showRaaContactInformationOption = $showRaaContactInformationOption->isEnabled(); - $command->verifyEmailOption = $verifyEmailOption->isEnabled(); + $command->verifyEmailOption = $verifyEmailOption->isEnabled(); $command->selfVetOption = $newSelfVetOption->isEnabled(); $command->allowedSecondFactors = $selfAssertedTokensOption->isEnabled(); $command->numberOfTokensPerIdentityOption = $numberOfTokensPerIdentityOption->getNumberOfTokensPerIdentity(); @@ -989,36 +989,36 @@ public function the_self_vet_option_can_be_changed(): void $numberOfTokensPerIdentityOption, $ssoOn2faOption, $selfVetOption, - $selfAssertedTokensOption + $selfAssertedTokensOption, ), - + ]) ->when($command) ->then([ new UseRaOptionChangedEvent( $institutionConfigurationId, $institution, - $useRaOption + $useRaOption, ), new UseRaaOptionChangedEvent( $institutionConfigurationId, $institution, - $useRaaOption + $useRaaOption, ), new SelectRaaOptionChangedEvent( $institutionConfigurationId, $institution, - $selectRaaOption + $selectRaaOption, ), new AllowedSecondFactorListUpdatedEvent( $institutionConfigurationId, $institution, - $defaultAllowedSecondFactorList + $defaultAllowedSecondFactorList, ), new SelfVetOptionChangedEvent( $institutionConfigurationId, $institution, - $newSelfVetOption + $newSelfVetOption, ), ]); } @@ -1033,15 +1033,15 @@ public function an_ra_location_cannot_be_removed_if_its_institution_configuratio $this->expectException(AggregateNotFoundException::class); $this->expectExceptionMessage('not found'); - $command = new RemoveRaLocationCommand(); - $command->raLocationId = self::uuid(); - $command->institution = 'An institution'; + $command = new RemoveRaLocationCommand(); + $command->raLocationId = self::uuid(); + $command->institution = 'An institution'; - $institution = new Institution($command->institution); - $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); - $useRaLocationsOption = new UseRaLocationsOption(true); + $institution = new Institution($command->institution); + $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); + $useRaLocationsOption = new UseRaLocationsOption(true); $showRaaContactInformationOption = new ShowRaaContactInformationOption(true); - $verifyEmailOption = new VerifyEmailOption(true); + $verifyEmailOption = new VerifyEmailOption(true); $ssoOn2faOption = SsoOn2faOption::getDefault(); $selfVetOption = SelfVetOption::getDefault(); $selfAssertedTokensOption = SelfAssertedTokensOption::getDefault(); @@ -1059,8 +1059,8 @@ public function an_ra_location_cannot_be_removed_if_its_institution_configuratio $numberOfTokensPerIdentityOption, $ssoOn2faOption, $selfVetOption, - $selfAssertedTokensOption - ) + $selfAssertedTokensOption, + ), ]) ->when($command); } @@ -1075,15 +1075,15 @@ public function an_ra_location_cannot_be_removed_if_it_is_not_present_within_an_ $this->expectException(DomainException::class); $this->expectExceptionMessage('not present'); - $command = new RemoveRaLocationCommand(); - $command->raLocationId = self::uuid(); - $command->institution = 'An institution'; + $command = new RemoveRaLocationCommand(); + $command->raLocationId = self::uuid(); + $command->institution = 'An institution'; - $institution = new Institution($command->institution); - $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); - $useRaLocationsOption = new UseRaLocationsOption(true); + $institution = new Institution($command->institution); + $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); + $useRaLocationsOption = new UseRaLocationsOption(true); $showRaaContactInformationOption = new ShowRaaContactInformationOption(true); - $verifyEmailOption = new VerifyEmailOption(true); + $verifyEmailOption = new VerifyEmailOption(true); $ssoOn2faOption = SsoOn2faOption::getDefault(); $selfVetOption = SelfVetOption::getDefault(); $selfAssertedTokensOption = SelfAssertedTokensOption::getDefault(); @@ -1101,8 +1101,8 @@ public function an_ra_location_cannot_be_removed_if_it_is_not_present_within_an_ $numberOfTokensPerIdentityOption, $ssoOn2faOption, $selfVetOption, - $selfAssertedTokensOption - ) + $selfAssertedTokensOption, + ), ]) ->when($command); } @@ -1114,15 +1114,15 @@ public function an_ra_location_cannot_be_removed_if_it_is_not_present_within_an_ */ public function an_ra_location_can_be_removed(): void { - $command = new RemoveRaLocationCommand(); - $command->raLocationId = self::uuid(); - $command->institution = 'An institution'; + $command = new RemoveRaLocationCommand(); + $command->raLocationId = self::uuid(); + $command->institution = 'An institution'; - $institution = new Institution($command->institution); - $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); - $useRaLocationsOption = new UseRaLocationsOption(true); + $institution = new Institution($command->institution); + $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); + $useRaLocationsOption = new UseRaLocationsOption(true); $showRaaContactInformationOption = new ShowRaaContactInformationOption(true); - $verifyEmailOption = new VerifyEmailOption(true); + $verifyEmailOption = new VerifyEmailOption(true); $ssoOn2faOption = SsoOn2faOption::getDefault(); $selfVetOption = SelfVetOption::getDefault(); $selfAssertedTokensOption = SelfAssertedTokensOption::getDefault(); @@ -1140,7 +1140,7 @@ public function an_ra_location_can_be_removed(): void $numberOfTokensPerIdentityOption, $ssoOn2faOption, $selfVetOption, - $selfAssertedTokensOption + $selfAssertedTokensOption, ), new RaLocationAddedEvent( $institutionConfigurationId, @@ -1148,15 +1148,15 @@ public function an_ra_location_can_be_removed(): void new RaLocationId($command->raLocationId), new RaLocationName('A location name'), new Location('A location'), - new ContactInformation('Some contact information') - ) + new ContactInformation('Some contact information'), + ), ]) ->when($command) ->then([ new RaLocationRemovedEvent( $institutionConfigurationId, - new RaLocationId($command->raLocationId) - ) + new RaLocationId($command->raLocationId), + ), ]); } @@ -1167,14 +1167,14 @@ public function an_ra_location_can_be_removed(): void */ public function an_institution_configuration_with_unnormalized_institution_configuration_id_can_be_removed(): void { - $command = new RemoveInstitutionConfigurationByUnnormalizedIdCommand(); - $command->institution = 'Babelfish Inc.'; + $command = new RemoveInstitutionConfigurationByUnnormalizedIdCommand(); + $command->institution = 'Babelfish Inc.'; - $institution = new Institution($command->institution); - $institutionConfigurationId = InstitutionConfigurationId::from($institution); - $useRaLocationsOption = new UseRaLocationsOption(true); + $institution = new Institution($command->institution); + $institutionConfigurationId = InstitutionConfigurationId::from($institution); + $useRaLocationsOption = new UseRaLocationsOption(true); $showRaaContactInformationOption = new ShowRaaContactInformationOption(true); - $verifyEmailOption = new VerifyEmailOption(true); + $verifyEmailOption = new VerifyEmailOption(true); $ssoOn2faOption = SsoOn2faOption::getDefault(); $selfVetOption = SelfVetOption::getDefault(); $selfAssertedTokensOption = SelfAssertedTokensOption::getDefault(); @@ -1193,18 +1193,18 @@ public function an_institution_configuration_with_unnormalized_institution_confi $numberOfTokensPerIdentityOption, $ssoOn2faOption, $selfVetOption, - $selfAssertedTokensOption - ) - ] + $selfAssertedTokensOption, + ), + ], ) ->when($command) ->then( [ new InstitutionConfigurationRemovedEvent( $institutionConfigurationId, - $institution - ) - ] + $institution, + ), + ], ); } @@ -1216,12 +1216,14 @@ public function an_institution_configuration_with_unnormalized_institution_confi * * @return CommandHandler */ - protected function createCommandHandler(EventStoreInterface $eventStore, EventBusInterface $eventBus): CommandHandler - { + protected function createCommandHandler( + EventStoreInterface $eventStore, + EventBusInterface $eventBus, + ): CommandHandler { $aggregateFactory = new PublicConstructorAggregateFactory(); return new InstitutionConfigurationCommandHandler( - new InstitutionConfigurationRepository($eventStore, $eventBus, $aggregateFactory) + new InstitutionConfigurationRepository($eventStore, $eventBus, $aggregateFactory), ); } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/Processor/InstitutionConfigurationProcessorTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/Processor/InstitutionConfigurationProcessorTest.php index 8e573cd53..d0affdfd2 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/Processor/InstitutionConfigurationProcessorTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/Processor/InstitutionConfigurationProcessorTest.php @@ -20,7 +20,6 @@ use Mockery; use PHPUnit\Framework\TestCase as TestCase; -use Surfnet\Stepup\Configuration\Value\Institution as ConfigurationInstitution; use Surfnet\Stepup\Identity\Collection\InstitutionCollection; use Surfnet\Stepup\Identity\Event\IdentityCreatedEvent; use Surfnet\Stepup\Identity\Event\InstitutionsAddedToWhitelistEvent; @@ -57,14 +56,14 @@ public function setUp(): void */ public function a_create_institution_configuration_command_is_processed_when_an_identity_was_created_with_a_non_configured_institution(): void { - $expectedInstitution = 'institution'; + $expectedInstitution = 'institution'; $identityCreatedEvent = new IdentityCreatedEvent( new IdentityId('Id'), new Institution($expectedInstitution), new NameId('Name Id'), new CommonName('Common name'), new Email('test@email.test'), - new Locale('Locale') + new Locale('Locale'), ); $repositoryMock = Mockery::mock(ConfiguredInstitutionRepository::class); @@ -79,7 +78,7 @@ public function a_create_institution_configuration_command_is_processed_when_an_ $institutionConfigurationProcessor = new InstitutionConfigurationProcessor( $repositoryMock, - $this->getContainerMock() + $this->getContainerMock(), ); $institutionConfigurationProcessor->handleIdentityCreatedEvent($identityCreatedEvent); @@ -99,7 +98,7 @@ public function no_create_institution_configuration_command_is_processed_when_an new NameId('Name Id'), new CommonName('Common name'), new Email('test@email.test'), - new Locale('Locale') + new Locale('Locale'), ); $repositoryMock = Mockery::mock(ConfiguredInstitutionRepository::class); @@ -113,7 +112,7 @@ public function no_create_institution_configuration_command_is_processed_when_an $institutionConfigurationProcessor = new InstitutionConfigurationProcessor( $repositoryMock, - $this->getContainerMock() + $this->getContainerMock(), ); $institutionConfigurationProcessor->handleIdentityCreatedEvent($identityCreatedEvent); @@ -127,7 +126,7 @@ public function no_create_institution_configuration_command_is_processed_when_an */ public function create_institution_configuration_commands_are_processed_when_a_whitelist_was_created_containing_non_configured_institutions(): void { - $firstInstitution = 'first institution'; + $firstInstitution = 'first institution'; $secondInstitution = 'second institution'; $whitelistCreatedEvent = new WhitelistCreatedEvent( @@ -135,8 +134,8 @@ public function create_institution_configuration_commands_are_processed_when_a_w [ new Institution($firstInstitution), new Institution($secondInstitution), - ] - ) + ], + ), ); $repositoryMock = Mockery::mock(ConfiguredInstitutionRepository::class); @@ -154,7 +153,7 @@ public function create_institution_configuration_commands_are_processed_when_a_w $institutionConfigurationProcessor = new InstitutionConfigurationProcessor( $repositoryMock, - $this->getContainerMock() + $this->getContainerMock(), ); $institutionConfigurationProcessor->handleWhitelistCreatedEvent($whitelistCreatedEvent); @@ -169,15 +168,15 @@ public function create_institution_configuration_commands_are_processed_when_a_w public function no_create_institution_configuration_command_is_processed_for_an_already_configured_institution_when_a_whitelist_was_created(): void { $alreadyPresentInstitution = 'already present'; - $newInstitution = 'new'; + $newInstitution = 'new'; $whitelistCreatedEvent = new WhitelistCreatedEvent( new InstitutionCollection( [ new Institution($alreadyPresentInstitution), new Institution($newInstitution), - ] - ) + ], + ), ); $repositoryMock = Mockery::mock(ConfiguredInstitutionRepository::class); @@ -199,7 +198,7 @@ public function no_create_institution_configuration_command_is_processed_for_an_ $institutionConfigurationProcessor = new InstitutionConfigurationProcessor( $repositoryMock, - $this->getContainerMock() + $this->getContainerMock(), ); $institutionConfigurationProcessor->handleWhitelistCreatedEvent($whitelistCreatedEvent); @@ -213,7 +212,7 @@ public function no_create_institution_configuration_command_is_processed_for_an_ */ public function create_institution_configuration_commands_are_created_when_a_whitelist_was_replaced_containing_non_configured_institutions(): void { - $firstInstitution = 'first institution'; + $firstInstitution = 'first institution'; $secondInstitution = 'second institution'; $whitelistReplacedEvent = new WhitelistReplacedEvent( @@ -221,8 +220,8 @@ public function create_institution_configuration_commands_are_created_when_a_whi [ new Institution($firstInstitution), new Institution($secondInstitution), - ] - ) + ], + ), ); $repositoryMock = Mockery::mock(ConfiguredInstitutionRepository::class); @@ -242,7 +241,7 @@ public function create_institution_configuration_commands_are_created_when_a_whi $institutionConfigurationProcessor = new InstitutionConfigurationProcessor( $repositoryMock, - $this->getContainerMock() + $this->getContainerMock(), ); $institutionConfigurationProcessor->handleWhitelistReplacedEvent($whitelistReplacedEvent); @@ -257,15 +256,15 @@ public function create_institution_configuration_commands_are_created_when_a_whi public function no_create_institution_configuration_command_is_processed_for_an_already_configured_institution_when_a_whitelist_was_replaced(): void { $alreadyPresentInstitution = 'already present'; - $newInstitution = 'new'; + $newInstitution = 'new'; $whitelistCreatedEvent = new WhitelistReplacedEvent( new InstitutionCollection( [ new Institution($alreadyPresentInstitution), new Institution($newInstitution), - ] - ) + ], + ), ); $repositoryMock = Mockery::mock(ConfiguredInstitutionRepository::class); @@ -287,7 +286,7 @@ public function no_create_institution_configuration_command_is_processed_for_an_ $institutionConfigurationProcessor = new InstitutionConfigurationProcessor( $repositoryMock, - $this->getContainerMock() + $this->getContainerMock(), ); $institutionConfigurationProcessor->handleWhitelistReplacedEvent($whitelistCreatedEvent); @@ -301,7 +300,7 @@ public function no_create_institution_configuration_command_is_processed_for_an_ */ public function create_institution_configuration_commands_are_created_when_non_configured_institutions_are_added_to_the_whitelist(): void { - $firstInstitution = 'first institution'; + $firstInstitution = 'first institution'; $secondInstitution = 'second institution'; $institutionsAddedToWhitelistEvent = new InstitutionsAddedToWhitelistEvent( @@ -309,8 +308,8 @@ public function create_institution_configuration_commands_are_created_when_non_c [ new Institution($firstInstitution), new Institution($secondInstitution), - ] - ) + ], + ), ); $repositoryMock = Mockery::mock(ConfiguredInstitutionRepository::class); @@ -330,7 +329,7 @@ public function create_institution_configuration_commands_are_created_when_non_c $institutionConfigurationProcessor = new InstitutionConfigurationProcessor( $repositoryMock, - $this->getContainerMock() + $this->getContainerMock(), ); $institutionConfigurationProcessor->handleInstitutionsAddedToWhitelistEvent($institutionsAddedToWhitelistEvent); @@ -345,15 +344,15 @@ public function create_institution_configuration_commands_are_created_when_non_c public function no_create_institution_configuration_command_is_created_for_an_already_configured_institution_when_institutions_are_added_to_a_whitelist(): void { $alreadyPresentInstitution = 'already present'; - $newInstitution = 'new'; + $newInstitution = 'new'; $whitelistCreatedEvent = new InstitutionsAddedToWhitelistEvent( new InstitutionCollection( [ new Institution($alreadyPresentInstitution), new Institution($newInstitution), - ] - ) + ], + ), ); $repositoryMock = Mockery::mock(ConfiguredInstitutionRepository::class); @@ -375,7 +374,7 @@ public function no_create_institution_configuration_command_is_created_for_an_al $institutionConfigurationProcessor = new InstitutionConfigurationProcessor( $repositoryMock, - $this->getContainerMock() + $this->getContainerMock(), ); $institutionConfigurationProcessor->handleInstitutionsAddedToWhitelistEvent($whitelistCreatedEvent); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/DateTimeHelper.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/DateTimeHelper.php index b84d8421b..42f43d134 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/DateTimeHelper.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/DateTimeHelper.php @@ -30,7 +30,7 @@ class DateTimeHelper */ public static function setCurrentTime(DateTime $now = null): void { - $nowProperty = new ReflectionProperty('Surfnet\Stepup\DateTime\DateTime', 'now'); + $nowProperty = new ReflectionProperty(DateTime::class, 'now'); $nowProperty->setAccessible(true); $nowProperty->setValue($now); } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/BufferedEventBusTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/BufferedEventBusTest.php index 91b7ad466..6531b96fa 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/BufferedEventBusTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/BufferedEventBusTest.php @@ -78,7 +78,7 @@ public function it_flushes_events(): void */ public function flushing_succesfully_empties_the_buffer_to_prevent_flushing_the_same_event_twice(): void { - $event = $this->createDummyDomainMessage(null); + $event = $this->createDummyDomainMessage(null); $listener = m::mock(EventListener::class) ->shouldReceive('handle')->once()->with($event) ->getMock(); @@ -107,7 +107,7 @@ public function an_event_caused_by_an_event_in_the_current_buffer_being_flushed_ $listener = new RecordEventsAndPublishToBusOnFirstCallEventListener( $bus, - new DomainEventStream([$eventCausedByFirstEvent]) + new DomainEventStream([$eventCausedByFirstEvent]), ); $bus->subscribe($listener); @@ -134,4 +134,3 @@ private function getDummyEntityManager() return m::mock(EntityManagerInterface::class)->shouldIgnoreMissing(true); } } - diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/RecordEventsAndPublishToBusOnFirstCallEventListener.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/RecordEventsAndPublishToBusOnFirstCallEventListener.php index 1c4c21817..752b46a65 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/RecordEventsAndPublishToBusOnFirstCallEventListener.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/RecordEventsAndPublishToBusOnFirstCallEventListener.php @@ -27,23 +27,15 @@ class RecordEventsAndPublishToBusOnFirstCallEventListener implements EventListen { private bool $firstEventHandled = false; - private BufferedEventBus $eventBus; - - private DomainEventStream $toPublish; - /** * @var DomainMessage[] */ private array $recordedEvents = []; - /** - * @param BufferedEventBus $eventBus - * @param DomainEventStream $toPublish - */ - public function __construct(BufferedEventBus $eventBus, DomainEventStream $toPublish) - { - $this->eventBus = $eventBus; - $this->toPublish = $toPublish; + public function __construct( + private readonly BufferedEventBus $eventBus, + private readonly DomainEventStream $toPublish, + ) { } /** diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerMoveTokenTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerMoveTokenTest.php index 7a49db78d..66c2d4855 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerMoveTokenTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerMoveTokenTest.php @@ -100,8 +100,10 @@ public function setUp(): void parent::setUp(); } - protected function createCommandHandler(EventStoreInterface $eventStore, EventBusInterface $eventBus): CommandHandler - { + protected function createCommandHandler( + EventStoreInterface $eventStore, + EventBusInterface $eventBus, + ): CommandHandler { $aggregateFactory = new PublicConstructorAggregateFactory(); $this->identityProjectionRepository = m::mock(IdentityProjectionRepository::class); $secondFactorTypeService = m::mock(SecondFactorTypeService::class); @@ -118,7 +120,7 @@ protected function createCommandHandler(EventStoreInterface $eventStore, EventBu $eventBus, $aggregateFactory, m::mock(UserDataFilterInterface::class), - $logger + $logger, ), $this->identityProjectionRepository, ConfigurableSettings::create(self::$window, ['nl_NL', 'en_GB']), @@ -128,7 +130,7 @@ protected function createCommandHandler(EventStoreInterface $eventStore, EventBu $this->configService, $this->loaResolutionService, m::mock(RecoveryTokenSecretHelper::class), - $registrationMailService + $registrationMailService, ); } @@ -173,7 +175,7 @@ public function test_a_second_factor_can_be_moved(): void $targetRegistrantNameId, $targetRegistrantCommonName, $targetRegistrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), ]) ->withAggregateId($sourceRegistrantId) @@ -184,7 +186,7 @@ public function test_a_second_factor_can_be_moved(): void $sourceRegistrantNameId, $sourceRegistrantCommonName, $sourceRegistrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $sourceRegistrantId, @@ -194,8 +196,8 @@ public function test_a_second_factor_can_be_moved(): void $sourceRegistrantEmail, new Locale('en_GB'), $sourceRegistrantSecFacId, - $sourceYubikeySecFacId - ) + $sourceYubikeySecFacId, + ), ]) ->when($command) ->then([ @@ -211,7 +213,7 @@ public function test_a_second_factor_can_be_moved(): void new UnknownVettingType(), $targetRegistrantCommonName, $targetRegistrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new SecondFactorMigratedToEvent( $sourceRegistrantId, @@ -220,7 +222,7 @@ public function test_a_second_factor_can_be_moved(): void $sourceRegistrantSecFacId, $targetRegistrantSecFacId, new SecondFactorType('yubikey'), - $sourceYubikeySecFacId + $sourceYubikeySecFacId, ), ]); } @@ -265,7 +267,7 @@ public function test_can_not_be_moved_if_already_moved(): void $targetRegistrantNameId, $targetRegistrantCommonName, $targetRegistrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new SecondFactorMigratedEvent( $targetRegistrantId, @@ -279,7 +281,7 @@ public function test_can_not_be_moved_if_already_moved(): void new UnknownVettingType(), $targetRegistrantCommonName, $targetRegistrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new SecondFactorMigratedToEvent( $sourceRegistrantId, @@ -288,7 +290,7 @@ public function test_can_not_be_moved_if_already_moved(): void $sourceRegistrantSecFacId, $targetRegistrantSecFacId, new SecondFactorType('yubikey'), - $sourceYubikeySecFacId + $sourceYubikeySecFacId, ), ]) ->withAggregateId($sourceRegistrantId) @@ -299,7 +301,7 @@ public function test_can_not_be_moved_if_already_moved(): void $sourceRegistrantNameId, $sourceRegistrantCommonName, $sourceRegistrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $sourceRegistrantId, @@ -309,7 +311,7 @@ public function test_can_not_be_moved_if_already_moved(): void $sourceRegistrantEmail, new Locale('en_GB'), $sourceRegistrantSecFacId, - $sourceYubikeySecFacId + $sourceYubikeySecFacId, ), ]) ->when($command) @@ -357,7 +359,7 @@ public function test_can_not_be_moved_if_already_present_as_bootstrapped_thus_ve $targetRegistrantNameId, $targetRegistrantCommonName, $targetRegistrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $targetRegistrantId, @@ -367,7 +369,7 @@ public function test_can_not_be_moved_if_already_present_as_bootstrapped_thus_ve $targetRegistrantEmail, new Locale('en_GB'), $targetRegistrantSecFacId, - $targetYubikeySecFacId + $targetYubikeySecFacId, ), ]) ->withAggregateId($sourceRegistrantId) @@ -378,7 +380,7 @@ public function test_can_not_be_moved_if_already_present_as_bootstrapped_thus_ve $sourceRegistrantNameId, $sourceRegistrantCommonName, $sourceRegistrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $sourceRegistrantId, @@ -388,7 +390,7 @@ public function test_can_not_be_moved_if_already_present_as_bootstrapped_thus_ve $sourceRegistrantEmail, new Locale('en_GB'), $sourceRegistrantSecFacId, - $sourceYubikeySecFacId + $sourceYubikeySecFacId, ), ]) ->when($command) @@ -437,7 +439,7 @@ public function test_can_not_be_moved_if_already_present_as_vetted_token(): void $targetRegistrantNameId, $targetRegistrantCommonName, $targetRegistrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeyPossessionProvenEvent( $targetRegistrantId, @@ -447,12 +449,12 @@ public function test_can_not_be_moved_if_already_present_as_vetted_token(): void true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $targetRegistrantCommonName, $targetRegistrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new EmailVerifiedEvent( $targetRegistrantId, @@ -464,7 +466,7 @@ public function test_can_not_be_moved_if_already_present_as_vetted_token(): void 'REGCODE', $targetRegistrantCommonName, $targetRegistrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new SecondFactorVettedEvent( $targetRegistrantId, @@ -476,7 +478,7 @@ public function test_can_not_be_moved_if_already_present_as_vetted_token(): void $targetRegistrantCommonName, $targetRegistrantEmail, new Locale('en_GB'), - new OnPremiseVettingType(new DocumentNumber('NH9392')) + new OnPremiseVettingType(new DocumentNumber('NH9392')), ), ]) ->withAggregateId($sourceRegistrantId) @@ -487,7 +489,7 @@ public function test_can_not_be_moved_if_already_present_as_vetted_token(): void $sourceRegistrantNameId, $sourceRegistrantCommonName, $sourceRegistrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $sourceRegistrantId, @@ -497,7 +499,7 @@ public function test_can_not_be_moved_if_already_present_as_vetted_token(): void $sourceRegistrantEmail, new Locale('en_GB'), $sourceRegistrantSecFacId, - $sourceYubikeySecFacId + $sourceYubikeySecFacId, ), ]) ->when($command) @@ -545,7 +547,7 @@ public function test_can_not_be_moved_if_already_present_as_verified_token(): vo $targetRegistrantNameId, $targetRegistrantCommonName, $targetRegistrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeyPossessionProvenEvent( $targetRegistrantId, @@ -555,12 +557,12 @@ public function test_can_not_be_moved_if_already_present_as_verified_token(): vo true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $targetRegistrantCommonName, $targetRegistrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new EmailVerifiedEvent( $targetRegistrantId, @@ -572,7 +574,7 @@ public function test_can_not_be_moved_if_already_present_as_verified_token(): vo 'REGCODE', $targetRegistrantCommonName, $targetRegistrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), ]) ->withAggregateId($sourceRegistrantId) @@ -583,7 +585,7 @@ public function test_can_not_be_moved_if_already_present_as_verified_token(): vo $sourceRegistrantNameId, $sourceRegistrantCommonName, $sourceRegistrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $sourceRegistrantId, @@ -593,7 +595,7 @@ public function test_can_not_be_moved_if_already_present_as_verified_token(): vo $sourceRegistrantEmail, new Locale('en_GB'), $sourceRegistrantSecFacId, - $sourceYubikeySecFacId + $sourceYubikeySecFacId, ), ]) ->when($command) @@ -641,7 +643,7 @@ public function test_can_not_be_moved_if_already_present_as_unverified_token(): $targetRegistrantNameId, $targetRegistrantCommonName, $targetRegistrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeyPossessionProvenEvent( $targetRegistrantId, @@ -651,12 +653,12 @@ public function test_can_not_be_moved_if_already_present_as_unverified_token(): true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $targetRegistrantCommonName, $targetRegistrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), ]) ->withAggregateId($sourceRegistrantId) @@ -667,7 +669,7 @@ public function test_can_not_be_moved_if_already_present_as_unverified_token(): $sourceRegistrantNameId, $sourceRegistrantCommonName, $sourceRegistrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $sourceRegistrantId, @@ -677,7 +679,7 @@ public function test_can_not_be_moved_if_already_present_as_unverified_token(): $sourceRegistrantEmail, new Locale('en_GB'), $sourceRegistrantSecFacId, - $sourceYubikeySecFacId + $sourceYubikeySecFacId, ), ]) ->when($command) @@ -723,7 +725,7 @@ public function test_can_not_be_moved_to_same_institution(): void $targetRegistrantNameId, $targetRegistrantCommonName, $targetRegistrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), ]) ->withAggregateId($sourceRegistrantId) @@ -734,7 +736,7 @@ public function test_can_not_be_moved_to_same_institution(): void $sourceRegistrantNameId, $sourceRegistrantCommonName, $sourceRegistrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $sourceRegistrantId, @@ -744,8 +746,8 @@ public function test_can_not_be_moved_to_same_institution(): void $sourceRegistrantEmail, new Locale('en_GB'), $sourceRegistrantSecFacId, - $sourceYubikeySecFacId - ) + $sourceYubikeySecFacId, + ), ]) ->when($command) ->then([]); @@ -791,7 +793,7 @@ public function test_can_not_be_moved_if_token_type_not_allowed_for_institution( $targetRegistrantNameId, $targetRegistrantCommonName, $targetRegistrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), ]) ->withAggregateId($sourceRegistrantId) @@ -802,7 +804,7 @@ public function test_can_not_be_moved_if_token_type_not_allowed_for_institution( $sourceRegistrantNameId, $sourceRegistrantCommonName, $sourceRegistrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $sourceRegistrantId, @@ -812,8 +814,8 @@ public function test_can_not_be_moved_if_token_type_not_allowed_for_institution( $sourceRegistrantEmail, new Locale('en_GB'), $sourceRegistrantSecFacId, - $sourceYubikeySecFacId - ) + $sourceYubikeySecFacId, + ), ]) ->when($command) ->then([ @@ -824,7 +826,7 @@ public function test_can_not_be_moved_if_token_type_not_allowed_for_institution( $targetRegistrantInstitution, $sourceRegistrantSecFacId, $targetRegistrantSecFacId, - new SecondFactorType('yubikey') + new SecondFactorType('yubikey'), ), ]); } @@ -870,7 +872,7 @@ public function test_the_max_number_of_tokens_can_not_be_exceeded(): void $targetRegistrantNameId, $targetRegistrantCommonName, $targetRegistrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $targetRegistrantId, @@ -880,8 +882,8 @@ public function test_the_max_number_of_tokens_can_not_be_exceeded(): void $targetRegistrantEmail, new Locale('en_GB'), $targetRegistrantSecFacId, - $targetYubikeySecFacId - ) + $targetYubikeySecFacId, + ), ]) ->withAggregateId($sourceRegistrantId) ->given([ @@ -891,7 +893,7 @@ public function test_the_max_number_of_tokens_can_not_be_exceeded(): void $sourceRegistrantNameId, $sourceRegistrantCommonName, $sourceRegistrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $sourceRegistrantId, @@ -901,8 +903,8 @@ public function test_the_max_number_of_tokens_can_not_be_exceeded(): void $sourceRegistrantEmail, new Locale('en_GB'), $sourceRegistrantSecFacId, - $sourceYubikeySecFacId - ) + $sourceYubikeySecFacId, + ), ]) ->when($command) ->then([]); @@ -915,7 +917,9 @@ private function setUpInstitutionConfiguration(int $allowedMaxNumberOfTokens, ar $secondFactorTypes[] = new SecondFactorType($type); } $this->configService->shouldReceive('getMaxNumberOfTokensFor')->andReturn($allowedMaxNumberOfTokens); - $this->allowedSecondFactorListServiceMock->shouldReceive('getAllowedSecondFactorListFor')->andReturn(AllowedSecondFactorList::ofTypes($secondFactorTypes)); + $this->allowedSecondFactorListServiceMock->shouldReceive('getAllowedSecondFactorListFor')->andReturn( + AllowedSecondFactorList::ofTypes($secondFactorTypes), + ); $this->configService->shouldIgnoreMissing(); } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerSelfAssertedTokensTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerSelfAssertedTokensTest.php index 1b21128b6..d66923cd9 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerSelfAssertedTokensTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerSelfAssertedTokensTest.php @@ -62,7 +62,6 @@ use Surfnet\Stepup\Identity\Value\SafeStore; use Surfnet\Stepup\Identity\Value\SecondFactorId; use Surfnet\Stepup\Identity\Value\SelfAssertedRegistrationVettingType; -use Surfnet\Stepup\Identity\Value\SelfVetVettingType; use Surfnet\Stepup\Identity\Value\StepupProvider; use Surfnet\Stepup\Identity\Value\TimeFrame; use Surfnet\Stepup\Identity\Value\UnhashedSecret; @@ -86,7 +85,6 @@ use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Service\RegistrationMailService; use Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\CommandHandlerTest; - /** * @runTestsInSeparateProcesses */ @@ -199,8 +197,8 @@ public function test_a_sms_recovery_code_possession_can_be_proven(): void $phoneNumber, $this->commonName, $this->email, - $this->preferredLocale - ) + $this->preferredLocale, + ), ]); } @@ -224,11 +222,13 @@ public function test_a_safe_store_secret_recovery_code_possession_can_be_proven( $this->recoveryTokenSecretHelper ->shouldReceive('hash') - ->with(m::on(function ($unhashedSecret): bool { - $isUnhashedSecret = $unhashedSecret instanceof UnhashedSecret; - $hasExpectedSecret = $unhashedSecret->getSecret() === 'super-safe-secret'; - return $isUnhashedSecret && $hasExpectedSecret; - })) + ->with( + m::on(function ($unhashedSecret): bool { + $isUnhashedSecret = $unhashedSecret instanceof UnhashedSecret; + $hasExpectedSecret = $unhashedSecret->getSecret() === 'super-safe-secret'; + return $isUnhashedSecret && $hasExpectedSecret; + }), + ) ->andReturn($secret); $this->scenario @@ -243,8 +243,8 @@ public function test_a_safe_store_secret_recovery_code_possession_can_be_proven( new SafeStore($secret), $this->commonName, $this->email, - $this->preferredLocale - ) + $this->preferredLocale, + ), ]); } @@ -271,11 +271,13 @@ public function test_a_safe_store_secret_and_phone_recovery_code_possession_can_ $secret = new HashedSecret('secret-for-safe-keeping'); $this->recoveryTokenSecretHelper ->shouldReceive('hash') - ->with(m::on(function ($unhashedSecret): bool { - $isUnhashedSecret = $unhashedSecret instanceof UnhashedSecret; - $hasExpectedSecret = $unhashedSecret->getSecret() === 'secret-for-safe-keeping'; - return $isUnhashedSecret && $hasExpectedSecret; - })) + ->with( + m::on(function ($unhashedSecret): bool { + $isUnhashedSecret = $unhashedSecret instanceof UnhashedSecret; + $hasExpectedSecret = $unhashedSecret->getSecret() === 'secret-for-safe-keeping'; + return $isUnhashedSecret && $hasExpectedSecret; + }), + ) ->andReturn($secret); $confMock = m::mock(InstitutionConfigurationOptions::class); @@ -294,8 +296,8 @@ public function test_a_safe_store_secret_and_phone_recovery_code_possession_can_ new SafeStore($secret), $this->commonName, $this->email, - $this->preferredLocale - ) + $this->preferredLocale, + ), ]) ->when($command2) ->then([ @@ -306,8 +308,8 @@ public function test_a_safe_store_secret_and_phone_recovery_code_possession_can_ $phoneNumber, $this->commonName, $this->email, - $this->preferredLocale - ) + $this->preferredLocale, + ), ]); } @@ -343,8 +345,8 @@ public function test_a_sms_recovery_code_possession_can_not_be_proven_twice(): v $phoneNumber, $this->commonName, $this->email, - $this->preferredLocale - ) + $this->preferredLocale, + ), ]) ->when($command); } @@ -369,11 +371,13 @@ public function test_only_one_safe_store_secret_allowed(): void $secret = new HashedSecret('secret-for-safe-keeping'); $this->recoveryTokenSecretHelper ->shouldReceive('hash') - ->with(m::on(function ($unhashedSecret): bool { - $isUnhashedSecret = $unhashedSecret instanceof UnhashedSecret; - $hasExpectedSecret = $unhashedSecret->getSecret() === 'secret-for-safe-keeping'; - return $isUnhashedSecret && $hasExpectedSecret; - })) + ->with( + m::on(function ($unhashedSecret): bool { + $isUnhashedSecret = $unhashedSecret instanceof UnhashedSecret; + $hasExpectedSecret = $unhashedSecret->getSecret() === 'secret-for-safe-keeping'; + return $isUnhashedSecret && $hasExpectedSecret; + }), + ) ->andReturn($secret); $this->expectException(DomainException::class); @@ -391,8 +395,8 @@ public function test_only_one_safe_store_secret_allowed(): void new SafeStore($secret), $this->commonName, $this->email, - $this->preferredLocale - ) + $this->preferredLocale, + ), ]) ->when($command); } @@ -416,7 +420,9 @@ public function test_a_sms_recovery_token_possession_requires_institution_config $this->configService->shouldReceive('findInstitutionConfigurationOptionsFor')->andReturn($confMock); $this->expectException(RuntimeException::class); - $this->expectExceptionMessage('Registration of self-asserted tokens is not allowed for this institution "a corp.".'); + $this->expectExceptionMessage( + 'Registration of self-asserted tokens is not allowed for this institution "a corp.".', + ); $this->scenario ->withAggregateId($this->id) @@ -429,8 +435,8 @@ public function test_a_sms_recovery_token_possession_requires_institution_config $phoneNumber, $this->commonName, $this->email, - $this->preferredLocale - ) + $this->preferredLocale, + ), ]) ->when($command); } @@ -468,7 +474,7 @@ public function test_a_safe_store_secret_recovery_code_possession_can_be_revoked $authorityNameId, $authorityCommonName, $authorityEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $authorityId, @@ -478,8 +484,8 @@ public function test_a_safe_store_secret_recovery_code_possession_can_be_revoked $authorityEmail, new Locale('en_GB'), new SecondFactorId(self::uuid()), - new YubikeyPublicId('00000012') - ) + new YubikeyPublicId('00000012'), + ), ]) ->withAggregateId($this->id) ->given([ @@ -491,8 +497,8 @@ public function test_a_safe_store_secret_recovery_code_possession_can_be_revoked new SafeStore($secret), $this->commonName, $this->email, - $this->preferredLocale - ) + $this->preferredLocale, + ), ]) ->when($command) ->then([ @@ -501,8 +507,8 @@ public function test_a_safe_store_secret_recovery_code_possession_can_be_revoked $this->institution, $recoveryTokenId, RecoveryTokenType::safeStore(), - $authorityId - ) + $authorityId, + ), ]); } @@ -532,7 +538,6 @@ public function test_a_token_can_be_registered_self_asserted(): void $expectedVettingType = new SelfAssertedRegistrationVettingType($recoveryTokenId); $this->scenario - ->withAggregateId($this->id) ->given([ $this->buildIdentityCreatedEvent(), @@ -544,12 +549,12 @@ public function test_a_token_can_be_registered_self_asserted(): void true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $this->commonName, $this->email, - new Locale('en_GB') + new Locale('en_GB'), ), new EmailVerifiedEvent( $this->id, @@ -561,7 +566,7 @@ public function test_a_token_can_be_registered_self_asserted(): void 'REGCODE', $this->commonName, $this->email, - new Locale('en_GB') + new Locale('en_GB'), ), new SafeStoreSecretRecoveryTokenPossessionPromisedEvent( $this->id, @@ -570,8 +575,8 @@ public function test_a_token_can_be_registered_self_asserted(): void new SafeStore($secret), $this->commonName, $this->email, - $this->preferredLocale - ) + $this->preferredLocale, + ), ]) ->when($command) ->then([ @@ -585,8 +590,8 @@ public function test_a_token_can_be_registered_self_asserted(): void $this->commonName, $this->email, $this->preferredLocale, - $expectedVettingType - ) + $expectedVettingType, + ), ]); } @@ -615,7 +620,6 @@ public function test_self_asserted_token_registration_requires_possession_of_rec $this->expectException(DomainException::class); $this->expectExceptionMessage('A recovery token is required to perform a self-asserted token registration'); $this->scenario - ->withAggregateId($this->id) ->given([ $this->buildIdentityCreatedEvent(), @@ -627,12 +631,12 @@ public function test_self_asserted_token_registration_requires_possession_of_rec true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $this->commonName, $this->email, - new Locale('en_GB') + new Locale('en_GB'), ), new EmailVerifiedEvent( $this->id, @@ -644,11 +648,10 @@ public function test_self_asserted_token_registration_requires_possession_of_rec 'REGCODE', $this->commonName, $this->email, - new Locale('en_GB') - ) + new Locale('en_GB'), + ), ]) - ->when($command); - + ->when($command); } /** @@ -679,8 +682,8 @@ public function test_a_safe_store_secret_recovery_code_possession_can_be_revoked new SafeStore($secret), $this->commonName, $this->email, - $this->preferredLocale - ) + $this->preferredLocale, + ), ]) ->when($command) ->then([ @@ -688,8 +691,8 @@ public function test_a_safe_store_secret_recovery_code_possession_can_be_revoked $this->id, $this->institution, $recoveryTokenId, - RecoveryTokenType::safeStore() - ) + RecoveryTokenType::safeStore(), + ), ]); } @@ -713,8 +716,8 @@ public function test_a_sat_token_can_be_used_to_self_vet_a_token(): void $loa = new Loa(1.5, 'loa-self-asserted'); $this->loaResolutionService->shouldReceive('getLoa')->with('loa-self-asserted')->andReturn($loa); - $phoneSfId = new SecondFactorId($this->uuid()); - $phoneIdentifier = new PhoneNumber('+31 (0) 612345678'); + $phoneSfId = new SecondFactorId($this->uuid()); + $phoneIdentifier = new PhoneNumber('+31 (0) 612345678'); $command = new SelfVetSecondFactorCommand(); $command->secondFactorId = '+31 (0) 612345678'; @@ -737,12 +740,12 @@ public function test_a_sat_token_can_be_used_to_self_vet_a_token(): void true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $this->commonName, $this->email, - new Locale('en_GB') + new Locale('en_GB'), ), new EmailVerifiedEvent( $this->id, @@ -754,7 +757,7 @@ public function test_a_sat_token_can_be_used_to_self_vet_a_token(): void 'REGCODE', $this->commonName, $this->email, - new Locale('en_GB') + new Locale('en_GB'), ), new SafeStoreSecretRecoveryTokenPossessionPromisedEvent( $this->id, @@ -763,7 +766,7 @@ public function test_a_sat_token_can_be_used_to_self_vet_a_token(): void new SafeStore($secret), $this->commonName, $this->email, - $this->preferredLocale + $this->preferredLocale, ), new SecondFactorVettedWithoutTokenProofOfPossession( $this->id, @@ -775,7 +778,7 @@ public function test_a_sat_token_can_be_used_to_self_vet_a_token(): void $this->commonName, $this->email, $this->preferredLocale, - $vettingType + $vettingType, ), // The next token is self-vetted using the other SAT token new PhonePossessionProvenEvent( @@ -786,12 +789,12 @@ public function test_a_sat_token_can_be_used_to_self_vet_a_token(): void true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $this->commonName, $this->email, - new Locale('en_GB') + new Locale('en_GB'), ), new EmailVerifiedEvent( $this->id, @@ -803,7 +806,7 @@ public function test_a_sat_token_can_be_used_to_self_vet_a_token(): void 'REGCODE', $this->commonName, $this->email, - new Locale('en_GB') + new Locale('en_GB'), ), ]) ->when($command) @@ -819,7 +822,7 @@ public function test_a_sat_token_can_be_used_to_self_vet_a_token(): void $this->commonName, $this->email, new Locale('en_GB'), - new SelfAssertedRegistrationVettingType($recoveryTokenId) + new SelfAssertedRegistrationVettingType($recoveryTokenId), ), ]); } @@ -867,14 +870,16 @@ public function test_sat_not_allowed_when_one_vetted_token_is_identity_vetted(): new SecondFactorType('tiqr'), new SecondFactorType('yubikey'), new SecondFactorType('sms'), - ] - ) + ], + ), ); $this->configService->shouldReceive('getMaxNumberOfTokensFor')->andReturn(5); $this->expectException(DomainException::class); - $this->expectExceptionMessage('Not all tokens are self-asserted, it is not allowed to self-vet using the self-asserted token'); + $this->expectExceptionMessage( + 'Not all tokens are self-asserted, it is not allowed to self-vet using the self-asserted token', + ); $this->scenario ->withAggregateId($this->id) @@ -888,12 +893,12 @@ public function test_sat_not_allowed_when_one_vetted_token_is_identity_vetted(): true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $this->commonName, $this->email, - new Locale('en_GB') + new Locale('en_GB'), ), new EmailVerifiedEvent( $this->id, @@ -905,7 +910,7 @@ public function test_sat_not_allowed_when_one_vetted_token_is_identity_vetted(): 'REGCODE', $this->commonName, $this->email, - new Locale('en_GB') + new Locale('en_GB'), ), new SafeStoreSecretRecoveryTokenPossessionPromisedEvent( $this->id, @@ -914,7 +919,7 @@ public function test_sat_not_allowed_when_one_vetted_token_is_identity_vetted(): new SafeStore($secret), $this->commonName, $this->email, - $this->preferredLocale + $this->preferredLocale, ), new SecondFactorVettedWithoutTokenProofOfPossession( $this->id, @@ -926,7 +931,7 @@ public function test_sat_not_allowed_when_one_vetted_token_is_identity_vetted(): $this->commonName, $this->email, $this->preferredLocale, - $vettingType + $vettingType, ), // The next token is ra-vetted new PhonePossessionProvenEvent( @@ -937,12 +942,12 @@ public function test_sat_not_allowed_when_one_vetted_token_is_identity_vetted(): true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $this->commonName, $this->email, - new Locale('en_GB') + new Locale('en_GB'), ), new EmailVerifiedEvent( $this->id, @@ -954,7 +959,7 @@ public function test_sat_not_allowed_when_one_vetted_token_is_identity_vetted(): 'REGCODE', $this->commonName, $this->email, - new Locale('en_GB') + new Locale('en_GB'), ), new SecondFactorVettedEvent( $this->id, @@ -966,7 +971,7 @@ public function test_sat_not_allowed_when_one_vetted_token_is_identity_vetted(): $this->commonName, $this->email, $this->preferredLocale, - new OnPremiseVettingType(new DocumentNumber('123123')) + new OnPremiseVettingType(new DocumentNumber('123123')), ), // The third token is an attempt to self-vet a token new GssfPossessionProvenEvent( @@ -978,12 +983,12 @@ public function test_sat_not_allowed_when_one_vetted_token_is_identity_vetted(): true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $this->commonName, $this->email, - new Locale('en_GB') + new Locale('en_GB'), ), new EmailVerifiedEvent( $this->id, @@ -995,14 +1000,16 @@ public function test_sat_not_allowed_when_one_vetted_token_is_identity_vetted(): 'REGCODE', $this->commonName, $this->email, - new Locale('en_GB') + new Locale('en_GB'), ), ]) ->when($command); } - protected function createCommandHandler(EventStoreInterface $eventStore, EventBusInterface $eventBus): CommandHandler - { + protected function createCommandHandler( + EventStoreInterface $eventStore, + EventBusInterface $eventBus, + ): CommandHandler { $aggregateFactory = new PublicConstructorAggregateFactory(); $this->identityProjectionRepository = m::mock(IdentityProjectionRepository::class); @@ -1021,7 +1028,7 @@ protected function createCommandHandler(EventStoreInterface $eventStore, EventBu $eventBus, $aggregateFactory, m::mock(UserDataFilterInterface::class), - $logger + $logger, ), $this->identityProjectionRepository, ConfigurableSettings::create(self::$window, ['nl_NL', 'en_GB']), @@ -1031,7 +1038,7 @@ protected function createCommandHandler(EventStoreInterface $eventStore, EventBu $this->configService, $this->loaResolutionService, $this->recoveryTokenSecretHelper, - $registrationMailService + $registrationMailService, ); } @@ -1045,7 +1052,7 @@ private function buildIdentityCreatedEvent(): IdentityCreatedEvent $this->nameId, $this->commonName, $this->email, - $this->preferredLocale + $this->preferredLocale, ); } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php index 0b218b9c3..161b3eafa 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php @@ -41,8 +41,8 @@ use Surfnet\Stepup\Identity\Event\IdentityRenamedEvent; use Surfnet\Stepup\Identity\Event\LocalePreferenceExpressedEvent; use Surfnet\Stepup\Identity\Event\PhonePossessionProvenEvent; -use Surfnet\Stepup\Identity\Event\SecondFactorVettedWithoutTokenProofOfPossession; use Surfnet\Stepup\Identity\Event\SecondFactorVettedEvent; +use Surfnet\Stepup\Identity\Event\SecondFactorVettedWithoutTokenProofOfPossession; use Surfnet\Stepup\Identity\Event\U2fDevicePossessionProvenEvent; use Surfnet\Stepup\Identity\Event\YubikeyPossessionProvenEvent; use Surfnet\Stepup\Identity\Event\YubikeySecondFactorBootstrappedEvent; @@ -63,7 +63,6 @@ use Surfnet\Stepup\Identity\Value\StepupProvider; use Surfnet\Stepup\Identity\Value\TimeFrame; use Surfnet\Stepup\Identity\Value\U2fKeyHandle; -use Surfnet\Stepup\Identity\Value\VettingType; use Surfnet\Stepup\Identity\Value\YubikeyPublicId; use Surfnet\StepupBundle\Service\LoaResolutionService; use Surfnet\StepupBundle\Service\SecondFactorTypeService; @@ -91,6 +90,7 @@ use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Service\RegistrationMailService; use Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\CommandHandlerTest; use Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\DateTimeHelper; + use function md5; /** @@ -143,8 +143,10 @@ public function setUp(): void parent::setUp(); } - protected function createCommandHandler(EventStoreInterface $eventStore, EventBusInterface $eventBus): CommandHandler - { + protected function createCommandHandler( + EventStoreInterface $eventStore, + EventBusInterface $eventBus, + ): CommandHandler { $aggregateFactory = new PublicConstructorAggregateFactory(); $this->identityProjectionRepository = m::mock(IdentityProjectionRepository::class); @@ -162,7 +164,7 @@ protected function createCommandHandler(EventStoreInterface $eventStore, EventBu $eventBus, $aggregateFactory, m::mock(UserDataFilterInterface::class), - $logger + $logger, ), $this->identityProjectionRepository, ConfigurableSettings::create(self::$window, ['nl_NL', 'en_GB']), @@ -172,7 +174,7 @@ protected function createCommandHandler(EventStoreInterface $eventStore, EventBu $this->configService, $this->loaResolutionService, m::mock(RecoveryTokenSecretHelper::class), - $this->registrationMailService + $this->registrationMailService, ); } @@ -183,14 +185,14 @@ protected function createCommandHandler(EventStoreInterface $eventStore, EventBu */ public function an_identity_can_be_bootstrapped_with_a_yubikey_second_factor(): void { - $command = new BootstrapIdentityWithYubikeySecondFactorCommand(); - $command->identityId = 'ID-ID'; - $command->nameId = 'N-ID'; - $command->institution = 'Institution'; - $command->commonName = 'Enrique'; - $command->email = 'foo@domain.invalid'; + $command = new BootstrapIdentityWithYubikeySecondFactorCommand(); + $command->identityId = 'ID-ID'; + $command->nameId = 'N-ID'; + $command->institution = 'Institution'; + $command->commonName = 'Enrique'; + $command->email = 'foo@domain.invalid'; $command->preferredLocale = 'nl_NL'; - $command->secondFactorId = 'SF-ID'; + $command->secondFactorId = 'SF-ID'; $command->yubikeyPublicId = '93193884'; $this->identityProjectionRepository->shouldReceive('hasIdentityWithNameIdAndInstitution')->andReturn(false); @@ -211,7 +213,7 @@ public function an_identity_can_be_bootstrapped_with_a_yubikey_second_factor(): new NameId('N-ID'), new CommonName($command->commonName), new Email($command->email), - new Locale('nl_NL') + new Locale('nl_NL'), ), new YubikeySecondFactorBootstrappedEvent( $identityId, @@ -221,8 +223,8 @@ public function an_identity_can_be_bootstrapped_with_a_yubikey_second_factor(): new Email($command->email), new Locale('nl_NL'), new SecondFactorId('SF-ID'), - new YubikeyPublicId('93193884') - ) + new YubikeyPublicId('93193884'), + ), ]); } @@ -233,14 +235,14 @@ public function an_identity_can_be_bootstrapped_with_a_yubikey_second_factor(): */ public function an_identity_cannot_be_bootstrapped_twice(): void { - $command = new BootstrapIdentityWithYubikeySecondFactorCommand(); - $command->identityId = 'ID-ID'; - $command->nameId = 'N-ID'; - $command->institution = 'Institution'; - $command->commonName = 'Enrique'; - $command->email = 'foo@domain.invalid'; + $command = new BootstrapIdentityWithYubikeySecondFactorCommand(); + $command->identityId = 'ID-ID'; + $command->nameId = 'N-ID'; + $command->institution = 'Institution'; + $command->commonName = 'Enrique'; + $command->email = 'foo@domain.invalid'; $command->preferredLocale = 'nl_NL'; - $command->secondFactorId = 'SF-ID'; + $command->secondFactorId = 'SF-ID'; $command->yubikeyPublicId = '93193884'; $this->identityProjectionRepository->shouldReceive('hasIdentityWithNameIdAndInstitution')->andReturn(true); @@ -268,19 +270,19 @@ public function a_yubikey_possession_can_be_proven(): void m::mock('alias:Surfnet\Stepup\Token\TokenGenerator') ->shouldReceive('generateNonce')->once()->andReturn('nonce'); - $id = new IdentityId(self::uuid()); - $institution = new Institution('A Corp.'); - $nameId = new NameId(md5(__METHOD__)); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); - $preferredLocale = new Locale('en_GB'); - $secFacId = new SecondFactorId(self::uuid()); - $pubId = new YubikeyPublicId('00028278'); + $id = new IdentityId(self::uuid()); + $institution = new Institution('A Corp.'); + $nameId = new NameId(md5(__METHOD__)); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); + $preferredLocale = new Locale('en_GB'); + $secFacId = new SecondFactorId(self::uuid()); + $pubId = new YubikeyPublicId('00028278'); - $command = new ProveYubikeyPossessionCommand(); - $command->identityId = (string) $id; - $command->secondFactorId = (string) $secFacId; - $command->yubikeyPublicId = (string) $pubId; + $command = new ProveYubikeyPossessionCommand(); + $command->identityId = (string)$id; + $command->secondFactorId = (string)$secFacId; + $command->yubikeyPublicId = (string)$pubId; $this->configService->shouldReceive('getMaxNumberOfTokensFor')->andReturn(2); @@ -290,14 +292,16 @@ public function a_yubikey_possession_can_be_proven(): void $this->scenario ->withAggregateId($id) - ->given([new IdentityCreatedEvent( - $id, - $institution, - $nameId, - $commonName, - $email, - $preferredLocale - )]) + ->given([ + new IdentityCreatedEvent( + $id, + $institution, + $nameId, + $commonName, + $email, + $preferredLocale, + ), + ]) ->when($command) ->then([ new YubikeyPossessionProvenEvent( @@ -308,13 +312,13 @@ public function a_yubikey_possession_can_be_proven(): void true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $commonName, $email, - $preferredLocale - ) + $preferredLocale, + ), ]); } @@ -332,19 +336,19 @@ public function a_yubikey_possession_cannot_be_proven_if_the_second_factor_is_no m::mock('alias:Surfnet\Stepup\Token\TokenGenerator') ->shouldReceive('generateNonce')->once()->andReturn('nonce'); - $id = new IdentityId(self::uuid()); - $institution = new Institution('A Corp.'); - $nameId = new NameId(md5(__METHOD__)); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); - $preferredLocale = new Locale('en_GB'); - $secFacId = new SecondFactorId(self::uuid()); - $pubId = new YubikeyPublicId('00028278'); + $id = new IdentityId(self::uuid()); + $institution = new Institution('A Corp.'); + $nameId = new NameId(md5(__METHOD__)); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); + $preferredLocale = new Locale('en_GB'); + $secFacId = new SecondFactorId(self::uuid()); + $pubId = new YubikeyPublicId('00028278'); - $command = new ProveYubikeyPossessionCommand(); - $command->identityId = (string) $id; - $command->secondFactorId = (string) $secFacId; - $command->yubikeyPublicId = (string) $pubId; + $command = new ProveYubikeyPossessionCommand(); + $command->identityId = (string)$id; + $command->secondFactorId = (string)$secFacId; + $command->yubikeyPublicId = (string)$pubId; $this->configService->shouldReceive('getMaxNumberOfTokensFor')->andReturn(2); @@ -357,14 +361,16 @@ public function a_yubikey_possession_cannot_be_proven_if_the_second_factor_is_no $this->scenario ->withAggregateId($id) - ->given([new IdentityCreatedEvent( - $id, - $institution, - $nameId, - $commonName, - $email, - $preferredLocale - )]) + ->given([ + new IdentityCreatedEvent( + $id, + $institution, + $nameId, + $commonName, + $email, + $preferredLocale, + ), + ]) ->when($command); } @@ -377,14 +383,14 @@ public function yubikey_possession_cannot_be_proven_twice(): void $this->expectException(DomainException::class); $this->expectExceptionMessage('more than 1 token(s)'); - $id = new IdentityId(self::uuid()); - $institution = new Institution('A Corp.'); - $nameId = new NameId(md5(__METHOD__)); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); - $preferredLocale = new Locale('en_GB'); - $secFacId1 = new SecondFactorId(self::uuid()); - $pubId1 = new YubikeyPublicId('00028278'); + $id = new IdentityId(self::uuid()); + $institution = new Institution('A Corp.'); + $nameId = new NameId(md5(__METHOD__)); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); + $preferredLocale = new Locale('en_GB'); + $secFacId1 = new SecondFactorId(self::uuid()); + $pubId1 = new YubikeyPublicId('00028278'); $this->allowedSecondFactorListServiceMock ->shouldReceive('getAllowedSecondFactorListFor') @@ -392,10 +398,10 @@ public function yubikey_possession_cannot_be_proven_twice(): void $this->configService->shouldReceive('getMaxNumberOfTokensFor')->andReturn(1); - $command = new ProveYubikeyPossessionCommand(); - $command->identityId = (string) $id; - $command->secondFactorId = (string) $secFacId1; - $command->yubikeyPublicId = (string) $pubId1; + $command = new ProveYubikeyPossessionCommand(); + $command->identityId = (string)$id; + $command->secondFactorId = (string)$secFacId1; + $command->yubikeyPublicId = (string)$pubId1; $this->scenario ->withAggregateId($id) @@ -406,7 +412,7 @@ public function yubikey_possession_cannot_be_proven_twice(): void $nameId, $commonName, $email, - $preferredLocale + $preferredLocale, ), new YubikeyPossessionProvenEvent( $id, @@ -416,13 +422,13 @@ public function yubikey_possession_cannot_be_proven_twice(): void true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $commonName, $email, - $preferredLocale - ) + $preferredLocale, + ), ]) ->when($command); } @@ -441,14 +447,14 @@ public function a_phone_possession_can_be_proven(): void m::mock('alias:Surfnet\Stepup\Token\TokenGenerator') ->shouldReceive('generateNonce')->once()->andReturn('nonce'); - $id = new IdentityId(self::uuid()); - $institution = new Institution('A Corp.'); - $nameId = new NameId(md5(__METHOD__)); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); - $preferredLocale = new Locale('en_GB'); - $secFacId = new SecondFactorId(self::uuid()); - $phoneNumber = new PhoneNumber('+31 (0) 612345678'); + $id = new IdentityId(self::uuid()); + $institution = new Institution('A Corp.'); + $nameId = new NameId(md5(__METHOD__)); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); + $preferredLocale = new Locale('en_GB'); + $secFacId = new SecondFactorId(self::uuid()); + $phoneNumber = new PhoneNumber('+31 (0) 612345678'); $this->allowedSecondFactorListServiceMock ->shouldReceive('getAllowedSecondFactorListFor') @@ -456,21 +462,23 @@ public function a_phone_possession_can_be_proven(): void $this->configService->shouldReceive('getMaxNumberOfTokensFor')->andReturn(2); - $command = new ProvePhonePossessionCommand(); - $command->identityId = (string) $id; - $command->secondFactorId = (string) $secFacId; - $command->phoneNumber = (string) $phoneNumber; + $command = new ProvePhonePossessionCommand(); + $command->identityId = (string)$id; + $command->secondFactorId = (string)$secFacId; + $command->phoneNumber = (string)$phoneNumber; $this->scenario ->withAggregateId($id) - ->given([new IdentityCreatedEvent( - $id, - $institution, - $nameId, - $commonName, - $email, - $preferredLocale - )]) + ->given([ + new IdentityCreatedEvent( + $id, + $institution, + $nameId, + $commonName, + $email, + $preferredLocale, + ), + ]) ->when($command) ->then([ new PhonePossessionProvenEvent( @@ -481,13 +489,13 @@ public function a_phone_possession_can_be_proven(): void true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $commonName, $email, - $preferredLocale - ) + $preferredLocale, + ), ]); } @@ -505,14 +513,14 @@ public function a_phone_possession_cannot_be_proven_if_the_second_factor_is_not_ m::mock('alias:Surfnet\Stepup\Token\TokenGenerator') ->shouldReceive('generateNonce')->once()->andReturn('nonce'); - $id = new IdentityId(self::uuid()); - $institution = new Institution('A Corp.'); - $nameId = new NameId(md5(__METHOD__)); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); - $preferredLocale = new Locale('en_GB'); - $secFacId = new SecondFactorId(self::uuid()); - $phoneNumber = new PhoneNumber('+31 (0) 612345678'); + $id = new IdentityId(self::uuid()); + $institution = new Institution('A Corp.'); + $nameId = new NameId(md5(__METHOD__)); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); + $preferredLocale = new Locale('en_GB'); + $secFacId = new SecondFactorId(self::uuid()); + $phoneNumber = new PhoneNumber('+31 (0) 612345678'); $this->allowedSecondFactorListServiceMock ->shouldReceive('getAllowedSecondFactorListFor') @@ -521,21 +529,23 @@ public function a_phone_possession_cannot_be_proven_if_the_second_factor_is_not_ $this->expectException(SecondFactorNotAllowedException::class); $this->expectExceptionMessage('does not support second factor'); - $command = new ProvePhonePossessionCommand(); - $command->identityId = (string) $id; - $command->secondFactorId = (string) $secFacId; - $command->phoneNumber = (string) $phoneNumber; + $command = new ProvePhonePossessionCommand(); + $command->identityId = (string)$id; + $command->secondFactorId = (string)$secFacId; + $command->phoneNumber = (string)$phoneNumber; $this->scenario ->withAggregateId($id) - ->given([new IdentityCreatedEvent( - $id, - $institution, - $nameId, - $commonName, - $email, - $preferredLocale - )]) + ->given([ + new IdentityCreatedEvent( + $id, + $institution, + $nameId, + $commonName, + $email, + $preferredLocale, + ), + ]) ->when($command) ->then([]); } @@ -556,15 +566,15 @@ public function a_gssf_possession_can_be_proven(): void m::mock('alias:Surfnet\Stepup\Token\TokenGenerator') ->shouldReceive('generateNonce')->once()->andReturn($nonce); - $identityId = new IdentityId(self::uuid()); - $institution = new Institution('Surfnet'); - $nameId = new NameId(md5(__METHOD__)); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); - $preferredLocale = new Locale('en_GB'); - $secondFactorId = new SecondFactorId(self::uuid()); - $stepupProvider = new StepupProvider('tiqr'); - $gssfId = new GssfId('_' . md5('Surfnet')); + $identityId = new IdentityId(self::uuid()); + $institution = new Institution('Surfnet'); + $nameId = new NameId(md5(__METHOD__)); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); + $preferredLocale = new Locale('en_GB'); + $secondFactorId = new SecondFactorId(self::uuid()); + $stepupProvider = new StepupProvider('tiqr'); + $gssfId = new GssfId('_' . md5('Surfnet')); $this->allowedSecondFactorListServiceMock ->shouldReceive('getAllowedSecondFactorListFor') @@ -574,28 +584,30 @@ public function a_gssf_possession_can_be_proven(): void new SecondFactorType('biometric'), new SecondFactorType('tiqr'), new SecondFactorType('anotherGssp'), - ] - ) + ], + ), ); $this->configService->shouldReceive('getMaxNumberOfTokensFor')->andReturn(2); - $command = new ProveGssfPossessionCommand(); - $command->identityId = (string) $identityId; - $command->secondFactorId = (string) $secondFactorId; - $command->stepupProvider = (string) $stepupProvider; - $command->gssfId = (string) $gssfId; + $command = new ProveGssfPossessionCommand(); + $command->identityId = (string)$identityId; + $command->secondFactorId = (string)$secondFactorId; + $command->stepupProvider = (string)$stepupProvider; + $command->gssfId = (string)$gssfId; $this->scenario ->withAggregateId($identityId) - ->given([new IdentityCreatedEvent( - $identityId, - $institution, - $nameId, - $commonName, - $email, - $preferredLocale - )]) + ->given([ + new IdentityCreatedEvent( + $identityId, + $institution, + $nameId, + $commonName, + $email, + $preferredLocale, + ), + ]) ->when($command) ->then([ new GssfPossessionProvenEvent( @@ -607,13 +619,13 @@ public function a_gssf_possession_can_be_proven(): void true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), $nonce, $commonName, $email, - $preferredLocale - ) + $preferredLocale, + ), ]); } @@ -634,15 +646,15 @@ public function a_gssf_possession_can_not_be_proven_if_the_second_factor_is_not_ m::mock('alias:Surfnet\Stepup\Token\TokenGenerator') ->shouldReceive('generateNonce')->once()->andReturn($nonce); - $identityId = new IdentityId(self::uuid()); - $institution = new Institution('Surfnet'); - $nameId = new NameId(md5(__METHOD__)); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); - $preferredLocale = new Locale('en_GB'); - $secondFactorId = new SecondFactorId(self::uuid()); - $stepupProvider = new StepupProvider('tiqr'); - $gssfId = new GssfId('_' . md5('Surfnet')); + $identityId = new IdentityId(self::uuid()); + $institution = new Institution('Surfnet'); + $nameId = new NameId(md5(__METHOD__)); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); + $preferredLocale = new Locale('en_GB'); + $secondFactorId = new SecondFactorId(self::uuid()); + $stepupProvider = new StepupProvider('tiqr'); + $gssfId = new GssfId('_' . md5('Surfnet')); $this->allowedSecondFactorListServiceMock ->shouldReceive('getAllowedSecondFactorListFor') @@ -651,22 +663,24 @@ public function a_gssf_possession_can_not_be_proven_if_the_second_factor_is_not_ $this->expectException(SecondFactorNotAllowedException::class); $this->expectExceptionMessage('does not support second factor'); - $command = new ProveGssfPossessionCommand(); - $command->identityId = (string) $identityId; - $command->secondFactorId = (string) $secondFactorId; - $command->stepupProvider = (string) $stepupProvider; - $command->gssfId = (string) $gssfId; + $command = new ProveGssfPossessionCommand(); + $command->identityId = (string)$identityId; + $command->secondFactorId = (string)$secondFactorId; + $command->stepupProvider = (string)$stepupProvider; + $command->gssfId = (string)$gssfId; $this->scenario ->withAggregateId($identityId) - ->given([new IdentityCreatedEvent( - $identityId, - $institution, - $nameId, - $commonName, - $email, - $preferredLocale - )]) + ->given([ + new IdentityCreatedEvent( + $identityId, + $institution, + $nameId, + $commonName, + $email, + $preferredLocale, + ), + ]) ->when($command) ->then([]); } @@ -685,14 +699,14 @@ public function a_u2f_device_possession_can_be_proven(): void m::mock('alias:Surfnet\Stepup\Token\TokenGenerator') ->shouldReceive('generateNonce')->once()->andReturn('nonce'); - $id = new IdentityId(self::uuid()); - $institution = new Institution('A Corp.'); - $nameId = new NameId(md5(__METHOD__)); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); - $preferredLocale = new Locale('en_GB'); - $secFacId = new SecondFactorId(self::uuid()); - $keyHandle = new U2fKeyHandle('DMUV_wX'); + $id = new IdentityId(self::uuid()); + $institution = new Institution('A Corp.'); + $nameId = new NameId(md5(__METHOD__)); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); + $preferredLocale = new Locale('en_GB'); + $secFacId = new SecondFactorId(self::uuid()); + $keyHandle = new U2fKeyHandle('DMUV_wX'); $this->allowedSecondFactorListServiceMock ->shouldReceive('getAllowedSecondFactorListFor') @@ -700,21 +714,23 @@ public function a_u2f_device_possession_can_be_proven(): void $this->configService->shouldReceive('getMaxNumberOfTokensFor')->andReturn(2); - $command = new ProveU2fDevicePossessionCommand(); - $command->identityId = (string) $id; - $command->secondFactorId = (string) $secFacId; - $command->keyHandle = $keyHandle->getValue(); + $command = new ProveU2fDevicePossessionCommand(); + $command->identityId = (string)$id; + $command->secondFactorId = (string)$secFacId; + $command->keyHandle = $keyHandle->getValue(); $this->scenario ->withAggregateId($id) - ->given([new IdentityCreatedEvent( - $id, - $institution, - $nameId, - $commonName, - $email, - $preferredLocale - )]) + ->given([ + new IdentityCreatedEvent( + $id, + $institution, + $nameId, + $commonName, + $email, + $preferredLocale, + ), + ]) ->when($command) ->then([ new U2fDevicePossessionProvenEvent( @@ -725,13 +741,13 @@ public function a_u2f_device_possession_can_be_proven(): void true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $commonName, $email, - $preferredLocale - ) + $preferredLocale, + ), ]); } @@ -749,14 +765,14 @@ public function a_u2f_device_possession_cannot_be_proven_if_the_second_factor_is m::mock('alias:Surfnet\Stepup\Token\TokenGenerator') ->shouldReceive('generateNonce')->once()->andReturn('nonce'); - $id = new IdentityId(self::uuid()); - $institution = new Institution('A Corp.'); - $nameId = new NameId(md5(__METHOD__)); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); - $preferredLocale = new Locale('en_GB'); - $secFacId = new SecondFactorId(self::uuid()); - $keyHandle = new U2fKeyHandle('DMUV_wX'); + $id = new IdentityId(self::uuid()); + $institution = new Institution('A Corp.'); + $nameId = new NameId(md5(__METHOD__)); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); + $preferredLocale = new Locale('en_GB'); + $secFacId = new SecondFactorId(self::uuid()); + $keyHandle = new U2fKeyHandle('DMUV_wX'); $this->allowedSecondFactorListServiceMock ->shouldReceive('getAllowedSecondFactorListFor') @@ -765,21 +781,23 @@ public function a_u2f_device_possession_cannot_be_proven_if_the_second_factor_is $this->expectException(SecondFactorNotAllowedException::class); $this->expectExceptionMessage('does not support second factor'); - $command = new ProveU2fDevicePossessionCommand(); - $command->identityId = (string) $id; - $command->secondFactorId = (string) $secFacId; - $command->keyHandle = $keyHandle->getValue(); + $command = new ProveU2fDevicePossessionCommand(); + $command->identityId = (string)$id; + $command->secondFactorId = (string)$secFacId; + $command->keyHandle = $keyHandle->getValue(); $this->scenario ->withAggregateId($id) - ->given([new IdentityCreatedEvent( - $id, - $institution, - $nameId, - $commonName, - $email, - $preferredLocale - )]) + ->given([ + new IdentityCreatedEvent( + $id, + $institution, + $nameId, + $commonName, + $email, + $preferredLocale, + ), + ]) ->when($command) ->then([]); } @@ -793,19 +811,19 @@ public function phone_possession_cannot_be_proven_twice(): void $this->expectException(DomainException::class); $this->expectExceptionMessage('more than 1 token(s)'); - $id = new IdentityId(self::uuid()); - $institution = new Institution('A Corp.'); - $nameId = new NameId(md5(__METHOD__)); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); - $preferredLocale = new Locale('en_GB'); - $secFacId1 = new SecondFactorId(self::uuid()); - $phoneNumber1 = new PhoneNumber('+31 (0) 612345678'); + $id = new IdentityId(self::uuid()); + $institution = new Institution('A Corp.'); + $nameId = new NameId(md5(__METHOD__)); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); + $preferredLocale = new Locale('en_GB'); + $secFacId1 = new SecondFactorId(self::uuid()); + $phoneNumber1 = new PhoneNumber('+31 (0) 612345678'); - $command = new ProvePhonePossessionCommand(); - $command->identityId = (string) $id; - $command->secondFactorId = (string) $secFacId1; - $command->phoneNumber = (string) $phoneNumber1; + $command = new ProvePhonePossessionCommand(); + $command->identityId = (string)$id; + $command->secondFactorId = (string)$secFacId1; + $command->phoneNumber = (string)$phoneNumber1; $this->allowedSecondFactorListServiceMock ->shouldReceive('getAllowedSecondFactorListFor') @@ -822,7 +840,7 @@ public function phone_possession_cannot_be_proven_twice(): void $nameId, $commonName, $email, - $preferredLocale + $preferredLocale, ), new PhonePossessionProvenEvent( $id, @@ -832,13 +850,13 @@ public function phone_possession_cannot_be_proven_twice(): void true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $commonName, $email, - $preferredLocale - ) + $preferredLocale, + ), ]) ->when($command); } @@ -852,15 +870,15 @@ public function cannot_prove_possession_of_arbitrary_second_factor_type_twice(): $this->expectException(DomainException::class); $this->expectExceptionMessage('more than 1 token(s)'); - $id = new IdentityId(self::uuid()); - $institution = new Institution('A Corp.'); - $nameId = new NameId(md5(__METHOD__)); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); - $preferredLocale = new Locale('en_GB'); - $secFacId1 = new SecondFactorId(self::uuid()); - $publicId = new YubikeyPublicId('00028278'); - $phoneNumber = new PhoneNumber('+31 (0) 676543210'); + $id = new IdentityId(self::uuid()); + $institution = new Institution('A Corp.'); + $nameId = new NameId(md5(__METHOD__)); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); + $preferredLocale = new Locale('en_GB'); + $secFacId1 = new SecondFactorId(self::uuid()); + $publicId = new YubikeyPublicId('00028278'); + $phoneNumber = new PhoneNumber('+31 (0) 676543210'); $this->allowedSecondFactorListServiceMock ->shouldReceive('getAllowedSecondFactorListFor') @@ -869,9 +887,9 @@ public function cannot_prove_possession_of_arbitrary_second_factor_type_twice(): $this->configService->shouldReceive('getMaxNumberOfTokensFor')->andReturn(1); $command = new ProvePhonePossessionCommand(); - $command->identityId = (string) $id; - $command->secondFactorId = (string) $secFacId1; - $command->phoneNumber = (string) $phoneNumber; + $command->identityId = (string)$id; + $command->secondFactorId = (string)$secFacId1; + $command->phoneNumber = (string)$phoneNumber; $this->scenario ->withAggregateId($id) @@ -882,7 +900,7 @@ public function cannot_prove_possession_of_arbitrary_second_factor_type_twice(): $nameId, $commonName, $email, - $preferredLocale + $preferredLocale, ), new YubikeyPossessionProvenEvent( $id, @@ -892,13 +910,13 @@ public function cannot_prove_possession_of_arbitrary_second_factor_type_twice(): true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $commonName, $email, - $preferredLocale - ) + $preferredLocale, + ), ]) ->when($command); } @@ -915,17 +933,17 @@ public function an_unverified_second_factors_email_can_be_verified(): void m::mock('alias:Surfnet\StepupBundle\Security\OtpGenerator') ->shouldReceive('generate')->once()->andReturn('regcode'); - $id = new IdentityId(self::uuid()); - $institution = new Institution('A Corp.'); - $nameId = new NameId(md5(__METHOD__)); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); - $preferredLocale = new Locale('en_GB'); - $secondFactorId = new SecondFactorId(self::uuid()); + $id = new IdentityId(self::uuid()); + $institution = new Institution('A Corp.'); + $nameId = new NameId(md5(__METHOD__)); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); + $preferredLocale = new Locale('en_GB'); + $secondFactorId = new SecondFactorId(self::uuid()); $secondFactorIdentifier = new YubikeyPublicId('00028278'); - $command = new VerifyEmailCommand(); - $command->identityId = (string) $id; + $command = new VerifyEmailCommand(); + $command->identityId = (string)$id; $command->verificationNonce = 'nonce'; $this->scenario @@ -937,7 +955,7 @@ public function an_unverified_second_factors_email_can_be_verified(): void $nameId, $commonName, $email, - $preferredLocale + $preferredLocale, ), new YubikeyPossessionProvenEvent( $id, @@ -947,13 +965,13 @@ public function an_unverified_second_factors_email_can_be_verified(): void true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $commonName, $email, - $preferredLocale - ) + $preferredLocale, + ), ]) ->when($command) ->then([ @@ -967,8 +985,8 @@ public function an_unverified_second_factors_email_can_be_verified(): void 'regcode', $commonName, $email, - $preferredLocale - ) + $preferredLocale, + ), ]); } @@ -979,19 +997,21 @@ public function an_unverified_second_factors_email_can_be_verified(): void public function a_verified_second_factors_email_cannot_be_verified(): void { $this->expectException(DomainException::class); - $this->expectExceptionMessage('Cannot verify second factor, no unverified second factor can be verified using the given nonce'); - - $id = new IdentityId(self::uuid()); - $institution = new Institution('A Corp.'); - $nameId = new NameId(md5(__METHOD__)); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); - $preferredLocale = new Locale('en_GB'); - $secondFactorId = new SecondFactorId(self::uuid()); + $this->expectExceptionMessage( + 'Cannot verify second factor, no unverified second factor can be verified using the given nonce', + ); + + $id = new IdentityId(self::uuid()); + $institution = new Institution('A Corp.'); + $nameId = new NameId(md5(__METHOD__)); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); + $preferredLocale = new Locale('en_GB'); + $secondFactorId = new SecondFactorId(self::uuid()); $secondFactorIdentifier = new YubikeyPublicId('00028278'); $command = new VerifyEmailCommand(); - $command->identityId = (string) $id; + $command->identityId = (string)$id; $command->verificationNonce = 'nonce'; $this->scenario @@ -1003,7 +1023,7 @@ public function a_verified_second_factors_email_cannot_be_verified(): void $nameId, $commonName, $email, - $preferredLocale + $preferredLocale, ), new YubikeyPossessionProvenEvent( $id, @@ -1013,12 +1033,12 @@ public function a_verified_second_factors_email_cannot_be_verified(): void true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $commonName, $email, - $preferredLocale + $preferredLocale, ), new EmailVerifiedEvent( $id, @@ -1030,8 +1050,8 @@ public function a_verified_second_factors_email_cannot_be_verified(): void 'regcode', $commonName, $email, - $preferredLocale - ) + $preferredLocale, + ), ]) ->when($command); } @@ -1050,12 +1070,12 @@ public function cannot_verify_an_email_after_the_verification_window_has_closed( $publicId = new YubikeyPublicId('00028278'); $institution = new Institution('A Corp.'); $nameId = new NameId(md5(__METHOD__)); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); - $preferredLocale = new Locale('en_GB'); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); + $preferredLocale = new Locale('en_GB'); $command = new VerifyEmailCommand(); - $command->identityId = (string) $id; + $command->identityId = (string)$id; $command->verificationNonce = 'nonce'; $this->scenario @@ -1067,7 +1087,7 @@ public function cannot_verify_an_email_after_the_verification_window_has_closed( $nameId, $commonName, $email, - $preferredLocale + $preferredLocale, ), new YubikeyPossessionProvenEvent( $id, @@ -1077,13 +1097,13 @@ public function cannot_verify_an_email_after_the_verification_window_has_closed( true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - new DateTime(new CoreDateTime('-2 days')) + new DateTime(new CoreDateTime('-2 days')), ), 'nonce', $commonName, $email, - $preferredLocale - ) + $preferredLocale, + ), ]) ->when($command); } @@ -1103,12 +1123,12 @@ public function it_can_create_a_new_identity(): void $createCommand->email = 'a@domain.invalid'; $createCommand->commonName = 'foobar'; - $identityId = new IdentityId($createCommand->id); - $identityInstitution = new Institution($createCommand->institution); - $identityNameId = new NameId($createCommand->nameId); - $identityEmail = new Email($createCommand->email); - $identityCommonName = new CommonName($createCommand->commonName); - $identityPreferredLocale = new Locale($createCommand->preferredLocale); + $identityId = new IdentityId($createCommand->id); + $identityInstitution = new Institution($createCommand->institution); + $identityNameId = new NameId($createCommand->nameId); + $identityEmail = new Email($createCommand->email); + $identityCommonName = new CommonName($createCommand->commonName); + $identityPreferredLocale = new Locale($createCommand->preferredLocale); $createdEvent = new IdentityCreatedEvent( $identityId, @@ -1116,7 +1136,7 @@ public function it_can_create_a_new_identity(): void $identityNameId, $identityCommonName, $identityEmail, - $identityPreferredLocale + $identityPreferredLocale, ); $this->scenario @@ -1133,10 +1153,10 @@ public function it_can_create_a_new_identity(): void */ public function an_identity_can_be_updated(): void { - $id = new IdentityId('42'); - $institution = new Institution('A Corp.'); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); + $id = new IdentityId('42'); + $institution = new Institution('A Corp.'); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); $createdEvent = new IdentityCreatedEvent( $id, @@ -1144,12 +1164,12 @@ public function an_identity_can_be_updated(): void new NameId('3'), $commonName, $email, - new Locale('de_DE') + new Locale('de_DE'), ); - $updateCommand = new UpdateIdentityCommand(); - $updateCommand->id = $id->getIdentityId(); - $updateCommand->email = 'new-email@domain.invalid'; + $updateCommand = new UpdateIdentityCommand(); + $updateCommand->id = $id->getIdentityId(); + $updateCommand->email = 'new-email@domain.invalid'; $updateCommand->commonName = 'Henk Hendriksen'; $this->scenario @@ -1158,7 +1178,7 @@ public function an_identity_can_be_updated(): void ->when($updateCommand) ->then([ new IdentityRenamedEvent($id, $institution, new CommonName($updateCommand->commonName)), - new IdentityEmailChangedEvent($id, $institution, new Email($updateCommand->email)) + new IdentityEmailChangedEvent($id, $institution, new Email($updateCommand->email)), ]); } @@ -1168,10 +1188,10 @@ public function an_identity_can_be_updated(): void */ public function an_identity_can_be_updated_twice_only_emitting_events_when_changed(): void { - $id = new IdentityId('42'); - $institution = new Institution('A Corp.'); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); + $id = new IdentityId('42'); + $institution = new Institution('A Corp.'); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); $createdEvent = new IdentityCreatedEvent( $id, @@ -1179,12 +1199,12 @@ public function an_identity_can_be_updated_twice_only_emitting_events_when_chang new NameId('3'), $commonName, $email, - new Locale('de_DE') + new Locale('de_DE'), ); - $updateCommand = new UpdateIdentityCommand(); - $updateCommand->id = $id->getIdentityId(); - $updateCommand->email = 'new-email@domain.invalid'; + $updateCommand = new UpdateIdentityCommand(); + $updateCommand->id = $id->getIdentityId(); + $updateCommand->email = 'new-email@domain.invalid'; $updateCommand->commonName = 'Henk Hendriksen'; $this->scenario @@ -1194,7 +1214,7 @@ public function an_identity_can_be_updated_twice_only_emitting_events_when_chang ->when($updateCommand) ->then([ new IdentityRenamedEvent($id, $institution, new CommonName($updateCommand->commonName)), - new IdentityEmailChangedEvent($id, $institution, new Email($updateCommand->email)) + new IdentityEmailChangedEvent($id, $institution, new Email($updateCommand->email)), ]); } @@ -1204,30 +1224,30 @@ public function an_identity_can_be_updated_twice_only_emitting_events_when_chang */ public function a_second_factor_can_be_vetted(): void { - $command = new VetSecondFactorCommand(); - $command->authorityId = 'AID'; - $command->identityId = 'IID'; - $command->secondFactorId = 'ISFID'; - $command->registrationCode = 'REGCODE'; - $command->secondFactorType = 'yubikey'; + $command = new VetSecondFactorCommand(); + $command->authorityId = 'AID'; + $command->identityId = 'IID'; + $command->secondFactorId = 'ISFID'; + $command->registrationCode = 'REGCODE'; + $command->secondFactorType = 'yubikey'; $command->secondFactorIdentifier = '00028278'; - $command->documentNumber = 'NH9392'; - $command->identityVerified = true; + $command->documentNumber = 'NH9392'; + $command->identityVerified = true; $command->provePossessionSkipped = false; - $authorityId = new IdentityId($command->authorityId); - $authorityNameId = new NameId($this->uuid()); - $authorityInstitution = new Institution('Wazoo'); - $authorityEmail = new Email('info@domain.invalid'); - $authorityCommonName = new CommonName('Henk Westbroek'); + $authorityId = new IdentityId($command->authorityId); + $authorityNameId = new NameId($this->uuid()); + $authorityInstitution = new Institution('Wazoo'); + $authorityEmail = new Email('info@domain.invalid'); + $authorityCommonName = new CommonName('Henk Westbroek'); - $registrantId = new IdentityId($command->identityId); - $registrantInstitution = new Institution('A Corp.'); - $registrantNameId = new NameId('3'); - $registrantEmail = new Email('reg@domain.invalid'); - $registrantCommonName = new CommonName('Reginald Waterloo'); - $registrantSecFacId = new SecondFactorId('ISFID'); - $registrantSecFacIdentifier = new YubikeyPublicId('00028278'); + $registrantId = new IdentityId($command->identityId); + $registrantInstitution = new Institution('A Corp.'); + $registrantNameId = new NameId('3'); + $registrantEmail = new Email('reg@domain.invalid'); + $registrantCommonName = new CommonName('Reginald Waterloo'); + $registrantSecFacId = new SecondFactorId('ISFID'); + $registrantSecFacIdentifier = new YubikeyPublicId('00028278'); $this->secondFactorTypeService->shouldReceive('hasEqualOrLowerLoaComparedTo')->andReturn(true); @@ -1245,7 +1265,7 @@ public function a_second_factor_can_be_vetted(): void $authorityNameId, $authorityCommonName, $authorityEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $authorityId, @@ -1255,8 +1275,8 @@ public function a_second_factor_can_be_vetted(): void $authorityEmail, new Locale('en_GB'), new SecondFactorId($this->uuid()), - new YubikeyPublicId('00000012') - ) + new YubikeyPublicId('00000012'), + ), ]) ->withAggregateId($registrantId) ->given([ @@ -1266,7 +1286,7 @@ public function a_second_factor_can_be_vetted(): void $registrantNameId, $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeyPossessionProvenEvent( $registrantId, @@ -1276,12 +1296,12 @@ public function a_second_factor_can_be_vetted(): void true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new EmailVerifiedEvent( $registrantId, @@ -1293,7 +1313,7 @@ public function a_second_factor_can_be_vetted(): void 'REGCODE', $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), ]) ->when($command) @@ -1308,7 +1328,7 @@ public function a_second_factor_can_be_vetted(): void $registrantCommonName, $registrantEmail, new Locale('en_GB'), - new OnPremiseVettingType(new DocumentNumber('NH9392')) + new OnPremiseVettingType(new DocumentNumber('NH9392')), ), ]); } @@ -1322,31 +1342,31 @@ public function a_second_factor_cannot_be_vetted_without_a_secure_enough_vetted_ $this->expectExceptionMessage("Authority does not have the required LoA"); $this->expectException(DomainException::class); - $command = new VetSecondFactorCommand(); - $command->authorityId = 'AID'; - $command->identityId = 'IID'; - $command->secondFactorId = 'ISFID'; - $command->registrationCode = 'REGCODE'; - $command->secondFactorType = 'yubikey'; + $command = new VetSecondFactorCommand(); + $command->authorityId = 'AID'; + $command->identityId = 'IID'; + $command->secondFactorId = 'ISFID'; + $command->registrationCode = 'REGCODE'; + $command->secondFactorType = 'yubikey'; $command->secondFactorIdentifier = '00028278'; - $command->documentNumber = 'NH9392'; - $command->identityVerified = true; - - $authorityId = new IdentityId($command->authorityId); - $authorityInstitution = new Institution('Wazoo'); - $authorityNameId = new NameId($this->uuid()); - $authorityEmail = new Email('info@domain.invalid'); - $authorityCommonName = new CommonName('Henk Westbroek'); - $authorityPhoneSfId = new SecondFactorId($this->uuid()); - $authorityPhoneNo = new PhoneNumber('+31 (0) 612345678'); - - $registrantId = new IdentityId($command->identityId); - $registrantInstitution = new Institution('A Corp.'); - $registrantNameId = new NameId('3'); - $registrantEmail = new Email('reg@domain.invalid'); - $registrantCommonName = new CommonName('Reginald Waterloo'); - $registrantSecFacId = new SecondFactorId('ISFID'); - $registrantPubId = new YubikeyPublicId('00028278'); + $command->documentNumber = 'NH9392'; + $command->identityVerified = true; + + $authorityId = new IdentityId($command->authorityId); + $authorityInstitution = new Institution('Wazoo'); + $authorityNameId = new NameId($this->uuid()); + $authorityEmail = new Email('info@domain.invalid'); + $authorityCommonName = new CommonName('Henk Westbroek'); + $authorityPhoneSfId = new SecondFactorId($this->uuid()); + $authorityPhoneNo = new PhoneNumber('+31 (0) 612345678'); + + $registrantId = new IdentityId($command->identityId); + $registrantInstitution = new Institution('A Corp.'); + $registrantNameId = new NameId('3'); + $registrantEmail = new Email('reg@domain.invalid'); + $registrantCommonName = new CommonName('Reginald Waterloo'); + $registrantSecFacId = new SecondFactorId('ISFID'); + $registrantPubId = new YubikeyPublicId('00028278'); $this->secondFactorTypeService->shouldReceive('hasEqualOrLowerLoaComparedTo')->andReturn(false); @@ -1359,7 +1379,7 @@ public function a_second_factor_cannot_be_vetted_without_a_secure_enough_vetted_ $authorityNameId, $authorityCommonName, $authorityEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new PhonePossessionProvenEvent( $authorityId, @@ -1369,12 +1389,12 @@ public function a_second_factor_cannot_be_vetted_without_a_secure_enough_vetted_ true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $authorityCommonName, $authorityEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new EmailVerifiedEvent( $authorityId, @@ -1386,7 +1406,7 @@ public function a_second_factor_cannot_be_vetted_without_a_secure_enough_vetted_ 'regcode', $authorityCommonName, $authorityEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new SecondFactorVettedEvent( $authorityId, @@ -1398,8 +1418,8 @@ public function a_second_factor_cannot_be_vetted_without_a_secure_enough_vetted_ $authorityCommonName, $authorityEmail, new Locale('en_GB'), - new OnPremiseVettingType(new DocumentNumber('NG-RB-81')) - ) + new OnPremiseVettingType(new DocumentNumber('NG-RB-81')), + ), ]) ->withAggregateId($registrantId) ->given([ @@ -1409,7 +1429,7 @@ public function a_second_factor_cannot_be_vetted_without_a_secure_enough_vetted_ $registrantNameId, $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeyPossessionProvenEvent( $registrantId, @@ -1419,12 +1439,12 @@ public function a_second_factor_cannot_be_vetted_without_a_secure_enough_vetted_ true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new EmailVerifiedEvent( $registrantId, @@ -1436,7 +1456,7 @@ public function a_second_factor_cannot_be_vetted_without_a_secure_enough_vetted_ 'REGCODE', $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), ]) ->when($command) @@ -1451,7 +1471,7 @@ public function a_second_factor_cannot_be_vetted_without_a_secure_enough_vetted_ $registrantCommonName, $registrantEmail, new Locale('en_GB'), - new OnPremiseVettingType(new DocumentNumber('NH9392')) + new OnPremiseVettingType(new DocumentNumber('NH9392')), ), ]); } @@ -1463,30 +1483,30 @@ public function a_second_factor_cannot_be_vetted_without_a_secure_enough_vetted_ */ public function a_second_factor_can_be_vetted_without_a_physical_proven_possession(): void { - $command = new VetSecondFactorCommand(); - $command->authorityId = 'AID'; - $command->identityId = 'IID'; - $command->secondFactorId = 'ISFID'; - $command->registrationCode = 'REGCODE'; - $command->secondFactorType = 'yubikey'; + $command = new VetSecondFactorCommand(); + $command->authorityId = 'AID'; + $command->identityId = 'IID'; + $command->secondFactorId = 'ISFID'; + $command->registrationCode = 'REGCODE'; + $command->secondFactorType = 'yubikey'; $command->secondFactorIdentifier = '00028278'; - $command->documentNumber = 'NH9392'; - $command->identityVerified = true; + $command->documentNumber = 'NH9392'; + $command->identityVerified = true; $command->provePossessionSkipped = true; - $authorityId = new IdentityId($command->authorityId); - $authorityNameId = new NameId($this->uuid()); - $authorityInstitution = new Institution('Wazoo'); - $authorityEmail = new Email('info@domain.invalid'); - $authorityCommonName = new CommonName('Henk Westbroek'); + $authorityId = new IdentityId($command->authorityId); + $authorityNameId = new NameId($this->uuid()); + $authorityInstitution = new Institution('Wazoo'); + $authorityEmail = new Email('info@domain.invalid'); + $authorityCommonName = new CommonName('Henk Westbroek'); - $registrantId = new IdentityId($command->identityId); - $registrantInstitution = new Institution('A Corp.'); - $registrantNameId = new NameId('3'); - $registrantEmail = new Email('reg@domain.invalid'); - $registrantCommonName = new CommonName('Reginald Waterloo'); - $registrantSecFacId = new SecondFactorId('ISFID'); - $registrantSecFacIdentifier = new YubikeyPublicId('00028278'); + $registrantId = new IdentityId($command->identityId); + $registrantInstitution = new Institution('A Corp.'); + $registrantNameId = new NameId('3'); + $registrantEmail = new Email('reg@domain.invalid'); + $registrantCommonName = new CommonName('Reginald Waterloo'); + $registrantSecFacId = new SecondFactorId('ISFID'); + $registrantSecFacIdentifier = new YubikeyPublicId('00028278'); $this->secondFactorTypeService->shouldReceive('hasEqualOrLowerLoaComparedTo')->andReturn(true); @@ -1504,7 +1524,7 @@ public function a_second_factor_can_be_vetted_without_a_physical_proven_possessi $authorityNameId, $authorityCommonName, $authorityEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $authorityId, @@ -1514,8 +1534,8 @@ public function a_second_factor_can_be_vetted_without_a_physical_proven_possessi $authorityEmail, new Locale('en_GB'), new SecondFactorId($this->uuid()), - new YubikeyPublicId('00000012') - ) + new YubikeyPublicId('00000012'), + ), ]) ->withAggregateId($registrantId) ->given([ @@ -1525,7 +1545,7 @@ public function a_second_factor_can_be_vetted_without_a_physical_proven_possessi $registrantNameId, $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeyPossessionProvenEvent( $registrantId, @@ -1535,12 +1555,12 @@ public function a_second_factor_can_be_vetted_without_a_physical_proven_possessi true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new EmailVerifiedEvent( $registrantId, @@ -1552,7 +1572,7 @@ public function a_second_factor_can_be_vetted_without_a_physical_proven_possessi 'REGCODE', $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), ]) ->when($command) @@ -1567,7 +1587,7 @@ public function a_second_factor_can_be_vetted_without_a_physical_proven_possessi $registrantCommonName, $registrantEmail, new Locale('en_GB'), - new OnPremiseVettingType(new DocumentNumber('NH9392')) + new OnPremiseVettingType(new DocumentNumber('NH9392')), ), ]); } @@ -1578,35 +1598,37 @@ public function a_second_factor_can_be_vetted_without_a_physical_proven_possessi */ public function a_second_factor_cannot_be_vetted_without_physical_prove_of_possession_when_not_configured(): void { - $this->expectExceptionMessage("The possession of registrants second factor with ID 'ISFID' of type 'yubikey' has to be physically proven"); + $this->expectExceptionMessage( + "The possession of registrants second factor with ID 'ISFID' of type 'yubikey' has to be physically proven", + ); $this->expectException(DomainException::class); - $command = new VetSecondFactorCommand(); - $command->authorityId = 'AID'; - $command->identityId = 'IID'; - $command->secondFactorId = 'ISFID'; - $command->registrationCode = 'REGCODE'; - $command->secondFactorType = 'yubikey'; + $command = new VetSecondFactorCommand(); + $command->authorityId = 'AID'; + $command->identityId = 'IID'; + $command->secondFactorId = 'ISFID'; + $command->registrationCode = 'REGCODE'; + $command->secondFactorType = 'yubikey'; $command->secondFactorIdentifier = '00028278'; - $command->documentNumber = 'NH9392'; - $command->identityVerified = true; + $command->documentNumber = 'NH9392'; + $command->identityVerified = true; $command->provePossessionSkipped = true; - $authorityId = new IdentityId($command->authorityId); - $authorityInstitution = new Institution('Wazoo'); - $authorityNameId = new NameId($this->uuid()); - $authorityEmail = new Email('info@domain.invalid'); - $authorityCommonName = new CommonName('Henk Westbroek'); - $authorityPhoneSfId = new SecondFactorId($this->uuid()); - $authorityPhoneNo = new PhoneNumber('+31 (0) 612345678'); - - $registrantId = new IdentityId($command->identityId); - $registrantInstitution = new Institution('A Corp.'); - $registrantNameId = new NameId('3'); - $registrantEmail = new Email('reg@domain.invalid'); - $registrantCommonName = new CommonName('Reginald Waterloo'); - $registrantSecFacId = new SecondFactorId('ISFID'); - $registrantPubId = new YubikeyPublicId('00028278'); + $authorityId = new IdentityId($command->authorityId); + $authorityInstitution = new Institution('Wazoo'); + $authorityNameId = new NameId($this->uuid()); + $authorityEmail = new Email('info@domain.invalid'); + $authorityCommonName = new CommonName('Henk Westbroek'); + $authorityPhoneSfId = new SecondFactorId($this->uuid()); + $authorityPhoneNo = new PhoneNumber('+31 (0) 612345678'); + + $registrantId = new IdentityId($command->identityId); + $registrantInstitution = new Institution('A Corp.'); + $registrantNameId = new NameId('3'); + $registrantEmail = new Email('reg@domain.invalid'); + $registrantCommonName = new CommonName('Reginald Waterloo'); + $registrantSecFacId = new SecondFactorId('ISFID'); + $registrantPubId = new YubikeyPublicId('00028278'); $this->secondFactorTypeService->shouldReceive('hasEqualOrLowerLoaComparedTo')->andReturn(true); @@ -1624,7 +1646,7 @@ public function a_second_factor_cannot_be_vetted_without_physical_prove_of_posse $authorityNameId, $authorityCommonName, $authorityEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new PhonePossessionProvenEvent( $authorityId, @@ -1634,12 +1656,12 @@ public function a_second_factor_cannot_be_vetted_without_physical_prove_of_posse true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $authorityCommonName, $authorityEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new EmailVerifiedEvent( $authorityId, @@ -1651,7 +1673,7 @@ public function a_second_factor_cannot_be_vetted_without_physical_prove_of_posse 'regcode', $authorityCommonName, $authorityEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new SecondFactorVettedEvent( $authorityId, @@ -1663,8 +1685,8 @@ public function a_second_factor_cannot_be_vetted_without_physical_prove_of_posse $authorityCommonName, $authorityEmail, new Locale('en_GB'), - new OnPremiseVettingType(new DocumentNumber('NG-RB-81')) - ) + new OnPremiseVettingType(new DocumentNumber('NG-RB-81')), + ), ]) ->withAggregateId($registrantId) ->given([ @@ -1674,7 +1696,7 @@ public function a_second_factor_cannot_be_vetted_without_physical_prove_of_posse $registrantNameId, $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeyPossessionProvenEvent( $registrantId, @@ -1684,12 +1706,12 @@ public function a_second_factor_cannot_be_vetted_without_physical_prove_of_posse true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new EmailVerifiedEvent( $registrantId, @@ -1701,7 +1723,7 @@ public function a_second_factor_cannot_be_vetted_without_physical_prove_of_posse 'REGCODE', $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), ]) ->when($command) @@ -1716,7 +1738,7 @@ public function a_second_factor_cannot_be_vetted_without_physical_prove_of_posse $registrantCommonName, $registrantEmail, new Locale('en_GB'), - new OnPremiseVettingType(new DocumentNumber('123456')) + new OnPremiseVettingType(new DocumentNumber('123456')), ), ]); } @@ -1728,11 +1750,11 @@ public function a_second_factor_cannot_be_vetted_without_physical_prove_of_posse */ public function an_identity_can_express_its_locale_preference(): void { - $command = new ExpressLocalePreferenceCommand(); - $command->identityId = $this->uuid(); + $command = new ExpressLocalePreferenceCommand(); + $command->identityId = $this->uuid(); $command->preferredLocale = 'nl_NL'; - $identityId = new IdentityId($command->identityId); + $identityId = new IdentityId($command->identityId); $institution = new Institution('Institution'); $this->scenario @@ -1744,7 +1766,7 @@ public function an_identity_can_express_its_locale_preference(): void new NameId('N-ID'), new CommonName('Matti Vanhanen'), new Email('m.vanhanen@domain.invalid'), - new Locale('en_GB') + new Locale('en_GB'), ), ]) ->when($command) @@ -1764,7 +1786,7 @@ public function an_identity_can_send_registration_mail(): void $command->identityId = self::uuid(); $command->secondFactorId = 'second-factor-id'; - $identityId = new IdentityId($command->identityId); + $identityId = new IdentityId($command->identityId); $institution = new Institution('Institution'); $this->registrationMailService @@ -1780,7 +1802,7 @@ public function an_identity_can_send_registration_mail(): void new NameId('N-ID'), new CommonName('Matti Vanhanen'), new Email('m.vanhanen@domain.invalid'), - new Locale('en_GB') + new Locale('en_GB'), ), ]) ->when($command) @@ -1797,11 +1819,11 @@ public function an_identity_cannot_express_a_preference_for_an_unsupported_local $this->expectExceptionMessage("Given locale \"fi_FI\" is not a supported locale"); $this->expectException(UnsupportedLocaleException::class); - $command = new ExpressLocalePreferenceCommand(); - $command->identityId = $this->uuid(); + $command = new ExpressLocalePreferenceCommand(); + $command->identityId = $this->uuid(); $command->preferredLocale = 'fi_FI'; - $identityId = new IdentityId($command->identityId); + $identityId = new IdentityId($command->identityId); $institution = new Institution('Institution'); $this->scenario @@ -1813,7 +1835,7 @@ public function an_identity_cannot_express_a_preference_for_an_unsupported_local new NameId('N-ID'), new CommonName('Matti Vanhanen'), new Email('m.vanhanen@domain.invalid'), - new Locale('en_GB') + new Locale('en_GB'), ), ]) ->when($command); @@ -1826,11 +1848,11 @@ public function an_identity_cannot_express_a_preference_for_an_unsupported_local */ public function an_identity_can_express_its_locale_preference_more_than_one_time(): void { - $command = new ExpressLocalePreferenceCommand(); - $command->identityId = $this->uuid(); + $command = new ExpressLocalePreferenceCommand(); + $command->identityId = $this->uuid(); $command->preferredLocale = 'nl_NL'; - $identityId = new IdentityId($command->identityId); + $identityId = new IdentityId($command->identityId); $institution = new Institution('Institution'); $this->scenario @@ -1842,7 +1864,7 @@ public function an_identity_can_express_its_locale_preference_more_than_one_time new NameId('N-ID'), new CommonName('Matti Vanhanen'), new Email('m.vanhanen@domain.invalid'), - new Locale('en_GB') + new Locale('en_GB'), ), ]) ->when($command) @@ -1867,8 +1889,8 @@ public function a_second_factor_can_be_self_vetted(): void $command->authoringSecondFactorLoa = "loa-3"; $command->secondFactorType = 'sms'; - $authorityPhoneSfId = new SecondFactorId($this->uuid()); - $authorityPhoneNo = new PhoneNumber('+31 (0) 612345678'); + $authorityPhoneSfId = new SecondFactorId($this->uuid()); + $authorityPhoneNo = new PhoneNumber('+31 (0) 612345678'); $registrantId = new IdentityId($command->identityId); $registrantInstitution = new Institution('Institution'); @@ -1892,7 +1914,7 @@ public function a_second_factor_can_be_self_vetted(): void $registrantNameId, $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeyPossessionProvenEvent( $registrantId, @@ -1902,12 +1924,12 @@ public function a_second_factor_can_be_self_vetted(): void true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new EmailVerifiedEvent( $registrantId, @@ -1919,7 +1941,7 @@ public function a_second_factor_can_be_self_vetted(): void $command->registrationCode, $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new SecondFactorVettedEvent( $registrantId, @@ -1931,7 +1953,7 @@ public function a_second_factor_can_be_self_vetted(): void $registrantCommonName, $registrantEmail, new Locale('en_GB'), - new OnPremiseVettingType(new DocumentNumber('123456')) + new OnPremiseVettingType(new DocumentNumber('123456')), ), // The next token is vetted using the other token new PhonePossessionProvenEvent( @@ -1942,12 +1964,12 @@ public function a_second_factor_can_be_self_vetted(): void true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new EmailVerifiedEvent( $registrantId, @@ -1959,7 +1981,7 @@ public function a_second_factor_can_be_self_vetted(): void 'REGCODE', $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), ]) ->when($command) @@ -1975,7 +1997,7 @@ public function a_second_factor_can_be_self_vetted(): void $registrantCommonName, $registrantEmail, new Locale('en_GB'), - new SelfVetVettingType($loa) + new SelfVetVettingType($loa), ), ]); } @@ -1996,8 +2018,8 @@ public function a_second_factor_can_be_self_vetted_using_old_authoringSecondFact $command->authoringSecondFactorIdentifier = "loa-3"; $command->secondFactorType = 'sms'; - $authorityPhoneSfId = new SecondFactorId($this->uuid()); - $authorityPhoneNo = new PhoneNumber('+31 (0) 612345678'); + $authorityPhoneSfId = new SecondFactorId($this->uuid()); + $authorityPhoneNo = new PhoneNumber('+31 (0) 612345678'); $registrantId = new IdentityId($command->identityId); $registrantInstitution = new Institution('Institution'); @@ -2021,7 +2043,7 @@ public function a_second_factor_can_be_self_vetted_using_old_authoringSecondFact $registrantNameId, $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeyPossessionProvenEvent( $registrantId, @@ -2031,12 +2053,12 @@ public function a_second_factor_can_be_self_vetted_using_old_authoringSecondFact true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new EmailVerifiedEvent( $registrantId, @@ -2048,7 +2070,7 @@ public function a_second_factor_can_be_self_vetted_using_old_authoringSecondFact $command->registrationCode, $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new SecondFactorVettedEvent( $registrantId, @@ -2060,7 +2082,7 @@ public function a_second_factor_can_be_self_vetted_using_old_authoringSecondFact $registrantCommonName, $registrantEmail, new Locale('en_GB'), - new OnPremiseVettingType(new DocumentNumber('123456')) + new OnPremiseVettingType(new DocumentNumber('123456')), ), // The next token is vetted using the other token new PhonePossessionProvenEvent( @@ -2071,12 +2093,12 @@ public function a_second_factor_can_be_self_vetted_using_old_authoringSecondFact true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new EmailVerifiedEvent( $registrantId, @@ -2088,7 +2110,7 @@ public function a_second_factor_can_be_self_vetted_using_old_authoringSecondFact 'REGCODE', $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), ]) ->when($command) @@ -2104,7 +2126,7 @@ public function a_second_factor_can_be_self_vetted_using_old_authoringSecondFact $registrantCommonName, $registrantEmail, new Locale('en_GB'), - new SelfVetVettingType($loa) + new SelfVetVettingType($loa), ), ]); } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityIdEnforcingEventStoreDecorator.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityIdEnforcingEventStoreDecorator.php index 596efa741..07f92e6ea 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityIdEnforcingEventStoreDecorator.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityIdEnforcingEventStoreDecorator.php @@ -23,16 +23,11 @@ use Surfnet\Stepup\Identity\Event\IdentityEvent; use Surfnet\StepupMiddleware\CommandHandlingBundle\Exception\InvalidArgumentException; -final class IdentityIdEnforcingEventStoreDecorator implements EventStoreInterface +final readonly class IdentityIdEnforcingEventStoreDecorator implements EventStoreInterface { - /** - * @var EventStoreInterface - */ - private EventStoreInterface $decoratedEventStore; - - public function __construct(EventStoreInterface $decoratedEventStore) - { - $this->decoratedEventStore = $decoratedEventStore; + public function __construct( + private EventStoreInterface $decoratedEventStore, + ) { } public function load($id): DomainEventStreamInterface @@ -65,15 +60,12 @@ public function loadFromPlayhead($id, int $playhead): DomainEventStreamInterface return $eventStream; } - /** - * @param DomainEventStreamInterface $stream - */ public function assertIdentityAggregate(DomainEventStreamInterface $stream): void { foreach ($stream as $message) { if (!$message->getPayload() instanceof IdentityEvent) { throw new InvalidArgumentException( - 'The SensitiveDataEventStoreDecorator only works with Identities, please pass in an IdentityId $id' + 'The SensitiveDataEventStoreDecorator only works with Identities, please pass in an IdentityId $id', ); } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RegistrationAuthorityCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RegistrationAuthorityCommandHandlerTest.php index 8d9cd1294..033c18ec9 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RegistrationAuthorityCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RegistrationAuthorityCommandHandlerTest.php @@ -22,7 +22,6 @@ use Broadway\CommandHandling\CommandHandlerInterface; use Broadway\EventHandling\EventBus as EventBusInterface; use Broadway\EventSourcing\AggregateFactory\PublicConstructorAggregateFactory; -use Broadway\EventSourcing\EventStreamDecorator; use Broadway\EventStore\EventStore as EventStoreInterface; use Mockery as m; use Psr\Log\LoggerInterface; @@ -77,12 +76,14 @@ class RegistrationAuthorityCommandHandlerTest extends CommandHandlerTest * Create a command handler for the given scenario test case. * * @param EventStoreInterface $eventStore - * @param EventBusInterface $eventBus + * @param EventBusInterface $eventBus * * @return CommandHandler */ - protected function createCommandHandler(EventStoreInterface $eventStore, EventBusInterface $eventBus): CommandHandler - { + protected function createCommandHandler( + EventStoreInterface $eventStore, + EventBusInterface $eventBus, + ): CommandHandler { $aggregateFactory = new PublicConstructorAggregateFactory(); $this->institutionConfigurationRepositoryMock = m::mock(InstitutionConfigurationRepository::class); @@ -101,10 +102,10 @@ protected function createCommandHandler(EventStoreInterface $eventStore, EventBu $eventBus, $aggregateFactory, m::mock(UserDataFilterInterface::class), - $logger + $logger, ), $this->institutionConfigurationRepositoryMock, - m::mock(VettingTypeHintService::class) + m::mock(VettingTypeHintService::class), ); } @@ -118,20 +119,20 @@ public function an_identity_cannot_be_accredited_for_another_institution_than_co $this->expectExceptionMessage("An Identity may only be accredited by configured institutions"); $this->expectException(DomainException::class); - $command = new AccreditIdentityCommand(); - $command->identityId = static::uuid(); - $command->institution = 'Babelfish Inc.'; - $command->role = 'ra'; - $command->location = 'Somewhere behind you'; + $command = new AccreditIdentityCommand(); + $command->identityId = static::uuid(); + $command->institution = 'Babelfish Inc.'; + $command->role = 'ra'; + $command->location = 'Somewhere behind you'; $command->contactInformation = 'Call me Maybe'; - $command->raInstitution = 'RA institution'; - - $identityId = new IdentityId($command->identityId); - $institution = new Institution('A Different Institution than the Command holds'); - $nameId = new NameId(md5('someNameId')); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); - $secondFactorId = new SecondFactorId(static::uuid()); + $command->raInstitution = 'RA institution'; + + $identityId = new IdentityId($command->identityId); + $institution = new Institution('A Different Institution than the Command holds'); + $nameId = new NameId(md5('someNameId')); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); + $secondFactorId = new SecondFactorId(static::uuid()); $secondFactorPublicId = new YubikeyPublicId('8329283834'); $this->institutionConfiguration @@ -147,7 +148,7 @@ public function an_identity_cannot_be_accredited_for_another_institution_than_co $nameId, $commonName, $email, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $identityId, @@ -157,8 +158,8 @@ public function an_identity_cannot_be_accredited_for_another_institution_than_co $email, new Locale('en_GB'), $secondFactorId, - $secondFactorPublicId - ) + $secondFactorPublicId, + ), ]) ->when($command); } @@ -170,21 +171,23 @@ public function an_identity_cannot_be_accredited_for_another_institution_than_co */ public function an_identity_cannot_be_accredited_when_it_does_not_have_a_vetted_second_factor(): void { - $this->expectExceptionMessage("An Identity must have at least one vetted second factor before it can be accredited"); + $this->expectExceptionMessage( + "An Identity must have at least one vetted second factor before it can be accredited", + ); $this->expectException(DomainException::class); - $command = new AccreditIdentityCommand(); - $command->identityId = static::uuid(); - $command->institution = 'Babelfish Inc.'; - $command->role = 'ra'; - $command->location = 'Somewhere behind you'; + $command = new AccreditIdentityCommand(); + $command->identityId = static::uuid(); + $command->institution = 'Babelfish Inc.'; + $command->role = 'ra'; + $command->location = 'Somewhere behind you'; $command->contactInformation = 'Call me Maybe'; - $command->raInstitution = 'RA institution'; + $command->raInstitution = 'RA institution'; - $identityId = new IdentityId($command->identityId); - $institution = new Institution($command->institution); - $nameId = new NameId(md5('someNameId')); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); + $identityId = new IdentityId($command->identityId); + $institution = new Institution($command->institution); + $nameId = new NameId(md5('someNameId')); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); $this->institutionConfiguration ->shouldReceive('isInstitutionAllowedToAccreditRoles') @@ -199,7 +202,7 @@ public function an_identity_cannot_be_accredited_when_it_does_not_have_a_vetted_ $nameId, $commonName, $email, - new Locale('en_GB') + new Locale('en_GB'), ), ]) ->when($command); @@ -215,20 +218,20 @@ public function an_identity_cannot_be_accredited_when_it_already_has_been_accred { $this->expectExceptionMessage("Cannot accredit Identity as it has already been accredited for institution"); $this->expectException(DomainException::class); - $command = new AccreditIdentityCommand(); - $command->identityId = static::uuid(); - $command->institution = 'Babelfish Inc.'; - $command->role = 'ra'; - $command->location = 'Somewhere behind you'; + $command = new AccreditIdentityCommand(); + $command->identityId = static::uuid(); + $command->institution = 'Babelfish Inc.'; + $command->role = 'ra'; + $command->location = 'Somewhere behind you'; $command->contactInformation = 'Call me Maybe'; - $command->raInstitution = 'Babelfish Inc.'; - - $identityId = new IdentityId($command->identityId); - $institution = new Institution($command->institution); - $nameId = new NameId(md5('someNameId')); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); - $secondFactorId = new SecondFactorId(static::uuid()); + $command->raInstitution = 'Babelfish Inc.'; + + $identityId = new IdentityId($command->identityId); + $institution = new Institution($command->institution); + $nameId = new NameId(md5('someNameId')); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); + $secondFactorId = new SecondFactorId(static::uuid()); $secondFactorPublicId = new YubikeyPublicId('8329283834'); $this->institutionConfiguration @@ -245,7 +248,7 @@ public function an_identity_cannot_be_accredited_when_it_already_has_been_accred $nameId, $commonName, $email, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $identityId, @@ -255,7 +258,7 @@ public function an_identity_cannot_be_accredited_when_it_already_has_been_accred $email, new Locale('en_GB'), $secondFactorId, - $secondFactorPublicId + $secondFactorPublicId, ), new IdentityAccreditedAsRaEvent( $identityId, @@ -263,9 +266,9 @@ public function an_identity_cannot_be_accredited_when_it_already_has_been_accred $institution, new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RAA), new Location('Somewhere behind you'), - new ContactInformation('Call me maybe') - ) - ] + new ContactInformation('Call me maybe'), + ), + ], ) ->when($command); } @@ -279,20 +282,20 @@ public function an_identity_cannot_be_accredited_with_an_invalid_role(): void { $this->expectException(RuntimeException::class); - $command = new AccreditIdentityCommand(); - $command->identityId = static::uuid(); - $command->institution = 'Babelfish Inc.'; - $command->role = 'A role that does not exist'; - $command->location = 'Somewhere behind you'; + $command = new AccreditIdentityCommand(); + $command->identityId = static::uuid(); + $command->institution = 'Babelfish Inc.'; + $command->role = 'A role that does not exist'; + $command->location = 'Somewhere behind you'; $command->contactInformation = 'Call me Maybe'; - $command->raInstitution = 'RA institution'; - - $identityId = new IdentityId($command->identityId); - $institution = new Institution($command->institution); - $nameId = new NameId(md5('someNameId')); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); - $secondFactorId = new SecondFactorId(static::uuid()); + $command->raInstitution = 'RA institution'; + + $identityId = new IdentityId($command->identityId); + $institution = new Institution($command->institution); + $nameId = new NameId(md5('someNameId')); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); + $secondFactorId = new SecondFactorId(static::uuid()); $secondFactorPublicId = new YubikeyPublicId('8329283834'); $this->scenario @@ -305,7 +308,7 @@ public function an_identity_cannot_be_accredited_with_an_invalid_role(): void $nameId, $commonName, $email, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $identityId, @@ -315,9 +318,9 @@ public function an_identity_cannot_be_accredited_with_an_invalid_role(): void $email, new Locale('en_GB'), $secondFactorId, - $secondFactorPublicId - ) - ] + $secondFactorPublicId, + ), + ], ) ->when($command); } @@ -329,22 +332,22 @@ public function an_identity_cannot_be_accredited_with_an_invalid_role(): void */ public function an_identity_can_be_accredited_with_ra_role(): void { - $command = new AccreditIdentityCommand(); - $command->identityId = static::uuid(); - $command->institution = 'RA institution'; - $command->role = 'ra'; - $command->location = 'Somewhere behind you'; + $command = new AccreditIdentityCommand(); + $command->identityId = static::uuid(); + $command->institution = 'RA institution'; + $command->role = 'ra'; + $command->location = 'Somewhere behind you'; $command->contactInformation = 'Call me Maybe'; - $command->raInstitution = 'RA institution'; - - $identityId = new IdentityId($command->identityId); - $institution = new Institution($command->institution); - $nameId = new NameId(md5('someNameId')); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); - $secondFactorId = new SecondFactorId(static::uuid()); + $command->raInstitution = 'RA institution'; + + $identityId = new IdentityId($command->identityId); + $institution = new Institution($command->institution); + $nameId = new NameId(md5('someNameId')); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); + $secondFactorId = new SecondFactorId(static::uuid()); $secondFactorPublicId = new YubikeyPublicId('8329283834'); - $raInstitution = new Institution($command->raInstitution); + $raInstitution = new Institution($command->raInstitution); $this->institutionConfiguration ->shouldReceive('isInstitutionAllowedToAccreditRoles') @@ -360,7 +363,7 @@ public function an_identity_can_be_accredited_with_ra_role(): void $nameId, $commonName, $email, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $identityId, @@ -370,9 +373,9 @@ public function an_identity_can_be_accredited_with_ra_role(): void $email, new Locale('en_GB'), $secondFactorId, - $secondFactorPublicId - ) - ] + $secondFactorPublicId, + ), + ], ) ->when($command) ->then([ @@ -383,8 +386,8 @@ public function an_identity_can_be_accredited_with_ra_role(): void new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RA), new Location($command->location), new ContactInformation($command->contactInformation), - $raInstitution - ) + $raInstitution, + ), ]); } @@ -395,21 +398,21 @@ public function an_identity_can_be_accredited_with_ra_role(): void */ public function an_identity_can_be_accredited_with_raa_role(): void { - $command = new AccreditIdentityCommand(); - $command->identityId = static::uuid(); - $command->institution = 'Babelfish Inc.'; - $command->role = 'raa'; - $command->location = 'Somewhere behind you'; + $command = new AccreditIdentityCommand(); + $command->identityId = static::uuid(); + $command->institution = 'Babelfish Inc.'; + $command->role = 'raa'; + $command->location = 'Somewhere behind you'; $command->contactInformation = 'Call me Maybe'; - $command->raInstitution = 'RA institution'; - - $identityId = new IdentityId($command->identityId); - $institution = new Institution('Babelfish Inc.'); - $raInstitution = new Institution($command->raInstitution); - $nameId = new NameId(md5('someNameId')); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); - $secondFactorId = new SecondFactorId(static::uuid()); + $command->raInstitution = 'RA institution'; + + $identityId = new IdentityId($command->identityId); + $institution = new Institution('Babelfish Inc.'); + $raInstitution = new Institution($command->raInstitution); + $nameId = new NameId(md5('someNameId')); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); + $secondFactorId = new SecondFactorId(static::uuid()); $secondFactorPublicId = new YubikeyPublicId('8329283834'); $this->institutionConfiguration @@ -426,7 +429,7 @@ public function an_identity_can_be_accredited_with_raa_role(): void $nameId, $commonName, $email, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $identityId, @@ -436,9 +439,9 @@ public function an_identity_can_be_accredited_with_raa_role(): void $email, new Locale('en_GB'), $secondFactorId, - $secondFactorPublicId - ) - ] + $secondFactorPublicId, + ), + ], ) ->when($command) ->then( @@ -450,9 +453,9 @@ public function an_identity_can_be_accredited_with_raa_role(): void new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RAA), new Location($command->location), new ContactInformation($command->contactInformation), - $raInstitution - ) - ] + $raInstitution, + ), + ], ); } @@ -463,18 +466,18 @@ public function an_identity_can_be_accredited_with_raa_role(): void */ public function a_registration_authoritys_information_can_be_amended(): void { - $command = new AmendRegistrationAuthorityInformationCommand(); - $command->identityId = static::uuid(); - $command->location = 'New York'; + $command = new AmendRegistrationAuthorityInformationCommand(); + $command->identityId = static::uuid(); + $command->location = 'New York'; $command->contactInformation = '131 West 3rd Street, NY'; - $command->raInstitution = 'Ra institution'; - - $identityId = new IdentityId($command->identityId); - $institution = new Institution($command->raInstitution); - $nameId = new NameId(md5('someNameId')); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); - $secondFactorId = new SecondFactorId(static::uuid()); + $command->raInstitution = 'Ra institution'; + + $identityId = new IdentityId($command->identityId); + $institution = new Institution($command->raInstitution); + $nameId = new NameId(md5('someNameId')); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); + $secondFactorId = new SecondFactorId(static::uuid()); $secondFactorPublicId = new YubikeyPublicId('8329283834'); $this->scenario @@ -487,7 +490,7 @@ public function a_registration_authoritys_information_can_be_amended(): void $nameId, $commonName, $email, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $identityId, @@ -497,7 +500,7 @@ public function a_registration_authoritys_information_can_be_amended(): void $email, new Locale('en_GB'), $secondFactorId, - $secondFactorPublicId + $secondFactorPublicId, ), new IdentityAccreditedAsRaaForInstitutionEvent( $identityId, @@ -506,9 +509,9 @@ public function a_registration_authoritys_information_can_be_amended(): void new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RAA), new Location('Somewhere behind you'), new ContactInformation('Call me Maybe'), - $institution + $institution, ), - ] + ], ) ->when($command) ->then( @@ -519,9 +522,9 @@ public function a_registration_authoritys_information_can_be_amended(): void $nameId, new Location($command->location), new ContactInformation($command->contactInformation), - $institution - ) - ] + $institution, + ), + ], ); } @@ -532,21 +535,23 @@ public function a_registration_authoritys_information_can_be_amended(): void */ public function an_identitys_registration_authority_information_cannot_be_amended(): void { - $this->expectExceptionMessage("Cannot amend registration authority information: identity is not a registration authority"); + $this->expectExceptionMessage( + "Cannot amend registration authority information: identity is not a registration authority", + ); $this->expectException(DomainException::class); - $command = new AmendRegistrationAuthorityInformationCommand(); - $command->identityId = static::uuid(); - $command->location = 'New York'; + $command = new AmendRegistrationAuthorityInformationCommand(); + $command->identityId = static::uuid(); + $command->location = 'New York'; $command->contactInformation = '131 West 3rd Street, NY'; - $command->raInstitution = 'Ra institution'; - - $identityId = new IdentityId($command->identityId); - $institution = new Institution('Blue Note'); - $nameId = new NameId(md5('someNameId')); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); - $secondFactorId = new SecondFactorId(static::uuid()); + $command->raInstitution = 'Ra institution'; + + $identityId = new IdentityId($command->identityId); + $institution = new Institution('Blue Note'); + $nameId = new NameId(md5('someNameId')); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); + $secondFactorId = new SecondFactorId(static::uuid()); $secondFactorPublicId = new YubikeyPublicId('8329283834'); $this->scenario @@ -559,7 +564,7 @@ public function an_identitys_registration_authority_information_cannot_be_amende $nameId, $commonName, $email, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $identityId, @@ -569,9 +574,9 @@ public function an_identitys_registration_authority_information_cannot_be_amende $email, new Locale('en_GB'), $secondFactorId, - $secondFactorPublicId + $secondFactorPublicId, ), - ] + ], ) ->when($command); } @@ -583,22 +588,24 @@ public function an_identitys_registration_authority_information_cannot_be_amende */ public function an_identity_without_vetted_second_factor_may_not_be_accredited_as_ra(): void { - $this->expectExceptionMessage("An Identity must have at least one vetted second factor before it can be accredited"); + $this->expectExceptionMessage( + "An Identity must have at least one vetted second factor before it can be accredited", + ); $this->expectException(DomainException::class); - $command = new AccreditIdentityCommand(); - $command->identityId = static::uuid(); - $command->institution = 'Babelfish Inc.'; - $command->role = 'ra'; - $command->location = 'somewhere'; + $command = new AccreditIdentityCommand(); + $command->identityId = static::uuid(); + $command->institution = 'Babelfish Inc.'; + $command->role = 'ra'; + $command->location = 'somewhere'; $command->contactInformation = 'Call me maybe'; - $command->raInstitution = 'RA institution'; + $command->raInstitution = 'RA institution'; - $identityId = new IdentityId($command->identityId); - $institution = new Institution($command->institution); - $nameId = new NameId(md5('someNameId')); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); + $identityId = new IdentityId($command->identityId); + $institution = new Institution($command->institution); + $nameId = new NameId(md5('someNameId')); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); $this->institutionConfiguration ->shouldReceive('isInstitutionAllowedToAccreditRoles') @@ -613,7 +620,7 @@ public function an_identity_without_vetted_second_factor_may_not_be_accredited_a $nameId, $commonName, $email, - new Locale('en_GB') + new Locale('en_GB'), ), ]) ->when($command); @@ -626,22 +633,22 @@ public function an_identity_without_vetted_second_factor_may_not_be_accredited_a */ public function an_identity_with_a_vetted_second_factor_can_be_accredited_as_ra(): void { - $command = new AccreditIdentityCommand(); - $command->identityId = static::uuid(); - $command->institution = 'Babelfish Inc.'; - $command->role = 'ra'; - $command->location = 'somewhere'; + $command = new AccreditIdentityCommand(); + $command->identityId = static::uuid(); + $command->institution = 'Babelfish Inc.'; + $command->role = 'ra'; + $command->location = 'somewhere'; $command->contactInformation = 'Call me maybe'; - $command->raInstitution = 'RA institution'; - - $identityId = new IdentityId($command->identityId); - $institution = new Institution($command->institution); - $nameId = new NameId(md5('someNameId')); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); - $secondFactorId = new SecondFactorId(static::uuid()); + $command->raInstitution = 'RA institution'; + + $identityId = new IdentityId($command->identityId); + $institution = new Institution($command->institution); + $nameId = new NameId(md5('someNameId')); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); + $secondFactorId = new SecondFactorId(static::uuid()); $secondFactorPublicId = new YubikeyPublicId('8329283834'); - $raInstitution = new Institution($command->raInstitution); + $raInstitution = new Institution($command->raInstitution); $this->institutionConfiguration ->shouldReceive('isInstitutionAllowedToAccreditRoles') @@ -657,7 +664,7 @@ public function an_identity_with_a_vetted_second_factor_can_be_accredited_as_ra( $nameId, $commonName, $email, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $identityId, @@ -667,9 +674,9 @@ public function an_identity_with_a_vetted_second_factor_can_be_accredited_as_ra( $email, new Locale('en_GB'), $secondFactorId, - $secondFactorPublicId + $secondFactorPublicId, ), - ] + ], ) ->when($command) ->then([ @@ -680,8 +687,8 @@ public function an_identity_with_a_vetted_second_factor_can_be_accredited_as_ra( new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RA), new Location($command->location), new ContactInformation($command->contactInformation), - $raInstitution - ) + $raInstitution, + ), ]); } @@ -695,20 +702,20 @@ public function an_identity_cannot_be_accredited_twice(): void $this->expectExceptionMessage("Cannot accredit Identity as it has already been accredited for institution"); $this->expectException(DomainException::class); - $command = new AccreditIdentityCommand(); - $command->identityId = static::uuid(); - $command->institution = 'Babelfish Inc.'; - $command->role = 'ra'; - $command->location = 'somewhere'; + $command = new AccreditIdentityCommand(); + $command->identityId = static::uuid(); + $command->institution = 'Babelfish Inc.'; + $command->role = 'ra'; + $command->location = 'somewhere'; $command->contactInformation = 'Call me maybe'; - $command->raInstitution = 'Babelfish Inc.'; - - $identityId = new IdentityId($command->identityId); - $institution = new Institution($command->institution); - $nameId = new NameId(md5('someNameId')); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); - $secondFactorId = new SecondFactorId(static::uuid()); + $command->raInstitution = 'Babelfish Inc.'; + + $identityId = new IdentityId($command->identityId); + $institution = new Institution($command->institution); + $nameId = new NameId(md5('someNameId')); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); + $secondFactorId = new SecondFactorId(static::uuid()); $secondFactorPublicId = new YubikeyPublicId('8329283834'); $this->institutionConfiguration @@ -724,7 +731,7 @@ public function an_identity_cannot_be_accredited_twice(): void $nameId, $commonName, $email, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $identityId, @@ -734,7 +741,7 @@ public function an_identity_cannot_be_accredited_twice(): void $email, new Locale('en_GB'), $secondFactorId, - $secondFactorPublicId + $secondFactorPublicId, ), new IdentityAccreditedAsRaForInstitutionEvent( $identityId, @@ -743,8 +750,8 @@ public function an_identity_cannot_be_accredited_twice(): void new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RA), new Location($command->location), new ContactInformation($command->contactInformation), - $institution - ) + $institution, + ), ]) ->when($command); } @@ -758,21 +765,21 @@ public function an_identity_cannot_be_accredited_as_sraa(): void { $this->expectException(RuntimeException::class); - $command = new AccreditIdentityCommand(); - $command->identityId = static::uuid(); - $command->institution = 'Babelfish Inc.'; - $command->role = 'sraa'; - $command->location = 'somewhere'; + $command = new AccreditIdentityCommand(); + $command->identityId = static::uuid(); + $command->institution = 'Babelfish Inc.'; + $command->role = 'sraa'; + $command->location = 'somewhere'; $command->contactInformation = 'Call me maybe'; - $command->raInstitution = 'Babelfish Inc.'; + $command->raInstitution = 'Babelfish Inc.'; - $identityId = new IdentityId($command->identityId); - $institution = new Institution($command->institution); - $nameId = new NameId(md5('someNameId')); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); - $secondFactorId = new SecondFactorId(static::uuid()); + $identityId = new IdentityId($command->identityId); + $institution = new Institution($command->institution); + $nameId = new NameId(md5('someNameId')); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); + $secondFactorId = new SecondFactorId(static::uuid()); $secondFactorPublicId = new YubikeyPublicId('8329283834'); $this->scenario @@ -784,7 +791,7 @@ public function an_identity_cannot_be_accredited_as_sraa(): void $nameId, $commonName, $email, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $identityId, @@ -794,7 +801,7 @@ public function an_identity_cannot_be_accredited_as_sraa(): void $email, new Locale('en_GB'), $secondFactorId, - $secondFactorPublicId + $secondFactorPublicId, ), ]) ->when($command); @@ -807,17 +814,17 @@ public function an_identity_cannot_be_accredited_as_sraa(): void */ public function an_identity_that_is_accredited_as_raa_can_be_appointed_as_ra(): void { - $command = new AppointRoleCommand(); - $command->identityId = static::uuid(); - $command->role = 'ra'; - $command->raInstitution = 'Babelfish Inc.'; - - $identityId = new IdentityId($command->identityId); - $institution = new Institution($command->raInstitution); - $nameId = new NameId(md5('someNameId')); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); - $secondFactorId = new SecondFactorId(static::uuid()); + $command = new AppointRoleCommand(); + $command->identityId = static::uuid(); + $command->role = 'ra'; + $command->raInstitution = 'Babelfish Inc.'; + + $identityId = new IdentityId($command->identityId); + $institution = new Institution($command->raInstitution); + $nameId = new NameId(md5('someNameId')); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); + $secondFactorId = new SecondFactorId(static::uuid()); $secondFactorPublicId = new YubikeyPublicId('8329283834'); $this->institutionConfiguration @@ -833,7 +840,7 @@ public function an_identity_that_is_accredited_as_raa_can_be_appointed_as_ra(): $nameId, $commonName, $email, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $identityId, @@ -843,7 +850,7 @@ public function an_identity_that_is_accredited_as_raa_can_be_appointed_as_ra(): $email, new Locale('en_GB'), $secondFactorId, - $secondFactorPublicId + $secondFactorPublicId, ), new IdentityAccreditedAsRaForInstitutionEvent( $identityId, @@ -852,8 +859,8 @@ public function an_identity_that_is_accredited_as_raa_can_be_appointed_as_ra(): new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RAA), new Location('somewhere'), new ContactInformation('Call me maybe'), - $institution - ) + $institution, + ), ]) ->when($command) ->then([ @@ -861,8 +868,8 @@ public function an_identity_that_is_accredited_as_raa_can_be_appointed_as_ra(): $identityId, $institution, $nameId, - $institution - ) + $institution, + ), ]); } @@ -873,18 +880,18 @@ public function an_identity_that_is_accredited_as_raa_can_be_appointed_as_ra(): */ public function an_identity_that_is_accredited_as_ra_can_be_appointed_as_raa(): void { - $command = new AppointRoleCommand(); - $command->identityId = static::uuid(); - $command->role = 'raa'; - $command->raInstitution = 'Ra institution'; - - $identityId = new IdentityId($command->identityId); - $institution = new Institution('Babelfish Inc.'); - $raInstitution = new Institution($command->raInstitution); - $nameId = new NameId(md5('someNameId')); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); - $secondFactorId = new SecondFactorId(static::uuid()); + $command = new AppointRoleCommand(); + $command->identityId = static::uuid(); + $command->role = 'raa'; + $command->raInstitution = 'Ra institution'; + + $identityId = new IdentityId($command->identityId); + $institution = new Institution('Babelfish Inc.'); + $raInstitution = new Institution($command->raInstitution); + $nameId = new NameId(md5('someNameId')); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); + $secondFactorId = new SecondFactorId(static::uuid()); $secondFactorPublicId = new YubikeyPublicId('8329283834'); $this->institutionConfiguration @@ -900,7 +907,7 @@ public function an_identity_that_is_accredited_as_ra_can_be_appointed_as_raa(): $nameId, $commonName, $email, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $identityId, @@ -910,7 +917,7 @@ public function an_identity_that_is_accredited_as_ra_can_be_appointed_as_raa(): $email, new Locale('en_GB'), $secondFactorId, - $secondFactorPublicId + $secondFactorPublicId, ), new IdentityAccreditedAsRaaForInstitutionEvent( $identityId, @@ -919,8 +926,8 @@ public function an_identity_that_is_accredited_as_ra_can_be_appointed_as_raa(): new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RA), new Location('somewhere'), new ContactInformation('Call me maybe'), - $raInstitution - ) + $raInstitution, + ), ]) ->when($command) ->then([ @@ -928,8 +935,8 @@ public function an_identity_that_is_accredited_as_ra_can_be_appointed_as_raa(): $identityId, $institution, $nameId, - $raInstitution - ) + $raInstitution, + ), ]); } @@ -940,20 +947,22 @@ public function an_identity_that_is_accredited_as_ra_can_be_appointed_as_raa(): */ public function an_unaccredited_identity_cannot_be_appointed_a_registration_authority_role(): void { - $this->expectExceptionMessage("Cannot appoint as different RegistrationAuthorityRole: identity is not a registration authority"); + $this->expectExceptionMessage( + "Cannot appoint as different RegistrationAuthorityRole: identity is not a registration authority", + ); $this->expectException(DomainException::class); - $command = new AppointRoleCommand(); - $command->identityId = static::uuid(); - $command->role = 'raa'; - $command->raInstitution = 'RA institution'; - - $identityId = new IdentityId($command->identityId); - $institution = new Institution('Babelfish Inc.'); - $nameId = new NameId(md5('someNameId')); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); - $secondFactorId = new SecondFactorId(static::uuid()); + $command = new AppointRoleCommand(); + $command->identityId = static::uuid(); + $command->role = 'raa'; + $command->raInstitution = 'RA institution'; + + $identityId = new IdentityId($command->identityId); + $institution = new Institution('Babelfish Inc.'); + $nameId = new NameId(md5('someNameId')); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); + $secondFactorId = new SecondFactorId(static::uuid()); $secondFactorPublicId = new YubikeyPublicId('8329283834'); $this->institutionConfiguration @@ -969,7 +978,7 @@ public function an_unaccredited_identity_cannot_be_appointed_a_registration_auth $nameId, $commonName, $email, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $identityId, @@ -979,8 +988,8 @@ public function an_unaccredited_identity_cannot_be_appointed_a_registration_auth $email, new Locale('en_GB'), $secondFactorId, - $secondFactorPublicId - ) + $secondFactorPublicId, + ), ]) ->when($command); } @@ -992,19 +1001,21 @@ public function an_unaccredited_identity_cannot_be_appointed_a_registration_auth */ public function an_unaccredited_identity_cannot_have_its_registration_authority_retracted(): void { - $this->expectExceptionMessage("Cannot Retract Registration Authority as the Identity is not a registration authority"); + $this->expectExceptionMessage( + "Cannot Retract Registration Authority as the Identity is not a registration authority", + ); $this->expectException(DomainException::class); - $command = new RetractRegistrationAuthorityCommand(); - $command->identityId = static::uuid(); + $command = new RetractRegistrationAuthorityCommand(); + $command->identityId = static::uuid(); $command->raInstitution = 'RA institution'; - $identityId = new IdentityId($command->identityId); - $institution = new Institution('Babelfish Inc.'); - $nameId = new NameId(md5('someNameId')); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); - $secondFactorId = new SecondFactorId(static::uuid()); + $identityId = new IdentityId($command->identityId); + $institution = new Institution('Babelfish Inc.'); + $nameId = new NameId(md5('someNameId')); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); + $secondFactorId = new SecondFactorId(static::uuid()); $secondFactorPublicId = new YubikeyPublicId('8329283834'); $this->scenario @@ -1016,7 +1027,7 @@ public function an_unaccredited_identity_cannot_have_its_registration_authority_ $nameId, $commonName, $email, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $identityId, @@ -1026,24 +1037,24 @@ public function an_unaccredited_identity_cannot_have_its_registration_authority_ $email, new Locale('en_GB'), $secondFactorId, - $secondFactorPublicId - ) + $secondFactorPublicId, + ), ]) ->when($command); } public function an_accredited_identity_can_retract_its_registration_authority(): void { - $command = new RetractRegistrationAuthorityCommand(); + $command = new RetractRegistrationAuthorityCommand(); $command->identityId = static::uuid(); - $identityId = new IdentityId($command->identityId); - $institution = new Institution('Babelfish Inc.'); - $raInstitution = new Institution('Ra institution'); - $nameId = new NameId(md5('someNameId')); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); - $secondFactorId = new SecondFactorId(static::uuid()); + $identityId = new IdentityId($command->identityId); + $institution = new Institution('Babelfish Inc.'); + $raInstitution = new Institution('Ra institution'); + $nameId = new NameId(md5('someNameId')); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); + $secondFactorId = new SecondFactorId(static::uuid()); $secondFactorPublicId = new YubikeyPublicId('8329283834'); $this->scenario @@ -1055,7 +1066,7 @@ public function an_accredited_identity_can_retract_its_registration_authority(): $nameId, $commonName, $email, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $identityId, @@ -1065,7 +1076,7 @@ public function an_accredited_identity_can_retract_its_registration_authority(): $email, new Locale('en_GB'), $secondFactorId, - $secondFactorPublicId + $secondFactorPublicId, ), new IdentityAccreditedAsRaaForInstitutionEvent( $identityId, @@ -1074,8 +1085,8 @@ public function an_accredited_identity_can_retract_its_registration_authority(): new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RA), new Location('somewhere'), new ContactInformation('Call me maybe'), - $raInstitution - ) + $raInstitution, + ), ]) ->when($command) ->then([ @@ -1085,8 +1096,8 @@ public function an_accredited_identity_can_retract_its_registration_authority(): $nameId, $commonName, $email, - $raInstitution - ) + $raInstitution, + ), ]); } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RightToBeForgottenCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RightToBeForgottenCommandHandlerTest.php index 9731c11f5..b2be366f3 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RightToBeForgottenCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RightToBeForgottenCommandHandlerTest.php @@ -45,10 +45,13 @@ use Surfnet\Stepup\Identity\Value\RegistrationAuthorityRole; use Surfnet\Stepup\Identity\Value\SecondFactorId; use Surfnet\Stepup\Identity\Value\YubikeyPublicId; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\SraaRepository; use Surfnet\StepupMiddleware\CommandHandlingBundle\Exception\RuntimeException; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\ForgetIdentityCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\CommandHandler\RightToBeForgottenCommandHandler; +use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Service\SensitiveDataService; use Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\CommandHandlerTest; + /** * @runTestsInSeparateProcesses */ @@ -63,13 +66,17 @@ class RightToBeForgottenCommandHandlerTest extends CommandHandlerTest /** @var MockInterface */ private $sraaRepository; - protected function createCommandHandler(EventStoreInterface $eventStore, EventBusInterface $eventBus): CommandHandler - { + protected function createCommandHandler( + EventStoreInterface $eventStore, + EventBusInterface $eventBus, + ): CommandHandler { $aggregateFactory = new PublicConstructorAggregateFactory(); - $this->apiIdentityRepository = m::mock('Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\IdentityRepository'); - $this->sensitiveDataService = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Service\SensitiveDataService'); - $this->sraaRepository = m::mock('Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\SraaRepository'); + $this->apiIdentityRepository = m::mock( + \Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\IdentityRepository::class, + ); + $this->sensitiveDataService = m::mock(SensitiveDataService::class); + $this->sraaRepository = m::mock(SraaRepository::class); $logger = m::mock(LoggerInterface::class); $logger->shouldIgnoreMissing(); @@ -80,11 +87,11 @@ protected function createCommandHandler(EventStoreInterface $eventStore, EventBu $eventBus, $aggregateFactory, m::mock(UserDataFilterInterface::class), - $logger + $logger, ), $this->apiIdentityRepository, $this->sensitiveDataService, - $this->sraaRepository + $this->sraaRepository, ); } @@ -95,18 +102,18 @@ protected function createCommandHandler(EventStoreInterface $eventStore, EventBu */ public function an_identity_can_be_forgotten(): void { - $identityId = new IdentityId('A'); + $identityId = new IdentityId('A'); $institution = new Institution('Helsingin Yliopisto'); - $nameId = new NameId('urn:eeva-kuopio'); - $commonName = new CommonName('Eeva Kuopio'); - $email = new Email('e.kuopio@hy.fi'); - $locale = new Locale('fi_FI');; + $nameId = new NameId('urn:eeva-kuopio'); + $commonName = new CommonName('Eeva Kuopio'); + $email = new Email('e.kuopio@hy.fi'); + $locale = new Locale('fi_FI'); $this->apiIdentityRepository ->shouldReceive('findOneByNameIdAndInstitution') ->once() ->with(Matchers::equalTo($nameId), Matchers::equalTo($institution)) - ->andReturn((object) ['id' => $identityId->getIdentityId()]); + ->andReturn((object)['id' => $identityId->getIdentityId()]); $this->sensitiveDataService ->shouldReceive('forgetSensitiveData') @@ -128,7 +135,7 @@ public function an_identity_can_be_forgotten(): void $nameId, $commonName, $email, - $locale + $locale, ), new YubikeySecondFactorBootstrappedEvent( $identityId, @@ -138,8 +145,8 @@ public function an_identity_can_be_forgotten(): void $email, $locale, new SecondFactorId('SF-ID'), - new YubikeyPublicId('01900473') - ) + new YubikeyPublicId('01900473'), + ), ]) ->when($command) ->then([ @@ -157,18 +164,18 @@ public function an_identity_may_not_be_forgotten_twice(): void $this->expectExceptionMessage("Operation on this Identity is not allowed: it has been forgotten"); $this->expectException(DomainException::class); - $identityId = new IdentityId('A'); + $identityId = new IdentityId('A'); $institution = new Institution('Helsingin Yliopisto'); - $nameId = new NameId('urn:eeva-kuopio'); - $commonName = new CommonName('Eeva Kuopio'); - $email = new Email('e.kuopio@hy.fi'); - $locale = new Locale('fi_FI');; + $nameId = new NameId('urn:eeva-kuopio'); + $commonName = new CommonName('Eeva Kuopio'); + $email = new Email('e.kuopio@hy.fi'); + $locale = new Locale('fi_FI'); $this->apiIdentityRepository ->shouldReceive('findOneByNameIdAndInstitution') ->once() ->with(Matchers::equalTo($nameId), Matchers::equalTo($institution)) - ->andReturn((object) ['id' => $identityId->getIdentityId()]); + ->andReturn((object)['id' => $identityId->getIdentityId()]); $this->sensitiveDataService ->shouldReceive('forgetSensitiveData') @@ -190,7 +197,7 @@ public function an_identity_may_not_be_forgotten_twice(): void $nameId, $commonName, $email, - $locale + $locale, ), new YubikeySecondFactorBootstrappedEvent( $identityId, @@ -200,7 +207,7 @@ public function an_identity_may_not_be_forgotten_twice(): void $email, $locale, new SecondFactorId('SF-ID'), - new YubikeyPublicId('01900473') + new YubikeyPublicId('01900473'), ), new IdentityForgottenEvent($identityId, $institution), ]) @@ -217,18 +224,18 @@ public function an_ra_cannot_be_forgotten(): void $this->expectExceptionMessage("Cannot forget an identity that is currently accredited as an RA(A)"); $this->expectException(DomainException::class); - $identityId = new IdentityId('A'); + $identityId = new IdentityId('A'); $institution = new Institution('Helsingin Yliopisto'); - $nameId = new NameId('urn:eeva-kuopio'); - $commonName = new CommonName('Eeva Kuopio'); - $email = new Email('e.kuopio@hy.fi'); - $locale = new Locale('fi_FI');; + $nameId = new NameId('urn:eeva-kuopio'); + $commonName = new CommonName('Eeva Kuopio'); + $email = new Email('e.kuopio@hy.fi'); + $locale = new Locale('fi_FI'); $this->apiIdentityRepository ->shouldReceive('findOneByNameIdAndInstitution') ->once() ->with(Matchers::equalTo($nameId), Matchers::equalTo($institution)) - ->andReturn((object) ['id' => $identityId->getIdentityId()]); + ->andReturn((object)['id' => $identityId->getIdentityId()]); $this->sensitiveDataService ->shouldReceive('forgetSensitiveData') @@ -250,7 +257,7 @@ public function an_ra_cannot_be_forgotten(): void $nameId, $commonName, $email, - $locale + $locale, ), new YubikeySecondFactorBootstrappedEvent( $identityId, @@ -260,7 +267,7 @@ public function an_ra_cannot_be_forgotten(): void $email, $locale, new SecondFactorId('SF-ID'), - new YubikeyPublicId('01900473') + new YubikeyPublicId('01900473'), ), new IdentityAccreditedAsRaEvent( $identityId, @@ -269,7 +276,7 @@ public function an_ra_cannot_be_forgotten(): void new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RA), new Location('0x0392ff832'), new ContactInformation('/dev/null'), - $institution + $institution, ), ]) ->when($command); @@ -285,18 +292,18 @@ public function an_raa_cannot_be_forgotten(): void $this->expectExceptionMessage("Cannot forget an identity that is currently accredited as an RA(A)"); $this->expectException(DomainException::class); - $identityId = new IdentityId('A'); + $identityId = new IdentityId('A'); $institution = new Institution('Helsingin Yliopisto'); - $nameId = new NameId('urn:eeva-kuopio'); - $commonName = new CommonName('Eeva Kuopio'); - $email = new Email('e.kuopio@hy.fi'); - $locale = new Locale('fi_FI');; + $nameId = new NameId('urn:eeva-kuopio'); + $commonName = new CommonName('Eeva Kuopio'); + $email = new Email('e.kuopio@hy.fi'); + $locale = new Locale('fi_FI'); $this->apiIdentityRepository ->shouldReceive('findOneByNameIdAndInstitution') ->once() ->with(Matchers::equalTo($nameId), Matchers::equalTo($institution)) - ->andReturn((object) ['id' => $identityId->getIdentityId()]); + ->andReturn((object)['id' => $identityId->getIdentityId()]); $this->sensitiveDataService ->shouldReceive('forgetSensitiveData') @@ -318,7 +325,7 @@ public function an_raa_cannot_be_forgotten(): void $nameId, $commonName, $email, - $locale + $locale, ), new YubikeySecondFactorBootstrappedEvent( $identityId, @@ -328,7 +335,7 @@ public function an_raa_cannot_be_forgotten(): void $email, $locale, new SecondFactorId('SF-ID'), - new YubikeyPublicId('01900473') + new YubikeyPublicId('01900473'), ), new IdentityAccreditedAsRaForInstitutionEvent( $identityId, @@ -337,7 +344,7 @@ public function an_raa_cannot_be_forgotten(): void new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RAA), new Location('0x0392ff832'), new ContactInformation('/dev/null'), - $institution + $institution, ), ]) ->when($command); @@ -353,18 +360,18 @@ public function an_sraa_cannae_be_forgotten(): void $this->expectExceptionMessage("Cannot forget an identity that is currently accredited as an SRAA"); $this->expectException(RuntimeException::class); - $identityId = new IdentityId('A'); + $identityId = new IdentityId('A'); $institution = new Institution('Helsingin Yliopisto'); - $nameId = new NameId('urn:eeva-kuopio'); - $commonName = new CommonName('Eeva Kuopio'); - $email = new Email('e.kuopio@hy.fi'); - $locale = new Locale('fi_FI');; + $nameId = new NameId('urn:eeva-kuopio'); + $commonName = new CommonName('Eeva Kuopio'); + $email = new Email('e.kuopio@hy.fi'); + $locale = new Locale('fi_FI'); $this->apiIdentityRepository ->shouldReceive('findOneByNameIdAndInstitution') ->once() ->with(Matchers::equalTo($nameId), Matchers::equalTo($institution)) - ->andReturn((object) ['id' => $identityId->getIdentityId()]); + ->andReturn((object)['id' => $identityId->getIdentityId()]); $this->sensitiveDataService ->shouldReceive('forgetSensitiveData') @@ -386,7 +393,7 @@ public function an_sraa_cannae_be_forgotten(): void $nameId, $commonName, $email, - $locale + $locale, ), new YubikeySecondFactorBootstrappedEvent( $identityId, @@ -396,8 +403,8 @@ public function an_sraa_cannae_be_forgotten(): void $email, $locale, new SecondFactorId('SF-ID'), - new YubikeyPublicId('01900473') - ) + new YubikeyPublicId('01900473'), + ), ]) ->when($command); } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/SecondFactorRevocationTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/SecondFactorRevocationTest.php index 294cabd1e..5a28dce09 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/SecondFactorRevocationTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/SecondFactorRevocationTest.php @@ -34,8 +34,8 @@ use Surfnet\Stepup\Identity\Event\CompliedWithVettedSecondFactorRevocationEvent; use Surfnet\Stepup\Identity\Event\EmailVerifiedEvent; use Surfnet\Stepup\Identity\Event\IdentityCreatedEvent; -use Surfnet\Stepup\Identity\Event\SecondFactorVettedWithoutTokenProofOfPossession; use Surfnet\Stepup\Identity\Event\SecondFactorVettedEvent; +use Surfnet\Stepup\Identity\Event\SecondFactorVettedWithoutTokenProofOfPossession; use Surfnet\Stepup\Identity\Event\U2fDevicePossessionProvenEvent; use Surfnet\Stepup\Identity\Event\UnverifiedSecondFactorRevokedEvent; use Surfnet\Stepup\Identity\Event\VerifiedSecondFactorRevokedEvent; @@ -76,8 +76,10 @@ class SecondFactorRevocationTest extends CommandHandlerTest { private static int $window = 3600; - protected function createCommandHandler(EventStoreInterface $eventStore, EventBusInterface $eventBus): CommandHandler - { + protected function createCommandHandler( + EventStoreInterface $eventStore, + EventBusInterface $eventBus, + ): CommandHandler { $aggregateFactory = new PublicConstructorAggregateFactory(); $logger = m::mock(LoggerInterface::class); $logger->shouldIgnoreMissing(); @@ -88,7 +90,7 @@ protected function createCommandHandler(EventStoreInterface $eventStore, EventBu $eventBus, $aggregateFactory, m::mock(UserDataFilterInterface::class), - $logger + $logger, ), m::mock(IdentityProjectionRepository::class), ConfigurableSettings::create(self::$window, []), @@ -98,7 +100,7 @@ protected function createCommandHandler(EventStoreInterface $eventStore, EventBu m::mock(InstitutionConfigurationOptionsService::class)->shouldIgnoreMissing(), m::mock(LoaResolutionService::class), m::mock(RecoveryTokenSecretHelper::class), - m::mock(RegistrationMailService::class) + m::mock(RegistrationMailService::class), ); } @@ -108,15 +110,15 @@ protected function createCommandHandler(EventStoreInterface $eventStore, EventBu */ public function an_identity_can_revoke_its_own_unverified_second_factor(): void { - $command = new RevokeOwnSecondFactorCommand(); - $command->identityId = '42'; + $command = new RevokeOwnSecondFactorCommand(); + $command->identityId = '42'; $command->secondFactorId = self::uuid(); - $identityId = new IdentityId($command->identityId); - $institution = new Institution('A Corp.'); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); - $secondFactorId = new SecondFactorId($command->secondFactorId); + $identityId = new IdentityId($command->identityId); + $institution = new Institution('A Corp.'); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); + $secondFactorId = new SecondFactorId($command->secondFactorId); $secondFactorIdentifier = new YubikeyPublicId('00890782'); $this->scenario @@ -128,7 +130,7 @@ public function an_identity_can_revoke_its_own_unverified_second_factor(): void new NameId('3'), $commonName, $email, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeyPossessionProvenEvent( $identityId, @@ -138,13 +140,13 @@ public function an_identity_can_revoke_its_own_unverified_second_factor(): void true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $commonName, $email, - new Locale('en_GB') - ) + new Locale('en_GB'), + ), ]) ->when($command) ->then([ @@ -153,8 +155,8 @@ public function an_identity_can_revoke_its_own_unverified_second_factor(): void $institution, $secondFactorId, new SecondFactorType('yubikey'), - $secondFactorIdentifier - ) + $secondFactorIdentifier, + ), ]); } @@ -164,15 +166,15 @@ public function an_identity_can_revoke_its_own_unverified_second_factor(): void */ public function an_identity_can_revoke_its_own_verified_second_factor(): void { - $command = new RevokeOwnSecondFactorCommand(); - $command->identityId = '42'; + $command = new RevokeOwnSecondFactorCommand(); + $command->identityId = '42'; $command->secondFactorId = self::uuid(); - $identityId = new IdentityId($command->identityId); - $institution = new Institution('A Corp.'); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); - $secondFactorId = new SecondFactorId($command->secondFactorId); + $identityId = new IdentityId($command->identityId); + $institution = new Institution('A Corp.'); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); + $secondFactorId = new SecondFactorId($command->secondFactorId); $secondFactorIdentifier = new YubikeyPublicId('00890782'); $this->scenario @@ -184,7 +186,7 @@ public function an_identity_can_revoke_its_own_verified_second_factor(): void new NameId('3'), $commonName, $email, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeyPossessionProvenEvent( $identityId, @@ -194,12 +196,12 @@ public function an_identity_can_revoke_its_own_verified_second_factor(): void true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $commonName, $email, - new Locale('en_GB') + new Locale('en_GB'), ), new EmailVerifiedEvent( $identityId, @@ -211,8 +213,8 @@ public function an_identity_can_revoke_its_own_verified_second_factor(): void 'SOMEREGISTRATIONCODE', $commonName, $email, - new Locale('en_GB') - ) + new Locale('en_GB'), + ), ]) ->when($command) ->then([ @@ -221,8 +223,8 @@ public function an_identity_can_revoke_its_own_verified_second_factor(): void $institution, $secondFactorId, new SecondFactorType('yubikey'), - $secondFactorIdentifier - ) + $secondFactorIdentifier, + ), ]); } @@ -232,17 +234,17 @@ public function an_identity_can_revoke_its_own_verified_second_factor(): void */ public function an_identity_can_revoke_its_own_vetted_second_factor(): void { - $command = new RevokeOwnSecondFactorCommand(); - $command->identityId = '42'; + $command = new RevokeOwnSecondFactorCommand(); + $command->identityId = '42'; $command->secondFactorId = self::uuid(); - $identityId = new IdentityId($command->identityId); - $nameId = new NameId('3'); - $institution = new Institution('A Corp.'); - $email = new Email('info@domain.invalid'); - $commonName = new CommonName('Henk Westbroek'); - $secondFactorId = new SecondFactorId($command->secondFactorId); - $secondFactorType = new SecondFactorType('yubikey'); + $identityId = new IdentityId($command->identityId); + $nameId = new NameId('3'); + $institution = new Institution('A Corp.'); + $email = new Email('info@domain.invalid'); + $commonName = new CommonName('Henk Westbroek'); + $secondFactorId = new SecondFactorId($command->secondFactorId); + $secondFactorType = new SecondFactorType('yubikey'); $secondFactorIdentifier = new YubikeyPublicId('00890782'); $this->scenario @@ -254,7 +256,7 @@ public function an_identity_can_revoke_its_own_vetted_second_factor(): void $nameId, $commonName, $email, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeyPossessionProvenEvent( $identityId, @@ -264,12 +266,12 @@ public function an_identity_can_revoke_its_own_vetted_second_factor(): void true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $commonName, $email, - new Locale('en_GB') + new Locale('en_GB'), ), new EmailVerifiedEvent( $identityId, @@ -281,7 +283,7 @@ public function an_identity_can_revoke_its_own_vetted_second_factor(): void 'SOMEREGISTRATIONCODE', $commonName, $email, - new Locale('en_GB') + new Locale('en_GB'), ), new SecondFactorVettedEvent( $identityId, @@ -293,8 +295,8 @@ public function an_identity_can_revoke_its_own_vetted_second_factor(): void $commonName, $email, new Locale('en_GB'), - new OnPremiseVettingType(new DocumentNumber('DOCUMENT_42')) - ) + new OnPremiseVettingType(new DocumentNumber('DOCUMENT_42')), + ), ]) ->when($command) ->then([ @@ -303,11 +305,11 @@ public function an_identity_can_revoke_its_own_vetted_second_factor(): void $institution, $secondFactorId, $secondFactorType, - $secondFactorIdentifier + $secondFactorIdentifier, ), new VettedSecondFactorsAllRevokedEvent( $identityId, - $institution + $institution, ), ]); } @@ -318,24 +320,24 @@ public function an_identity_can_revoke_its_own_vetted_second_factor(): void */ public function a_registration_authority_can_revoke_an_unverified_second_factor(): void { - $command = new RevokeRegistrantsSecondFactorCommand(); - $command->authorityId = static::uuid(); - $command->identityId = static::uuid(); + $command = new RevokeRegistrantsSecondFactorCommand(); + $command->authorityId = static::uuid(); + $command->identityId = static::uuid(); $command->secondFactorId = static::uuid(); - $authorityId = new IdentityId($command->authorityId); - $authorityNameId = new NameId(static::uuid()); - $authorityInstitution = new Institution('SURFnet'); - $authorityEmail = new Email('info@domain.invalid'); - $authorityCommonName = new CommonName('Henk Westbroek'); + $authorityId = new IdentityId($command->authorityId); + $authorityNameId = new NameId(static::uuid()); + $authorityInstitution = new Institution('SURFnet'); + $authorityEmail = new Email('info@domain.invalid'); + $authorityCommonName = new CommonName('Henk Westbroek'); - $registrantId = new IdentityId($command->identityId); - $registrantInstitution = new Institution('SURFnet'); - $registrantNameId = new NameId('3'); - $registrantSecondFactorId = new SecondFactorId($command->secondFactorId); + $registrantId = new IdentityId($command->identityId); + $registrantInstitution = new Institution('SURFnet'); + $registrantNameId = new NameId('3'); + $registrantSecondFactorId = new SecondFactorId($command->secondFactorId); $registrantSecondFactorIdentifier = new YubikeyPublicId('00890782'); - $registrantEmail = new Email('matti@domain.invalid'); - $registrantCommonName = new CommonName('Matti Vanhanen'); + $registrantEmail = new Email('matti@domain.invalid'); + $registrantCommonName = new CommonName('Matti Vanhanen'); $this->scenario ->withAggregateId($authorityId) @@ -346,7 +348,7 @@ public function a_registration_authority_can_revoke_an_unverified_second_factor( $authorityNameId, $authorityCommonName, $authorityEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $authorityId, @@ -356,8 +358,8 @@ public function a_registration_authority_can_revoke_an_unverified_second_factor( $authorityEmail, new Locale('en_GB'), new SecondFactorId(static::uuid()), - new YubikeyPublicId('12345678') - ) + new YubikeyPublicId('12345678'), + ), ]) ->withAggregateId($registrantId) ->given([ @@ -367,7 +369,7 @@ public function a_registration_authority_can_revoke_an_unverified_second_factor( $registrantNameId, $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeyPossessionProvenEvent( $registrantId, @@ -377,12 +379,12 @@ public function a_registration_authority_can_revoke_an_unverified_second_factor( true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), ]) ->when($command) @@ -393,7 +395,7 @@ public function a_registration_authority_can_revoke_an_unverified_second_factor( $registrantSecondFactorId, new SecondFactorType('yubikey'), $registrantSecondFactorIdentifier, - $authorityId + $authorityId, ), ]); } @@ -404,25 +406,25 @@ public function a_registration_authority_can_revoke_an_unverified_second_factor( */ public function a_registration_authority_can_revoke_a_verified_second_factor(): void { - $command = new RevokeRegistrantsSecondFactorCommand(); - $command->authorityId = static::uuid(); - $command->identityId = static::uuid(); + $command = new RevokeRegistrantsSecondFactorCommand(); + $command->authorityId = static::uuid(); + $command->identityId = static::uuid(); $command->secondFactorId = static::uuid(); - $authorityId = new IdentityId($command->authorityId); - $authorityNameId = new NameId(static::uuid()); - $authorityInstitution = new Institution('Wazoo'); - $authorityEmail = new Email('info@domain.invalid'); - $authorityCommonName = new CommonName('Henk Westbroek'); - - $registrantId = new IdentityId($command->identityId); - $registrantInstitution = new Institution('A Corp.'); - $registrantNameId = new NameId('3'); - $registrantSecondFactorId = new SecondFactorId($command->secondFactorId); - $registrantSecondFactorType = new SecondFactorType('yubikey'); + $authorityId = new IdentityId($command->authorityId); + $authorityNameId = new NameId(static::uuid()); + $authorityInstitution = new Institution('Wazoo'); + $authorityEmail = new Email('info@domain.invalid'); + $authorityCommonName = new CommonName('Henk Westbroek'); + + $registrantId = new IdentityId($command->identityId); + $registrantInstitution = new Institution('A Corp.'); + $registrantNameId = new NameId('3'); + $registrantSecondFactorId = new SecondFactorId($command->secondFactorId); + $registrantSecondFactorType = new SecondFactorType('yubikey'); $registrantSecondFactorIdentifier = new YubikeyPublicId('00890782'); - $registrantEmail = new Email('matti@domain.invalid'); - $registrantCommonName = new CommonName('Matti Vanhanen'); + $registrantEmail = new Email('matti@domain.invalid'); + $registrantCommonName = new CommonName('Matti Vanhanen'); $this->scenario ->withAggregateId($authorityId) @@ -433,7 +435,7 @@ public function a_registration_authority_can_revoke_a_verified_second_factor(): $authorityNameId, $authorityCommonName, $authorityEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $authorityId, @@ -443,8 +445,8 @@ public function a_registration_authority_can_revoke_a_verified_second_factor(): $authorityEmail, new Locale('en_GB'), new SecondFactorId(static::uuid()), - new YubikeyPublicId('12345678') - ) + new YubikeyPublicId('12345678'), + ), ]) ->withAggregateId($registrantId) ->given([ @@ -454,7 +456,7 @@ public function a_registration_authority_can_revoke_a_verified_second_factor(): $registrantNameId, $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeyPossessionProvenEvent( $registrantId, @@ -464,12 +466,12 @@ public function a_registration_authority_can_revoke_a_verified_second_factor(): true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new EmailVerifiedEvent( $registrantId, @@ -481,8 +483,8 @@ public function a_registration_authority_can_revoke_a_verified_second_factor(): 'REGISTRATION_CODE', $registrantCommonName, $registrantEmail, - new Locale('en_GB') - ) + new Locale('en_GB'), + ), ]) ->when($command) ->then([ @@ -492,7 +494,7 @@ public function a_registration_authority_can_revoke_a_verified_second_factor(): $registrantSecondFactorId, $registrantSecondFactorType, $registrantSecondFactorIdentifier, - $authorityId + $authorityId, ), ]); } @@ -503,25 +505,25 @@ public function a_registration_authority_can_revoke_a_verified_second_factor(): */ public function a_registration_authority_can_revoke_a_vetted_second_factor(): void { - $command = new RevokeRegistrantsSecondFactorCommand(); - $command->authorityId = static::uuid(); - $command->identityId = static::uuid(); + $command = new RevokeRegistrantsSecondFactorCommand(); + $command->authorityId = static::uuid(); + $command->identityId = static::uuid(); $command->secondFactorId = static::uuid(); - $authorityId = new IdentityId($command->authorityId); - $authorityNameId = new NameId(static::uuid()); - $authorityInstitution = new Institution('Wazoo'); - $authorityEmail = new Email('info@domain.invalid'); - $authorityCommonName = new CommonName('Henk Westbroek'); - - $registrantId = new IdentityId($command->identityId); - $registrantInstitution = new Institution('A Corp.'); - $registrantNameId = new NameId('3'); - $registrantSecondFactorId = new SecondFactorId($command->secondFactorId); - $registrantSecondFactorType = new SecondFactorType('yubikey'); + $authorityId = new IdentityId($command->authorityId); + $authorityNameId = new NameId(static::uuid()); + $authorityInstitution = new Institution('Wazoo'); + $authorityEmail = new Email('info@domain.invalid'); + $authorityCommonName = new CommonName('Henk Westbroek'); + + $registrantId = new IdentityId($command->identityId); + $registrantInstitution = new Institution('A Corp.'); + $registrantNameId = new NameId('3'); + $registrantSecondFactorId = new SecondFactorId($command->secondFactorId); + $registrantSecondFactorType = new SecondFactorType('yubikey'); $registrantSecondFactorIdentifier = new YubikeyPublicId('00890782'); - $registrantEmail = new Email('matti@domain.invalid'); - $registrantCommonName = new CommonName('Matti Vanhanen'); + $registrantEmail = new Email('matti@domain.invalid'); + $registrantCommonName = new CommonName('Matti Vanhanen'); $this->scenario ->withAggregateId($authorityId) @@ -532,7 +534,7 @@ public function a_registration_authority_can_revoke_a_vetted_second_factor(): vo $authorityNameId, $authorityCommonName, $authorityEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $authorityId, @@ -542,8 +544,8 @@ public function a_registration_authority_can_revoke_a_vetted_second_factor(): vo $authorityEmail, new Locale('en_GB'), new SecondFactorId(static::uuid()), - new YubikeyPublicId('12345678') - ) + new YubikeyPublicId('12345678'), + ), ]) ->withAggregateId($registrantId) ->given([ @@ -553,7 +555,7 @@ public function a_registration_authority_can_revoke_a_vetted_second_factor(): vo $registrantNameId, $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeyPossessionProvenEvent( $registrantId, @@ -563,12 +565,12 @@ public function a_registration_authority_can_revoke_a_vetted_second_factor(): vo true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new EmailVerifiedEvent( $registrantId, @@ -580,7 +582,7 @@ public function a_registration_authority_can_revoke_a_vetted_second_factor(): vo 'REGISTRATION_CODE', $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new SecondFactorVettedEvent( $registrantId, @@ -592,8 +594,8 @@ public function a_registration_authority_can_revoke_a_vetted_second_factor(): vo $registrantCommonName, $registrantEmail, new Locale('en_GB'), - new OnPremiseVettingType(new DocumentNumber('DOCUMENT_NUMBER')) - ) + new OnPremiseVettingType(new DocumentNumber('DOCUMENT_NUMBER')), + ), ]) ->when($command) ->then([ @@ -603,42 +605,41 @@ public function a_registration_authority_can_revoke_a_vetted_second_factor(): vo $registrantSecondFactorId, new SecondFactorType('yubikey'), $registrantSecondFactorIdentifier, - $authorityId + $authorityId, ), new VettedSecondFactorsAllRevokedEvent( $registrantId, - $registrantInstitution + $registrantInstitution, ), ]); } - /** * @test * @group command-handler */ public function a_registration_authority_can_revoke_a_possession_proved_skipped_vetted_second_factor(): void { - $command = new RevokeRegistrantsSecondFactorCommand(); - $command->authorityId = static::uuid(); - $command->identityId = static::uuid(); + $command = new RevokeRegistrantsSecondFactorCommand(); + $command->authorityId = static::uuid(); + $command->identityId = static::uuid(); $command->secondFactorId = static::uuid(); - $authorityId = new IdentityId($command->authorityId); - $authorityNameId = new NameId(static::uuid()); - $authorityInstitution = new Institution('Wazoo'); - $authorityEmail = new Email('info@domain.invalid'); - $authorityCommonName = new CommonName('Henk Westbroek'); - - $registrantId = new IdentityId($command->identityId); - $registrantInstitution = new Institution('A Corp.'); - $registrantNameId = new NameId('3'); - $registrantSecondFactorId = new SecondFactorId($command->secondFactorId); - $registrantSecondFactorType = new SecondFactorType('yubikey'); + $authorityId = new IdentityId($command->authorityId); + $authorityNameId = new NameId(static::uuid()); + $authorityInstitution = new Institution('Wazoo'); + $authorityEmail = new Email('info@domain.invalid'); + $authorityCommonName = new CommonName('Henk Westbroek'); + + $registrantId = new IdentityId($command->identityId); + $registrantInstitution = new Institution('A Corp.'); + $registrantNameId = new NameId('3'); + $registrantSecondFactorId = new SecondFactorId($command->secondFactorId); + $registrantSecondFactorType = new SecondFactorType('yubikey'); $registrantSecondFactorIdentifier = new YubikeyPublicId('00890782'); - $registrantEmail = new Email('matti@domain.invalid'); - $registrantCommonName = new CommonName('Matti Vanhanen'); + $registrantEmail = new Email('matti@domain.invalid'); + $registrantCommonName = new CommonName('Matti Vanhanen'); $this->scenario ->withAggregateId($authorityId) @@ -649,7 +650,7 @@ public function a_registration_authority_can_revoke_a_possession_proved_skipped_ $authorityNameId, $authorityCommonName, $authorityEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $authorityId, @@ -659,8 +660,8 @@ public function a_registration_authority_can_revoke_a_possession_proved_skipped_ $authorityEmail, new Locale('en_GB'), new SecondFactorId(static::uuid()), - new YubikeyPublicId('12345678') - ) + new YubikeyPublicId('12345678'), + ), ]) ->withAggregateId($registrantId) ->given([ @@ -670,7 +671,7 @@ public function a_registration_authority_can_revoke_a_possession_proved_skipped_ $registrantNameId, $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeyPossessionProvenEvent( $registrantId, @@ -680,12 +681,12 @@ public function a_registration_authority_can_revoke_a_possession_proved_skipped_ true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new EmailVerifiedEvent( $registrantId, @@ -697,7 +698,7 @@ public function a_registration_authority_can_revoke_a_possession_proved_skipped_ 'REGISTRATION_CODE', $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new SecondFactorVettedWithoutTokenProofOfPossession( $registrantId, @@ -709,8 +710,8 @@ public function a_registration_authority_can_revoke_a_possession_proved_skipped_ $registrantCommonName, $registrantEmail, new Locale('en_GB'), - new OnPremiseVettingType(new DocumentNumber('DOCUMENT_NUMBER')) - ) + new OnPremiseVettingType(new DocumentNumber('DOCUMENT_NUMBER')), + ), ]) ->when($command) ->then([ @@ -720,11 +721,11 @@ public function a_registration_authority_can_revoke_a_possession_proved_skipped_ $registrantSecondFactorId, new SecondFactorType('yubikey'), $registrantSecondFactorIdentifier, - $authorityId + $authorityId, ), new VettedSecondFactorsAllRevokedEvent( $registrantId, - $registrantInstitution + $registrantInstitution, ), ]); } @@ -736,29 +737,29 @@ public function a_registration_authority_can_revoke_a_possession_proved_skipped_ */ public function a_registration_authority_can_revoke_one_of_multiple_vetted_second_factors(): void { - $command = new RevokeRegistrantsSecondFactorCommand(); - $command->authorityId = static::uuid(); - $command->identityId = static::uuid(); - $command->secondFactorId = static::uuid(); + $command = new RevokeRegistrantsSecondFactorCommand(); + $command->authorityId = static::uuid(); + $command->identityId = static::uuid(); + $command->secondFactorId = static::uuid(); $secondFactorId2 = static::uuid(); - $authorityId = new IdentityId($command->authorityId); - $authorityNameId = new NameId(static::uuid()); - $authorityInstitution = new Institution('Wazoo'); - $authorityEmail = new Email('info@domain.invalid'); - $authorityCommonName = new CommonName('Henk Westbroek'); - - $registrantId = new IdentityId($command->identityId); - $registrantInstitution = new Institution('A Corp.'); - $registrantNameId = new NameId('3'); - $registrantSecondFactorId = new SecondFactorId($command->secondFactorId); - $registrantSecondFactorType = new SecondFactorType('yubikey'); + $authorityId = new IdentityId($command->authorityId); + $authorityNameId = new NameId(static::uuid()); + $authorityInstitution = new Institution('Wazoo'); + $authorityEmail = new Email('info@domain.invalid'); + $authorityCommonName = new CommonName('Henk Westbroek'); + + $registrantId = new IdentityId($command->identityId); + $registrantInstitution = new Institution('A Corp.'); + $registrantNameId = new NameId('3'); + $registrantSecondFactorId = new SecondFactorId($command->secondFactorId); + $registrantSecondFactorType = new SecondFactorType('yubikey'); $registrantSecondFactorIdentifier = new YubikeyPublicId('00890782'); - $registrantEmail = new Email('matti@domain.invalid'); - $registrantCommonName = new CommonName('Matti Vanhanen'); + $registrantEmail = new Email('matti@domain.invalid'); + $registrantCommonName = new CommonName('Matti Vanhanen'); - $registrantSecondFactorId2 = new SecondFactorId($secondFactorId2); - $registrantSecondFactorType2 = new SecondFactorType('u2f'); + $registrantSecondFactorId2 = new SecondFactorId($secondFactorId2); + $registrantSecondFactorType2 = new SecondFactorType('u2f'); $registrantSecondFactorIdentifier2 = new U2fKeyHandle('00890783'); $this->scenario @@ -770,7 +771,7 @@ public function a_registration_authority_can_revoke_one_of_multiple_vetted_secon $authorityNameId, $authorityCommonName, $authorityEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new YubikeySecondFactorBootstrappedEvent( $authorityId, @@ -780,8 +781,8 @@ public function a_registration_authority_can_revoke_one_of_multiple_vetted_secon $authorityEmail, new Locale('en_GB'), new SecondFactorId(static::uuid()), - new YubikeyPublicId('12345678') - ) + new YubikeyPublicId('12345678'), + ), ]) ->withAggregateId($registrantId) ->given([ @@ -791,7 +792,7 @@ public function a_registration_authority_can_revoke_one_of_multiple_vetted_secon $registrantNameId, $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), // First second factor new YubikeyPossessionProvenEvent( @@ -802,12 +803,12 @@ public function a_registration_authority_can_revoke_one_of_multiple_vetted_secon true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new EmailVerifiedEvent( $registrantId, @@ -819,7 +820,7 @@ public function a_registration_authority_can_revoke_one_of_multiple_vetted_secon 'REGISTRATION_CODE', $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new SecondFactorVettedEvent( $registrantId, @@ -831,7 +832,7 @@ public function a_registration_authority_can_revoke_one_of_multiple_vetted_secon $registrantCommonName, $registrantEmail, new Locale('en_GB'), - new OnPremiseVettingType(new DocumentNumber('DOCUMENT_NUMBER')) + new OnPremiseVettingType(new DocumentNumber('DOCUMENT_NUMBER')), ), // Second second factor new U2fDevicePossessionProvenEvent( @@ -842,12 +843,12 @@ public function a_registration_authority_can_revoke_one_of_multiple_vetted_secon true, EmailVerificationWindow::createFromTimeFrameStartingAt( TimeFrame::ofSeconds(static::$window), - DateTime::now() + DateTime::now(), ), 'nonce', $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new EmailVerifiedEvent( $registrantId, @@ -859,7 +860,7 @@ public function a_registration_authority_can_revoke_one_of_multiple_vetted_secon 'REGISTRATION_CODE', $registrantCommonName, $registrantEmail, - new Locale('en_GB') + new Locale('en_GB'), ), new SecondFactorVettedEvent( $registrantId, @@ -871,7 +872,7 @@ public function a_registration_authority_can_revoke_one_of_multiple_vetted_secon $registrantCommonName, $registrantEmail, new Locale('en_GB'), - new OnPremiseVettingType(new DocumentNumber('DOCUMENT_NUMBER')) + new OnPremiseVettingType(new DocumentNumber('DOCUMENT_NUMBER')), ), ]) ->when($command) @@ -882,7 +883,7 @@ public function a_registration_authority_can_revoke_one_of_multiple_vetted_secon $registrantSecondFactorId, new SecondFactorType('yubikey'), $registrantSecondFactorIdentifier, - $authorityId + $authorityId, ), ]); } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/WhitelistCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/WhitelistCommandHandlerTest.php index 4d893400a..c407c752b 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/WhitelistCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/WhitelistCommandHandlerTest.php @@ -42,10 +42,12 @@ class WhitelistCommandHandlerTest extends CommandHandlerTest /** * Shorthand for fixed Whitelist ID. */ - const WID = Whitelist::WHITELIST_AGGREGATE_ID; + public const WID = Whitelist::WHITELIST_AGGREGATE_ID; - protected function createCommandHandler(EventStoreInterface $eventStore, EventBusInterface $eventBus): CommandHandler - { + protected function createCommandHandler( + EventStoreInterface $eventStore, + EventBusInterface $eventBus, + ): CommandHandler { $aggregateFactory = new PublicConstructorAggregateFactory(); return new WhitelistCommandHandler(new WhitelistRepository($eventStore, $eventBus, $aggregateFactory)); @@ -58,15 +60,15 @@ protected function createCommandHandler(EventStoreInterface $eventStore, EventBu */ public function when_the_whitelist_does_not_exist_yet_it_is_created(): void { - $command = new ReplaceWhitelistCommand(); + $command = new ReplaceWhitelistCommand(); $command->institutions = ['Replace A', 'Replace B', 'Replace C']; - $institutions = $this->mapStringValuesToInstitutions($command->institutions); + $institutions = $this->mapStringValuesToInstitutions($command->institutions); $this->scenario ->when($command) ->then([ new WhitelistCreatedEvent(new InstitutionCollection()), - new WhitelistReplacedEvent(new InstitutionCollection($institutions)) + new WhitelistReplacedEvent(new InstitutionCollection($institutions)), ]); } @@ -88,8 +90,8 @@ public function the_whitelist_can_be_fully_replaced(): void ->when($command) ->then([ new WhitelistReplacedEvent( - new InstitutionCollection($this->mapStringValuesToInstitutions($command->institutions)) - ) + new InstitutionCollection($this->mapStringValuesToInstitutions($command->institutions)), + ), ]); } @@ -103,7 +105,7 @@ public function an_institution_not_yet_on_the_whitelist_can_be_added_to_the_whit { $initialInstitutions = $this->mapStringValuesToInstitutions(['Initial One', 'Initial Two']); - $command = new AddToWhitelistCommand(); + $command = new AddToWhitelistCommand(); $command->institutionsToBeAdded = ['Added Institution']; $this->scenario @@ -112,8 +114,8 @@ public function an_institution_not_yet_on_the_whitelist_can_be_added_to_the_whit ->when($command) ->then([ new InstitutionsAddedToWhitelistEvent( - new InstitutionCollection($this->mapStringValuesToInstitutions($command->institutionsToBeAdded)) - ) + new InstitutionCollection($this->mapStringValuesToInstitutions($command->institutionsToBeAdded)), + ), ]); } @@ -129,7 +131,7 @@ public function an_institution_on_the_whitelist_may_not_be_added_again(): void $initialInstitutions = $this->mapStringValuesToInstitutions(['Initial One', 'Already Exists']); - $command = new AddToWhitelistCommand(); + $command = new AddToWhitelistCommand(); $command->institutionsToBeAdded = ['Already Exists']; $this->scenario @@ -147,7 +149,7 @@ public function an_institution_on_the_whitelist_can_be_removed_from_the_whitelis { $initialInstitutions = $this->mapStringValuesToInstitutions(['Initial One', 'On the whitelist']); - $command = new RemoveFromWhitelistCommand(); + $command = new RemoveFromWhitelistCommand(); $command->institutionsToBeRemoved = ['On the whitelist']; $this->scenario @@ -156,8 +158,8 @@ public function an_institution_on_the_whitelist_can_be_removed_from_the_whitelis ->when($command) ->then([ new InstitutionsRemovedFromWhitelistEvent( - new InstitutionCollection($this->mapStringValuesToInstitutions($command->institutionsToBeRemoved)) - ) + new InstitutionCollection($this->mapStringValuesToInstitutions($command->institutionsToBeRemoved)), + ), ]); } @@ -183,13 +185,10 @@ public function an_institution_that_is_not_on_the_whitelist_cannot_be_removed(): /** * Helper function to quickly map String[] to Institution[] - * @param array $institutions * @return array */ private function mapStringValuesToInstitutions(array $institutions): array { - return array_map(function ($institution): Institution { - return new Institution($institution); - }, $institutions); + return array_map(fn($institution): Institution => new Institution($institution), $institutions); } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcher.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcher.php index fbc5b12a5..1ffca0fe2 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcher.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcher.php @@ -27,7 +27,7 @@ public function __construct($expected) { if (!is_string($expected)) { throw new RuntimeException( - sprintf('In order to use the %s, a string should be given.', self::class) + sprintf('In order to use the %s, a string should be given.', self::class), ); } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcherTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcherTest.php index 9e03538ce..3dc16f476 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcherTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcherTest.php @@ -34,7 +34,7 @@ class HasInstitutionMatcherTest extends TestCase * * @dataProvider nonStringProvider */ - public function has_institution_matcher_only_matches_against_strings(bool|int|float|stdClass|array|null $nonString): void + public function has_institution_matcher_only_matches_against_strings(bool|int|float|stdClass|array|null $nonString,): void { $this->expectException(RuntimeException::class); @@ -48,8 +48,9 @@ public function has_institution_matcher_only_matches_against_strings(bool|int|fl * * @dataProvider nonObjectProvider */ - public function has_institution_matcher_only_matches_objects_against_a_given_institution(bool|int|float|string|array|null $nonObject): void - { + public function has_institution_matcher_only_matches_objects_against_a_given_institution( + bool|int|float|string|array|null $nonObject, + ): void { $institution = 'surfnet.nl'; $hasInstitutionMatcher = new HasInstitutionMatcher($institution); @@ -82,7 +83,7 @@ public function has_institution_matcher_does_not_match_when_object_has_no_instit */ public function has_institution_matcher_does_not_match_when_objects_accessed_institution_differs_from_given_institution(): void { - $institution = 'surfnet.nl'; + $institution = 'surfnet.nl'; $differentInstitution = 'not-surfnet.nl'; $nonMatchingObject = new ObjectWithInstitutionAccessor($institution); @@ -100,7 +101,7 @@ public function has_institution_matcher_does_not_match_when_objects_accessed_ins */ public function has_institution_matcher_matches_when_objects_accessed_institution_is_the_same_as_given_institution(): void { - $institution = 'surfnet.nl'; + $institution = 'surfnet.nl'; $nonMatchingObject = new ObjectWithInstitutionAccessor($institution); @@ -117,7 +118,7 @@ public function has_institution_matcher_matches_when_objects_accessed_institutio */ public function has_institution_matcher_does_not_match_when_objects_institution_property_differs_from_given_institution(): void { - $institution = 'surfnet.nl'; + $institution = 'surfnet.nl'; $differentInstitution = 'not-surfnet.nl'; $nonMatchingObject = new ObjectWithInstitutionProperty($institution); @@ -148,24 +149,24 @@ public function has_institution_matcher_matches_when_objects_institution_propert public function nonStringProvider(): array { return [ - 'null' => [null], - 'array' => [[]], - 'boolean' => [true], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new stdClass()], + 'null' => [null], + 'array' => [[]], + 'boolean' => [true], + 'integer' => [1], + 'float' => [1.2], + 'object' => [new stdClass()], ]; } public function nonObjectProvider(): array { return [ - 'null' => [null], - 'array' => [[]], - 'boolean' => [true], - 'integer' => [1], - 'float' => [1.2], - 'string' => ['string'], + 'null' => [null], + 'array' => [[]], + 'boolean' => [true], + 'integer' => [1], + 'float' => [1.2], + 'string' => ['string'], ]; } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/TestObjects/ObjectWithInstitutionAccessor.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/TestObjects/ObjectWithInstitutionAccessor.php index 5eba39b90..7814c8a28 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/TestObjects/ObjectWithInstitutionAccessor.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/TestObjects/ObjectWithInstitutionAccessor.php @@ -20,11 +20,8 @@ final class ObjectWithInstitutionAccessor { - private $institution; - - public function __construct($institution) + public function __construct(private $institution) { - $this->institution = $institution; } public function getInstitution() diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/TestObjects/ObjectWithInstitutionProperty.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/TestObjects/ObjectWithInstitutionProperty.php index 877603f79..251d50130 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/TestObjects/ObjectWithInstitutionProperty.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/TestObjects/ObjectWithInstitutionProperty.php @@ -20,10 +20,7 @@ final class ObjectWithInstitutionProperty { - public $institution; - - public function __construct($institution) + public function __construct(public $institution) { - $this->institution = $institution; } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/AuthorizingStageTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/AuthorizingStageTest.php index e97714ae6..dc9470245 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/AuthorizingStageTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/AuthorizingStageTest.php @@ -22,8 +22,13 @@ use Mockery\MockInterface; use PHPUnit\Framework\TestCase as UnitTest; use Psr\Log\NullLogger; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\ManagementExecutable; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\RaExecutable; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\SelfServiceExecutable; use Surfnet\StepupMiddleware\CommandHandlingBundle\Exception\ForbiddenException; use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\AuthorizingStage; +use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface; class AuthorizingStageTest extends UnitTest { @@ -41,7 +46,7 @@ public function setUp(): void { $this->logger = new NullLogger(); $this->authorizationChecker = m::mock( - 'Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface' + AuthorizationCheckerInterface::class, ); } @@ -51,7 +56,7 @@ public function setUp(): void */ public function when_a_command_has_no_marker_interface_authorization_is_granted_by_default(): void { - $command = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command'); + $command = m::mock(Command::class); $this->authorizationChecker->shouldReceive('isGranted')->never(); $authorizingStage = new AuthorizingStage($this->logger, $this->authorizationChecker); @@ -65,12 +70,11 @@ public function when_a_command_has_no_marker_interface_authorization_is_granted_ * @test * @group pipeline * @dataProvider interfaceToRoleMappingProvider - * - * @param string $interface - * @param string $role */ - public function a_command_with_a_marker_interface_triggers_a_check_for_the_correct_role(string $interface, string $role): void - { + public function a_command_with_a_marker_interface_triggers_a_check_for_the_correct_role( + string $interface, + string $role, + ): void { $command = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command, ' . $interface); $this->authorizationChecker ->shouldReceive('isGranted') @@ -95,7 +99,7 @@ public function when_a_command_implements_multiple_marker_interfaces_at_least_on 'Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command, ' . 'Surfnet\StepupMiddleware\CommandHandlingBundle\Command\SelfServiceExecutable, ' . 'Surfnet\StepupMiddleware\CommandHandlingBundle\Command\RaExecutable, ' - . 'Surfnet\StepupMiddleware\CommandHandlingBundle\Command\ManagementExecutable' + . ManagementExecutable::class, ); $this->authorizationChecker @@ -130,7 +134,7 @@ public function when_the_client_does_not_have_the_required_role_an_forbidden_exc $command = m::mock( 'Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command, ' - . 'Surfnet\StepupMiddleware\CommandHandlingBundle\Command\SelfServiceExecutable' + . SelfServiceExecutable::class, ); $this->authorizationChecker @@ -148,19 +152,19 @@ public function when_the_client_does_not_have_the_required_role_an_forbidden_exc public function interfaceToRoleMappingProvider(): array { - return [ + return [ 'SelfServiceExecutable => ROLE_SS' => [ - 'Surfnet\StepupMiddleware\CommandHandlingBundle\Command\SelfServiceExecutable', - 'ROLE_SS' + SelfServiceExecutable::class, + 'ROLE_SS', ], 'RaExecutable => ROLE_RA' => [ - 'Surfnet\StepupMiddleware\CommandHandlingBundle\Command\RaExecutable', - 'ROLE_RA' + RaExecutable::class, + 'ROLE_RA', ], 'ManagementExecutable => ROLE_MANAGEMENT' => [ - 'Surfnet\StepupMiddleware\CommandHandlingBundle\Command\ManagementExecutable', - 'ROLE_MANAGEMENT' - ] + ManagementExecutable::class, + 'ROLE_MANAGEMENT', + ], ]; } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/DispatchStageTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/DispatchStageTest.php index d01d22786..a7bd78f52 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/DispatchStageTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/DispatchStageTest.php @@ -22,6 +22,7 @@ use Mockery as m; use PHPUnit\Framework\TestCase; use Psr\Log\NullLogger; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\DispatchStage; class DispatchStageTest extends TestCase @@ -32,7 +33,7 @@ class DispatchStageTest extends TestCase */ public function it_dispatches_commands(): void { - $command = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command'); + $command = m::mock(Command::class); $commandBus = m::mock(CommandBus::class)->makePartial() ->shouldReceive('dispatch')->once()->with($command)->andReturnNull() ->getMock(); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/EventDispatchingStageTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/EventDispatchingStageTest.php index 6e453b709..b4902efb1 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/EventDispatchingStageTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/EventDispatchingStageTest.php @@ -21,6 +21,8 @@ use Mockery as m; use PHPUnit\Framework\TestCase as UnitTest; use Psr\Log\NullLogger; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; +use Surfnet\StepupMiddleware\CommandHandlingBundle\EventHandling\BufferedEventBus; use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\EventDispatchingStage; use Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\Command\FixedUuidStubCommand; @@ -32,8 +34,8 @@ class EventDispatchingStageTest extends UnitTest */ public function buffered_event_bus_flush_is_called_during_process(): void { - $command = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command'); - $eventBus = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\EventHandling\BufferedEventBus') + $command = m::mock(Command::class); + $eventBus = m::mock(BufferedEventBus::class) ->shouldReceive('flush')->once() ->getMock(); @@ -52,7 +54,7 @@ public function it_returns_the_same_command_as_it_processes_unmodified(): void $command = new FixedUuidStubCommand(); $uuid = $command->UUID; - $eventBus = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\EventHandling\BufferedEventBus') + $eventBus = m::mock(BufferedEventBus::class) ->shouldReceive('flush')->once() ->getMock(); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/StagedPipelineTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/StagedPipelineTest.php index 40a3adf16..156883b39 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/StagedPipelineTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/StagedPipelineTest.php @@ -21,6 +21,8 @@ use Mockery as m; use PHPUnit\Framework\TestCase; use Psr\Log\NullLogger; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\Stage; use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\StagedPipeline; class StagedPipelineTest extends TestCase @@ -31,8 +33,8 @@ class StagedPipelineTest extends TestCase */ public function it_passes_a_command_through_a_single_stage(): void { - $command = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command'); - $stage = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\Stage') + $command = m::mock(Command::class); + $stage = m::mock(Stage::class) ->shouldReceive('process')->once()->with($command)->andReturn($command) ->getMock(); @@ -48,11 +50,11 @@ public function it_passes_a_command_through_a_single_stage(): void */ public function it_passes_a_command_through_multiple_stages(): void { - $command = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command'); - $stage1 = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\Stage') + $command = m::mock(Command::class); + $stage1 = m::mock(Stage::class) ->shouldReceive('process')->once()->with($command)->andReturn($command) ->getMock(); - $stage2 = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\Stage') + $stage2 = m::mock(Stage::class) ->shouldReceive('process')->once()->with($command)->andReturn($command) ->getMock(); @@ -69,12 +71,12 @@ public function it_passes_a_command_through_multiple_stages(): void */ public function it_passes_the_command_returned_from_an_earlier_stage_on_to_the_next(): void { - $command1 = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command'); - $command2 = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command'); - $stage1 = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\Stage') + $command1 = m::mock(Command::class); + $command2 = m::mock(Command::class); + $stage1 = m::mock(Stage::class) ->shouldReceive('process')->once()->with($command1)->andReturn($command2) ->getMock(); - $stage2 = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\Stage') + $stage2 = m::mock(Stage::class) ->shouldReceive('process')->once()->with($command2)->andReturn($command2) ->getMock(); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/ValidationStageTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/ValidationStageTest.php index bce8c72a2..012fcca8a 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/ValidationStageTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/ValidationStageTest.php @@ -22,8 +22,11 @@ use Mockery as m; use PHPUnit\Framework\TestCase; use Psr\Log\NullLogger; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\Exception\InvalidCommandException; use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\ValidationStage; +use Symfony\Component\Validator\ConstraintViolationListInterface; +use Symfony\Component\Validator\Validator\ValidatorInterface; class ValidationStageTest extends TestCase { @@ -33,11 +36,11 @@ class ValidationStageTest extends TestCase */ public function it_validates_commands(): void { - $command = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command'); - $violations = m::mock('Symfony\Component\Validator\ConstraintViolationListInterface') + $command = m::mock(Command::class); + $violations = m::mock(ConstraintViolationListInterface::class) ->shouldReceive('count')->with()->andReturn(0) ->getMock(); - $validator = m::mock('Symfony\Component\Validator\Validator\ValidatorInterface') + $validator = m::mock(ValidatorInterface::class) ->shouldReceive('validate')->once()->with($command)->andReturn($violations) ->getMock(); @@ -54,12 +57,12 @@ public function it_throws_an_exception_when_validation_fails(): void { $this->expectException(InvalidCommandException::class); - $command = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command'); - $violations = m::mock('Symfony\Component\Validator\ConstraintViolationListInterface') + $command = m::mock(Command::class); + $violations = m::mock(ConstraintViolationListInterface::class) ->shouldReceive('count')->with()->andReturn(1) ->shouldReceive('getIterator')->with()->andReturn(new ArrayIterator()) ->getMock(); - $validator = m::mock('Symfony\Component\Validator\Validator\ValidatorInterface') + $validator = m::mock(ValidatorInterface::class) ->shouldReceive('validate')->once()->with($command)->andReturn($violations) ->getMock(); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Processor/RecoveryTokenEmailProcessorTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Processor/RecoveryTokenEmailProcessorTest.php index 25d70503f..839e358ac 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Processor/RecoveryTokenEmailProcessorTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Processor/RecoveryTokenEmailProcessorTest.php @@ -33,7 +33,6 @@ use Surfnet\Stepup\Identity\Value\RecoveryTokenId; use Surfnet\Stepup\Identity\Value\RecoveryTokenType; use Surfnet\Stepup\Identity\Value\SafeStore; -use Surfnet\Stepup\Identity\Value\Secret; use Surfnet\Stepup\Identity\Value\UnhashedSecret; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Identity; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\IdentityService; @@ -64,7 +63,7 @@ public function setUp(): void $this->identityService = Mockery::mock(IdentityService::class); $this->processor = new RecoveryTokenEmailProcessor( $this->mailService, - $this->identityService + $this->identityService, ); } @@ -83,7 +82,7 @@ public function test_mails_when_complied_with_recovery_token_revocation(): void new Institution('Harderwijk University'), new RecoveryTokenId('r-t-id'), new RecoveryTokenType('safe-store'), - new IdentityId('ra-id') + new IdentityId('ra-id'), ); $this->mailService @@ -95,7 +94,7 @@ public function test_mails_when_complied_with_recovery_token_revocation(): void $identity->email, $event->recoveryTokenType, $event->recoveryTokenId, - true + true, ); $this->processor->handleCompliedWithRecoveryCodeRevocationEvent($event); } @@ -114,7 +113,7 @@ public function test_does_not_mail_when_identity_not_found_complied_with_recover new Institution('Harderwijk University'), new RecoveryTokenId('r-t-id'), new RecoveryTokenType('safe-store'), - new IdentityId('ra-id') + new IdentityId('ra-id'), ); $this->mailService @@ -136,7 +135,7 @@ public function test_it_mails_when_recovery_token_revoked_by_identity(): void new IdentityId('my-id'), new Institution('Harderwijk University'), new RecoveryTokenId('r-t-id'), - new RecoveryTokenType('safe-store') + new RecoveryTokenType('safe-store'), ); $this->mailService @@ -148,7 +147,7 @@ public function test_it_mails_when_recovery_token_revoked_by_identity(): void $identity->email, $event->recoveryTokenType, $event->recoveryTokenId, - false + false, ); $this->processor->handleRecoveryTokenRevokedEvent($event); } @@ -166,7 +165,7 @@ public function test_does_not_mail_when_identity_not_found_recovery_token_revoca new IdentityId('my-not-found-id'), new Institution('Harderwijk University'), new RecoveryTokenId('r-t-id'), - new RecoveryTokenType('safe-store') + new RecoveryTokenType('safe-store'), ); $this->mailService @@ -191,7 +190,7 @@ public function test_it_mails_when_sms_token_created(): void new PhoneNumber('+42 (0) 612345678'), $identity->commonName, $identity->email, - $identity->preferredLocale + $identity->preferredLocale, ); $this->mailService @@ -200,7 +199,7 @@ public function test_it_mails_when_sms_token_created(): void ->with( $identity->preferredLocale, $identity->commonName, - $identity->email + $identity->email, ); $this->processor->handlePhoneRecoveryTokenPossessionProvenEvent($event); } @@ -221,7 +220,7 @@ public function test_does_not_mail_when_identity_not_found_sms_creation(): void new PhoneNumber('+42 (0) 38473929281'), new CommonName('Jan de Wandelaar'), new Email('j.walker@example.com'), - new Locale('nl_NL') + new Locale('nl_NL'), ); $this->mailService @@ -246,7 +245,7 @@ public function test_it_mails_when_safe_store_token_created(): void new SafeStore(new UnhashedSecret('super-secret')), $identity->commonName, $identity->email, - $identity->preferredLocale + $identity->preferredLocale, ); $this->mailService @@ -255,7 +254,7 @@ public function test_it_mails_when_safe_store_token_created(): void ->with( $identity->preferredLocale, $identity->commonName, - $identity->email + $identity->email, ); $this->processor->handleSafeStoreSecretRecoveryTokenPossessionPromisedEvent($event); } @@ -276,7 +275,7 @@ public function test_does_not_mail_when_identity_not_found_safe_store_creation() new SafeStore(new UnhashedSecret('super-secret')), new CommonName('Jan de Wandelaar'), new Email('j.walker@example.com'), - new Locale('nl_NL') + new Locale('nl_NL'), ); $this->mailService diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/EventSourcing/SensitiveDataMessageStreamTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/EventSourcing/SensitiveDataMessageStreamTest.php index a9bed74e1..4e5d0b8d9 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/EventSourcing/SensitiveDataMessageStreamTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/EventSourcing/SensitiveDataMessageStreamTest.php @@ -34,8 +34,8 @@ final class SensitiveDataMessageStreamTest extends TestCase { - const EVENT_STREAM_A = 'A'; - const EVENT_STREAM_B = 'B'; + public const EVENT_STREAM_A = 'A'; + public const EVENT_STREAM_B = 'B'; /** * @test @@ -58,7 +58,7 @@ public function it_can_apply_one_sensitive_data_message_to_one_matching_event(): new SensitiveDataMessage( new IdentityId(self::EVENT_STREAM_A), 0, - (new SensitiveData)->withCommonName(new CommonName('Willie Willoughby')) + (new SensitiveData)->withCommonName(new CommonName('Willie Willoughby')), ), ]; $domainMessages = [ @@ -67,7 +67,7 @@ public function it_can_apply_one_sensitive_data_message_to_one_matching_event(): 0, new Metadata(), new ForgettableEventStub(), - DateTime::now() + DateTime::now(), ), ]; @@ -85,12 +85,12 @@ public function it_can_apply_two_sensitive_data_message_to_two_matching_events() new SensitiveDataMessage( new IdentityId(self::EVENT_STREAM_A), 0, - (new SensitiveData)->withCommonName(new CommonName('Willie Willoughby')) + (new SensitiveData)->withCommonName(new CommonName('Willie Willoughby')), ), new SensitiveDataMessage( new IdentityId(self::EVENT_STREAM_A), 1, - (new SensitiveData)->withEmail(new Email('willie@willougby.invalid')) + (new SensitiveData)->withEmail(new Email('willie@willougby.invalid')), ), ]; $domainMessages = [ @@ -99,14 +99,14 @@ public function it_can_apply_two_sensitive_data_message_to_two_matching_events() 0, new Metadata(), new ForgettableEventStub(), - DateTime::now() + DateTime::now(), ), new DomainMessage( self::EVENT_STREAM_A, 1, new Metadata(), new ForgettableEventStub(), - DateTime::now() + DateTime::now(), ), ]; @@ -125,7 +125,7 @@ public function it_can_apply_one_sensitive_data_message_to_one_regular_event_and new SensitiveDataMessage( new IdentityId(self::EVENT_STREAM_A), 1, - (new SensitiveData)->withEmail(new Email('willie@willougby.invalid'))->forget() + (new SensitiveData)->withEmail(new Email('willie@willougby.invalid'))->forget(), ), ]; $domainMessages = [ @@ -134,14 +134,14 @@ public function it_can_apply_one_sensitive_data_message_to_one_regular_event_and 0, new Metadata(), new RegularEventStub(), - DateTime::now() + DateTime::now(), ), new DomainMessage( self::EVENT_STREAM_A, 1, new Metadata(), new ForgettableEventStub(), - DateTime::now() + DateTime::now(), ), ]; @@ -165,7 +165,7 @@ public function it_fails_when_sensitive_data_is_missing_for_an_event(): void 0, new Metadata(), new ForgettableEventStub(), - DateTime::now() + DateTime::now(), ), ]; @@ -184,7 +184,7 @@ public function it_fails_when_not_all_sensitive_data_could_be_matched_to_an_even new SensitiveDataMessage( new IdentityId(self::EVENT_STREAM_A), 1, - (new SensitiveData)->withEmail(new Email('willie@willougby.invalid'))->forget() + (new SensitiveData)->withEmail(new Email('willie@willougby.invalid'))->forget(), ), ]; $domainMessages = [ @@ -193,7 +193,7 @@ public function it_fails_when_not_all_sensitive_data_could_be_matched_to_an_even 0, new Metadata(), new RegularEventStub(), - DateTime::now() + DateTime::now(), ), ]; @@ -206,14 +206,16 @@ public function it_fails_when_not_all_sensitive_data_could_be_matched_to_an_even */ public function it_fails_when_sensitive_data_matches_a_regular_event(): void { - $this->expectExceptionMessage("Encountered sensitive data for event which does not support sensitive data, UUID A, playhead 0"); + $this->expectExceptionMessage( + "Encountered sensitive data for event which does not support sensitive data, UUID A, playhead 0", + ); $this->expectException(SensitiveDataApplicationException::class); $sensitiveDataMessages = [ new SensitiveDataMessage( new IdentityId(self::EVENT_STREAM_A), 0, - (new SensitiveData)->withEmail(new Email('willie@willougby.invalid'))->forget() + (new SensitiveData)->withEmail(new Email('willie@willougby.invalid'))->forget(), ), ]; $domainMessages = [ @@ -222,7 +224,7 @@ public function it_fails_when_sensitive_data_matches_a_regular_event(): void 0, new Metadata(), new RegularEventStub(), - DateTime::now() + DateTime::now(), ), ]; @@ -242,7 +244,7 @@ public function it_fails_when_stream_ids_dont_match(): void new SensitiveDataMessage( new IdentityId(self::EVENT_STREAM_A), 0, - (new SensitiveData)->withEmail(new Email('willie@willougby.invalid'))->forget() + (new SensitiveData)->withEmail(new Email('willie@willougby.invalid'))->forget(), ), ]; $domainMessages = [ @@ -251,7 +253,7 @@ public function it_fails_when_stream_ids_dont_match(): void 0, new Metadata(), new ForgettableEventStub(), - DateTime::now() + DateTime::now(), ), ]; @@ -265,7 +267,7 @@ public function it_fails_when_stream_ids_dont_match(): void public function it_can_forget_all_sensitive_data(): void { $sensitiveDataMessageStream = new SensitiveDataMessageStream([ - m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\EventSourcing\SensitiveDataMessage') + m::mock(SensitiveDataMessage::class) ->shouldReceive('forget')->once() ->getMock(), ]); @@ -280,8 +282,10 @@ private function apply(array $sensitiveDataMessages, array $domainMessages): voi ->applyToDomainEventStream(new DomainEventStream($domainMessages)); } - private function assertSensitiveDataEquals(SensitiveDataMessage $sensitiveDataMessage, DomainMessage $domainMessage): void - { + private function assertSensitiveDataEquals( + SensitiveDataMessage $sensitiveDataMessage, + DomainMessage $domainMessage, + ): void { $this->assertEquals($sensitiveDataMessage->getSensitiveData(), $domainMessage->getPayload()->sensitiveData); } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/SensitiveDataTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/SensitiveDataTest.php index b40934e55..cab1f70f4 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/SensitiveDataTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/SensitiveDataTest.php @@ -36,11 +36,11 @@ public function sensitiveDataToSerialise(): array return [ 'None' => [ (new SensitiveData()), - [] + [], ], 'None, forgotten' => [ (new SensitiveData())->forget(), - [] + [], ], 'CommonName' => [ (new SensitiveData())->withCommonName(new CommonName('Willie')), @@ -103,13 +103,10 @@ public function sensitiveDataToSerialise(): array * @test * @group sensitive-data * @dataProvider sensitiveDataToSerialise - * - * @param SensitiveData $sensitiveData - * @param array $getterExpectations */ public function it_serialises_and_deserialises( SensitiveData $sensitiveData, - array $getterExpectations + array $getterExpectations, ): void { $sensitiveData = SensitiveData::deserialize(json_decode(json_encode($sensitiveData->serialize()), true)); @@ -117,7 +114,7 @@ public function it_serialises_and_deserialises( $this->assertEquals( $expectedValue, $sensitiveData->{"get$data"}(), - "get$data() returned an unexpected value" + "get$data() returned an unexpected value", ); } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/Service/SensitiveDataServiceTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/Service/SensitiveDataServiceTest.php index ae876311c..8e6610561 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/Service/SensitiveDataServiceTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/Service/SensitiveDataServiceTest.php @@ -21,6 +21,8 @@ use Mockery as m; use PHPUnit\Framework\TestCase as TestCase; use Surfnet\Stepup\Identity\Value\IdentityId; +use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\EventSourcing\SensitiveDataMessageStream; +use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Repository\SensitiveDataMessageRepository; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Service\SensitiveDataService; final class SensitiveDataServiceTest extends TestCase @@ -33,10 +35,12 @@ public function it_can_forget_sensitive_data_in_a_stream(): void { $identityId = new IdentityId('A'); - $sensitiveDataMessageStream = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\EventSourcing\SensitiveDataMessageStream'); + $sensitiveDataMessageStream = m::mock(SensitiveDataMessageStream::class); $sensitiveDataMessageStream->shouldReceive('forget')->once(); - $sensitiveDataMessageRepository = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Repository\SensitiveDataMessageRepository'); - $sensitiveDataMessageRepository->shouldReceive('findByIdentityId')->with($identityId)->once()->andReturn($sensitiveDataMessageStream); + $sensitiveDataMessageRepository = m::mock(SensitiveDataMessageRepository::class); + $sensitiveDataMessageRepository->shouldReceive('findByIdentityId')->with($identityId)->once()->andReturn( + $sensitiveDataMessageStream, + ); $sensitiveDataMessageRepository->shouldReceive('modify')->with($sensitiveDataMessageStream); $service = new SensitiveDataService($sensitiveDataMessageRepository); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Value/InstitutionTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Value/InstitutionTest.php index 8199349c9..a3e206cf3 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Value/InstitutionTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Value/InstitutionTest.php @@ -31,8 +31,9 @@ class InstitutionTest extends UnitTest * * @param mixed $invalidValue */ - public function an_institution_cannot_be_created_with_anything_but_a_nonempty_string(string|int|float|StdClass|array $invalidValue): void - { + public function an_institution_cannot_be_created_with_anything_but_a_nonempty_string( + string|int|float|StdClass|array $invalidValue, + ): void { $this->expectException(InvalidArgumentException::class); new Institution($invalidValue); @@ -43,10 +44,10 @@ public function an_institution_cannot_be_created_with_anything_but_a_nonempty_st */ public function two_institutions_with_the_same_value_are_equal(): void { - $institution = new Institution('a'); - $theSame = new Institution('a'); + $institution = new Institution('a'); + $theSame = new Institution('a'); $theSameWithSpaces = new Institution(' a '); - $different = new Institution('A'); + $different = new Institution('A'); $this->assertTrue($institution->equals($theSame)); $this->assertTrue($institution->equals($theSameWithSpaces)); @@ -58,10 +59,10 @@ public function nonStringOrNonEmptyStringProvider(): array return [ 'empty string' => [''], 'blank string' => [' '], - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], + 'array' => [[]], + 'integer' => [1], + 'float' => [1.2], + 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Value/Institution.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Value/Institution.php index b7f87681b..43577a25b 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Value/Institution.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Value/Institution.php @@ -18,11 +18,12 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Value; +use Stringable; use Surfnet\StepupMiddleware\CommandHandlingBundle\Exception\InvalidArgumentException; -final class Institution +final class Institution implements Stringable { - private string $institution; + private readonly string $institution; /** * @param string $institution may not be an empty string @@ -45,7 +46,6 @@ public function getInstitution() } /** - * @param Institution $otherInstitution * @return bool */ public function equals(Institution $otherInstitution): bool diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Value/Sender.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Value/Sender.php index 2e91a79f9..f87244419 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Value/Sender.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Value/Sender.php @@ -18,13 +18,14 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Value; +use Stringable; use Surfnet\StepupMiddleware\CommandHandlingBundle\Exception\InvalidArgumentException; -class Sender +class Sender implements Stringable { - private string $name; + private readonly string $name; - private string $email; + private readonly string $email; public function __construct(string $name, string $email) { @@ -38,7 +39,7 @@ public function __construct(string $name, string $email) if (!filter_var($email, FILTER_VALIDATE_EMAIL)) { throw new InvalidArgumentException( - sprintf("Invalid argument type: expected e-mail address for 'email', got '%s'", $email) + sprintf("Invalid argument type: expected e-mail address for 'email', got '%s'", $email), ); } diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntity.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntity.php index 7ae3131b5..923cae629 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntity.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntity.php @@ -29,8 +29,8 @@ class SamlEntity /** * Constants denoting the type of SamlEntity. Also used in the gateway to make that distinction */ - const TYPE_IDP = 'idp'; - const TYPE_SP = 'sp'; + public const TYPE_IDP = 'idp'; + public const TYPE_SP = 'sp'; /** * @var string @@ -39,40 +39,19 @@ class SamlEntity #[ORM\Column(length: 36)] public $id; - /** - * @var string - */ - #[ORM\Column] - public $entityId; - - /** - * @var string - */ - #[ORM\Column] - public $type; - - /** - * @var string the configuration as json string - */ - #[ORM\Column(type: 'text')] - public $configuration; - - /** - * @param string $entityId - * @param string $type - * @param string $configuration - */ - private function __construct($entityId, $type, $configuration) - { - $this->id = (string) Uuid::uuid4(); - $this->entityId = $entityId; - $this->type = $type; - $this->configuration = $configuration; + private function __construct( + #[ORM\Column] + public string $entityId, + #[ORM\Column] + public string $type, + #[ORM\Column(type: 'text')] + public string $configuration, + ) { + $this->id = (string)Uuid::uuid4(); } /** * @param string $entityId - * @param array $configuration * @return SamlEntity */ public static function createServiceProvider($entityId, array $configuration): self @@ -82,7 +61,6 @@ public static function createServiceProvider($entityId, array $configuration): s /** * @param string $entityId - * @param array $configuration * @return SamlEntity */ public static function createIdentityProvider($entityId, array $configuration): self diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntityRepository.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntityRepository.php index 6e23e0174..0801062e0 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntityRepository.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntityRepository.php @@ -24,8 +24,6 @@ class SamlEntityRepository extends EntityRepository { /** * Replace all configured service provider SamlEntities with the new SamlEntities. - * - * @param array $newSamlEntities */ public function replaceAllSps(array $newSamlEntities): void { @@ -34,8 +32,6 @@ public function replaceAllSps(array $newSamlEntities): void /** * Replace all configured identity provider SamlEntities with the new SamlEntities. - * - * @param array $newSamlEntities */ public function replaceAllIdps(array $newSamlEntities): void { @@ -46,9 +42,6 @@ public function replaceAllIdps(array $newSamlEntities): void * Replace all configured SamlEntities with the new SamlEntities. * * Will be updated later, see https://www.pivotaltracker.com/story/show/83532704 - * - * @param string $type - * @param array $newSamlEntities */ private function replaceAllOfType(string $type, array $newSamlEntities): void { @@ -79,7 +72,7 @@ private function removeAllOfType($type): void $this ->getEntityManager() ->createQuery( - 'DELETE FROM SurfnetStepupMiddlewareGatewayBundle:SamlEntity se WHERE se.type = :type' + 'DELETE FROM SurfnetStepupMiddlewareGatewayBundle:SamlEntity se WHERE se.type = :type', ) ->execute(['type' => $type]); } diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SecondFactor.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SecondFactor.php index 5bdd31181..bcc548ff1 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SecondFactor.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SecondFactor.php @@ -38,79 +38,44 @@ class SecondFactor private string $id; /** - * @var string + * @param string $identityId + * @param string $nameId + * @param string $institution + * @param string $displayLocale + * @param string $secondFactorId + * @param string $secondFactorType + * @param string $secondFactorIdentifier */ - #[ORM\Id] - #[ORM\Column(length: 36)] - private $identityId; - - /** - * @var string - */ - #[ORM\Column(length: 200)] - private $nameId; - - /** - * @var string - */ - #[ORM\Column(length: 200)] - private $institution; - - /** - * In which language to display any second factor verification screens. - * - * @var string - */ - #[ORM\Column] - public $displayLocale; - - /** - * @var string - */ - #[ORM\Column(length: 36)] - private $secondFactorId; - - /** - * @var string - */ - #[ORM\Column(length: 50)] - private $secondFactorType; - - /** - * @var string - */ - #[ORM\Column(length: 255)] - private $secondFactorIdentifier; - - /** - * This boolean indicates if the second factor token was vetted - * using one of the vetting types that are considered 'identity-vetted'. - * That in turn means if the owner of the second factor token has its - * identity vetted (verified) by a RA(A) at the service desk. This trickles - * down to the self-vet vetting type. As the token used for self vetting - * was RA vetted. - */ - #[ORM\Column(type: 'boolean', options: ['default' => '1'])] - private $identityVetted; - public function __construct( - $identityId, - $nameId, - $institution, - $displayLocale, - $secondFactorId, - $secondFactorIdentifier, - $secondFactorType, - $identityVetted + #[ORM\Id] + #[ORM\Column(length: 36)] + private $identityId, + #[ORM\Column(length: 200)] + private $nameId, + #[ORM\Column(length: 200)] + private $institution, + /** + * In which language to display any second factor verification screens. + */ + #[ORM\Column] + public $displayLocale, + #[ORM\Column(length: 36)] + private $secondFactorId, + #[ORM\Column(length: 255)] + private $secondFactorIdentifier, + #[ORM\Column(length: 50)] + private $secondFactorType, + /** + * This boolean indicates if the second factor token was vetted + * using one of the vetting types that are considered 'identity-vetted'. + * That in turn means if the owner of the second factor token has its + * identity vetted (verified) by a RA(A) at the service desk. This trickles + * down to the self-vet vetting type. As the token used for self vetting + * was RA vetted. + */ + #[ORM\Column(type: 'boolean', options: ['default' => '1'])] + private $identityVetted, ) { - $this->id = (string) Uuid::uuid4(); - $this->identityId = $identityId; - $this->nameId = $nameId; - $this->institution = $institution; - $this->displayLocale = $displayLocale; - $this->secondFactorId = $secondFactorId; - $this->secondFactorIdentifier = $secondFactorIdentifier; - $this->secondFactorType = $secondFactorType; - $this->identityVetted = $identityVetted; + $this->id = (string)Uuid::uuid4(); } } diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/WhitelistEntry.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/WhitelistEntry.php index c1fd71aa9..1f39c7ee2 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/WhitelistEntry.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/WhitelistEntry.php @@ -31,7 +31,7 @@ class WhitelistEntry public static function createFrom(Institution $institution): self { - $instance = new self(); + $instance = new self(); $instance->institution = $institution; return $instance; diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/InstitutionConfigurationProjector.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/InstitutionConfigurationProjector.php index 62e442c7e..c680a8268 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/InstitutionConfigurationProjector.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/InstitutionConfigurationProjector.php @@ -29,21 +29,15 @@ class InstitutionConfigurationProjector extends Projector { - private InstitutionConfigurationRepository $repository; - - /** - * @param InstitutionConfigurationRepository $repository - */ - public function __construct(InstitutionConfigurationRepository $repository) + public function __construct(private readonly InstitutionConfigurationRepository $repository) { - $this->repository = $repository; } public function applyNewInstitutionConfigurationCreatedEvent(NewInstitutionConfigurationCreatedEvent $event): void { $institutionConfiguration = new InstitutionConfiguration( (string)$event->institution, - $event->ssoOn2faOption->isEnabled() + $event->ssoOn2faOption->isEnabled(), ); $this->repository->save($institutionConfiguration); @@ -51,7 +45,7 @@ public function applyNewInstitutionConfigurationCreatedEvent(NewInstitutionConfi public function applySsoOn2faOptionChangedEvent(SsoOn2faOptionChangedEvent $event): void { - $institutionConfiguration = $this->repository->findByInstitution((string) $event->institution); + $institutionConfiguration = $this->repository->findByInstitution((string)$event->institution); if ($institutionConfiguration instanceof InstitutionConfiguration) { $institutionConfiguration->ssoOn2faEnabled = $event->ssoOn2faOption->isEnabled(); $this->repository->save($institutionConfiguration); @@ -62,7 +56,7 @@ public function applySsoOn2faOptionChangedEvent(SsoOn2faOptionChangedEvent $even if (!$institutionConfiguration) { $institutionConfiguration = new InstitutionConfiguration( (string)$event->institution, - $event->ssoOn2faOption->isEnabled() + $event->ssoOn2faOption->isEnabled(), ); $this->repository->save($institutionConfiguration); } diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/SamlEntityProjector.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/SamlEntityProjector.php index fd2da1824..3b9a5675d 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/SamlEntityProjector.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/SamlEntityProjector.php @@ -26,19 +26,11 @@ class SamlEntityProjector extends Projector { - private SamlEntityRepository $samlEntityRepository; - - /** - * @param SamlEntityRepository $samlEntityRepository - */ - public function __construct(SamlEntityRepository $samlEntityRepository) - { - $this->samlEntityRepository = $samlEntityRepository; + public function __construct( + private readonly SamlEntityRepository $samlEntityRepository, + ) { } - /** - * @param ServiceProvidersUpdatedEvent $event - */ public function applyServiceProvidersUpdatedEvent(ServiceProvidersUpdatedEvent $event): void { $spConfigurations = []; @@ -52,9 +44,6 @@ public function applyServiceProvidersUpdatedEvent(ServiceProvidersUpdatedEvent $ $this->samlEntityRepository->replaceAllSps($spConfigurations); } - /** - * @param IdentityProvidersUpdatedEvent $event - */ public function applyIdentityProvidersUpdatedEvent(IdentityProvidersUpdatedEvent $event): void { $spConfigurations = []; diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/SecondFactorProjector.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/SecondFactorProjector.php index 65bf704b4..2a39787af 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/SecondFactorProjector.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/SecondFactorProjector.php @@ -34,29 +34,23 @@ class SecondFactorProjector extends Projector { - private SecondFactorRepository $repository; - - /** - * @param SecondFactorRepository $repository - */ - public function __construct(SecondFactorRepository $repository) + public function __construct(private readonly SecondFactorRepository $repository) { - $this->repository = $repository; } public function applyYubikeySecondFactorBootstrappedEvent(YubikeySecondFactorBootstrappedEvent $event): void { $this->repository->save( new SecondFactor( - (string) $event->identityId, - (string) $event->nameId, - (string) $event->identityInstitution, - (string) $event->preferredLocale, - (string) $event->secondFactorId, - (string) $event->yubikeyPublicId, + (string)$event->identityId, + (string)$event->nameId, + (string)$event->identityInstitution, + (string)$event->preferredLocale, + (string)$event->secondFactorId, + (string)$event->yubikeyPublicId, 'yubikey', - true - ) + true, + ), ); } @@ -64,15 +58,15 @@ public function applySecondFactorMigratedEvent(SecondFactorMigratedEvent $event) { $this->repository->save( new SecondFactor( - (string) $event->identityId, - (string) $event->targetNameId, - (string) $event->identityInstitution, - (string) $event->preferredLocale, - (string) $event->newSecondFactorId, + (string)$event->identityId, + (string)$event->targetNameId, + (string)$event->identityInstitution, + (string)$event->preferredLocale, + (string)$event->newSecondFactorId, $event->secondFactorIdentifier, $event->secondFactorType, - $this->isIdentityVetted($event->vettingType) - ) + $this->isIdentityVetted($event->vettingType), + ), ); } @@ -80,31 +74,32 @@ public function applySecondFactorVettedEvent(SecondFactorVettedEvent $event): vo { $this->repository->save( new SecondFactor( - (string) $event->identityId, - (string) $event->nameId, - (string) $event->identityInstitution, - (string) $event->preferredLocale, - (string) $event->secondFactorId, + (string)$event->identityId, + (string)$event->nameId, + (string)$event->identityInstitution, + (string)$event->preferredLocale, + (string)$event->secondFactorId, $event->secondFactorIdentifier, $event->secondFactorType, - $this->isIdentityVetted($event->vettingType) - ) + $this->isIdentityVetted($event->vettingType), + ), ); } - public function applySecondFactorVettedWithoutTokenProofOfPossession(SecondFactorVettedWithoutTokenProofOfPossession $event): void - { + public function applySecondFactorVettedWithoutTokenProofOfPossession( + SecondFactorVettedWithoutTokenProofOfPossession $event, + ): void { $this->repository->save( new SecondFactor( - (string) $event->identityId, - (string) $event->nameId, - (string) $event->identityInstitution, - (string) $event->preferredLocale, - (string) $event->secondFactorId, + (string)$event->identityId, + (string)$event->nameId, + (string)$event->identityInstitution, + (string)$event->preferredLocale, + (string)$event->secondFactorId, $event->secondFactorIdentifier, $event->secondFactorType, - $this->isIdentityVetted($event->vettingType) - ) + $this->isIdentityVetted($event->vettingType), + ), ); } @@ -118,25 +113,29 @@ protected function applyVettedSecondFactorRevokedEvent(VettedSecondFactorRevoked $secondFactor = $this->repository->findOneBySecondFactorId($event->secondFactorId); if ($secondFactor === null) { - throw new RuntimeException(sprintf( - 'Expected to find a second factor having secondFactorId "%s", found none.', - $event->secondFactorId - )); + throw new RuntimeException( + sprintf( + 'Expected to find a second factor having secondFactorId "%s", found none.', + $event->secondFactorId, + ), + ); } $this->repository->remove($secondFactor); } protected function applyCompliedWithVettedSecondFactorRevocationEvent( - CompliedWithVettedSecondFactorRevocationEvent $event + CompliedWithVettedSecondFactorRevocationEvent $event, ) { $secondFactor = $this->repository->findOneBySecondFactorId($event->secondFactorId); if ($secondFactor === null) { - throw new RuntimeException(sprintf( - 'Expected to find a second factor having secondFactorId "%s", found none.', - $event->secondFactorId - )); + throw new RuntimeException( + sprintf( + 'Expected to find a second factor having secondFactorId "%s", found none.', + $event->secondFactorId, + ), + ); } $this->repository->remove($secondFactor); @@ -147,7 +146,7 @@ protected function applyLocalePreferenceExpressedEvent(LocalePreferenceExpressed $secondFactors = $this->repository->findByIdentityId($event->identityId); foreach ($secondFactors as $secondFactor) { - $secondFactor->displayLocale = (string) $event->preferredLocale; + $secondFactor->displayLocale = (string)$event->preferredLocale; $this->repository->save($secondFactor); } } diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/WhitelistProjector.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/WhitelistProjector.php index 894a2372a..79e8d51b1 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/WhitelistProjector.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/WhitelistProjector.php @@ -28,19 +28,10 @@ class WhitelistProjector extends Projector { - private WhitelistEntryRepository $whitelistEntryRepository; - - /** - * @param WhitelistEntryRepository $whitelistRepository - */ - public function __construct(WhitelistEntryRepository $whitelistRepository) + public function __construct(private readonly WhitelistEntryRepository $whitelistEntryRepository) { - $this->whitelistEntryRepository = $whitelistRepository; } - /** - * @param WhitelistCreatedEvent $event - */ protected function applyWhitelistCreatedEvent(WhitelistCreatedEvent $event) { $whitelistEntries = []; @@ -51,9 +42,6 @@ protected function applyWhitelistCreatedEvent(WhitelistCreatedEvent $event) $this->whitelistEntryRepository->saveEntries($whitelistEntries); } - /** - * @param WhitelistReplacedEvent $event - */ protected function applyWhitelistReplacedEvent(WhitelistReplacedEvent $event) { $this->whitelistEntryRepository->removeAll(); @@ -66,9 +54,6 @@ protected function applyWhitelistReplacedEvent(WhitelistReplacedEvent $event) $this->whitelistEntryRepository->saveEntries($whitelistEntries); } - /** - * @param InstitutionsAddedToWhitelistEvent $event - */ protected function applyInstitutionsAddedToWhitelistEvent(InstitutionsAddedToWhitelistEvent $event) { $whitelistEntries = []; @@ -79,9 +64,6 @@ protected function applyInstitutionsAddedToWhitelistEvent(InstitutionsAddedToWhi $this->whitelistEntryRepository->saveEntries($whitelistEntries); } - /** - * @param InstitutionsRemovedFromWhitelistEvent $event - */ protected function applyInstitutionsRemovedFromWhitelistEvent(InstitutionsRemovedFromWhitelistEvent $event) { $institutions = []; diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/SecondFactorRepository.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/SecondFactorRepository.php index 91f4fac33..a8157e05c 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/SecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/SecondFactorRepository.php @@ -26,9 +26,7 @@ class SecondFactorRepository extends EntityRepository { public $_entityName; - /** - * @param SecondFactor $secondFactor - */ + public function save(SecondFactor $secondFactor): void { $this->getEntityManager()->persist($secondFactor); @@ -36,21 +34,19 @@ public function save(SecondFactor $secondFactor): void } /** - * @param SecondFactorId $secondFactorId * @return SecondFactor|null */ public function findOneBySecondFactorId(SecondFactorId $secondFactorId): ?object { - return $this->findOneBy(['secondFactorId' => (string) $secondFactorId]); + return $this->findOneBy(['secondFactorId' => (string)$secondFactorId]); } /** - * @param IdentityId $identityId * @return SecondFactor[] */ public function findByIdentityId(IdentityId $identityId): array { - return $this->findBy(['identityId' => (string) $identityId]); + return $this->findBy(['identityId' => (string)$identityId]); } public function removeByIdentityId(IdentityId $identityId): void @@ -63,9 +59,6 @@ public function removeByIdentityId(IdentityId $identityId): void ->execute(); } - /** - * @param SecondFactor $secondFactor - */ public function remove(SecondFactor $secondFactor): void { $this->getEntityManager()->remove($secondFactor); diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Resources/config/projection.yml b/src/Surfnet/StepupMiddleware/GatewayBundle/Resources/config/projection.yml index a678a91c4..e1106de72 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Resources/config/projection.yml +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Resources/config/projection.yml @@ -1,24 +1,24 @@ services: - surfnet_stepup_middleware_gateway.projector.institution_configuration: - class: Surfnet\StepupMiddleware\GatewayBundle\Projector\InstitutionConfigurationProjector - arguments: - - "@middleware.gateway_repository.institution_configuration" - tags: [{ name: event_bus.event_listener, disable_for_replay: false }] + surfnet_stepup_middleware_gateway.projector.institution_configuration: + class: Surfnet\StepupMiddleware\GatewayBundle\Projector\InstitutionConfigurationProjector + arguments: + - "@middleware.gateway_repository.institution_configuration" + tags: [ { name: event_bus.event_listener, disable_for_replay: false } ] - surfnet_stepup_middleware_gateway.projector.second_factor: - class: Surfnet\StepupMiddleware\GatewayBundle\Projector\SecondFactorProjector - arguments: - - "@middleware.gateway_repository.second_factors" - tags: [{ name: event_bus.event_listener, disable_for_replay: false }] + surfnet_stepup_middleware_gateway.projector.second_factor: + class: Surfnet\StepupMiddleware\GatewayBundle\Projector\SecondFactorProjector + arguments: + - "@middleware.gateway_repository.second_factors" + tags: [ { name: event_bus.event_listener, disable_for_replay: false } ] - surfnet_stepup_middleware_gateway.projector.saml_entity: - class: Surfnet\StepupMiddleware\GatewayBundle\Projector\SamlEntityProjector - arguments: - - "@middleware.gateway_repository.saml_entities" - tags: [{ name: event_bus.event_listener, disable_for_replay: false }] + surfnet_stepup_middleware_gateway.projector.saml_entity: + class: Surfnet\StepupMiddleware\GatewayBundle\Projector\SamlEntityProjector + arguments: + - "@middleware.gateway_repository.saml_entities" + tags: [ { name: event_bus.event_listener, disable_for_replay: false } ] - surfnet_stepup_middleware_gateway.projector.whitelist_entry: - class: Surfnet\StepupMiddleware\GatewayBundle\Projector\WhitelistProjector - arguments: - - "@middleware.gateway_repository.whitelist_entry" - tags: [{ name: event_bus.event_listener, disable_for_replay: false }] + surfnet_stepup_middleware_gateway.projector.whitelist_entry: + class: Surfnet\StepupMiddleware\GatewayBundle\Projector\WhitelistProjector + arguments: + - "@middleware.gateway_repository.whitelist_entry" + tags: [ { name: event_bus.event_listener, disable_for_replay: false } ] diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Resources/config/repositories.yml b/src/Surfnet/StepupMiddleware/GatewayBundle/Resources/config/repositories.yml index de9b33b72..8a4fbae31 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Resources/config/repositories.yml +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Resources/config/repositories.yml @@ -1,24 +1,24 @@ services: - middleware.gateway_repository.saml_entities: - class: Surfnet\StepupMiddleware\GatewayBundle\Entity\SamlEntityRepository - factory: ["@doctrine.orm.gateway_entity_manager", getRepository] - arguments: - - 'Surfnet\StepupMiddleware\GatewayBundle\Entity\SamlEntity' + middleware.gateway_repository.saml_entities: + class: Surfnet\StepupMiddleware\GatewayBundle\Entity\SamlEntityRepository + factory: [ "@doctrine.orm.gateway_entity_manager", getRepository ] + arguments: + - 'Surfnet\StepupMiddleware\GatewayBundle\Entity\SamlEntity' - middleware.gateway_repository.second_factors: - class: Surfnet\StepupMiddleware\GatewayBundle\Repository\SecondFactorRepository - factory: ["@doctrine.orm.gateway_entity_manager", getRepository] - arguments: - - 'Surfnet\StepupMiddleware\GatewayBundle\Entity\SecondFactor' + middleware.gateway_repository.second_factors: + class: Surfnet\StepupMiddleware\GatewayBundle\Repository\SecondFactorRepository + factory: [ "@doctrine.orm.gateway_entity_manager", getRepository ] + arguments: + - 'Surfnet\StepupMiddleware\GatewayBundle\Entity\SecondFactor' - middleware.gateway_repository.institution_configuration: - class: Surfnet\StepupMiddleware\GatewayBundle\Repository\InstitutionConfigurationRepository - factory: ["@doctrine.orm.gateway_entity_manager", getRepository] - arguments: - - 'Surfnet\StepupMiddleware\GatewayBundle\Entity\InstitutionConfiguration' + middleware.gateway_repository.institution_configuration: + class: Surfnet\StepupMiddleware\GatewayBundle\Repository\InstitutionConfigurationRepository + factory: [ "@doctrine.orm.gateway_entity_manager", getRepository ] + arguments: + - 'Surfnet\StepupMiddleware\GatewayBundle\Entity\InstitutionConfiguration' - middleware.gateway_repository.whitelist_entry: - class: Surfnet\StepupMiddleware\GatewayBundle\Repository\WhitelistEntryRepository - factory: ["@doctrine.orm.gateway_entity_manager", getRepository] - arguments: - - 'Surfnet\StepupMiddleware\GatewayBundle\Entity\WhitelistEntry' + middleware.gateway_repository.whitelist_entry: + class: Surfnet\StepupMiddleware\GatewayBundle\Repository\WhitelistEntryRepository + factory: [ "@doctrine.orm.gateway_entity_manager", getRepository ] + arguments: + - 'Surfnet\StepupMiddleware\GatewayBundle\Entity\WhitelistEntry' diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Tests/Projector/InstitutionConfigurationProjectorTest.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Tests/Projector/InstitutionConfigurationProjectorTest.php index 8e2d1c826..136f1ec9e 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Tests/Projector/InstitutionConfigurationProjectorTest.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Tests/Projector/InstitutionConfigurationProjectorTest.php @@ -38,6 +38,7 @@ class InstitutionConfigurationProjectorTest extends TestCase private InstitutionConfigurationProjector $projector; private $repository; + protected function setUp(): void { $repository = m::mock(InstitutionConfigurationRepository::class); @@ -51,28 +52,31 @@ public function test_create_row_when_non_existent(): void $event = new SsoOn2faOptionChangedEvent( new InstitutionConfigurationId(Uuid::uuid4()->toString()), new Institution('institution-a.nl'), - new SsoOn2faOption(true) + new SsoOn2faOption(true), ); $this->repository->shouldReceive('findByInstitution')->with('institution-a.nl')->andReturn(null); - $this->repository->shouldReceive('save')->withArgs(function(InstitutionConfiguration $configuration): bool{ - return $configuration->institution === 'institution-a.nl' && $configuration->ssoOn2faEnabled === true; - }); + $this->repository->shouldReceive('save')->withArgs( + fn(InstitutionConfiguration $configuration, + ): bool => $configuration->institution === 'institution-a.nl' && $configuration->ssoOn2faEnabled === true, + ); $this->projector->applySsoOn2faOptionChangedEvent($event); } + public function test_updates_existing_row(): void { $event = new SsoOn2faOptionChangedEvent( new InstitutionConfigurationId(Uuid::uuid4()->toString()), new Institution('institution-a.nl'), - new SsoOn2faOption(true) + new SsoOn2faOption(true), ); $configuration = new InstitutionConfiguration('institution-a.nl', false); $this->repository->shouldReceive('findByInstitution')->with('institution-a.nl')->andReturn($configuration); - $this->repository->shouldReceive('save')->withArgs(function(InstitutionConfiguration $configuration): bool{ - return $configuration->institution === 'institution-a.nl' && $configuration->ssoOn2faEnabled === true; - }); + $this->repository->shouldReceive('save')->withArgs( + fn(InstitutionConfiguration $configuration, + ): bool => $configuration->institution === 'institution-a.nl' && $configuration->ssoOn2faEnabled === true, + ); $this->projector->applySsoOn2faOptionChangedEvent($event); } diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Entity/EmailTemplate.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Entity/EmailTemplate.php index ffeda2054..8bdaba73b 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Entity/EmailTemplate.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Entity/EmailTemplate.php @@ -26,7 +26,7 @@ #[ORM\Entity(repositoryClass: EmailTemplateRepository::class)] class EmailTemplate { - + #[ORM\Id] #[ORM\GeneratedValue(strategy: 'NONE')] #[ORM\Column] @@ -53,7 +53,7 @@ class EmailTemplate public static function create($name, $locale, $htmlContent): self { $self = new self(); - $self->id = (string) Uuid::uuid4(); + $self->id = (string)Uuid::uuid4(); $self->name = $name; $self->locale = $locale; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Projector/EmailTemplatesProjector.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Projector/EmailTemplatesProjector.php index 72fe6aa61..51b22ebfc 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Projector/EmailTemplatesProjector.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Projector/EmailTemplatesProjector.php @@ -25,11 +25,9 @@ final class EmailTemplatesProjector extends Projector { - private EmailTemplateRepository $repository; - - public function __construct(EmailTemplateRepository $repository) - { - $this->repository = $repository; + public function __construct( + private readonly EmailTemplateRepository $repository, + ) { } public function applyEmailTemplatesUpdatedEvent(EmailTemplatesUpdatedEvent $event): void diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Repository/EmailTemplateRepository.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Repository/EmailTemplateRepository.php index f92186095..390dd8272 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Repository/EmailTemplateRepository.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Repository/EmailTemplateRepository.php @@ -45,7 +45,7 @@ public function findOneByName(mixed $name, mixed $preferredLocale, mixed $fallba 'CASE WHEN tpl.locale = :preferredLocale THEN 2 WHEN tpl.locale = :fallbackLocale THEN 1 ELSE 0 - END AS HIDDEN localePreference' + END AS HIDDEN localePreference', ) ->setParameter('preferredLocale', $preferredLocale) ->setParameter('fallbackLocale', $fallbackLocale) diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Service/EmailTemplateService.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Service/EmailTemplateService.php index 89aab91c8..b5e49cd92 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Service/EmailTemplateService.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Service/EmailTemplateService.php @@ -24,14 +24,11 @@ use Surfnet\StepupMiddleware\CommandHandlingBundle\Exception\RuntimeException; use Surfnet\StepupMiddleware\ManagementBundle\Configuration\Repository\EmailTemplateRepository; -final class EmailTemplateService implements CommandHandlingEmailTemplateService +final readonly class EmailTemplateService implements CommandHandlingEmailTemplateService { - private EmailTemplateRepository $repository; - public function __construct( - EmailTemplateRepository $repository + private EmailTemplateRepository $repository, ) { - $this->repository = $repository; } /** diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php index d7bc13dbd..f1570a612 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php @@ -29,28 +29,21 @@ class ConfigurationController extends AbstractController { - /** - * @return TransactionAwarePipeline - */ - private TransactionAwarePipeline $pipeline; - - public function __construct(TransactionAwarePipeline $pipeline) - { - $this->pipeline = $pipeline; + public function __construct( + private readonly TransactionAwarePipeline $pipeline, + ) { } public function update(Request $request) { - $command = new UpdateConfigurationCommand(); - $command->UUID = (string) Uuid::uuid4(); + $command = new UpdateConfigurationCommand(); + $command->UUID = (string)Uuid::uuid4(); $command->configuration = $request->getContent(); return $this->handleCommand($request, $command); } /** - * @param Request $request - * @param Command $command * @return JsonResponse */ private function handleCommand(Request $request, Command $command): JsonResponse @@ -60,9 +53,9 @@ private function handleCommand(Request $request, Command $command): JsonResponse $serverName = $request->server->get('SERVER_NAME') ?: $request->server->get('SERVER_ADDR'); return new JsonResponse([ - 'status' => 'OK', + 'status' => 'OK', 'processed_by' => $serverName, - 'applied_at' => (new DateTime())->format(DateTime::ISO8601) + 'applied_at' => (new DateTime())->format(DateTime::ISO8601), ]); } } diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php index 38f325662..d3e5f4edf 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php @@ -46,54 +46,15 @@ */ final class InstitutionConfigurationController extends AbstractController { - /** - * @return InstitutionConfigurationOptionsService - */ - private InstitutionConfigurationOptionsService $institutionConfigurationOptionsService; - - /** - * @return InstitutionAuthorizationService - */ - private InstitutionAuthorizationService $institutionAuthorizationService; - - /** - * @return ValidatorInterface - */ - private ValidatorInterface $validator; - - /** - * @return AllowedSecondFactorListService - */ - private AllowedSecondFactorListService $allowedSecondFactorListService; - - /** - * @return LoggerInterface - */ - private LoggerInterface $logger; - - /** - * @return TransactionAwarePipeline - */ - private TransactionAwarePipeline $pipeline; - - private DBALConnectionHelper $connectionHelper; - public function __construct( - InstitutionConfigurationOptionsService $institutionConfigurationOptionsService, - InstitutionAuthorizationService $institutionAuthorizationService, - ValidatorInterface $dataCollectingValidator, - AllowedSecondFactorListService $allowedSecondFactorListService, - LoggerInterface $logger, - TransactionAwarePipeline $pipeline, - DBALConnectionHelper $dbalConnectionHelper + private readonly InstitutionConfigurationOptionsService $institutionConfigurationOptionsService, + private readonly InstitutionAuthorizationService $institutionAuthorizationService, + private readonly ValidatorInterface $validator, + private readonly AllowedSecondFactorListService $allowedSecondFactorListService, + private readonly LoggerInterface $logger, + private readonly TransactionAwarePipeline $pipeline, + private DBALConnectionHelper $connectionHelper, ) { - $this->institutionConfigurationOptionsService = $institutionConfigurationOptionsService; - $this->institutionAuthorizationService = $institutionAuthorizationService; - $this->validator = $dataCollectingValidator; - $this->allowedSecondFactorListService = $allowedSecondFactorListService; - $this->logger = $logger; - $this->pipeline = $pipeline; - $this->connectionHelper = $dbalConnectionHelper; } public function show(): JsonResponse @@ -124,11 +85,17 @@ public function show(): JsonResponse 'allow_self_asserted_tokens' => $options->selfAssertedTokensOption, 'number_of_tokens_per_identity' => $numberOfTokensPerIdentity, 'allowed_second_factors' => $allowedSecondFactorMap->getAllowedSecondFactorListFor( - $options->institution + $options->institution, ), - 'use_ra' => $institutionConfigurationOptionsMap->getAuthorizationOptionsByRole(InstitutionRole::useRa())->jsonSerialize(), - 'use_raa' => $institutionConfigurationOptionsMap->getAuthorizationOptionsByRole(InstitutionRole::useRaa())->jsonSerialize(), - 'select_raa' => $institutionConfigurationOptionsMap->getAuthorizationOptionsByRole(InstitutionRole::selectRaa())->jsonSerialize(), + 'use_ra' => $institutionConfigurationOptionsMap->getAuthorizationOptionsByRole( + InstitutionRole::useRa(), + )->jsonSerialize(), + 'use_raa' => $institutionConfigurationOptionsMap->getAuthorizationOptionsByRole( + InstitutionRole::useRaa(), + )->jsonSerialize(), + 'select_raa' => $institutionConfigurationOptionsMap->getAuthorizationOptionsByRole( + InstitutionRole::selectRaa(), + )->jsonSerialize(), ]; } @@ -150,26 +117,26 @@ public function reconfigure(Request $request): JsonResponse $this->logger->notice('No institutions to reconfigure: empty configuration received'); return new JsonResponse([ - 'status' => 'OK', - 'processed_by' => $request->server->get('SERVER_NAME') ?: $request->server->get('SERVER_ADDR'), - 'applied_at' => (new DateTime())->format(DateTime::ISO8601), + 'status' => 'OK', + 'processed_by' => $request->server->get('SERVER_NAME') ?: $request->server->get('SERVER_ADDR'), + 'applied_at' => (new DateTime())->format(DateTime::ISO8601), ]); } $commands = []; foreach ($configuration as $institution => $options) { - $command = new ReconfigureInstitutionConfigurationOptionsCommand(); - $command->UUID = (string) Uuid::uuid4(); - $command->institution = $institution; - $command->useRaLocationsOption = $options['use_ra_locations']; + $command = new ReconfigureInstitutionConfigurationOptionsCommand(); + $command->UUID = (string)Uuid::uuid4(); + $command->institution = $institution; + $command->useRaLocationsOption = $options['use_ra_locations']; $command->showRaaContactInformationOption = $options['show_raa_contact_information']; - $command->verifyEmailOption = $options['verify_email']; + $command->verifyEmailOption = $options['verify_email']; $command->numberOfTokensPerIdentityOption = $options['number_of_tokens_per_identity']; - $command->allowedSecondFactors = $options['allowed_second_factors']; + $command->allowedSecondFactors = $options['allowed_second_factors']; // The useRa, useRaa and selectRaa options are optional - $command->useRaOption = isset($options['use_ra']) ? $options['use_ra'] : null; - $command->useRaaOption = isset($options['use_raa']) ? $options['use_raa'] : null; - $command->selectRaaOption = isset($options['select_raa']) ? $options['select_raa'] : null; + $command->useRaOption = $options['use_ra'] ?? null; + $command->useRaaOption = $options['use_raa'] ?? null; + $command->selectRaaOption = $options['select_raa'] ?? null; // So are sso_on_2fa and the allow_self_asserted_tokens options $command->selfVetOption = $options['self_vet'] ?? null; $command->ssoOn2faOption = $options['sso_on_2fa'] ?? null; @@ -179,15 +146,15 @@ public function reconfigure(Request $request): JsonResponse } $this->logger->notice( - sprintf('Executing %s reconfigure institution configuration options commands', count($commands)) + sprintf('Executing %s reconfigure institution configuration options commands', count($commands)), ); $this->handleCommands($commands); return new JsonResponse([ - 'status' => 'OK', - 'processed_by' => $request->server->get('SERVER_NAME') ?: $request->server->get('SERVER_ADDR'), - 'applied_at' => (new DateTime())->format(DateTime::ISO8601), + 'status' => 'OK', + 'processed_by' => $request->server->get('SERVER_NAME') ?: $request->server->get('SERVER_ADDR'), + 'applied_at' => (new DateTime())->format(DateTime::ISO8601), ]); } @@ -209,7 +176,7 @@ private function handleCommands(array $commands): void throw new AccessDeniedHttpException( sprintf('Processing of command "%s" is forbidden for this client', $command), - $e + $e, ); } catch (Exception $exception) { $connectionHelper->rollBack(); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php index b95c4c76b..d5fffe23f 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php @@ -38,17 +38,13 @@ */ class RightToBeForgottenController extends AbstractController { - /** - * @return TransactionAwarePipeline - */ - private TransactionAwarePipeline $pipeline; - - private IdentityService $identityService; - - public function __construct(TransactionAwarePipeline $pipeline, IdentityService $identityService) - { - $this->pipeline = $pipeline; - $this->identityService = $identityService; + public function __construct( + /** + * @return TransactionAwarePipeline + */ + private readonly TransactionAwarePipeline $pipeline, + private readonly IdentityService $identityService, + ) { } public function forgetIdentity(Request $request) @@ -68,16 +64,14 @@ public function forgetIdentity(Request $request) $this->assertMayForget(new NameId($payload['name_id']), new Institution($payload['institution'])); $command = new ForgetIdentityCommand(); - $command->UUID = (string) Uuid::uuid4(); - $command->nameId = $payload['name_id']; + $command->UUID = (string)Uuid::uuid4(); + $command->nameId = $payload['name_id']; $command->institution = $payload['institution']; return $this->handleCommand($request, $command); } /** - * @param Request $request - * @param Command $command * @return JsonResponse */ private function handleCommand(Request $request, Command $command): JsonResponse @@ -87,15 +81,13 @@ private function handleCommand(Request $request, Command $command): JsonResponse $serverName = $request->server->get('SERVER_NAME') ?: $request->server->get('SERVER_ADDR'); return new JsonResponse([ - 'status' => 'OK', + 'status' => 'OK', 'processed_by' => $serverName, - 'applied_at' => (new DateTime())->format(DateTime::ISO8601) + 'applied_at' => (new DateTime())->format(DateTime::ISO8601), ]); } /** - * @param NameId $nameId - * @param Institution $institution * @throws ConflictHttpException */ private function assertMayForget(NameId $nameId, Institution $institution): void @@ -110,15 +102,17 @@ private function assertMayForget(NameId $nameId, Institution $institution): void if ($credentials->isSraa()) { throw new ConflictHttpException( 'Identity is currently configured to act as an SRAA. ' . - 'Remove its NameID from the configuration and try again.' + 'Remove its NameID from the configuration and try again.', ); } $role = $credentials->isRaa() ? 'RAA' : 'RA'; - throw new ConflictHttpException(sprintf( - 'Identity is currently accredited as an %s. Retract the accreditation and try again.', - $role - )); + throw new ConflictHttpException( + sprintf( + 'Identity is currently accredited as an %s. Retract the accreditation and try again.', + $role, + ), + ); } } diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php index 1ccaead05..0df7fc1dd 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php @@ -39,25 +39,21 @@ */ class WhitelistController extends AbstractController { - /** - * @return TransactionAwarePipeline - */ - private TransactionAwarePipeline $pipeline; - - private WhitelistService $whitelistService; - - public function __construct(TransactionAwarePipeline $pipeline, WhitelistService $whitelistService) - { - $this->pipeline = $pipeline; - $this->whitelistService = $whitelistService; + public function __construct( + /** + * @return TransactionAwarePipeline + */ + private readonly TransactionAwarePipeline $pipeline, + private readonly WhitelistService $whitelistService, + ) { } public function replaceWhitelist(Request $request) { $this->denyAccessUnlessGranted(['ROLE_MANAGEMENT']); - $command = new ReplaceWhitelistCommand(); - $command->UUID = (string) Uuid::uuid4(); + $command = new ReplaceWhitelistCommand(); + $command->UUID = (string)Uuid::uuid4(); $command->institutions = $this->getInstitutionsFromBody($request); return $this->handleCommand($request, $command); @@ -67,8 +63,8 @@ public function addToWhitelist(Request $request) { $this->denyAccessUnlessGranted(['ROLE_MANAGEMENT']); - $command = new AddToWhitelistCommand(); - $command->UUID = (string) Uuid::uuid4(); + $command = new AddToWhitelistCommand(); + $command->UUID = (string)Uuid::uuid4(); $command->institutionsToBeAdded = $this->getInstitutionsFromBody($request); return $this->handleCommand($request, $command); @@ -78,8 +74,8 @@ public function removeFromWhitelist(Request $request) { $this->denyAccessUnlessGranted(['ROLE_MANAGEMENT']); - $command = new RemoveFromWhitelistCommand(); - $command->UUID = (string) Uuid::uuid4(); + $command = new RemoveFromWhitelistCommand(); + $command->UUID = (string)Uuid::uuid4(); $command->institutionsToBeRemoved = $this->getInstitutionsFromBody($request); return $this->handleCommand($request, $command); @@ -93,8 +89,6 @@ public function showWhitelist(): JsonResponse } /** - * @param Request $request - * @param Command $command * @return JsonResponse */ private function handleCommand(Request $request, Command $command): JsonResponse @@ -104,21 +98,20 @@ private function handleCommand(Request $request, Command $command): JsonResponse } catch (ForbiddenException $e) { throw new AccessDeniedHttpException( sprintf('Processing of command "%s" is forbidden for this client', $command), - $e + $e, ); } $serverName = $request->server->get('SERVER_NAME') ?: $request->server->get('SERVER_ADDR'); return new JsonResponse([ - 'status' => 'OK', + 'status' => 'OK', 'processed_by' => $serverName, - 'applied_at' => (new DateTime())->format(DateTime::ISO8601), + 'applied_at' => (new DateTime())->format(DateTime::ISO8601), ]); } /** - * @param Request $request * @return array */ private function getInstitutionsFromBody(Request $request) @@ -127,7 +120,7 @@ private function getInstitutionsFromBody(Request $request) if (!isset($decoded['institutions']) || !is_array($decoded['institutions'])) { throw new BadRequestHttpException( - 'Request must contain json object with property "institutions" containing an array of institutions' + 'Request must contain json object with property "institutions" containing an array of institutions', ); } diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/DependencyInjection/Configuration.php b/src/Surfnet/StepupMiddleware/ManagementBundle/DependencyInjection/Configuration.php index 8a1f7ca49..cdb19d9d2 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/DependencyInjection/Configuration.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/DependencyInjection/Configuration.php @@ -30,7 +30,7 @@ public function getConfigTreeBuilder(): TreeBuilder $rootNode ->children() - ->scalarNode('email_required_locale')->isRequired()->end() + ->scalarNode('email_required_locale')->isRequired()->end() ->end(); return $treeBuilder; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Exception/InvalidArgumentException.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Exception/InvalidArgumentException.php index 6360d3622..4e4fa23d9 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Exception/InvalidArgumentException.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Exception/InvalidArgumentException.php @@ -27,13 +27,13 @@ class InvalidArgumentException extends \InvalidArgumentException implements Exce * * @return self */ - public static function invalidType($expected, $parameterName, $parameter): self + public static function invalidType($expected, $parameterName, mixed $parameter): self { $message = sprintf( 'Invalid argument type: "%s" expected, "%s" given for "%s"', $expected, - is_object($parameter) ? get_class($parameter) : gettype($parameter), - $parameterName + get_debug_type($parameter), + $parameterName, ); return new self($message); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Resources/config/routing.yml b/src/Surfnet/StepupMiddleware/ManagementBundle/Resources/config/routing.yml index 2bfd636fd..e4bf80525 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Resources/config/routing.yml +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Resources/config/routing.yml @@ -1,48 +1,48 @@ management_configuration_update: - path: /configuration - defaults: { _controller: Surfnet\StepupMiddleware\ManagementBundle\Controller\ConfigurationController::updateAction } - methods: [POST] - condition: "request.headers.get('Content-Type') == 'application/json' && request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /configuration + defaults: { _controller: Surfnet\StepupMiddleware\ManagementBundle\Controller\ConfigurationController::update } + methods: [ POST ] + condition: "request.headers.get('Content-Type') == 'application/json' && request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" management_institution_configuration_show: - path: /institution-configuration - defaults: { _controller: Surfnet\StepupMiddleware\ManagementBundle\Controller\InstitutionConfigurationController::showAction } - methods: [GET] - condition: "request.headers.get('Content-Type') == 'application/json' && request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /institution-configuration + defaults: { _controller: Surfnet\StepupMiddleware\ManagementBundle\Controller\InstitutionConfigurationController::show } + methods: [ GET ] + condition: "request.headers.get('Content-Type') == 'application/json' && request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" management_institution_configuration_reconfigure: - path: /institution-configuration - defaults: { _controller: Surfnet\StepupMiddleware\ManagementBundle\Controller\InstitutionConfigurationController::reconfigureAction } - methods: [POST] - condition: "request.headers.get('Content-Type') == 'application/json' && request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /institution-configuration + defaults: { _controller: Surfnet\StepupMiddleware\ManagementBundle\Controller\InstitutionConfigurationController::reconfigure } + methods: [ POST ] + condition: "request.headers.get('Content-Type') == 'application/json' && request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" management_whitelist_add: - path: /whitelist/add - defaults: { _controller: Surfnet\StepupMiddleware\ManagementBundle\Controller\WhitelistController::addToWhitelistAction } - methods: [POST] - condition: "request.headers.get('Content-Type') == 'application/json' && request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /whitelist/add + defaults: { _controller: Surfnet\StepupMiddleware\ManagementBundle\Controller\WhitelistController::addToWhitelist } + methods: [ POST ] + condition: "request.headers.get('Content-Type') == 'application/json' && request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" management_whitelist_replace: - path: /whitelist/replace - defaults: { _controller: Surfnet\StepupMiddleware\ManagementBundle\Controller\WhitelistController::replaceWhitelistAction } - methods: [POST] - condition: "request.headers.get('Content-Type') == 'application/json' && request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /whitelist/replace + defaults: { _controller: Surfnet\StepupMiddleware\ManagementBundle\Controller\WhitelistController::replaceWhitelist } + methods: [ POST ] + condition: "request.headers.get('Content-Type') == 'application/json' && request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" management_whitelist_remove: - path: /whitelist/remove - defaults: { _controller: Surfnet\StepupMiddleware\ManagementBundle\Controller\WhitelistController::removeFromWhitelistAction } - methods: [POST] - condition: "request.headers.get('Content-Type') == 'application/json' && request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /whitelist/remove + defaults: { _controller: Surfnet\StepupMiddleware\ManagementBundle\Controller\WhitelistController::removeFromWhitelist } + methods: [ POST ] + condition: "request.headers.get('Content-Type') == 'application/json' && request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" management_whitelist_show: - path: /whitelist - defaults: { _controller: Surfnet\StepupMiddleware\ManagementBundle\Controller\WhitelistController::showWhitelistAction } - methods: [GET] - condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /whitelist + defaults: { _controller: Surfnet\StepupMiddleware\ManagementBundle\Controller\WhitelistController::showWhitelist } + methods: [ GET ] + condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" management_forget_identity: - path: /forget-identity - defaults: { _controller: Surfnet\StepupMiddleware\ManagementBundle\Controller\RightToBeForgottenController::forgetIdentityAction } - methods: [POST] - condition: "request.headers.get('Content-Type') == 'application/json' && request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" + path: /forget-identity + defaults: { _controller: Surfnet\StepupMiddleware\ManagementBundle\Controller\RightToBeForgottenController::forgetIdentity } + methods: [ POST ] + condition: "request.headers.get('Content-Type') == 'application/json' && request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Resources/config/services.yml b/src/Surfnet/StepupMiddleware/ManagementBundle/Resources/config/services.yml index 451e9f126..c2d4d38dc 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Resources/config/services.yml +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Resources/config/services.yml @@ -1,71 +1,70 @@ services: - Surfnet\StepupMiddleware\ManagementBundle\Controller\: - resource: '../../Controller' - autowire: true - tags: ['controller.service_arguments'] + Surfnet\StepupMiddleware\ManagementBundle\Controller\: + resource: '../../Controller' + autowire: true + tags: [ 'controller.service_arguments' ] - Surfnet\StepupMiddleware\ManagementBundle\: - resource: '../../*' - autowire: true - exclude: '../../{DependencyInjection,Entity,Repository,Migrations,Tests,Exception,Controller}' + Surfnet\StepupMiddleware\ManagementBundle\: + resource: '../../*' + autowire: true + exclude: '../../{DependencyInjection,Entity,Repository,Migrations,Tests,Exception,Controller}' - # BC aliases - Surfnet\StepupMiddleware\ManagementBundle\Service\DBALConnectionHelper: "@surfnet_stepup_middleware_management.dbal_connection_helper" - Surfnet\StepupMiddleware\ManagementBundle\Validator\EmailTemplatesConfigurationValidator: "@surfnet_stepup_middleware_management.validator.email_templates_configuration" + # BC aliases + Surfnet\StepupMiddleware\ManagementBundle\Service\DBALConnectionHelper: "@surfnet_stepup_middleware_management.dbal_connection_helper" + Surfnet\StepupMiddleware\ManagementBundle\Validator\EmailTemplatesConfigurationValidator: "@surfnet_stepup_middleware_management.validator.email_templates_configuration" - Liip\FunctionalTestBundle\Validator\DataCollectingValidator: '@validator' + Liip\FunctionalTestBundle\Validator\DataCollectingValidator: '@validator' - surfnet_stepup_middleware_management.validator.configuration: - class: Surfnet\StepupMiddleware\ManagementBundle\Validator\ConfigurationStructureValidator - arguments: - - "@surfnet_stepup_middleware_management.validator.gateway_configuration" - - "@surfnet_stepup_middleware_management.validator.email_templates_configuration" - tags: - - { name: validator.constraint_validator, alias: configuration_structure_validator } + surfnet_stepup_middleware_management.validator.configuration: + class: Surfnet\StepupMiddleware\ManagementBundle\Validator\ConfigurationStructureValidator + arguments: + - "@surfnet_stepup_middleware_management.validator.gateway_configuration" + - "@surfnet_stepup_middleware_management.validator.email_templates_configuration" + tags: + - { name: validator.constraint_validator, alias: configuration_structure_validator } - surfnet_stepup_middleware_management.validator.gateway_configuration: - class: Surfnet\StepupMiddleware\ManagementBundle\Validator\GatewayConfigurationValidator - arguments: - - "@surfnet_stepup_middleware_management.validator.identity_provider_configuration" - - "@surfnet_stepup_middleware_management.validator.service_provider_configuration" + surfnet_stepup_middleware_management.validator.gateway_configuration: + class: Surfnet\StepupMiddleware\ManagementBundle\Validator\GatewayConfigurationValidator + arguments: + - "@surfnet_stepup_middleware_management.validator.identity_provider_configuration" + - "@surfnet_stepup_middleware_management.validator.service_provider_configuration" - surfnet_stepup_middleware_management.validator.service_provider_configuration: - class: Surfnet\StepupMiddleware\ManagementBundle\Validator\ServiceProviderConfigurationValidator + surfnet_stepup_middleware_management.validator.service_provider_configuration: + class: Surfnet\StepupMiddleware\ManagementBundle\Validator\ServiceProviderConfigurationValidator - surfnet_stepup_middleware_management.validator.identity_provider_configuration: - class: Surfnet\StepupMiddleware\ManagementBundle\Validator\IdentityProviderConfigurationValidator + surfnet_stepup_middleware_management.validator.identity_provider_configuration: + class: Surfnet\StepupMiddleware\ManagementBundle\Validator\IdentityProviderConfigurationValidator - surfnet_stepup_middleware_management.validator.email_templates_configuration: - class: Surfnet\StepupMiddleware\ManagementBundle\Validator\EmailTemplatesConfigurationValidator - arguments: - - '' # Default locale + surfnet_stepup_middleware_management.validator.email_templates_configuration: + class: Surfnet\StepupMiddleware\ManagementBundle\Validator\EmailTemplatesConfigurationValidator + arguments: + - '' # Default locale - surfnet_stepup_middleware_management.validator.reconfigure_institution_request: - class: Surfnet\StepupMiddleware\ManagementBundle\Validator\ReconfigureInstitutionRequestValidator - arguments: - - "@surfnet_stepup_middleware_api.service.configured_institutions" - - "@surfnet_stepup.service.second_factor_type" - - "@surfnet_stepup_middleware_api.service.whitelist_entry" - tags: - - { name: validator.constraint_validator, alias: reconfigure_institution_configuration_structure_validator } + surfnet_stepup_middleware_management.validator.reconfigure_institution_request: + class: Surfnet\StepupMiddleware\ManagementBundle\Validator\ReconfigureInstitutionRequestValidator + arguments: + - "@surfnet_stepup_middleware_api.service.configured_institutions" + - "@surfnet_stepup.service.second_factor_type" + - "@surfnet_stepup_middleware_api.service.whitelist_entry" + tags: + - { name: validator.constraint_validator, alias: reconfigure_institution_configuration_structure_validator } - surfnet_stepup_middleware_management.projector.email_templates: - class: Surfnet\StepupMiddleware\ManagementBundle\Configuration\Projector\EmailTemplatesProjector - arguments: - - "@surfnet_stepup_middleware_management.repository.email_template" - tags: [{ name: event_bus.event_listener, disable_for_replay: false }] + surfnet_stepup_middleware_management.projector.email_templates: + class: Surfnet\StepupMiddleware\ManagementBundle\Configuration\Projector\EmailTemplatesProjector + arguments: + - "@surfnet_stepup_middleware_management.repository.email_template" + tags: [ { name: event_bus.event_listener, disable_for_replay: false } ] - surfnet_stepup_middleware_management.repository.email_template: '@Surfnet\StepupMiddleware\ManagementBundle\Configuration\Repository\EmailTemplateRepository' + surfnet_stepup_middleware_management.repository.email_template: '@Surfnet\StepupMiddleware\ManagementBundle\Configuration\Repository\EmailTemplateRepository' - surfnet_stepup_middleware_management.service.email_template: - class: Surfnet\StepupMiddleware\ManagementBundle\Configuration\Service\EmailTemplateService - arguments: [ "@surfnet_stepup_middleware_management.repository.email_template" ] + surfnet_stepup_middleware_management.service.email_template: + class: Surfnet\StepupMiddleware\ManagementBundle\Configuration\Service\EmailTemplateService + arguments: [ "@surfnet_stepup_middleware_management.repository.email_template" ] - surfnet_stepup_middleware_management.dbal_connection_helper: - class: Surfnet\StepupMiddleware\ManagementBundle\Service\DBALConnectionHelper - arguments: - - - middleware: "@doctrine.dbal.middleware_connection" - gateway: "@doctrine.dbal.gateway_connection" + surfnet_stepup_middleware_management.dbal_connection_helper: + class: Surfnet\StepupMiddleware\ManagementBundle\Service\DBALConnectionHelper + arguments: + - middleware: "@doctrine.dbal.middleware_connection" + gateway: "@doctrine.dbal.gateway_connection" diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Service/DBALConnectionHelper.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Service/DBALConnectionHelper.php index a0bf63841..26118013f 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Service/DBALConnectionHelper.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Service/DBALConnectionHelper.php @@ -36,7 +36,7 @@ public function __construct(array $connections) { foreach ($connections as $connection) { if (!$connection instanceof Connection) { - throw InvalidArgumentException::invalidType('\Doctrine\DBAL\Connection', 'connection', $connection); + throw InvalidArgumentException::invalidType(Connection::class, 'connection', $connection); } } diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php index 15f8e1a89..8bc6a7e65 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php @@ -72,15 +72,19 @@ public function requests_with_invalid_content_are_bad_requests(): void [], [], [ - 'HTTP_ACCEPT' => 'application/json', - 'CONTENT_TYPE' => 'application/json', + 'HTTP_ACCEPT' => 'application/json', + 'CONTENT_TYPE' => 'application/json', 'PHP_AUTH_USER' => 'management', - 'PHP_AUTH_PW' => $this->password + 'PHP_AUTH_PW' => $this->password, ], - json_encode([]) + json_encode([]), ); - $this->assertSame(Response::HTTP_BAD_REQUEST, $this->client->getResponse()->getStatusCode(), $this->client->getResponse()->getContent()); + $this->assertSame( + Response::HTTP_BAD_REQUEST, + $this->client->getResponse()->getStatusCode(), + $this->client->getResponse()->getContent(), + ); } /** @@ -95,10 +99,10 @@ public function authorization_is_required(): void [], [], [ - 'HTTP_ACCEPT' => 'application/json', - 'CONTENT_TYPE' => 'application/json' + 'HTTP_ACCEPT' => 'application/json', + 'CONTENT_TYPE' => 'application/json', ], - json_encode([]) + json_encode([]), ); $this->assertEquals(Response::HTTP_UNAUTHORIZED, $this->client->getResponse()->getStatusCode()); @@ -116,12 +120,12 @@ public function readonly_user_cannot_modify_configuration(): void [], [], [ - 'HTTP_ACCEPT' => 'application/json', - 'CONTENT_TYPE' => 'application/json', + 'HTTP_ACCEPT' => 'application/json', + 'CONTENT_TYPE' => 'application/json', 'PHP_AUTH_USER' => 'apireader', - 'PHP_AUTH_PW' => $this->passwordRo, + 'PHP_AUTH_PW' => $this->passwordRo, ], - json_encode([]) + json_encode([]), ); $this->assertEquals(Response::HTTP_FORBIDDEN, $this->client->getResponse()->getStatusCode()); @@ -141,10 +145,10 @@ public function only_post_requests_are_accepted(string $invalidHttpMethod): void [], [], [ - 'HTTP_ACCEPT' => 'application/json', - 'CONTENT_TYPE' => 'application/json' + 'HTTP_ACCEPT' => 'application/json', + 'CONTENT_TYPE' => 'application/json', ], - json_encode([]) + json_encode([]), ); $this->assertEquals(Response::HTTP_METHOD_NOT_ALLOWED, $this->client->getResponse()->getStatusCode()); @@ -162,19 +166,19 @@ public function json_is_returned_from_the_configuration_api(): void [], [], [ - 'HTTP_ACCEPT' => 'application/json', - 'CONTENT_TYPE' => 'application/json', + 'HTTP_ACCEPT' => 'application/json', + 'CONTENT_TYPE' => 'application/json', 'PHP_AUTH_USER' => 'management', - 'PHP_AUTH_PW' => $this->password, + 'PHP_AUTH_PW' => $this->password, ], - json_encode([]) + json_encode([]), ); $this->assertTrue( $this->client->getResponse()->headers->contains( 'Content-Type', - 'application/json' - ) + 'application/json', + ), ); } @@ -188,7 +192,7 @@ public function invalidHttpMethodProvider(): array 'DELETE' => ['DELETE'], 'HEAD' => ['HEAD'], 'PUT' => ['PUT'], - 'OPTIONS' => ['OPTIONS'] + 'OPTIONS' => ['OPTIONS'], ]; } } diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php index 58f615682..6127a12bf 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php @@ -71,10 +71,10 @@ public function authorization_is_required_for_reconfiguring_institution_configur [], [], [ - 'HTTP_ACCEPT' => 'application/json', - 'CONTENT_TYPE' => 'application/json' + 'HTTP_ACCEPT' => 'application/json', + 'CONTENT_TYPE' => 'application/json', ], - json_encode([]) + json_encode([]), ); $this->assertEquals(Response::HTTP_UNAUTHORIZED, $this->client->getResponse()->getStatusCode()); @@ -92,12 +92,12 @@ public function readonly_user_cannot_reconfigure_institution_configuration_optio [], [], [ - 'HTTP_ACCEPT' => 'application/json', - 'CONTENT_TYPE' => 'application/json', + 'HTTP_ACCEPT' => 'application/json', + 'CONTENT_TYPE' => 'application/json', 'PHP_AUTH_USER' => 'apireader', - 'PHP_AUTH_PW' => $this->passwordRo, + 'PHP_AUTH_PW' => $this->passwordRo, ], - json_encode([]) + json_encode([]), ); $this->assertEquals(Response::HTTP_FORBIDDEN, $this->client->getResponse()->getStatusCode()); @@ -115,10 +115,10 @@ public function authorization_is_required_for_querying_institution_configuration [], [], [ - 'HTTP_ACCEPT' => 'application/json', - 'CONTENT_TYPE' => 'application/json' + 'HTTP_ACCEPT' => 'application/json', + 'CONTENT_TYPE' => 'application/json', ], - json_encode([]) + json_encode([]), ); $this->assertEquals(Response::HTTP_UNAUTHORIZED, $this->client->getResponse()->getStatusCode()); @@ -136,12 +136,12 @@ public function requests_with_invalid_content_are_bad_requests(): void [], [], [ - 'HTTP_ACCEPT' => 'application/json', - 'CONTENT_TYPE' => 'application/json', + 'HTTP_ACCEPT' => 'application/json', + 'CONTENT_TYPE' => 'application/json', 'PHP_AUTH_USER' => 'management', - 'PHP_AUTH_PW' => $this->password + 'PHP_AUTH_PW' => $this->password, ], - json_encode(['non-existing.organisation.test' => []]) + json_encode(['non-existing.organisation.test' => []]), ); $this->assertEquals(Response::HTTP_BAD_REQUEST, $this->client->getResponse()->getStatusCode()); @@ -162,10 +162,10 @@ public function only_post_and_get_requests_are_accepted(string $invalidHttpMetho [], [], [ - 'HTTP_ACCEPT' => 'application/json', - 'CONTENT_TYPE' => 'application/json' + 'HTTP_ACCEPT' => 'application/json', + 'CONTENT_TYPE' => 'application/json', ], - json_encode([]) + json_encode([]), ); $this->assertEquals(Response::HTTP_METHOD_NOT_ALLOWED, $this->client->getResponse()->getStatusCode()); @@ -183,12 +183,12 @@ public function a_get_request_without_content_is_valid(): void [], [], [ - 'HTTP_ACCEPT' => 'application/json', + 'HTTP_ACCEPT' => 'application/json', 'CONTENT_TYPE' => 'application/json', 'PHP_AUTH_USER' => 'management', - 'PHP_AUTH_PW' => $this->password + 'PHP_AUTH_PW' => $this->password, ], - json_encode([]) + json_encode([]), ); $this->assertEquals(Response::HTTP_OK, $this->client->getResponse()->getStatusCode()); @@ -206,19 +206,19 @@ public function json_is_returned_from_the_institution_configuration_api(): void [], [], [ - 'HTTP_ACCEPT' => 'application/json', - 'CONTENT_TYPE' => 'application/json', + 'HTTP_ACCEPT' => 'application/json', + 'CONTENT_TYPE' => 'application/json', 'PHP_AUTH_USER' => 'management', - 'PHP_AUTH_PW' => $this->password + 'PHP_AUTH_PW' => $this->password, ], - json_encode([]) + json_encode([]), ); $this->assertTrue( $this->client->getResponse()->headers->contains( 'Content-Type', - 'application/json' - ) + 'application/json', + ), ); } @@ -228,8 +228,8 @@ public function json_is_returned_from_the_institution_configuration_api(): void public function invalidHttpMethodProvider(): array { return [ - 'DELETE' => ['DELETE'], - 'PUT' => ['PUT'], + 'DELETE' => ['DELETE'], + 'PUT' => ['PUT'], 'OPTIONS' => ['OPTIONS'], ]; } diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ConfigurationValidationTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ConfigurationValidationTest.php index d11560b5f..0637164ea 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ConfigurationValidationTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ConfigurationValidationTest.php @@ -27,6 +27,8 @@ use Surfnet\StepupMiddleware\ManagementBundle\Validator\GatewayConfigurationValidator; use Surfnet\StepupMiddleware\ManagementBundle\Validator\IdentityProviderConfigurationValidator; use Surfnet\StepupMiddleware\ManagementBundle\Validator\ServiceProviderConfigurationValidator; +use Symfony\Component\Validator\Context\ExecutionContextInterface; +use Symfony\Component\Validator\Violation\ConstraintViolationBuilderInterface; final class ConfigurationValidationTest extends TestCase { @@ -41,9 +43,9 @@ public function invalidConfigurations(): array $fixture = include $invalidConfiguration; $dataSet[basename($invalidConfiguration)] = [ $fixture['configuration'], - $fixture['expectedPropertyPath'] + $fixture['expectedPropertyPath'], ]; - }; + } return $dataSet; } @@ -57,19 +59,19 @@ public function invalidConfigurations(): array */ public function it_rejects_invalid_configuration($configuration, $expectedPropertyPath): void { - $builder = m::mock('Symfony\Component\Validator\Violation\ConstraintViolationBuilderInterface'); + $builder = m::mock(ConstraintViolationBuilderInterface::class); $builder->shouldReceive('addViolation')->with()->once(); $builder->shouldReceive('atPath')->with($this->spy($actualPropertyPath))->once(); - $context = m::mock('Symfony\Component\Validator\Context\ExecutionContextInterface'); + $context = m::mock(ExecutionContextInterface::class); $context->shouldReceive('buildViolation')->with($this->spy($errorMessage))->once()->andReturn($builder); $validator = new ConfigurationStructureValidator( new GatewayConfigurationValidator( new IdentityProviderConfigurationValidator(), - new ServiceProviderConfigurationValidator() + new ServiceProviderConfigurationValidator(), ), - new EmailTemplatesConfigurationValidator('en_GB') + new EmailTemplatesConfigurationValidator('en_GB'), ); $validator->initialize($context); $validator->validate(json_encode($configuration), new HasValidConfigurationStructure()); @@ -78,22 +80,21 @@ public function it_rejects_invalid_configuration($configuration, $expectedProper $this->assertEquals( $expectedPropertyPath, $actualPropertyPath, - sprintf("Actual path to erroneous property doesn't match expected path (%s)", $errorMessage) + sprintf("Actual path to erroneous property doesn't match expected path (%s)", $errorMessage), ); } /** - * @param mixed &$spy * @return MatcherAbstract */ - private function spy(&$spy) + private function spy(mixed &$spy) { return m::on( function ($value) use (&$spy): bool { $spy = $value; return true; - } + }, ); } } diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/empty_idp_loas.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/empty_idp_loas.php index 8833dd702..fcaecbdc8 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/empty_idp_loas.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/empty_idp_loas.php @@ -18,36 +18,36 @@ return [ 'expectedPropertyPath' => 'gateway.identity_providers[0].loa', - 'configuration' => [ - 'gateway' => [ + 'configuration' => [ + 'gateway' => [ 'identity_providers' => [ [ "entity_id" => "http://idp.tld/metadata", - "loa" => [], + "loa" => [], ], ], - 'service_providers' => [ + 'service_providers' => [ [ - "entity_id" => "https://entity.tld/id", - "public_key" => "MIIE...", - "acs" => ["https://entity.tld/consume-assertion"], - "loa" => [ + "entity_id" => "https://entity.tld/id", + "public_key" => "MIIE...", + "acs" => ["https://entity.tld/consume-assertion"], + "loa" => [ "__default__" => "https://entity.tld/authentication/loa2", ], - "second_factor_only" => false, + "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [], + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => [], ], ], ], - 'sraa' => ['20394-4320423-439248324'], + 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/empty_sp_acs.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/empty_sp_acs.php index 307202225..84d057818 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/empty_sp_acs.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/empty_sp_acs.php @@ -18,31 +18,31 @@ return [ 'expectedPropertyPath' => 'gateway.service_providers[0].acs', - 'configuration' => [ - 'gateway' => [ + 'configuration' => [ + 'gateway' => [ 'identity_providers' => [], - 'service_providers' => [ + 'service_providers' => [ [ - "entity_id" => "https://entity.tld/id", - "public_key" => "MIIE...", - "acs" => [], - "loa" => [ + "entity_id" => "https://entity.tld/id", + "public_key" => "MIIE...", + "acs" => [], + "loa" => [ "__default__" => "https://entity.tld/authentication/loa2", ], - "second_factor_only" => false, + "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [], + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => [], ], ], ], - 'sraa' => ['20394-4320423-439248324'], + 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/empty_sp_loas.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/empty_sp_loas.php index 8081c548d..cbefcd946 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/empty_sp_loas.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/empty_sp_loas.php @@ -18,29 +18,29 @@ return [ 'expectedPropertyPath' => 'gateway.service_providers[0].loa', - 'configuration' => [ - 'gateway' => [ + 'configuration' => [ + 'gateway' => [ 'identity_providers' => [], - 'service_providers' => [ + 'service_providers' => [ [ - "entity_id" => "https://entity.tld/id", - "public_key" => "MIIE...", - "acs" => ["https://entity.tld/consume-assertion"], - "loa" => [], - "second_factor_only" => false, + "entity_id" => "https://entity.tld/id", + "public_key" => "MIIE...", + "acs" => ["https://entity.tld/consume-assertion"], + "loa" => [], + "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [], + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => [], ], ], ], - 'sraa' => ['20394-4320423-439248324'], + 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_blacklisted_encryption_algorithm.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_blacklisted_encryption_algorithm.php index a7de73b14..468451094 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_blacklisted_encryption_algorithm.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_blacklisted_encryption_algorithm.php @@ -18,31 +18,31 @@ return [ 'expectedPropertyPath' => 'gateway.service_providers[0].blacklisted_encryption_algorithms', - 'configuration' => [ - 'gateway' => [ + 'configuration' => [ + 'gateway' => [ 'identity_providers' => [], - 'service_providers' => [ + 'service_providers' => [ [ - "entity_id" => "https://entity.tld/id", - "public_key" => "MIIE...", - "acs" => ["https://entity.tld/consume-assertion"], - "loa" => [ + "entity_id" => "https://entity.tld/id", + "public_key" => "MIIE...", + "acs" => ["https://entity.tld/consume-assertion"], + "loa" => [ "__default__" => "https://entity.tld/authentication/loa2", ], - "second_factor_only" => false, + "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [9], + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => [9], ], ], ], - 'sraa' => ['20394-4320423-439248324'], + 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_blacklisted_encryption_algorithms.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_blacklisted_encryption_algorithms.php index af68335ba..66c9fb892 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_blacklisted_encryption_algorithms.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_blacklisted_encryption_algorithms.php @@ -18,31 +18,31 @@ return [ 'expectedPropertyPath' => 'gateway.service_providers[0].blacklisted_encryption_algorithms', - 'configuration' => [ - 'gateway' => [ + 'configuration' => [ + 'gateway' => [ 'identity_providers' => [], - 'service_providers' => [ + 'service_providers' => [ [ - "entity_id" => "https://entity.tld/id", - "public_key" => "MIIE...", - "acs" => ["https://entity.tld/consume-assertion"], - "loa" => [ + "entity_id" => "https://entity.tld/id", + "public_key" => "MIIE...", + "acs" => ["https://entity.tld/consume-assertion"], + "loa" => [ "__default__" => "https://entity.tld/authentication/loa2", ], - "second_factor_only" => false, + "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => 9, + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => 9, ], ], ], - 'sraa' => ['20394-4320423-439248324'], + 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_email_template_locale.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_email_template_locale.php index 7b90f9aa4..3fe626880 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_email_template_locale.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_email_template_locale.php @@ -18,33 +18,33 @@ return [ 'expectedPropertyPath' => 'email_templates.confirm_email[9]', - 'configuration' => [ - 'gateway' => [ + 'configuration' => [ + 'gateway' => [ 'identity_providers' => [], - 'service_providers' => [ + 'service_providers' => [ [ - "entity_id" => "https://entity.tld/id", - "public_key" => "MIIE...", - "acs" => ["https://entity.tld/consume-assertion"], - "loa" => [ + "entity_id" => "https://entity.tld/id", + "public_key" => "MIIE...", + "acs" => ["https://entity.tld/consume-assertion"], + "loa" => [ "__default__" => "https://entity.tld/authentication/loa2", ], - "second_factor_only" => false, + "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [], + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => [], ], ], ], - 'sraa' => ['20394-4320423-439248324'], + 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}', 9 => ''], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}', 9 => ''], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'recovery_token_created' => ['en_GB' => 'Code {{ commonName }}'], 'recovery_token_revoked' => ['en_GB' => 'Code {{ commonName }}'], ], diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_idp.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_idp.php index 62d456f47..14c62e7aa 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_idp.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_idp.php @@ -18,31 +18,31 @@ return [ 'expectedPropertyPath' => 'gateway.identity_providers[0]', - 'configuration' => [ - 'gateway' => [ + 'configuration' => [ + 'gateway' => [ 'identity_providers' => [9], - 'service_providers' => [ + 'service_providers' => [ [ - "entity_id" => "https://entity.tld/id", - "public_key" => "MIIE...", - "acs" => ["https://entity.tld/consume-assertion"], - "loa" => [ + "entity_id" => "https://entity.tld/id", + "public_key" => "MIIE...", + "acs" => ["https://entity.tld/consume-assertion"], + "loa" => [ "__default__" => "https://entity.tld/authentication/loa2", ], - "second_factor_only" => false, + "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [], + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => [], ], ], ], - 'sraa' => ['20394-4320423-439248324'], + 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_idp_entity_id.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_idp_entity_id.php index 82df849bd..36bc198ce 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_idp_entity_id.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_idp_entity_id.php @@ -18,38 +18,38 @@ return [ 'expectedPropertyPath' => 'gateway.identity_providers[0].entity_id', - 'configuration' => [ - 'gateway' => [ + 'configuration' => [ + 'gateway' => [ 'identity_providers' => [ [ "entity_id" => 9, - "loa" => [ + "loa" => [ "__default__" => "https://entity.tld/authentication/loa2", ], ], ], - 'service_providers' => [ + 'service_providers' => [ [ - "entity_id" => "https://entity.tld/id", - "public_key" => "MIIE...", - "acs" => ["https://entity.tld/consume-assertion"], - "loa" => [ + "entity_id" => "https://entity.tld/id", + "public_key" => "MIIE...", + "acs" => ["https://entity.tld/consume-assertion"], + "loa" => [ "__default__" => "https://entity.tld/authentication/loa2", ], - "second_factor_only" => false, + "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [], + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => [], ], ], ], - 'sraa' => ['20394-4320423-439248324'], + 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_idp_loa.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_idp_loa.php index b5722ef25..4655ed97e 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_idp_loa.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_idp_loa.php @@ -18,38 +18,38 @@ return [ 'expectedPropertyPath' => 'gateway.identity_providers[0].loa', - 'configuration' => [ - 'gateway' => [ + 'configuration' => [ + 'gateway' => [ 'identity_providers' => [ [ "entity_id" => "http://idp.tld/metadata", - "loa" => [ + "loa" => [ "__default__" => 9, ], ], ], - 'service_providers' => [ + 'service_providers' => [ [ - "entity_id" => "https://entity.tld/id", - "public_key" => "MIIE...", - "acs" => ["https://entity.tld/consume-assertion"], - "loa" => [ + "entity_id" => "https://entity.tld/id", + "public_key" => "MIIE...", + "acs" => ["https://entity.tld/consume-assertion"], + "loa" => [ "__default__" => "https://entity.tld/authentication/loa2", ], - "second_factor_only" => false, + "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [], + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => [], ], ], ], - 'sraa' => ['20394-4320423-439248324'], + 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_idps.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_idps.php index c2d268da5..4d54571d7 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_idps.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_idps.php @@ -18,31 +18,31 @@ return [ 'expectedPropertyPath' => 'gateway.identity_providers', - 'configuration' => [ - 'gateway' => [ + 'configuration' => [ + 'gateway' => [ 'identity_providers' => 9, - 'service_providers' => [ + 'service_providers' => [ [ - "entity_id" => "https://entity.tld/id", - "public_key" => "MIIE...", - "acs" => ["https://entity.tld/consume-assertion"], - "loa" => [ + "entity_id" => "https://entity.tld/id", + "public_key" => "MIIE...", + "acs" => ["https://entity.tld/consume-assertion"], + "loa" => [ "__default__" => "https://entity.tld/authentication/loa2", ], - "second_factor_only" => false, + "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [], + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => [], ], ], ], - 'sraa' => ['20394-4320423-439248324'], + 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp.php index e265df570..b278c5059 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp.php @@ -18,18 +18,18 @@ return [ 'expectedPropertyPath' => 'gateway.service_providers[0]', - 'configuration' => [ - 'gateway' => [ + 'configuration' => [ + 'gateway' => [ 'identity_providers' => [], - 'service_providers' => [9], + 'service_providers' => [9], ], - 'sraa' => ['20394-4320423-439248324'], + 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp_acs.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp_acs.php index aa3a4aa52..7d32100ac 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp_acs.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp_acs.php @@ -18,31 +18,31 @@ return [ 'expectedPropertyPath' => 'gateway.service_providers[0].acs', - 'configuration' => [ - 'gateway' => [ + 'configuration' => [ + 'gateway' => [ 'identity_providers' => [], - 'service_providers' => [ + 'service_providers' => [ [ - "entity_id" => "https://entity.tld/id", - "public_key" => "MIIE...", - "acs" => [9], - "loa" => [ + "entity_id" => "https://entity.tld/id", + "public_key" => "MIIE...", + "acs" => [9], + "loa" => [ "__default__" => "https://entity.tld/authentication/loa2", ], - "second_factor_only" => false, + "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [], + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => [], ], ], ], - 'sraa' => ['20394-4320423-439248324'], + 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp_assertion_encryption_enabled.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp_assertion_encryption_enabled.php index aea9fb23b..13c317681 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp_assertion_encryption_enabled.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp_assertion_encryption_enabled.php @@ -18,31 +18,31 @@ return [ 'expectedPropertyPath' => 'gateway.service_providers[0].assertion_encryption_enabled', - 'configuration' => [ - 'gateway' => [ + 'configuration' => [ + 'gateway' => [ 'identity_providers' => [], - 'service_providers' => [ + 'service_providers' => [ [ - "entity_id" => "https://entity.tld/id", - "public_key" => "MIIE...", - "acs" => ["https://entity.tld/consume-assertion"], - "loa" => [ + "entity_id" => "https://entity.tld/id", + "public_key" => "MIIE...", + "acs" => ["https://entity.tld/consume-assertion"], + "loa" => [ "__default__" => "https://entity.tld/authentication/loa2", ], - "second_factor_only" => false, + "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => 9, - "blacklisted_encryption_algorithms" => [], + "assertion_encryption_enabled" => 9, + "blacklisted_encryption_algorithms" => [], ], ], ], - 'sraa' => ['20394-4320423-439248324'], + 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp_entity_id.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp_entity_id.php index de3b1e209..61c6f50c8 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp_entity_id.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp_entity_id.php @@ -18,31 +18,31 @@ return [ 'expectedPropertyPath' => 'gateway.service_providers[0].entity_id', - 'configuration' => [ - 'gateway' => [ + 'configuration' => [ + 'gateway' => [ 'identity_providers' => [], - 'service_providers' => [ + 'service_providers' => [ [ - "entity_id" => 9, - "public_key" => "MIIE...", - "acs" => ["https://entity.tld/consume-assertion"], - "loa" => [ + "entity_id" => 9, + "public_key" => "MIIE...", + "acs" => ["https://entity.tld/consume-assertion"], + "loa" => [ "__default__" => "https://entity.tld/authentication/loa2", ], - "second_factor_only" => false, + "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [], + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => [], ], ], ], - 'sraa' => ['20394-4320423-439248324'], + 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp_loa.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp_loa.php index 24aced856..d5fffab71 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp_loa.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp_loa.php @@ -18,31 +18,31 @@ return [ 'expectedPropertyPath' => 'gateway.service_providers[0].loa', - 'configuration' => [ - 'gateway' => [ + 'configuration' => [ + 'gateway' => [ 'identity_providers' => [], - 'service_providers' => [ + 'service_providers' => [ [ - "entity_id" => "https://entity.tld/id", - "public_key" => "MIIE...", - "acs" => ["https://entity.tld/consume-assertion"], - "loa" => [ + "entity_id" => "https://entity.tld/id", + "public_key" => "MIIE...", + "acs" => ["https://entity.tld/consume-assertion"], + "loa" => [ "__default__" => 3, ], - "second_factor_only" => false, + "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [], + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => [], ], ], ], - 'sraa' => ['20394-4320423-439248324'], + 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp_loa_uppercase_institution_sho.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp_loa_uppercase_institution_sho.php index c7ac566d3..57a915d1d 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp_loa_uppercase_institution_sho.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp_loa_uppercase_institution_sho.php @@ -18,32 +18,32 @@ return [ 'expectedPropertyPath' => 'gateway.service_providers[0].loa', - 'configuration' => [ - 'gateway' => [ + 'configuration' => [ + 'gateway' => [ 'identity_providers' => [], - 'service_providers' => [ + 'service_providers' => [ [ - "entity_id" => "https://entity.tld/id", - "public_key" => "MIIE...", - "acs" => ["https://entity.tld/consume-assertion"], - "loa" => [ + "entity_id" => "https://entity.tld/id", + "public_key" => "MIIE...", + "acs" => ["https://entity.tld/consume-assertion"], + "loa" => [ "__default__" => 'https://entity.tld/authentication/loa2', - "InstItuTioN" => 'https://entity.tld/authentication/loa3' + "InstItuTioN" => 'https://entity.tld/authentication/loa3', ], - "second_factor_only" => false, + "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [], + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => [], ], ], ], - 'sraa' => ['20394-4320423-439248324'], + 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp_public_key.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp_public_key.php index 04f164597..645b2c6df 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp_public_key.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp_public_key.php @@ -18,31 +18,31 @@ return [ 'expectedPropertyPath' => 'gateway.service_providers[0].public_key', - 'configuration' => [ - 'gateway' => [ + 'configuration' => [ + 'gateway' => [ 'identity_providers' => [], - 'service_providers' => [ + 'service_providers' => [ [ - "entity_id" => "https://entity.tld/id", - "public_key" => 9, - "acs" => ["https://entity.tld/consume-assertion"], - "loa" => [ + "entity_id" => "https://entity.tld/id", + "public_key" => 9, + "acs" => ["https://entity.tld/consume-assertion"], + "loa" => [ "__default__" => "https://entity.tld/authentication/loa2", ], - "second_factor_only" => false, + "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [], + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => [], ], ], ], - 'sraa' => ['20394-4320423-439248324'], + 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp_second_factor_only.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp_second_factor_only.php index a3f6251d2..9d387a8f6 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp_second_factor_only.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp_second_factor_only.php @@ -18,31 +18,33 @@ return [ 'expectedPropertyPath' => 'gateway.service_providers[0].second_factor_only', - 'configuration' => [ - 'gateway' => [ + 'configuration' => [ + 'gateway' => [ 'identity_providers' => [], - 'service_providers' => [ + 'service_providers' => [ [ - "entity_id" => "https://entity.tld/id", - "public_key" => "MIIE...", - "acs" => ["https://entity.tld/consume-assertion"], - "loa" => [ + "entity_id" => "https://entity.tld/id", + "public_key" => "MIIE...", + "acs" => ["https://entity.tld/consume-assertion"], + "loa" => [ "__default__" => "https://entity.tld/authentication/loa2", ], - "second_factor_only" => 'true', + "second_factor_only" => 'true', "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [], + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => [], ], ], ], - 'sraa' => ['20394-4320423-439248324'], + 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp_second_factor_only_nameid_patterns.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp_second_factor_only_nameid_patterns.php index 94be77f42..1d83ff344 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp_second_factor_only_nameid_patterns.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sp_second_factor_only_nameid_patterns.php @@ -18,31 +18,33 @@ return [ 'expectedPropertyPath' => 'gateway.service_providers[0].second_factor_only_nameid_patterns', - 'configuration' => [ - 'gateway' => [ + 'configuration' => [ + 'gateway' => [ 'identity_providers' => [], - 'service_providers' => [ + 'service_providers' => [ [ - "entity_id" => "https://entity.tld/id", - "public_key" => "MIIE...", - "acs" => ["https://entity.tld/consume-assertion"], - "loa" => [ + "entity_id" => "https://entity.tld/id", + "public_key" => "MIIE...", + "acs" => ["https://entity.tld/consume-assertion"], + "loa" => [ "__default__" => "https://entity.tld/authentication/loa2", ], - "second_factor_only" => true, + "second_factor_only" => true, "second_factor_only_nameid_patterns" => "urn:*", - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [], + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => [], ], ], ], - 'sraa' => ['20394-4320423-439248324'], + 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sps.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sps.php index 8931cd073..ac2423f78 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sps.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sps.php @@ -18,18 +18,20 @@ return [ 'expectedPropertyPath' => 'gateway.service_providers', - 'configuration' => [ - 'gateway' => [ + 'configuration' => [ + 'gateway' => [ 'identity_providers' => [], - 'service_providers' => 9, + 'service_providers' => 9, ], - 'sraa' => ['20394-4320423-439248324'], + 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sraa.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sraa.php index 21bcac48e..9cf861103 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sraa.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sraa.php @@ -18,31 +18,33 @@ return [ 'expectedPropertyPath' => 'sraa[0]', - 'configuration' => [ - 'gateway' => [ + 'configuration' => [ + 'gateway' => [ 'identity_providers' => [], - 'service_providers' => [ + 'service_providers' => [ [ - "entity_id" => "https://entity.tld/id", - "public_key" => "MIIE...", - "acs" => ["https://entity.tld/consume-assertion"], - "loa" => [ + "entity_id" => "https://entity.tld/id", + "public_key" => "MIIE...", + "acs" => ["https://entity.tld/consume-assertion"], + "loa" => [ "__default__" => "https://entity.tld/authentication/loa2", ], - "second_factor_only" => false, + "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [], + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => [], ], ], ], - 'sraa' => [9], + 'sraa' => [9], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sraas.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sraas.php index aa0960d78..3b5d3b96c 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sraas.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sraas.php @@ -18,31 +18,33 @@ return [ 'expectedPropertyPath' => 'sraa', - 'configuration' => [ - 'gateway' => [ + 'configuration' => [ + 'gateway' => [ 'identity_providers' => [], - 'service_providers' => [ + 'service_providers' => [ [ - "entity_id" => "https://entity.tld/id", - "public_key" => "MIIE...", - "acs" => ["https://entity.tld/consume-assertion"], - "loa" => [ + "entity_id" => "https://entity.tld/id", + "public_key" => "MIIE...", + "acs" => ["https://entity.tld/consume-assertion"], + "loa" => [ "__default__" => "https://entity.tld/authentication/loa2", ], - "second_factor_only" => false, + "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [], + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => [], ], ], ], - 'sraa' => 9, + 'sraa' => 9, 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/missing_email_template_confirm_email.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/missing_email_template_confirm_email.php index eb8954c8e..3c9cea46a 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/missing_email_template_confirm_email.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/missing_email_template_confirm_email.php @@ -18,30 +18,32 @@ return [ 'expectedPropertyPath' => 'email_templates', - 'configuration' => [ - 'gateway' => [ + 'configuration' => [ + 'gateway' => [ 'identity_providers' => [], - 'service_providers' => [ + 'service_providers' => [ [ - "entity_id" => "https://entity.tld/id", - "public_key" => "MIIE...", - "acs" => ["https://entity.tld/consume-assertion"], - "loa" => [ + "entity_id" => "https://entity.tld/id", + "public_key" => "MIIE...", + "acs" => ["https://entity.tld/consume-assertion"], + "loa" => [ "__default__" => "https://entity.tld/authentication/loa2", ], - "second_factor_only" => false, + "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [], + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => [], ], ], ], - 'sraa' => ['20394-4320423-439248324'], + 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/missing_email_template_locale.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/missing_email_template_locale.php index 4a4024fb1..e8581de28 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/missing_email_template_locale.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/missing_email_template_locale.php @@ -18,32 +18,32 @@ return [ 'expectedPropertyPath' => 'email_templates.confirm_email', - 'configuration' => [ + 'configuration' => [ 'gateway' => [ 'identity_providers' => [], - 'service_providers' => [ + 'service_providers' => [ [ - "entity_id" => "https://entity.tld/id", - "public_key" => "MIIE...", - "acs" => ["https://entity.tld/consume-assertion"], - "loa" => [ + "entity_id" => "https://entity.tld/id", + "public_key" => "MIIE...", + "acs" => ["https://entity.tld/consume-assertion"], + "loa" => [ "__default__" => "https://entity.tld/authentication/loa2", ], - "second_factor_only" => false, + "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [], + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => [], ], ], ], - 'sraa' => ['20394-4320423-439248324'], + 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['nl_NL' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['nl_NL' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], 'recovery_token_created' => ['en_GB' => 'Code {{ commonName }}'], diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/missing_email_template_registration_code.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/missing_email_template_registration_code.php index 4719a64c6..98cbdb2b6 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/missing_email_template_registration_code.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/missing_email_template_registration_code.php @@ -18,28 +18,28 @@ return [ 'expectedPropertyPath' => 'email_templates', - 'configuration' => [ - 'gateway' => [ + 'configuration' => [ + 'gateway' => [ 'identity_providers' => [], - 'service_providers' => [ + 'service_providers' => [ [ - "entity_id" => "https://entity.tld/id", - "public_key" => "MIIE...", - "acs" => ["https://entity.tld/consume-assertion"], - "loa" => [ + "entity_id" => "https://entity.tld/id", + "public_key" => "MIIE...", + "acs" => ["https://entity.tld/consume-assertion"], + "loa" => [ "__default__" => "https://entity.tld/authentication/loa2", ], - "second_factor_only" => false, + "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [], + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => [], ], ], ], - 'sraa' => ['20394-4320423-439248324'], + 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], ], ], diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/missing_email_template_second_factor_revoked.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/missing_email_template_second_factor_revoked.php index e22fd79bb..9ad984d75 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/missing_email_template_second_factor_revoked.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/missing_email_template_second_factor_revoked.php @@ -18,30 +18,30 @@ return [ 'expectedPropertyPath' => 'email_templates', - 'configuration' => [ - 'gateway' => [ + 'configuration' => [ + 'gateway' => [ 'identity_providers' => [], - 'service_providers' => [ + 'service_providers' => [ [ - "entity_id" => "https://entity.tld/id", - "public_key" => "MIIE...", - "acs" => ["https://entity.tld/consume-assertion"], - "loa" => [ + "entity_id" => "https://entity.tld/id", + "public_key" => "MIIE...", + "acs" => ["https://entity.tld/consume-assertion"], + "loa" => [ "__default__" => "https://entity.tld/authentication/loa2", ], - "second_factor_only" => false, + "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [], + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => [], ], ], ], - 'sraa' => ['20394-4320423-439248324'], + 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], ], ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/missing_sps.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/missing_sps.php index 37c4689a0..f16ce8de0 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/missing_sps.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/missing_sps.php @@ -24,13 +24,13 @@ ], 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], - ] + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_email_templates.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_email_templates.php index 9b7b4c0ee..3cd10dc10 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_email_templates.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_email_templates.php @@ -18,8 +18,8 @@ return [ 'expectedPropertyPath' => '(root)', - 'configuration' => [ + 'configuration' => [ 'gateway' => [], - 'sraa' => [], + 'sraa' => [], ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_gateway.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_gateway.php index 38d80ffbc..eaeb13e57 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_gateway.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_gateway.php @@ -18,5 +18,5 @@ return [ 'expectedPropertyPath' => '(root)', - 'configuration' => [], + 'configuration' => [], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_sp_acs.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_sp_acs.php index fd487ef6a..53036be90 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_sp_acs.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_sp_acs.php @@ -23,27 +23,27 @@ 'identity_providers' => [], 'service_providers' => [ [ - "entity_id" => "https://entity.tld/id", + "entity_id" => "https://entity.tld/id", "public_key" => "MIIE...", - "loa" => [ + "loa" => [ "__default__" => "https://entity.tld/authentication/loa2", ], "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [] - ] + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => [], + ], ], ], 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], - ] + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_sp_assertion_encryption_enabled.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_sp_assertion_encryption_enabled.php index 344e8fb21..2ad4b032b 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_sp_assertion_encryption_enabled.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_sp_assertion_encryption_enabled.php @@ -23,27 +23,27 @@ 'identity_providers' => [], 'service_providers' => [ [ - "entity_id" => "https://entity.tld/id", + "entity_id" => "https://entity.tld/id", "public_key" => "MIIE...", - "acs" => ["https://entity.tld/consume-assertion"], - "loa" => [ + "acs" => ["https://entity.tld/consume-assertion"], + "loa" => [ "__default__" => "https://entity.tld/authentication/loa2", ], "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "blacklisted_encryption_algorithms" => [] - ] + "blacklisted_encryption_algorithms" => [], + ], ], ], 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], - ] + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_sp_blacklisted_encryption_algorithms.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_sp_blacklisted_encryption_algorithms.php index e4ea8cf39..f2916e2a6 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_sp_blacklisted_encryption_algorithms.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_sp_blacklisted_encryption_algorithms.php @@ -23,27 +23,27 @@ 'identity_providers' => [], 'service_providers' => [ [ - "entity_id" => "https://entity.tld/id", + "entity_id" => "https://entity.tld/id", "public_key" => "MIIE...", - "acs" => ["https://entity.tld/consume-assertion"], - "loa" => [ + "acs" => ["https://entity.tld/consume-assertion"], + "loa" => [ "__default__" => "https://entity.tld/authentication/loa2", ], "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - ] + "assertion_encryption_enabled" => false, + ], ], ], 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], - ] + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_sp_entity_id.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_sp_entity_id.php index 15a1623b0..95edd3e80 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_sp_entity_id.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_sp_entity_id.php @@ -24,26 +24,26 @@ 'service_providers' => [ [ "public_key" => "MIIE...", - "acs" => ["https://entity.tld/consume-assertion"], - "loa" => [ + "acs" => ["https://entity.tld/consume-assertion"], + "loa" => [ "__default__" => "https://entity.tld/authentication/loa2", ], "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [] - ] + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => [], + ], ], ], 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], - ] + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_sp_loas.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_sp_loas.php index e9113338d..ad0fd331a 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_sp_loas.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_sp_loas.php @@ -23,25 +23,25 @@ 'identity_providers' => [], 'service_providers' => [ [ - "entity_id" => "https://entity.tld/id", + "entity_id" => "https://entity.tld/id", "public_key" => "MIIE...", - "acs" => ["https://entity.tld/consume-assertion"], + "acs" => ["https://entity.tld/consume-assertion"], "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [] - ] + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => [], + ], ], ], 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], - ] + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_sp_public_key.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_sp_public_key.php index 5183de8c3..3a5df34b7 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_sp_public_key.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_sp_public_key.php @@ -23,27 +23,27 @@ 'identity_providers' => [], 'service_providers' => [ [ - "entity_id" => "https://entity.tld/id", - "acs" => ["https://entity.tld/consume-assertion"], - "loa" => [ + "entity_id" => "https://entity.tld/id", + "acs" => ["https://entity.tld/consume-assertion"], + "loa" => [ "__default__" => "https://entity.tld/authentication/loa2", ], "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [] - ] + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => [], + ], ], ], 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], - ] + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_sps.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_sps.php index 561e6e4c3..904ec0eb3 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_sps.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_sps.php @@ -25,13 +25,13 @@ ], 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], - ] + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_sraa.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_sraa.php index a4e1e2fad..ecce9fab5 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_sraa.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_sraa.php @@ -18,7 +18,7 @@ return [ 'expectedPropertyPath' => '(root)', - 'configuration' => [ + 'configuration' => [ 'gateway' => [], - ] + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_superfluous_keys_email_template.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_superfluous_keys_email_template.php index fe0fe3ca8..8bfb9ae62 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_superfluous_keys_email_template.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_superfluous_keys_email_template.php @@ -23,29 +23,29 @@ 'identity_providers' => [], 'service_providers' => [ [ - "entity_id" => "https://entity.tld/id", + "entity_id" => "https://entity.tld/id", "public_key" => "MIIE...", - "acs" => ["https://entity.tld/consume-assertion"], - "loa" => [ + "acs" => ["https://entity.tld/consume-assertion"], + "loa" => [ "__default__" => "https://entity.tld/authentication/loa2", ], "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [] - ] + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => [], + ], ], ], 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'superfluous_key' => 'lemon', - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'superfluous_key' => 'lemon', + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], - ] + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_superfluous_keys_gateway.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_superfluous_keys_gateway.php index 60ecd680d..c7178f1c5 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_superfluous_keys_gateway.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_superfluous_keys_gateway.php @@ -24,28 +24,28 @@ 'identity_providers' => [], 'service_providers' => [ [ - "entity_id" => "https://entity.tld/id", + "entity_id" => "https://entity.tld/id", "public_key" => "MIIE...", - "acs" => ["https://entity.tld/consume-assertion"], - "loa" => [ + "acs" => ["https://entity.tld/consume-assertion"], + "loa" => [ "__default__" => "https://entity.tld/authentication/loa2", ], "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [] - ] + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => [], + ], ], ], 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], - ] + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_superfluous_keys_gateway_sp.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_superfluous_keys_gateway_sp.php index 0c0243a21..020413aa2 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_superfluous_keys_gateway_sp.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_superfluous_keys_gateway_sp.php @@ -24,28 +24,28 @@ 'service_providers' => [ [ 'superfluous_key' => 'lemon', - "entity_id" => "https://entity.tld/id", + "entity_id" => "https://entity.tld/id", "public_key" => "MIIE...", - "acs" => ["https://entity.tld/consume-assertion"], - "loa" => [ + "acs" => ["https://entity.tld/consume-assertion"], + "loa" => [ "__default__" => "https://entity.tld/authentication/loa2", ], "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [] - ] + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => [], + ], ], ], 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], - ] + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_superfluous_keys_root.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_superfluous_keys_root.php index 9001cd862..3cd189021 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_superfluous_keys_root.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/no_superfluous_keys_root.php @@ -24,28 +24,28 @@ 'identity_providers' => [], 'service_providers' => [ [ - "entity_id" => "https://entity.tld/id", + "entity_id" => "https://entity.tld/id", "public_key" => "MIIE...", - "acs" => ["https://entity.tld/consume-assertion"], - "loa" => [ + "acs" => ["https://entity.tld/consume-assertion"], + "loa" => [ "__default__" => "https://entity.tld/authentication/loa2", ], "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [] - ] + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => [], + ], ], ], 'sraa' => ['20394-4320423-439248324'], 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], + 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], + 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], + 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], + 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], ], - ] + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/not_array_email_templates.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/not_array_email_templates.php index 2bb90a029..4cd6698a0 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/not_array_email_templates.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/not_array_email_templates.php @@ -18,8 +18,8 @@ return [ 'expectedPropertyPath' => 'email_templates', - 'configuration' => [ - 'gateway' => [ + 'configuration' => [ + 'gateway' => [ 'identity_providers' => [], 'service_providers' => [ [ @@ -27,16 +27,16 @@ 'public_key' => 'MIIEEE...', 'acs' => ['http://entity.tld/consume-assertion'], 'loa' => [ - '__default__' => 'http://gateway.tld/loa/1' + '__default__' => 'http://gateway.tld/loa/1', ], "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [] + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => [], ], ], ], - 'sraa' => [], + 'sraa' => [], 'email_templates' => null, - ] + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/not_array_gateway.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/not_array_gateway.php index 0dfc5aec1..3e1fe7757 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/not_array_gateway.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/not_array_gateway.php @@ -18,9 +18,9 @@ return [ 'expectedPropertyPath' => 'gateway', - 'configuration' => [ - 'gateway' => null, - 'sraa' => [], + 'configuration' => [ + 'gateway' => null, + 'sraa' => [], 'email_templates' => [], - ] + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/not_array_sraa.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/not_array_sraa.php index 5320fee28..b0f3b1822 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/not_array_sraa.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/not_array_sraa.php @@ -18,8 +18,8 @@ return [ 'expectedPropertyPath' => 'sraa', - 'configuration' => [ - 'gateway' => [ + 'configuration' => [ + 'gateway' => [ 'identity_providers' => [], 'service_providers' => [ [ @@ -27,16 +27,16 @@ 'public_key' => 'MIIEEE...', 'acs' => ['http://entity.tld/consume-assertion'], 'loa' => [ - '__default__' => 'http://gateway.tld/loa/1' + '__default__' => 'http://gateway.tld/loa/1', ], "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [] + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => [], ], ], ], - 'sraa' => null, + 'sraa' => null, 'email_templates' => [], - ] + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/not_strings_sraa.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/not_strings_sraa.php index 6732cc31c..bc5c4cce9 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/not_strings_sraa.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/not_strings_sraa.php @@ -18,8 +18,8 @@ return [ 'expectedPropertyPath' => 'sraa[0]', - 'configuration' => [ - 'gateway' => [ + 'configuration' => [ + 'gateway' => [ 'identity_providers' => [], 'service_providers' => [ [ @@ -27,18 +27,18 @@ 'public_key' => 'MIIEEE...', 'acs' => ['http://entity.tld/consume-assertion'], 'loa' => [ - '__default__' => 'http://gateway.tld/loa/1' + '__default__' => 'http://gateway.tld/loa/1', ], "second_factor_only" => false, "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [] + "assertion_encryption_enabled" => false, + "blacklisted_encryption_algorithms" => [], ], ], ], - 'sraa' => [ - 9 + 'sraa' => [ + 9, ], 'email_templates' => [], - ] + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/null.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/null.php index 1521c384b..4acd4e5ab 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/null.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/null.php @@ -18,5 +18,5 @@ return [ 'expectedPropertyPath' => '(root)', - 'configuration' => null + 'configuration' => null, ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/greater_thant_zero_number_of_tokens_per_identity_option.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/greater_thant_zero_number_of_tokens_per_identity_option.php index af9f38f62..8278042d9 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/greater_thant_zero_number_of_tokens_per_identity_option.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/greater_thant_zero_number_of_tokens_per_identity_option.php @@ -29,6 +29,6 @@ 'allow_self_asserted_tokens' => false, 'number_of_tokens_per_identity' => -1, 'allowed_second_factors' => [], - ] - ] + ], + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/missing_allowed_second_factors_option.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/missing_allowed_second_factors_option.php index 908bb25af..8669955d3 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/missing_allowed_second_factors_option.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/missing_allowed_second_factors_option.php @@ -28,6 +28,6 @@ 'sso_on_2fa' => false, 'allow_self_asserted_tokens' => false, 'number_of_tokens_per_identity' => 1, - ] - ] + ], + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/missing_show_raa_contact_information_option.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/missing_show_raa_contact_information_option.php index fbfeeb3d5..b17bbeca7 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/missing_show_raa_contact_information_option.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/missing_show_raa_contact_information_option.php @@ -28,6 +28,6 @@ 'allow_self_asserted_tokens' => false, 'number_of_tokens_per_identity' => 2, 'allowed_second_factors' => [], - ] - ] + ], + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/missing_use_ra_locations_option.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/missing_use_ra_locations_option.php index f3a9b9cc2..b26a29bda 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/missing_use_ra_locations_option.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/missing_use_ra_locations_option.php @@ -28,6 +28,6 @@ 'allow_self_asserted_tokens' => false, 'number_of_tokens_per_identity' => 1, 'allowed_second_factors' => [], - ] - ] + ], + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_array_allowed_second_factors_option.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_array_allowed_second_factors_option.php index cd2cb17d0..f4b4a7650 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_array_allowed_second_factors_option.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_array_allowed_second_factors_option.php @@ -29,6 +29,6 @@ 'allow_self_asserted_tokens' => false, 'number_of_tokens_per_identity' => 3, 'allowed_second_factors' => false, - ] - ] + ], + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_array_use_raa.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_array_use_raa.php index 2f391a4ec..97ff3f256 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_array_use_raa.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_array_use_raa.php @@ -32,6 +32,6 @@ "use_ra" => [], "use_raa" => "surfnet.nl", "select_raa" => ["surfnet.nl"], - ] - ] + ], + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_boolean_allow_self_asserted_tokens_option.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_boolean_allow_self_asserted_tokens_option.php index b36257646..1ba6fecd6 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_boolean_allow_self_asserted_tokens_option.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_boolean_allow_self_asserted_tokens_option.php @@ -27,6 +27,6 @@ 'allow_self_asserted_tokens' => "false", 'number_of_tokens_per_identity' => 1, 'allowed_second_factors' => [], - ] - ] + ], + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_boolean_self_vet_option.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_boolean_self_vet_option.php index cef3023d0..81b911bd0 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_boolean_self_vet_option.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_boolean_self_vet_option.php @@ -27,6 +27,6 @@ 'self_vet' => 'yes', 'number_of_tokens_per_identity' => 1, 'allowed_second_factors' => [], - ] - ] + ], + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_boolean_show_raa_contact_information_option.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_boolean_show_raa_contact_information_option.php index d9b5e7712..415c8468d 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_boolean_show_raa_contact_information_option.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_boolean_show_raa_contact_information_option.php @@ -30,5 +30,5 @@ 'number_of_tokens_per_identity' => 1, 'allowed_second_factors' => [], ], - ] + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_boolean_sso_on_2fa_option.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_boolean_sso_on_2fa_option.php index 52ff933be..c4941d3d8 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_boolean_sso_on_2fa_option.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_boolean_sso_on_2fa_option.php @@ -27,6 +27,6 @@ 'sso_on_2fa' => -1, 'number_of_tokens_per_identity' => 1, 'allowed_second_factors' => [], - ] - ] + ], + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_boolean_use_ra_locations_option.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_boolean_use_ra_locations_option.php index fb9862cb1..12f2fbcaf 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_boolean_use_ra_locations_option.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_boolean_use_ra_locations_option.php @@ -29,6 +29,6 @@ 'allow_self_asserted_tokens' => false, 'number_of_tokens_per_identity' => 2, 'allowed_second_factors' => [], - ] - ] + ], + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_integer_ii_number_of_tokens_per_identity_option.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_integer_ii_number_of_tokens_per_identity_option.php index 3ad445139..44e6a382b 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_integer_ii_number_of_tokens_per_identity_option.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_integer_ii_number_of_tokens_per_identity_option.php @@ -29,6 +29,6 @@ 'allow_self_asserted_tokens' => false, 'number_of_tokens_per_identity' => 3.1415, 'allowed_second_factors' => [], - ] - ] + ], + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_integer_number_of_tokens_per_identity_option.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_integer_number_of_tokens_per_identity_option.php index 98a092c45..697727fc6 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_integer_number_of_tokens_per_identity_option.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_integer_number_of_tokens_per_identity_option.php @@ -29,6 +29,6 @@ 'allow_self_asserted_tokens' => false, 'number_of_tokens_per_identity' => true, 'allowed_second_factors' => [], - ] - ] + ], + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_strings_allowed_second_factors_option.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_strings_allowed_second_factors_option.php index 60830d867..49c7c8492 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_strings_allowed_second_factors_option.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_strings_allowed_second_factors_option.php @@ -32,7 +32,7 @@ 1, 2, 3, - ] - ] - ] + ], + ], + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_valid_second_factor_types_allowed_second_factors_option.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_valid_second_factor_types_allowed_second_factors_option.php index c4ad0e57b..68636c6d5 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_valid_second_factor_types_allowed_second_factors_option.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_valid_second_factor_types_allowed_second_factors_option.php @@ -29,8 +29,8 @@ 'allow_self_asserted_tokens' => false, 'number_of_tokens_per_identity' => 4, 'allowed_second_factors' => [ - 'faux_second_factor' + 'faux_second_factor', ], - ] - ] + ], + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_whitelisted_institution_use_raa.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_whitelisted_institution_use_raa.php index 2be4f6d5f..4b13a20a9 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_whitelisted_institution_use_raa.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_whitelisted_institution_use_raa.php @@ -32,6 +32,6 @@ "use_ra" => ["surfnet.nl"], "use_raa" => ["example.com"], "select_raa" => ["surfnet.nl"], - ] - ] + ], + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/with_extra_options.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/with_extra_options.php index bee84c9d3..2fa69bb1e 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/with_extra_options.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/with_extra_options.php @@ -30,6 +30,6 @@ 'number_of_tokens_per_identity' => 2, 'allowed_second_factors' => [], 'extra_option' => 'cannot be handled', - ] - ] + ], + ], ]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ReconfigureInstitutionRequestValidatorTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ReconfigureInstitutionRequestValidatorTest.php index 06fef08c0..b41a3e9bf 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ReconfigureInstitutionRequestValidatorTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ReconfigureInstitutionRequestValidatorTest.php @@ -48,7 +48,7 @@ public function invalidReconfigureInstitutionRequests(): array $dataSet[basename($invalidConfiguration)] = [ $fixture['reconfigureInstitutionRequest'], $fixture['expectedPropertyPath'], - $fixture['expectErrorMessageToContain'] + $fixture['expectErrorMessageToContain'], ]; } @@ -61,14 +61,13 @@ public function invalidReconfigureInstitutionRequests(): array * @dataProvider invalidReconfigureInstitutionRequests * @param array $reconfigureRequest * @param string $expectedPropertyPath - * @param string $expectErrorMessageToContain */ public function it_rejects_invalid_configuration( $reconfigureRequest, $expectedPropertyPath, - string $expectErrorMessageToContain + string $expectErrorMessageToContain, ): void { - $existingInstitution = ConfiguredInstitution::createFrom(new Institution('surfnet.nl')); + $existingInstitution = ConfiguredInstitution::createFrom(new Institution('surfnet.nl')); $anotherExistingInstitution = ConfiguredInstitution::createFrom(new Institution('another-organisation.test')); $configuredInstitutionServiceMock = Mockery::mock(ConfiguredInstitutionService::class); @@ -76,7 +75,7 @@ public function it_rejects_invalid_configuration( ->shouldReceive('getAll') ->andReturn([ $existingInstitution, - $anotherExistingInstitution + $anotherExistingInstitution, ]); $builder = Mockery::mock(ConstraintViolationBuilderInterface::class); @@ -91,12 +90,12 @@ public function it_rejects_invalid_configuration( $whitelistedInstitution = WhitelistEntry::createFrom(new IdentityInstitution('surfnet.nl')); $whitelistServiceMock = Mockery::mock(WhitelistService::class); - $whitelistServiceMock->shouldReceive('getAllEntries')->andReturn(new ArrayCollection([$whitelistedInstitution])); + $whitelistServiceMock->shouldReceive('getAllEntries')->andReturn(new ArrayCollection([$whitelistedInstitution]),); $validator = new ReconfigureInstitutionRequestValidator( $configuredInstitutionServiceMock, $secondFactorTypeServiceMock, - $whitelistServiceMock + $whitelistServiceMock, ); $validator->initialize($context); $validator->validate($reconfigureRequest, new ValidReconfigureInstitutionsRequest); @@ -105,7 +104,7 @@ public function it_rejects_invalid_configuration( $this->assertEquals( $expectedPropertyPath, $actualPropertyPath, - sprintf('Actual path to erroneous property does not match expected path (%s)', $actualErrorMessage) + sprintf('Actual path to erroneous property does not match expected path (%s)', $actualErrorMessage), ); $this->assertStringContainsString( $expectErrorMessageToContain, @@ -113,8 +112,8 @@ public function it_rejects_invalid_configuration( sprintf( 'The error message (%s) does not contain the expected message (%s)', $actualErrorMessage, - $expectErrorMessageToContain - ) + $expectErrorMessageToContain, + ), ); } @@ -149,7 +148,7 @@ public function reconfigure_institution_request_cannot_contain_institutions_that $validator = new ReconfigureInstitutionRequestValidator( $configuredInstitutionServiceMock, $secondFactorTypeServiceMock, - $whitelistServiceMock + $whitelistServiceMock, ); $validator->initialize($context); @@ -169,14 +168,14 @@ public function validation_for_existing_institutions_is_done_case_insensitively( $invalidRequest = [ $differentlyCasedButSameInstitution => [ - 'use_ra_locations' => false, + 'use_ra_locations' => false, 'show_raa_contact_information' => true, - 'verify_email' => false, + 'verify_email' => false, 'sso_on_2fa' => false, 'self_vet' => false, 'allow_self_asserted_tokens' => false, 'number_of_tokens_per_identity' => 1, - 'allowed_second_factors' => [], + 'allowed_second_factors' => [], ], ]; @@ -198,7 +197,7 @@ public function validation_for_existing_institutions_is_done_case_insensitively( $validator = new ReconfigureInstitutionRequestValidator( $configuredInstitutionServiceMock, $secondFactorTypeServiceMock, - $whitelistServiceMock + $whitelistServiceMock, ); $validator->initialize($context); @@ -216,14 +215,14 @@ public function valid_reconfigure_institution_requests_do_not_cause_any_violatio $institution = 'surfnet.nl'; $validRequest = [ $institution => [ - 'use_ra_locations' => true, + 'use_ra_locations' => true, 'show_raa_contact_information' => true, - 'verify_email' => true, + 'verify_email' => true, 'self_vet' => false, 'sso_on_2fa' => false, 'allow_self_asserted_tokens' => false, 'number_of_tokens_per_identity' => 3, - 'allowed_second_factors' => [], + 'allowed_second_factors' => [], ], ]; @@ -241,11 +240,11 @@ public function valid_reconfigure_institution_requests_do_not_cause_any_violatio $secondFactorTypeServiceMock = Mockery::mock(SecondFactorTypeService::class); $secondFactorTypeServiceMock->shouldReceive('getAvailableSecondFactorTypes')->andReturn(['yubikey', 'sms']); $whitelistServiceMock = Mockery::mock(WhitelistService::class); - $whitelistServiceMock->shouldReceive('getAllEntries')->andReturn(new ArrayCollection([$whitelistedInstitution])); + $whitelistServiceMock->shouldReceive('getAllEntries')->andReturn(new ArrayCollection([$whitelistedInstitution]),); $validator = new ReconfigureInstitutionRequestValidator( $configuredInstitutionServiceMock, $secondFactorTypeServiceMock, - $whitelistServiceMock + $whitelistServiceMock, ); $validator->initialize($context); $validator->validate($validRequest, new ValidReconfigureInstitutionsRequest); @@ -255,17 +254,16 @@ public function valid_reconfigure_institution_requests_do_not_cause_any_violatio } /** - * @param mixed &$spy * @return MatcherAbstract */ - private function spy(&$spy) + private function spy(mixed &$spy) { return Mockery::on( function ($value) use (&$spy): bool { $spy = $value; return true; - } + }, ); } } diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Assert.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Assert.php index 00e6cafa1..96adb9048 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Assert.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Assert.php @@ -37,12 +37,17 @@ public static function keysMatch(array $value, array $keys, $message = null, $pr 0, $propertyPath, $value, - ['expected' => $keys, 'actual' => $keysOfValue] + ['expected' => $keys, 'actual' => $keysOfValue], ); } - public static function requiredAndOptionalOptions(array $value, array $required, array $optional, $message = null, $propertyPath = null): void - { + public static function requiredAndOptionalOptions( + array $value, + array $required, + array $optional, + $message = null, + $propertyPath = null, + ): void { // Filter out the optional items from the value array $requiredValueSet = array_diff_key($value, array_flip($optional)); @@ -62,7 +67,7 @@ public static function requiredAndOptionalOptions(array $value, array $required, 0, $propertyPath, $value, - ['expected' => $optional, 'actual' => $keysOfValue] + ['expected' => $optional, 'actual' => $keysOfValue], ); } } diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationStructureValidator.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationStructureValidator.php index 396d070cc..2af9aa23d 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationStructureValidator.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationStructureValidator.php @@ -33,16 +33,10 @@ */ class ConfigurationStructureValidator extends ConstraintValidator { - private GatewayConfigurationValidator $gatewayConfigurationValidator; - - private EmailTemplatesConfigurationValidator $emailTemplatesConfigurationValidator; - public function __construct( - GatewayConfigurationValidator $gatewayConfigurationValidator, - EmailTemplatesConfigurationValidator $emailTemplatesConfigurationValidator + private readonly GatewayConfigurationValidator $gatewayConfigurationValidator, + private readonly EmailTemplatesConfigurationValidator $emailTemplatesConfigurationValidator, ) { - $this->gatewayConfigurationValidator = $gatewayConfigurationValidator; - $this->emailTemplatesConfigurationValidator = $emailTemplatesConfigurationValidator; } public function validate($value, Constraint $constraint): void @@ -81,7 +75,7 @@ public function validateRoot($configuration): void $configuration, $acceptedProperties, sprintf("Expected only properties '%s'", implode(',', $acceptedProperties)), - '(root)' + '(root)', ); $this->validateGatewayConfiguration($configuration, 'gateway'); @@ -101,14 +95,14 @@ private function validateSraaConfiguration(array $configuration, string $propert Assertion::isArray( $configuration['sraa'], 'Property sraa must have an array of name_ids (string) as value', - $propertyPath + $propertyPath, ); foreach ($configuration['sraa'] as $index => $value) { Assertion::string( $value, 'value must be a string (the name_id of the SRAA)', - $propertyPath . '[' . $index. ']' + $propertyPath . '[' . $index . ']', ); } } @@ -118,7 +112,7 @@ private function validateEmailTemplatesConfiguration(array $configuration, strin Assertion::isArray( $configuration['email_templates'], 'Property "email_templates" must have an object as value', - $propertyPath + $propertyPath, ); $this->emailTemplatesConfigurationValidator->validate($configuration['email_templates'], $propertyPath); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationValidatorInterface.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationValidatorInterface.php index 29fdc5f3d..2a2549395 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationValidatorInterface.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationValidatorInterface.php @@ -23,7 +23,6 @@ interface ConfigurationValidatorInterface { /** - * @param array $configuration * @param string $propertyPath * @return void * @throws InvalidArgumentException diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/EmailTemplatesConfigurationValidator.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/EmailTemplatesConfigurationValidator.php index 2045a994c..0655fd118 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/EmailTemplatesConfigurationValidator.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/EmailTemplatesConfigurationValidator.php @@ -24,7 +24,7 @@ final class EmailTemplatesConfigurationValidator implements ConfigurationValidatorInterface { - private string $requiredLocale; + private readonly string $requiredLocale; /** * @param string $requiredLocale @@ -56,14 +56,14 @@ public function validate(array $configuration, $propertyPath): void $configuration, $templateNames, sprintf("Expected only templates '%s'", implode(',', $templateNames)), - $propertyPath + $propertyPath, ); foreach ($templateNames as $templateName) { Assertion::isArray( $configuration[$templateName], 'Property "' . $templateName . '" must have an object as value', - $propertyPath + $propertyPath, ); $templatePropertyPath = $propertyPath . '.' . $templateName; @@ -72,7 +72,7 @@ public function validate(array $configuration, $propertyPath): void $configuration[$templateName], $this->requiredLocale, "Required property '" . $this->requiredLocale . "' is missing", - $templatePropertyPath + $templatePropertyPath, ); foreach ($configuration[$templateName] as $locale => $template) { @@ -80,12 +80,12 @@ public function validate(array $configuration, $propertyPath): void Assertion::string( $locale, 'Locale must be string', - $localePropertyPath + $localePropertyPath, ); Assertion::string( $template, "Property '" . $this->requiredLocale . "' must have a string as value", - $localePropertyPath + $localePropertyPath, ); } } diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/GatewayConfigurationValidator.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/GatewayConfigurationValidator.php index a7832a9db..2e7ee62b2 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/GatewayConfigurationValidator.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/GatewayConfigurationValidator.php @@ -23,20 +23,14 @@ class GatewayConfigurationValidator implements ConfigurationValidatorInterface { - private IdentityProviderConfigurationValidator $identityProviderConfigurationValidator; - - private ServiceProviderConfigurationValidator $serviceProviderConfigurationValidator; - public function __construct( - IdentityProviderConfigurationValidator $identityProviderConfigurationValidator, - ServiceProviderConfigurationValidator $serviceProviderConfigurationValidator + private readonly IdentityProviderConfigurationValidator $identityProviderConfigurationValidator, + private readonly ServiceProviderConfigurationValidator $serviceProviderConfigurationValidator, ) { - $this->identityProviderConfigurationValidator = $identityProviderConfigurationValidator; - $this->serviceProviderConfigurationValidator = $serviceProviderConfigurationValidator; } /** - * @param array $gatewayConfiguration + * @param array $gatewayConfiguration * @param string $propertyPath */ public function validate(array $gatewayConfiguration, $propertyPath): void @@ -45,16 +39,16 @@ public function validate(array $gatewayConfiguration, $propertyPath): void $gatewayConfiguration, ['service_providers', 'identity_providers'], "Expected properties 'service_providers' and 'identity_providers'", - $propertyPath + $propertyPath, ); $this->validateIdentityProviders( $gatewayConfiguration['identity_providers'], - $propertyPath . '.identity_providers' + $propertyPath . '.identity_providers', ); $this->validateServiceProviders( $gatewayConfiguration['service_providers'], - $propertyPath . '.service_providers' + $propertyPath . '.service_providers', ); } @@ -63,7 +57,7 @@ private function validateIdentityProviders($identityProviders, string $propertyP Assertion::isArray( $identityProviders, 'identity_providers must have an array of identity provider configurations as value', - $propertyPath + $propertyPath, ); foreach ($identityProviders as $index => $identityProvider) { @@ -79,12 +73,12 @@ private function validateServiceProviders($serviceProviders, string $propertyPat Assertion::isArray( $serviceProviders, 'service_providers must have an array of service provider configurations as value', - $propertyPath + $propertyPath, ); Assertion::true( count($serviceProviders) >= 1, 'at least one service_provider must be configured', - $propertyPath + $propertyPath, ); foreach ($serviceProviders as $index => $serviceProvider) { diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/IdentityProviderConfigurationValidator.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/IdentityProviderConfigurationValidator.php index 0ca6fa23b..b4ba68525 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/IdentityProviderConfigurationValidator.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/IdentityProviderConfigurationValidator.php @@ -30,7 +30,7 @@ public function validate(array $configuration, $propertyPath): void $requiredProperties = [ 'entity_id', 'loa', - 'use_pdp' + 'use_pdp', ]; if (empty($configuration['use_pdp'])) { @@ -42,9 +42,9 @@ public function validate(array $configuration, $propertyPath): void $requiredProperties, sprintf( "The following properties must be present: '%s'; other properties are not supported", - implode("', '", $requiredProperties) + implode("', '", $requiredProperties), ), - $propertyPath + $propertyPath, ); $this->validateStringValue($configuration, 'entity_id', $propertyPath); @@ -52,37 +52,28 @@ public function validate(array $configuration, $propertyPath): void $this->validateBooleanValue($configuration, 'use_pdp', $propertyPath); } - /** - * @param array $configuration - * @param string $name - * @param string $propertyPath - */ private function validateStringValue(array $configuration, string $name, string $propertyPath): void { Assertion::string($configuration[$name], 'value must be a string', $propertyPath . '.' . $name); } - /** - * @param array $configuration - * @param string $name - * @param string $propertyPath - */ private function validateBooleanValue(array $configuration, string $name, string $propertyPath): void { Assertion::boolean($configuration[$name], 'value must be a boolean', $propertyPath . '.' . $name); } - /** - * @param array $configuration - * @param string $propertyPath - */ private function validateLoaDefinition(array $configuration, string $propertyPath): void { $value = $configuration['loa']; - $path = $propertyPath . '.loa'; + $path = $propertyPath . '.loa'; Assertion::isArray($value, 'must be an object', $path); - Assertion::keyExists($value, '__default__', "must have the default loa set on the '__default__' property", $path); + Assertion::keyExists( + $value, + '__default__', + "must have the default loa set on the '__default__' property", + $path, + ); Assertion::allString($value, 'all properties must contain strings as values', $path); } } diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php index 63f4e2499..cbaa2bbde 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php @@ -35,30 +35,21 @@ final class ReconfigureInstitutionRequestValidator extends ConstraintValidator { - private ConfiguredInstitutionService $configuredInstitutionsService; - /** * @var string[] internal cache, access through getConfiguredInstitutions() */ private ?array $configuredInstitutions = null; - private SecondFactorTypeService $secondFactorTypeService; - - private WhitelistService $whitelistService; - /** * @var string[] internal cache, access through getWhitelistedInstitutions() */ private ?array $whitelistedInstitutions = null; public function __construct( - ConfiguredInstitutionService $configuredInstitutionsService, - SecondFactorTypeService $secondFactorTypeService, - WhitelistService $whitelistService + private readonly ConfiguredInstitutionService $configuredInstitutionsService, + private readonly SecondFactorTypeService $secondFactorTypeService, + private readonly WhitelistService $whitelistService, ) { - $this->configuredInstitutionsService = $configuredInstitutionsService; - $this->secondFactorTypeService = $secondFactorTypeService; - $this->whitelistService = $whitelistService; } public function validate($value, Constraint $constraint): void @@ -91,9 +82,6 @@ public function validateRoot(array $configuration): void } } - /** - * @param array $institutions - */ public function validateInstitutionsExist(array $institutions): void { $configuredInstitutions = $this->getConfiguredInstitutions(); @@ -102,7 +90,7 @@ public function validateInstitutionsExist(array $institutions): void if ($nonExistentInstitutions !== []) { throw new InvalidArgumentException( - sprintf('Cannot reconfigure non-existent institution(s): %s', implode(', ', $nonExistentInstitutions)) + sprintf('Cannot reconfigure non-existent institution(s): %s', implode(', ', $nonExistentInstitutions)), ); } } @@ -134,72 +122,72 @@ public function validateInstitutionConfigurationOptions(array $options, string $ 'Invalid option(s) for "%s". Required options: "%s"; Optional options: "%s"', $institution, implode(', ', $requiredOptions), - implode(', ', $optionalOptions) + implode(', ', $optionalOptions), ), - $propertyPath + $propertyPath, ); Assertion::boolean( $options['use_ra_locations'], sprintf('Option "use_ra_locations" for "%s" must be a boolean value', $institution), - $propertyPath + $propertyPath, ); Assertion::boolean( $options['show_raa_contact_information'], sprintf('Option "show_raa_contact_information" for "%s" must be a boolean value', $institution), - $propertyPath + $propertyPath, ); Assertion::boolean( $options['verify_email'], sprintf('Option "verify_email" for "%s" must be a boolean value', $institution), - $propertyPath + $propertyPath, ); if (isset($options['self_vet'])) { Assertion::boolean( $options['self_vet'], sprintf('Option "self_vet" for "%s" must be a boolean value', $institution), - $propertyPath + $propertyPath, ); } if (isset($options['sso_on_2fa'])) { Assertion::boolean( $options['sso_on_2fa'], sprintf('Option "sso_on_2fa" for "%s" must be a boolean value', $institution), - $propertyPath + $propertyPath, ); } if (isset($options['allow_self_asserted_tokens'])) { Assertion::nullOrBoolean( $options['allow_self_asserted_tokens'], sprintf('Option "allow_self_asserted_tokens" for "%s" must be a boolean value', $institution), - $propertyPath + $propertyPath, ); } Assertion::integer( $options['number_of_tokens_per_identity'], sprintf('Option "number_of_tokens_per_identity" for "%s" must be an integer value', $institution), - $propertyPath + $propertyPath, ); Assertion::min( $options['number_of_tokens_per_identity'], 0, sprintf('Option "number_of_tokens_per_identity" for "%s" must be greater than or equal to 0', $institution), - $propertyPath + $propertyPath, ); Assertion::isArray( $options['allowed_second_factors'], sprintf('Option "allowed_second_factors" for "%s" must be an array of strings', $institution), - $propertyPath + $propertyPath, ); Assertion::allString( $options['allowed_second_factors'], sprintf('Option "allowed_second_factors" for "%s" must be an array of strings', $institution), - $propertyPath + $propertyPath, ); Assertion::allInArray( $options['allowed_second_factors'], $this->secondFactorTypeService->getAvailableSecondFactorTypes(), 'Option "allowed_second_factors" for "%s" must contain valid second factor types', - $propertyPath + $propertyPath, ); $this->validateAuthorizationSettings($options, $institution, $propertyPath); } @@ -216,10 +204,8 @@ private function getConfiguredInstitutions() } $this->configuredInstitutions = array_map( - function (ConfiguredInstitution $configuredInstitution) { - return $configuredInstitution->institution->getInstitution(); - }, - $this->configuredInstitutionsService->getAll() + fn(ConfiguredInstitution $configuredInstitution) => $configuredInstitution->institution->getInstitution(), + $this->configuredInstitutionsService->getAll(), ); return $this->configuredInstitutions; @@ -237,10 +223,8 @@ private function getWhitelistedInstitutions() } $this->whitelistedInstitutions = array_map( - function (WhitelistEntry $whitelistEntry): string { - return (string)$whitelistEntry->institution; - }, - $this->whitelistService->getAllEntries()->toArray() + fn(WhitelistEntry $whitelistEntry): string => (string)$whitelistEntry->institution, + $this->whitelistService->getAllEntries()->toArray(), ); return $this->whitelistedInstitutions; @@ -254,10 +238,8 @@ function (WhitelistEntry $whitelistEntry): string { public function determineNonExistentInstitutions(array $institutions, $configuredInstitutions): array { $normalizedConfiguredInstitutions = array_map( - function ($institution): string { - return strtolower($institution); - }, - $configuredInstitutions + fn($institution): string => strtolower((string)$institution), + $configuredInstitutions, ); return array_filter( @@ -266,7 +248,7 @@ function ($institution) use ($normalizedConfiguredInstitutions): bool { $normalizedInstitution = strtolower($institution); return !in_array($normalizedInstitution, $normalizedConfiguredInstitutions); - } + }, ); } @@ -281,8 +263,11 @@ function ($institution) use ($normalizedConfiguredInstitutions): bool { * @param $propertyPath * @throws AssertionFailedException */ - private function validateAuthorizationSettings(array $authorizationSettings, string $institution, string $propertyPath): void - { + private function validateAuthorizationSettings( + array $authorizationSettings, + string $institution, + string $propertyPath, + ): void { $acceptedOptions = [ 'use_ra', 'use_raa', @@ -300,9 +285,9 @@ private function validateAuthorizationSettings(array $authorizationSettings, str 'Option "%s" for "%s" must be an array of strings. ("%s") was passed.', $optionName, $institution, - var_export($setting, true) + var_export($setting, true), ), - $propertyPath + $propertyPath, ); // 2. The contents of the array must be empty or string @@ -312,9 +297,9 @@ private function validateAuthorizationSettings(array $authorizationSettings, str 'All values of option "%s" should be of type string. ("%s") was passed.', $optionName, $institution, - var_export($setting, true) + var_export($setting, true), ), - $propertyPath + $propertyPath, ); // 3. The institutions that are used in the configuration, should be known, configured, institutions @@ -325,9 +310,9 @@ private function validateAuthorizationSettings(array $authorizationSettings, str 'All values of option "%s" should be known institutions. ("%s") was passed.', $optionName, $institution, - var_export($setting, true) + var_export($setting, true), ), - $propertyPath + $propertyPath, ); } } diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php index 54058ce0d..188f8fae9 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php @@ -38,7 +38,7 @@ public function validate(array $configuration, $propertyPath): void 'blacklisted_encryption_algorithms', 'use_pdp', 'allow_sso_on_2fa', - 'set_sso_cookie_on_2fa' + 'set_sso_cookie_on_2fa', ]; if (empty($configuration['use_pdp'])) { @@ -58,9 +58,9 @@ public function validate(array $configuration, $propertyPath): void $requiredProperties, sprintf( "The following properties must be present: '%s'; other properties are not supported", - implode("', '", $requiredProperties) + implode("', '", $requiredProperties), ), - $propertyPath + $propertyPath, ); $this->validateStringValue($configuration, 'entity_id', $propertyPath); @@ -70,61 +70,45 @@ public function validate(array $configuration, $propertyPath): void $this->validateBooleanValue( $configuration, 'assertion_encryption_enabled', - $propertyPath + $propertyPath, ); $this->validateBooleanValue( $configuration, 'second_factor_only', - $propertyPath + $propertyPath, ); $this->validateListOfNameIdPatterns( $configuration, 'second_factor_only_nameid_patterns', - $propertyPath + $propertyPath, ); $this->validateStringValues( $configuration, 'blacklisted_encryption_algorithms', - $propertyPath + $propertyPath, ); $this->validateBooleanValue($configuration, 'use_pdp', $propertyPath); $this->validateBooleanValue($configuration, 'allow_sso_on_2fa', $propertyPath); $this->validateBooleanValue($configuration, 'set_sso_cookie_on_2fa', $propertyPath); } - /** - * @param array $configuration - * @param string $name - * @param string $propertyPath - */ private function validateStringValue(array $configuration, string $name, string $propertyPath): void { Assertion::string($configuration[$name], 'value must be a string', $propertyPath . '.' . $name); } - /** - * @param array $configuration - * @param string $name - * @param string $propertyPath - */ private function validateStringValues(array $configuration, string $name, string $propertyPath): void { Assertion::isArray($configuration[$name], 'value must be an array', $propertyPath . '.' . $name); Assertion::allString($configuration[$name], 'value must be an array of strings', $propertyPath . '.' . $name); } - /** - * @param array $configuration - * @param string $name - * @param string $propertyPath - */ private function validateBooleanValue(array $configuration, string $name, string $propertyPath): void { Assertion::boolean($configuration[$name], 'value must be a boolean', $propertyPath . '.' . $name); } /** - * @param array $configuration * @param string $propertyPath */ private function validateAssertionConsumerUrls(array $configuration, $propertyPath): void @@ -137,30 +121,29 @@ private function validateAssertionConsumerUrls(array $configuration, $propertyPa Assertion::allString($value, 'must be an array of strings', $propertyPath); } - /** - * @param array $configuration - * @param string $propertyPath - */ private function validateLoaDefinition(array $configuration, string $propertyPath): void { $value = $configuration['loa']; - $path = $propertyPath . '.loa'; + $path = $propertyPath . '.loa'; Assertion::isArray($value, 'must be an object', $path); - Assertion::keyExists($value, '__default__', "must have the default loa set on the '__default__' property", $path); + Assertion::keyExists( + $value, + '__default__', + "must have the default loa set on the '__default__' property", + $path, + ); Assertion::allString($value, 'all properties must contain strings as values', $path); // Test if all SP specific LoA configuration entries are lower case. $this->assertValidInstitutionIdentifiers( $value, 'The shacHomeOrganisation names in SP LoA configuration must all be lower case', - $path + $path, ); } /** - * @param array $configuration - * @param string $name * @param string $propertyPath */ private function validateListOfNameIdPatterns(array $configuration, string $name, $propertyPath): void @@ -182,15 +165,14 @@ private function validateListOfNameIdPatterns(array $configuration, string $name * 'My.Institution' => 'loa2', // invalid * ] * - * @param array $spLoaConfiguration - * @param string $message * @param $propertyPath */ - private function assertValidInstitutionIdentifiers(array $spLoaConfiguration, string $message, string $propertyPath): void - { - $assertLowerCase = function ($sho): bool { - return ($sho === strtolower($sho)); - }; + private function assertValidInstitutionIdentifiers( + array $spLoaConfiguration, + string $message, + string $propertyPath, + ): void { + $assertLowerCase = fn($sho): bool => $sho === strtolower((string)$sho); // The array keys match the institution name / SHO. $lowerCaseTestResults = array_map($assertLowerCase, array_keys($spLoaConfiguration)); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php index 1327f33de..9013d4943 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php @@ -32,13 +32,10 @@ final class BootstrapGsspSecondFactorCommand extends Command { - private BootstrapCommandService $bootstrapService; - private TransactionHelper $transactionHelper; - - public function __construct(BootstrapCommandService $bootstrapService, TransactionHelper $transactionHelper) - { - $this->bootstrapService = $bootstrapService; - $this->transactionHelper = $transactionHelper; + public function __construct( + private readonly BootstrapCommandService $bootstrapService, + private readonly TransactionHelper $transactionHelper, + ) { parent::__construct(); } @@ -51,17 +48,17 @@ protected function configure(): void ->addArgument( 'gssp-token-type', InputArgument::REQUIRED, - 'The GSSP token type as defined in the GSSP config, for example tiqr or webauthn' + 'The GSSP token type as defined in the GSSP config, for example tiqr or webauthn', ) ->addArgument( 'gssp-token-identifier', InputArgument::REQUIRED, - 'The identifier of the token as registered at the GSSP' + 'The identifier of the token as registered at the GSSP', ) ->addArgument( 'registration-status', InputArgument::REQUIRED, - 'Valid arguments: unverified, verified, vetted' + 'Valid arguments: unverified, verified, vetted', ) ->addArgument('actor-id', InputArgument::REQUIRED, 'The id of the vetting actor'); } @@ -72,7 +69,7 @@ protected function execute(InputInterface $input, OutputInterface $output): void $this->bootstrapService->validRegistrationStatus($registrationStatus); $this->bootstrapService->setToken( - new AnonymousToken('cli.bootstrap-gssp-token', 'cli', ['ROLE_SS', 'ROLE_RA']) + new AnonymousToken('cli.bootstrap-gssp-token', 'cli', ['ROLE_SS', 'ROLE_RA']), ); $nameId = new NameId($input->getArgument('name-id')); $institutionText = $input->getArgument('institution'); @@ -87,14 +84,21 @@ protected function execute(InputInterface $input, OutputInterface $output): void sprintf( 'An identity with name ID "%s" from institution "%s" does not exist, create it first.', $nameId->getNameId(), - $institution->getInstitution() - ) + $institution->getInstitution(), + ), ); return; } $identity = $this->bootstrapService->getIdentity($nameId, $institution); - $output->writeln(sprintf('Adding a %s %s GSSP token for %s', $registrationStatus, $tokenType, $identity->commonName)); + $output->writeln( + sprintf( + 'Adding a %s %s GSSP token for %s', + $registrationStatus, + $tokenType, + $identity->commonName, + ), + ); $this->transactionHelper->beginTransaction(); $secondFactorId = Uuid::uuid4()->toString(); @@ -102,11 +106,21 @@ protected function execute(InputInterface $input, OutputInterface $output): void switch ($registrationStatus) { case "unverified": $output->writeln(sprintf('Creating an unverified %s token', $tokenType)); - $this->bootstrapService->proveGsspPossession($secondFactorId, $identity, $tokenType, $tokenIdentifier); + $this->bootstrapService->proveGsspPossession( + $secondFactorId, + $identity, + $tokenType, + $tokenIdentifier, + ); break; case "verified": $output->writeln(sprintf('Creating an unverified %s token', $tokenType)); - $this->bootstrapService->proveGsspPossession($secondFactorId, $identity, $tokenType, $tokenIdentifier); + $this->bootstrapService->proveGsspPossession( + $secondFactorId, + $identity, + $tokenType, + $tokenIdentifier, + ); if ($mailVerificationRequired) { $output->writeln(sprintf('Creating an verified %s token', $tokenType)); $this->bootstrapService->verifyEmail($identity, $tokenType); @@ -114,7 +128,12 @@ protected function execute(InputInterface $input, OutputInterface $output): void break; case "vetted": $output->writeln(sprintf('Creating an unverified %s token', $tokenType)); - $this->bootstrapService->proveGsspPossession($secondFactorId, $identity, $tokenType, $tokenIdentifier); + $this->bootstrapService->proveGsspPossession( + $secondFactorId, + $identity, + $tokenType, + $tokenIdentifier, + ); if ($mailVerificationRequired) { $output->writeln(sprintf('Creating an verified %s token', $tokenType)); $this->bootstrapService->verifyEmail($identity, $tokenType); @@ -125,7 +144,7 @@ protected function execute(InputInterface $input, OutputInterface $output): void $actorId, $identity, $secondFactorId, - $tokenIdentifier + $tokenIdentifier, ); break; } @@ -135,8 +154,8 @@ protected function execute(InputInterface $input, OutputInterface $output): void sprintf( 'An Error occurred when trying to bootstrap the %s token: "%s"', $tokenType, - $e->getMessage() - ) + $e->getMessage(), + ), ); $this->transactionHelper->rollback(); throw $e; @@ -146,8 +165,8 @@ protected function execute(InputInterface $input, OutputInterface $output): void 'Successfully %s %s second factor with UUID %s', $registrationStatus, $tokenType, - $secondFactorId - ) + $secondFactorId, + ), ); } } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityCommand.php index fd1627b71..49ab55dd8 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityCommand.php @@ -31,13 +31,10 @@ final class BootstrapIdentityCommand extends Command { - private BootstrapCommandService $bootstrapService; - private TransactionHelper $transactionHelper; - - public function __construct(BootstrapCommandService $bootstrapService, TransactionHelper $transactionHelper) - { - $this->bootstrapService = $bootstrapService; - $this->transactionHelper = $transactionHelper; + public function __construct( + private readonly BootstrapCommandService $bootstrapService, + private readonly TransactionHelper $transactionHelper, + ) { parent::__construct(); } @@ -56,7 +53,7 @@ protected function configure(): void protected function execute(InputInterface $input, OutputInterface $output): void { $this->bootstrapService->setToken( - new AnonymousToken('cli.bootstrap-identity-with-sms-token', 'cli', ['ROLE_SS']) + new AnonymousToken('cli.bootstrap-identity-with-sms-token', 'cli', ['ROLE_SS']), ); $nameId = new NameId($input->getArgument('name-id')); @@ -75,28 +72,34 @@ protected function execute(InputInterface $input, OutputInterface $output): void sprintf( 'An identity with name ID "%s" from institution "%s" already exists', $nameId->getNameId(), - $institution->getInstitution() - ) + $institution->getInstitution(), + ), ); return; } try { $this->transactionHelper->beginTransaction(); $output->writeln('Creating a new identity'); - $identity = $this->bootstrapService->createIdentity($institution, $nameId, $commonName, $email, $preferredLocale); + $identity = $this->bootstrapService->createIdentity( + $institution, + $nameId, + $commonName, + $email, + $preferredLocale, + ); $this->transactionHelper->finishTransaction(); } catch (Exception $e) { $output->writeln( sprintf( 'An Error occurred when trying to bootstrap the identity: "%s"', - $e->getMessage() - ) + $e->getMessage(), + ), ); $this->transactionHelper->rollback(); throw $e; } $output->writeln( - sprintf('Successfully created identity with UUID %s', $identity->id) + sprintf('Successfully created identity with UUID %s', $identity->id), ); } } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php index 8babbd3c2..823244b30 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php @@ -23,9 +23,7 @@ use Ramsey\Uuid\Uuid; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\Stepup\Identity\Value\NameId; -use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\IdentityRepository; -use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\BootstrapIdentityWithYubikeySecondFactorCommand - as BootstrapIdentityWithYubikeySecondFactorIdentityCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\BootstrapIdentityWithYubikeySecondFactorCommand as BootstrapIdentityWithYubikeySecondFactorIdentityCommand; use Surfnet\StepupMiddleware\MiddlewareBundle\Service\BootstrapCommandService; use Surfnet\StepupMiddleware\MiddlewareBundle\Service\TransactionHelper; use Symfony\Component\Console\Command\Command; @@ -40,14 +38,6 @@ final class BootstrapIdentityWithYubikeySecondFactorCommand extends Command { protected static $defaultName = 'middleware:bootstrap:identity-with-yubikey'; - private BootstrapCommandService $bootstrapService; - - private TransactionHelper $transactionHelper; - - /** - * @var IdentityRepository - */ - private ServiceEntityRepository $projectionRepository; protected function configure(): void { @@ -61,28 +51,25 @@ protected function configure(): void ->addArgument( 'yubikey', InputArgument::REQUIRED, - 'The public ID of the Yubikey. Remove the last 32 characters of a Yubikey OTP to acquire this.' + 'The public ID of the Yubikey. Remove the last 32 characters of a Yubikey OTP to acquire this.', ); } public function __construct( - BootstrapCommandService $bootstrapService, - ServiceEntityRepository $projectionRepository, - TransactionHelper $transactionHelper + private readonly BootstrapCommandService $bootstrapService, + private readonly ServiceEntityRepository $projectionRepository, + private readonly TransactionHelper $transactionHelper, ) { parent::__construct(); - $this->bootstrapService = $bootstrapService; - $this->projectionRepository = $projectionRepository; - $this->transactionHelper = $transactionHelper; } protected function execute(InputInterface $input, OutputInterface $output) { $this->bootstrapService->setToken( - new AnonymousToken('cli.bootstrap-yubikey-token', 'cli', ['ROLE_SS', 'ROLE_RA', 'ROLE_MANAGEMENT']) + new AnonymousToken('cli.bootstrap-yubikey-token', 'cli', ['ROLE_SS', 'ROLE_RA', 'ROLE_MANAGEMENT']), ); - $nameId = new NameId($input->getArgument('name-id')); + $nameId = new NameId($input->getArgument('name-id')); $institution = new Institution($input->getArgument('institution')); if ($this->projectionRepository->hasIdentityWithNameIdAndInstitution($nameId, $institution)) { @@ -90,22 +77,22 @@ protected function execute(InputInterface $input, OutputInterface $output) sprintf( 'An identity with name ID "%s" from institution "%s" already exists', $nameId->getNameId(), - $institution->getInstitution() - ) + $institution->getInstitution(), + ), ); return 1; } - $command = new BootstrapIdentityWithYubikeySecondFactorIdentityCommand(); - $command->UUID = (string) Uuid::uuid4(); - $command->identityId = (string) Uuid::uuid4(); - $command->nameId = $input->getArgument('name-id'); - $command->institution = $input->getArgument('institution'); - $command->commonName = $input->getArgument('common-name'); - $command->email = $input->getArgument('email'); + $command = new BootstrapIdentityWithYubikeySecondFactorIdentityCommand(); + $command->UUID = (string)Uuid::uuid4(); + $command->identityId = (string)Uuid::uuid4(); + $command->nameId = $input->getArgument('name-id'); + $command->institution = $input->getArgument('institution'); + $command->commonName = $input->getArgument('common-name'); + $command->email = $input->getArgument('email'); $command->preferredLocale = $input->getArgument('preferred-locale'); - $command->secondFactorId = (string) Uuid::uuid4(); + $command->secondFactorId = (string)Uuid::uuid4(); $command->yubikeyPublicId = $input->getArgument('yubikey'); $this->transactionHelper->beginTransaction(); @@ -114,19 +101,23 @@ protected function execute(InputInterface $input, OutputInterface $output) $command = $this->transactionHelper->process($command); $this->transactionHelper->finishTransaction(); } catch (Exception $e) { - $output->writeln(sprintf( - 'An Error occurred when trying to bootstrap the token for identity: "%s"', - $e->getMessage() - )); + $output->writeln( + sprintf( + 'An Error occurred when trying to bootstrap the token for identity: "%s"', + $e->getMessage(), + ), + ); $this->transactionHelper->rollBack(); throw $e; } - $output->writeln(sprintf( - 'Successfully registered a Yubikey token with UUID %s', - $command->secondFactorId - )); + $output->writeln( + sprintf( + 'Successfully registered a Yubikey token with UUID %s', + $command->secondFactorId, + ), + ); } } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapSmsSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapSmsSecondFactorCommand.php index c554985cb..cab70fe89 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapSmsSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapSmsSecondFactorCommand.php @@ -32,13 +32,10 @@ final class BootstrapSmsSecondFactorCommand extends Command { - private BootstrapCommandService $bootstrapService; - private TransactionHelper $transactionHelper; - - public function __construct(BootstrapCommandService $bootstrapService, TransactionHelper $transactionHelper) - { - $this->bootstrapService = $bootstrapService; - $this->transactionHelper = $transactionHelper; + public function __construct( + private readonly BootstrapCommandService $bootstrapService, + private readonly TransactionHelper $transactionHelper, + ) { parent::__construct(); } @@ -51,12 +48,12 @@ protected function configure(): void ->addArgument( 'phone-number', InputArgument::REQUIRED, - 'The phone number of the user should be formatted like "+31 (0) 612345678"' + 'The phone number of the user should be formatted like "+31 (0) 612345678"', ) ->addArgument( 'registration-status', InputArgument::REQUIRED, - 'Valid arguments: unverified, verified, vetted' + 'Valid arguments: unverified, verified, vetted', ) ->addArgument('actor-id', InputArgument::REQUIRED, 'The id of the vetting actor'); } @@ -67,7 +64,7 @@ protected function execute(InputInterface $input, OutputInterface $output): void $this->bootstrapService->validRegistrationStatus($registrationStatus); $this->bootstrapService->setToken( - new AnonymousToken('cli.bootstrap-sms-token', 'cli', ['ROLE_SS', 'ROLE_RA']) + new AnonymousToken('cli.bootstrap-sms-token', 'cli', ['ROLE_SS', 'ROLE_RA']), ); $nameId = new NameId($input->getArgument('name-id')); $institutionText = $input->getArgument('institution'); @@ -81,14 +78,16 @@ protected function execute(InputInterface $input, OutputInterface $output): void sprintf( 'An identity with name ID "%s" from institution "%s" does not exist, create it first.', $nameId->getNameId(), - $institution->getInstitution() - ) + $institution->getInstitution(), + ), ); return; } $identity = $this->bootstrapService->getIdentity($nameId, $institution); - $output->writeln(sprintf('Adding a %s SMS token for %s', $registrationStatus, $identity->commonName)); + $output->writeln( + sprintf('Adding a %s SMS token for %s', $registrationStatus, $identity->commonName), + ); $this->transactionHelper->beginTransaction(); $secondFactorId = Uuid::uuid4()->toString(); @@ -119,7 +118,7 @@ protected function execute(InputInterface $input, OutputInterface $output): void $actorId, $identity, $secondFactorId, - $phoneNumber + $phoneNumber, ); break; } @@ -128,8 +127,8 @@ protected function execute(InputInterface $input, OutputInterface $output): void $output->writeln( sprintf( 'An Error occurred when trying to bootstrap the SMS token: "%s"', - $e->getMessage() - ) + $e->getMessage(), + ), ); $this->transactionHelper->rollback(); throw $e; @@ -137,8 +136,8 @@ protected function execute(InputInterface $input, OutputInterface $output): void $output->writeln( sprintf( 'Successfully registered a SMS token with UUID %s', - $secondFactorId - ) + $secondFactorId, + ), ); } } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapYubikeySecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapYubikeySecondFactorCommand.php index fd9fcc448..e054725c7 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapYubikeySecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapYubikeySecondFactorCommand.php @@ -32,13 +32,10 @@ final class BootstrapYubikeySecondFactorCommand extends Command { - private BootstrapCommandService $bootstrapService; - private TransactionHelper $transactionHelper; - - public function __construct(BootstrapCommandService $bootstrapService, TransactionHelper $transactionHelper) - { - $this->bootstrapService = $bootstrapService; - $this->transactionHelper = $transactionHelper; + public function __construct( + private readonly BootstrapCommandService $bootstrapService, + private readonly TransactionHelper $transactionHelper, + ) { parent::__construct(); } @@ -51,12 +48,12 @@ protected function configure(): void ->addArgument( 'yubikey', InputArgument::REQUIRED, - 'The public ID of the Yubikey. Remove the last 32 characters of a Yubikey OTP to acquire this.' + 'The public ID of the Yubikey. Remove the last 32 characters of a Yubikey OTP to acquire this.', ) ->addArgument( 'registration-status', InputArgument::REQUIRED, - 'Valid arguments: unverified, verified, vetted' + 'Valid arguments: unverified, verified, vetted', ) ->addArgument('actor-id', InputArgument::REQUIRED, 'The id of the vetting actor'); } @@ -67,7 +64,7 @@ protected function execute(InputInterface $input, OutputInterface $output): void $this->bootstrapService->validRegistrationStatus($registrationStatus); $this->bootstrapService->setToken( - new AnonymousToken('cli.bootstrap-yubikey-token', 'cli', ['ROLE_SS', 'ROLE_RA']) + new AnonymousToken('cli.bootstrap-yubikey-token', 'cli', ['ROLE_SS', 'ROLE_RA']), ); $nameId = new NameId($input->getArgument('name-id')); $institutionText = $input->getArgument('institution'); @@ -82,14 +79,16 @@ protected function execute(InputInterface $input, OutputInterface $output): void sprintf( 'An identity with name ID "%s" from institution "%s" does not exist, create it first.', $nameId->getNameId(), - $institution->getInstitution() - ) + $institution->getInstitution(), + ), ); return; } $identity = $this->bootstrapService->getIdentity($nameId, $institution); - $output->writeln(sprintf('Adding a %s Yubikey token for %s', $registrationStatus, $identity->commonName)); + $output->writeln( + sprintf('Adding a %s Yubikey token for %s', $registrationStatus, $identity->commonName), + ); $this->transactionHelper->beginTransaction(); $secondFactorId = Uuid::uuid4()->toString(); @@ -120,7 +119,7 @@ protected function execute(InputInterface $input, OutputInterface $output): void $actorId, $identity, $secondFactorId, - $yubikey + $yubikey, ); break; } @@ -129,8 +128,8 @@ protected function execute(InputInterface $input, OutputInterface $output): void $output->writeln( sprintf( 'An Error occurred when trying to bootstrap the Yubikey token: "%s"', - $e->getMessage() - ) + $e->getMessage(), + ), ); $this->transactionHelper->rollback(); throw $e; @@ -138,8 +137,8 @@ protected function execute(InputInterface $input, OutputInterface $output): void $output->writeln( sprintf( 'Successfully registered a second factor with UUID %s', - $secondFactorId - ) + $secondFactorId, + ), ); } } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/EmailVerifiedSecondFactorRemindersCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/EmailVerifiedSecondFactorRemindersCommand.php index 8c8c54085..bff44a558 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/EmailVerifiedSecondFactorRemindersCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/EmailVerifiedSecondFactorRemindersCommand.php @@ -45,13 +45,6 @@ final class EmailVerifiedSecondFactorRemindersCommand extends Command { protected static $defaultName = 'middleware:cron:email-reminder'; - private TransactionAwarePipeline $pipeline; - - private BufferedEventBus $eventBus; - - private DBALConnectionHelper $connection; - - private LoggerInterface $logger; protected function configure(): void { @@ -61,26 +54,22 @@ protected function configure(): void 'dry-run', null, InputOption::VALUE_NONE, - 'Run in dry mode, not sending any email' + 'Run in dry mode, not sending any email', ) ->addOption( 'date', null, InputOption::VALUE_OPTIONAL, - 'The date (Y-m-d) that should be used for sending reminder email messages, defaults to TODAY - 7' + 'The date (Y-m-d) that should be used for sending reminder email messages, defaults to TODAY - 7', ); } public function __construct( - TransactionAwarePipeline $pipeline, - BufferedEventBus $eventBus, - DBALConnectionHelper $connection, - LoggerInterface $logger + private readonly TransactionAwarePipeline $pipeline, + private readonly BufferedEventBus $eventBus, + private readonly DBALConnectionHelper $connection, + private readonly LoggerInterface $logger, ) { - $this->pipeline = $pipeline; - $this->eventBus = $eventBus; - $this->connection = $connection; - $this->logger = $logger; parent::__construct(); } @@ -127,7 +116,11 @@ private function validateInput(InputInterface $input): void { if ($input->hasOption('date')) { $date = $input->getOption('date'); - Assertion::nullOrDate($date, 'Y-m-d', 'Expected date to be a string and formatted in the Y-m-d date format'); + Assertion::nullOrDate( + $date, + 'Y-m-d', + 'Expected date to be a string and formatted in the Y-m-d date format', + ); } if ($input->hasOption('dry-run')) { diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php index b3b91a510..534d3b62f 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php @@ -31,17 +31,15 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken; + use function sprintf; final class MigrateSecondFactorCommand extends Command { - private BootstrapCommandService $bootstrapService; - private TransactionHelper $transactionHelper; - - public function __construct(BootstrapCommandService $bootstrapService, TransactionHelper $transactionHelper) - { - $this->bootstrapService = $bootstrapService; - $this->transactionHelper = $transactionHelper; + public function __construct( + private readonly BootstrapCommandService $bootstrapService, + private readonly TransactionHelper $transactionHelper, + ) { parent::__construct(); } @@ -52,12 +50,12 @@ protected function configure(): void ->addArgument( 'old-name-id', InputArgument::REQUIRED, - 'The old NameID of the identity used as the source of the tokens to move' + 'The old NameID of the identity used as the source of the tokens to move', ) ->addArgument( 'new-name-id', InputArgument::REQUIRED, - 'The new NameID of the identity to move the tokens to' + 'The new NameID of the identity to move the tokens to', ) ->addArgument('target-institution', InputArgument::OPTIONAL, 'The institution of the target identity') ->addArgument('email', InputArgument::OPTIONAL, 'The e-mail address of the identity to create'); @@ -69,7 +67,7 @@ protected function execute(InputInterface $input, OutputInterface $output): void $targetNameId = new NameId($input->getArgument('new-name-id')); $this->bootstrapService->setToken( - new AnonymousToken('cli.bootstrap-yubikey-token', 'cli', ['ROLE_SS', 'ROLE_RA']) + new AnonymousToken('cli.bootstrap-yubikey-token', 'cli', ['ROLE_SS', 'ROLE_RA']), ); $output->writeln(sprintf('Starting token migration for %s', $sourceNameId)); @@ -82,13 +80,13 @@ protected function execute(InputInterface $input, OutputInterface $output): void // Check if target identity should be created if (!$targetIdentity instanceof Identity) { $output->writeln( - sprintf('Target with NameID %s does not exist, creating new identity', $targetNameId) + sprintf('Target with NameID %s does not exist, creating new identity', $targetNameId), ); $identityId = $this->createIdentity($targetNameId, $sourceIdentity, $input); $output->writeln( - sprintf('Successfully created identity with UUID %s', $identityId) + sprintf('Successfully created identity with UUID %s', $identityId), ); @@ -103,7 +101,9 @@ protected function execute(InputInterface $input, OutputInterface $output): void $this->bootstrapService->migrateVettedSecondFactor($sourceIdentity, $targetIdentity, $secondFactor); $output->writeln(sprintf('Moved token %s', $secondFactor->id)); } else { - $output->writeln(sprintf('Skipped moving token %s, already present"', $secondFactor->id)); + $output->writeln( + sprintf('Skipped moving token %s, already present"', $secondFactor->id), + ); } } @@ -112,21 +112,22 @@ protected function execute(InputInterface $input, OutputInterface $output): void $output->writeln( sprintf( 'An Error occurred when trying to move the tokens of identity: "%s"', - $e->getMessage() - ) + $e->getMessage(), + ), ); $this->transactionHelper->rollback(); throw $e; } $output->writeln( - sprintf('Successfully moved tokens from identity %s to identity %s', $sourceIdentity->id, $targetIdentity->id) + sprintf( + 'Successfully moved tokens from identity %s to identity %s', + $sourceIdentity->id, + $targetIdentity->id, + ), ); } /** - * @param NameId $targetNameId - * @param Identity $sourceIdentity - * @param InputInterface $input * @return string */ private function createIdentity(NameId $targetNameId, Identity $sourceIdentity, InputInterface $input) @@ -144,7 +145,7 @@ private function createIdentity(NameId $targetNameId, Identity $sourceIdentity, $targetNameId, $sourceIdentity->commonName->getCommonName(), $newEmail, - $sourceIdentity->preferredLocale->getLocale() + $sourceIdentity->preferredLocale->getLocale(), ); return $identity->id; diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplayEventsCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplayEventsCommand.php index 47e2143a8..eee751598 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplayEventsCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplayEventsCommand.php @@ -31,12 +31,10 @@ class ReplayEventsCommand extends Command { protected static $defaultName = 'middleware:event:replay'; - private EventStreamReplayer $replayer; - public function __construct(EventStreamReplayer $eventStreamReplayer) + public function __construct(private readonly EventStreamReplayer $replayer) { parent::__construct(); - $this->replayer = $eventStreamReplayer; } protected function configure() @@ -44,14 +42,14 @@ protected function configure() $this ->setDescription( 'Wipes all read models and repopulates the tables from the event store. Use the - --no-interaction option to perform the event replay without the additional confirmation question.' + --no-interaction option to perform the event replay without the additional confirmation question.', ) ->addOption( 'increments', 'i', InputOption::VALUE_REQUIRED, 'The amount of events that are replayed at once (repeated until all events are replayed)', - 1000 + 1000, ); } @@ -67,15 +65,17 @@ protected function execute(InputInterface $input, OutputInterface $output) $noInteraction = $input->getOption('no-interaction'); if (!in_array($environment, ['dev_event_replay', 'prod_event_replay', 'smoketest_event_replay'])) { - $output->writeln($formatter->formatBlock( - [ - '', - 'This command may only be executed using env "dev_event_replay", "prod_event_replay", or + $output->writeln( + $formatter->formatBlock( + [ + '', + 'This command may only be executed using env "dev_event_replay", "prod_event_replay", or "smoketest_event_replay"', - '' - ], - 'error' - )); + '', + ], + 'error', + ), + ); return; } @@ -85,8 +85,8 @@ protected function execute(InputInterface $input, OutputInterface $output) if ($environment === 'prod_event_replay') { $wantToRunOnProd = new ConfirmationQuestion( 'You have selected to run this on production. Have you disabled all access to the production ' - .'environment? (y/N)', - false + . 'environment? (y/N)', + false, ); if (!$interrogator->ask($input, $output, $wantToRunOnProd)) { @@ -101,8 +101,8 @@ protected function execute(InputInterface $input, OutputInterface $output) $output->writeln( $formatter->formatBlock( sprintf('Increments must be a positive integer, "%s" given', $input->getOption('increments')), - 'error' - ) + 'error', + ), ); return; @@ -130,7 +130,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $output->writeln(['', $formatter->formatBlock('Starting Event Replay', 'info')]); $output->writeln( - $formatter->formatBlock(' >> If it is interrupted it must be rerun till completed', 'comment') + $formatter->formatBlock(' >> If it is interrupted it must be rerun till completed', 'comment'), ); $this->replayer->replayEvents($output, $increments); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplaySpecificEventsCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplaySpecificEventsCommand.php index 3ecc0fdbe..6ccf1312f 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplaySpecificEventsCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplaySpecificEventsCommand.php @@ -32,15 +32,8 @@ class ReplaySpecificEventsCommand extends Command { protected static $defaultName = 'stepup:event:replay'; - const OPTION_LIST_EVENTS = 'list-events'; - const OPTION_LIST_PROJECTORS = 'list-projectors'; - - private EventCollection $collection; - - private PastEventsService $pastEventsService; - - private TransactionAwareEventDispatcher $eventDispatcher; - private ProjectorCollection $projectorCollection; + public const OPTION_LIST_EVENTS = 'list-events'; + public const OPTION_LIST_PROJECTORS = 'list-projectors'; protected function configure() { @@ -50,32 +43,28 @@ protected function configure() self::OPTION_LIST_EVENTS, null, InputOption::VALUE_NONE, - 'List all events available to replay' + 'List all events available to replay', ) ->addOption( self::OPTION_LIST_PROJECTORS, null, InputOption::VALUE_NONE, - 'List all projectors available for which events can be replayed' + 'List all projectors available for which events can be replayed', ); } public function __construct( - EventCollection $collection, - ProjectorCollection $projectorCollection, - PastEventsService $pastEventsService, - TransactionAwareEventDispatcher $eventDispatcher + private readonly EventCollection $collection, + private readonly ProjectorCollection $projectorCollection, + private readonly PastEventsService $pastEventsService, + private readonly TransactionAwareEventDispatcher $eventDispatcher, ) { - $this->collection = $collection; - $this->projectorCollection = $projectorCollection; - $this->pastEventsService = $pastEventsService; - $this->eventDispatcher = $eventDispatcher; parent::__construct(); } protected function execute(InputInterface $input, OutputInterface $output) { - $availableEvents = $this->collection->getEventNames(); + $availableEvents = $this->collection->getEventNames(); $availableProjectors = $this->projectorCollection->getProjectorNames(); if ($input->getOption(self::OPTION_LIST_EVENTS)) { @@ -103,21 +92,21 @@ protected function execute(InputInterface $input, OutputInterface $output) $selectEventsQuestion = new ChoiceQuestion( 'Which events would you like to replay? Please supply a comma-separated list of numbers.', - $availableEvents + $availableEvents, ); $selectEventsQuestion->setMultiselect(true); - $chosenEvents = $questionHelper->ask($input, $output, $selectEventsQuestion); + $chosenEvents = $questionHelper->ask($input, $output, $selectEventsQuestion); $eventSelection = $this->collection->select($chosenEvents); $selectProjectorsQuestion = new ChoiceQuestion( 'For which projectors would you like to replay the selected events? ' . 'Please supply a comma-separated list of numbers.', - $availableProjectors + $availableProjectors, ); $selectProjectorsQuestion->setMultiselect(true); - $chosenProjectors = $questionHelper->ask($input, $output, $selectProjectorsQuestion); + $chosenProjectors = $questionHelper->ask($input, $output, $selectProjectorsQuestion); $projectorSelection = $this->projectorCollection->selectByNames($chosenProjectors); $events = $this->pastEventsService->findEventsBy($eventSelection); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/DependencyInjection/Configuration.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/DependencyInjection/Configuration.php index 92b3b0749..4e32baf4c 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/DependencyInjection/Configuration.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/DependencyInjection/Configuration.php @@ -29,29 +29,27 @@ public function getConfigTreeBuilder(): TreeBuilder $rootNode = $treeBuilder->getRootNode(); $rootNode ->children() - ->arrayNode('second_factors_display_name')->isRequired()->scalarPrototype()->end()->end() - ->scalarNode('email_verification_window') - ->info('The amount of seconds after which the email verification url/code expires') - ->defaultValue(3600) - ->validate() - ->ifTrue(function ($seconds): bool { - return !is_int($seconds) || $seconds < 1; - }) - ->thenInvalid( - 'The email verification window must be a positive integer' - ) - ->end() - ->end() - ->arrayNode('enabled_generic_second_factors') - ->isRequired() - ->prototype('array') - ->children() - ->scalarNode('loa') - ->isRequired() - ->info('The lao level of the Gssf') - ->end() - ->end() - ->end() + ->arrayNode('second_factors_display_name')->isRequired()->scalarPrototype()->end()->end() + ->scalarNode('email_verification_window') + ->info('The amount of seconds after which the email verification url/code expires') + ->defaultValue(3600) + ->validate() + ->ifTrue(fn($seconds): bool => !is_int($seconds) || $seconds < 1) + ->thenInvalid( + 'The email verification window must be a positive integer', + ) + ->end() + ->end() + ->arrayNode('enabled_generic_second_factors') + ->isRequired() + ->prototype('array') + ->children() + ->scalarNode('loa') + ->isRequired() + ->info('The lao level of the Gssf') + ->end() + ->end() + ->end() ->end(); return $treeBuilder; diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/DependencyInjection/SurfnetStepupMiddlewareMiddlewareExtension.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/DependencyInjection/SurfnetStepupMiddlewareMiddlewareExtension.php index 430c0f2a8..8d76d5c63 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/DependencyInjection/SurfnetStepupMiddlewareMiddlewareExtension.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/DependencyInjection/SurfnetStepupMiddlewareMiddlewareExtension.php @@ -18,6 +18,7 @@ namespace Surfnet\StepupMiddleware\MiddlewareBundle\DependencyInjection; +use Surfnet\Stepup\Identity\Entity\ConfigurableSettings; use Symfony\Component\Config\Definition\Processor; use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; @@ -38,7 +39,7 @@ public function load(array $config, ContainerBuilder $container): void $fileLoader->load('event_replaying.yml'); $definition = (new Definition()) - ->setClass('Surfnet\Stepup\Identity\Entity\ConfigurableSettings') + ->setClass(ConfigurableSettings::class) ->setFactory('Surfnet\Stepup\Identity\Entity\ConfigurableSettings::create') ->setArguments([$config['email_verification_window'], $container->getParameter('locales')]); @@ -46,7 +47,7 @@ public function load(array $config, ContainerBuilder $container): void $container->setParameter( 'middleware.enabled_generic_second_factors', - $config['enabled_generic_second_factors'] + $config['enabled_generic_second_factors'], ); } } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php index 3c263bc7d..3cf4a3dda 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php @@ -31,46 +31,22 @@ class DBALEventHydrator { - private Connection $connection; - - private SimpleInterfaceSerializer $payloadSerializer; - - private SimpleInterfaceSerializer $metadataSerializer; - - /** - * @var string - */ - private $eventStreamTableName; - - /** - * @var string - */ - private $sensitiveDataTable; - /** * @var Statement */ private $loadStatement = null; /** - * @param Connection $connection - * @param SimpleInterfaceSerializer $payloadSerializer - * @param SimpleInterfaceSerializer $metadataSerializer - * @param string $eventStreamTable - * @param string $sensitiveDataTable + * @param string $eventStreamTableName + * @param string $sensitiveDataTable */ public function __construct( - Connection $connection, - SimpleInterfaceSerializer $payloadSerializer, - SimpleInterfaceSerializer $metadataSerializer, - $eventStreamTable, - $sensitiveDataTable + private readonly Connection $connection, + private readonly SimpleInterfaceSerializer $payloadSerializer, + private readonly SimpleInterfaceSerializer $metadataSerializer, + private $eventStreamTableName, + private $sensitiveDataTable, ) { - $this->connection = $connection; - $this->payloadSerializer = $payloadSerializer; - $this->metadataSerializer = $metadataSerializer; - $this->eventStreamTableName = $eventStreamTable; - $this->sensitiveDataTable = $sensitiveDataTable; } /** @@ -100,7 +76,7 @@ public function getFromTill($limit, $offset): DomainEventStream $statement->execute(); - $events = array(); + $events = []; while ($row = $statement->fetch()) { $events[] = $this->deserializeEvent($row); } @@ -121,13 +97,13 @@ public function fetchByEventTypes($eventTypes): DomainEventStream ON %es%.uuid = %sd%.identity_id AND %es%.playhead = %sd%.playhead WHERE %es%.type IN ($eventTypePlaceholders) - ORDER BY recorded_on, playhead ASC" + ORDER BY recorded_on, playhead ASC", ); $statement = $this->connection->prepare($query); $statement->execute($eventTypes); - $events = array(); + $events = []; while ($row = $statement->fetch()) { $events[] = $this->deserializeEvent($row); } @@ -137,18 +113,18 @@ public function fetchByEventTypes($eventTypes): DomainEventStream private function deserializeEvent(array $row): DomainMessage { - $event = $this->payloadSerializer->deserialize(json_decode($row['payload'], true)); + $event = $this->payloadSerializer->deserialize(json_decode((string)$row['payload'], true)); if ($event instanceof Forgettable) { - $event->setSensitiveData(SensitiveData::deserialize(json_decode($row['sensitive_data'], true))); + $event->setSensitiveData(SensitiveData::deserialize(json_decode((string)$row['sensitive_data'], true))); } return new DomainMessage( $row['uuid'], $row['playhead'], - $this->metadataSerializer->deserialize(json_decode($row['metadata'], true)), + $this->metadataSerializer->deserialize(json_decode((string)$row['metadata'], true)), $event, - DateTime::fromString($row['recorded_on']) + DateTime::fromString($row['recorded_on']), ); } @@ -164,7 +140,7 @@ private function prepareLoadStatement() ON %es%.uuid = %sd%.identity_id AND %es%.playhead = %sd%.playhead ORDER BY recorded_on ASC - LIMIT :limit OFFSET :offset' + LIMIT :limit OFFSET :offset', ); $this->loadStatement = $this->connection->prepare($query); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/EventCollection.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/EventCollection.php index a26f41123..8c0c1bf37 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/EventCollection.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/EventCollection.php @@ -37,10 +37,12 @@ public function __construct(array $eventNames) } if (!class_exists($eventName)) { - throw new InvalidArgumentException(sprintf( - 'Cannot create EventCollection: class "%s" does not exist', - $eventName - )); + throw new InvalidArgumentException( + sprintf( + 'Cannot create EventCollection: class "%s" does not exist', + $eventName, + ), + ); } $this->eventNames[] = $eventName; @@ -58,15 +60,12 @@ public function getEventNames() public function formatAsEventStreamTypes(): array { return array_map( - function ($eventName): string { - return strtr($eventName, '\\', '.'); - }, - $this->eventNames + fn($eventName): string => strtr($eventName, '\\', '.'), + $this->eventNames, ); } /** - * @param array $subset * @return EventCollection */ public function select(array $subset): self @@ -77,8 +76,8 @@ public function select(array $subset): self throw new InvalidArgumentException( sprintf( 'Subset of event names contains event names not present in collection: %s', - implode(', ', $nonAvailableEventNames) - ) + implode(', ', $nonAvailableEventNames), + ), ); } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/ProjectorCollection.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/ProjectorCollection.php index 08b2e2a45..12efd2fac 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/ProjectorCollection.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/ProjectorCollection.php @@ -30,12 +30,9 @@ final class ProjectorCollection implements IteratorAggregate */ private array $projectors = []; - /** - * @param ProjectorInterface $projector - */ public function add(ProjectorInterface $projector): void { - $this->projectors[get_class($projector)] = $projector; + $this->projectors[$projector::class] = $projector; } /** @@ -44,15 +41,12 @@ public function add(ProjectorInterface $projector): void public function getProjectorNames(): array { return array_map( - function (ProjectorInterface $projector): string { - return get_class($projector); - }, - array_values($this->projectors) + fn(ProjectorInterface $projector): string => $projector::class, + array_values($this->projectors), ); } /** - * @param array $projectorNames * @return ProjectorCollection */ public function selectByNames(array $projectorNames): ProjectorCollection @@ -64,8 +58,8 @@ public function selectByNames(array $projectorNames): ProjectorCollection throw new InvalidArgumentException( sprintf( 'Cannot select a subset of projectors, because projector "%s" is not present in the collection', - $projectorName - ) + $projectorName, + ), ); } @@ -76,12 +70,11 @@ public function selectByNames(array $projectorNames): ProjectorCollection } /** - * @param ProjectorInterface $projector * @return bool */ public function contains(ProjectorInterface $projector): bool { - return array_key_exists(get_class($projector), $this->projectors); + return array_key_exists($projector::class, $this->projectors); } public function getIterator() diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Exception/InvalidArgumentException.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Exception/InvalidArgumentException.php index e20b63c55..41d4c67f8 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Exception/InvalidArgumentException.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Exception/InvalidArgumentException.php @@ -23,19 +23,19 @@ class InvalidArgumentException extends CoreInvalidArgumentException { /** - * @param string $expected description of expected type + * @param string $expected description of expected type * @param string $parameterName - * @param mixed $parameter the parameter that is not of the expected type. + * @param mixed $parameter the parameter that is not of the expected type. * * @return self */ - public static function invalidType($expected, $parameterName, $parameter): self + public static function invalidType($expected, $parameterName, mixed $parameter): self { $message = sprintf( 'Invalid argument type: "%s" expected, "%s" given for "%s"', $expected, - is_object($parameter) ? get_class($parameter) : gettype($parameter), - $parameterName + get_debug_type($parameter), + $parameterName, ); return new self($message); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/InstitutionConfigurationProvider.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/InstitutionConfigurationProvider.php index c2aefb35e..938e905b8 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/InstitutionConfigurationProvider.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/InstitutionConfigurationProvider.php @@ -22,27 +22,13 @@ use Surfnet\StepupMiddleware\ApiBundle\Configuration\Service\InstitutionConfigurationOptionsService; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Service\RaLocationService; -final class InstitutionConfigurationProvider +final readonly class InstitutionConfigurationProvider { - private ConfiguredInstitutionService $configuredInstitutionService; - - private InstitutionConfigurationOptionsService $institutionConfigurationOptionsService; - - private RaLocationService $raLocationService; - - /** - * @param ConfiguredInstitutionService $configuredInstitutionService - * @param InstitutionConfigurationOptionsService $institutionConfigurationOptionsService - * @param RaLocationService $raLocationService - */ public function __construct( - ConfiguredInstitutionService $configuredInstitutionService, - InstitutionConfigurationOptionsService $institutionConfigurationOptionsService, - RaLocationService $raLocationService + private ConfiguredInstitutionService $configuredInstitutionService, + private InstitutionConfigurationOptionsService $institutionConfigurationOptionsService, + private RaLocationService $raLocationService, ) { - $this->configuredInstitutionService = $configuredInstitutionService; - $this->institutionConfigurationOptionsService = $institutionConfigurationOptionsService; - $this->raLocationService = $raLocationService; } public function loadData(): InstitutionConfigurationState @@ -55,7 +41,7 @@ public function loadData(): InstitutionConfigurationState return InstitutionConfigurationState::load( $configuredInstitutions, $institutionConfigurationOptions, - $raLocations + $raLocations, ); } } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/InstitutionConfigurationState.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/InstitutionConfigurationState.php index 01c37e152..5782a9e59 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/InstitutionConfigurationState.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/InstitutionConfigurationState.php @@ -24,27 +24,23 @@ use Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity\RaLocation; use Surfnet\StepupMiddleware\MiddlewareBundle\Exception\RuntimeException; -final class InstitutionConfigurationState +final readonly class InstitutionConfigurationState { /** - * @var MappedInstitutionConfiguration[] - */ - private array $mappedInstitutionConfigurations; - - /** - * @param ConfiguredInstitution[] $configuredInstitutions + * @param ConfiguredInstitution[] $configuredInstitutions * @param InstitutionConfigurationOptions[] $institutionConfigurationOptions - * @param RaLocation[] $raLocations + * @param RaLocation[] $raLocations * @return InstitutionConfigurationState */ public static function load( $configuredInstitutions, $institutionConfigurationOptions, - $raLocations + $raLocations, ): self { - $optionInstitutions = array_map(function (InstitutionConfigurationOptions $options) { - return $options->institution->getInstitution(); - }, $institutionConfigurationOptions); + $optionInstitutions = array_map( + fn(InstitutionConfigurationOptions $options) => $options->institution->getInstitution(), + $institutionConfigurationOptions, + ); $mappedConfigurationOptions = array_combine($optionInstitutions, $institutionConfigurationOptions); $mappedRaLocations = []; @@ -57,15 +53,17 @@ public static function load( foreach ($configuredInstitutions as $institution) { $institutionName = $institution->institution->getInstitution(); if (!array_key_exists($institutionName, $mappedConfigurationOptions)) { - throw new RuntimeException(sprintf( - 'Institution "%s" has been configured, but does not have options.', - $institutionName - )); + throw new RuntimeException( + sprintf( + 'Institution "%s" has been configured, but does not have options.', + $institutionName, + ), + ); } /** @var InstitutionConfigurationOptions $options */ $options = $mappedConfigurationOptions[$institutionName]; - $locations = isset($mappedRaLocations[$institutionName]) ? $mappedRaLocations[$institutionName] : []; + $locations = $mappedRaLocations[$institutionName] ?? []; $mappedInstitutionConfigurations[] = new MappedInstitutionConfiguration( $institution->institution, @@ -74,7 +72,7 @@ public static function load( $options->verifyEmailOption, $options->selfVetOption, $options->numberOfTokensPerIdentityOption, - $locations + $locations, ); } @@ -84,9 +82,8 @@ public static function load( /** * @param MappedInstitutionConfiguration[] $mappedInstitutionConfigurations */ - private function __construct(array $mappedInstitutionConfigurations) + private function __construct(private array $mappedInstitutionConfigurations) { - $this->mappedInstitutionConfigurations = $mappedInstitutionConfigurations; } /** diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/MappedInstitutionConfiguration.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/MappedInstitutionConfiguration.php index b8b3c6b7d..38b1009be 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/MappedInstitutionConfiguration.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/MappedInstitutionConfiguration.php @@ -19,62 +19,33 @@ namespace Surfnet\StepupMiddleware\MiddlewareBundle\Migrations\InstitutionConfiguration; use Ramsey\Uuid\Uuid; +use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\Stepup\Configuration\Value\NumberOfTokensPerIdentityOption; use Surfnet\Stepup\Configuration\Value\SelfVetOption; -use Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity\RaLocation; -use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\Stepup\Configuration\Value\ShowRaaContactInformationOption; use Surfnet\Stepup\Configuration\Value\UseRaLocationsOption; use Surfnet\Stepup\Configuration\Value\VerifyEmailOption; +use Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity\RaLocation; use Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\Command\AddRaLocationCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\Command\CreateInstitutionConfigurationCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\Command\ReconfigureInstitutionConfigurationOptionsCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\Command\RemoveInstitutionConfigurationByUnnormalizedIdCommand; -final class MappedInstitutionConfiguration +final readonly class MappedInstitutionConfiguration { - private Institution $institution; - - private ShowRaaContactInformationOption $showRaaContactInformationOption; - - private UseRaLocationsOption $useRaLocationsOption; - - private VerifyEmailOption $verifyEmailOption; - - private SelfVetOption $selfVetOption; - - private NumberOfTokensPerIdentityOption $numberOfTokensPerIdentityOption; - /** - * @var RaLocation[] - */ - private array $raLocations; - - /** - * @param Institution $institution - * @param UseRaLocationsOption $useRaLocationsOption - * @param ShowRaaContactInformationOption $showRaaContactInformationOption - * @param VerifyEmailOption $verifyEmailOption * @param SelfVetOption $setVetOption - * @param NumberOfTokensPerIdentityOption $numberOfTokensPerIdentityOption * @param RaLocation[] $raLocations */ public function __construct( - Institution $institution, - UseRaLocationsOption $useRaLocationsOption, - ShowRaaContactInformationOption $showRaaContactInformationOption, - VerifyEmailOption $verifyEmailOption, - SelfVetOption $selfVetOption, - NumberOfTokensPerIdentityOption $numberOfTokensPerIdentityOption, - array $raLocations + private Institution $institution, + private UseRaLocationsOption $useRaLocationsOption, + private ShowRaaContactInformationOption $showRaaContactInformationOption, + private VerifyEmailOption $verifyEmailOption, + private SelfVetOption $selfVetOption, + private NumberOfTokensPerIdentityOption $numberOfTokensPerIdentityOption, + private array $raLocations, ) { - $this->institution = $institution; - $this->useRaLocationsOption = $useRaLocationsOption; - $this->showRaaContactInformationOption = $showRaaContactInformationOption; - $this->verifyEmailOption = $verifyEmailOption; - $this->selfVetOption = $selfVetOption; - $this->numberOfTokensPerIdentityOption = $numberOfTokensPerIdentityOption; - $this->raLocations = $raLocations; } /** @@ -82,8 +53,8 @@ public function __construct( */ public function inferRemoveInstitutionConfigurationByIdCommand(): RemoveInstitutionConfigurationByUnnormalizedIdCommand { - $command = new RemoveInstitutionConfigurationByUnnormalizedIdCommand(); - $command->UUID = (string) Uuid::uuid4(); + $command = new RemoveInstitutionConfigurationByUnnormalizedIdCommand(); + $command->UUID = (string)Uuid::uuid4(); $command->institution = $this->institution->getInstitution(); return $command; @@ -94,8 +65,8 @@ public function inferRemoveInstitutionConfigurationByIdCommand(): RemoveInstitut */ public function inferCreateInstitutionConfigurationCommand(): CreateInstitutionConfigurationCommand { - $command = new CreateInstitutionConfigurationCommand(); - $command->UUID = (string) Uuid::uuid4(); + $command = new CreateInstitutionConfigurationCommand(); + $command->UUID = (string)Uuid::uuid4(); $command->institution = $this->institution->getInstitution(); return $command; @@ -106,14 +77,15 @@ public function inferCreateInstitutionConfigurationCommand(): CreateInstitutionC */ public function inferReconfigureInstitutionConfigurationCommand(): ReconfigureInstitutionConfigurationOptionsCommand { - $command = new ReconfigureInstitutionConfigurationOptionsCommand(); - $command->UUID = (string) Uuid::uuid4(); - $command->institution = $this->institution->getInstitution(); - $command->useRaLocationsOption = $this->useRaLocationsOption->isEnabled(); + $command = new ReconfigureInstitutionConfigurationOptionsCommand(); + $command->UUID = (string)Uuid::uuid4(); + $command->institution = $this->institution->getInstitution(); + $command->useRaLocationsOption = $this->useRaLocationsOption->isEnabled(); $command->showRaaContactInformationOption = $this->showRaaContactInformationOption->isEnabled(); - $command->verifyEmailOption = $this->verifyEmailOption->isEnabled(); - $command->selfVetOption= $this->selfVetOption->isEnabled(); - $command->numberOfTokensPerIdentityOption = $this->numberOfTokensPerIdentityOption->getNumberOfTokensPerIdentity(); + $command->verifyEmailOption = $this->verifyEmailOption->isEnabled(); + $command->selfVetOption = $this->selfVetOption->isEnabled(); + $command->numberOfTokensPerIdentityOption = $this->numberOfTokensPerIdentityOption->getNumberOfTokensPerIdentity( + ); return $command; } @@ -127,13 +99,13 @@ public function inferAddRaLocationCommands(): array $institution = $this->institution->getInstitution(); foreach ($this->raLocations as $raLocation) { - $command = new AddRaLocationCommand(); - $command->UUID = (string) Uuid::uuid4(); - $command->institution = $institution; - $command->raLocationId = $raLocation->id ; - $command->raLocationName = $raLocation->name->getRaLocationName(); + $command = new AddRaLocationCommand(); + $command->UUID = (string)Uuid::uuid4(); + $command->institution = $institution; + $command->raLocationId = $raLocation->id; + $command->raLocationName = $raLocation->name->getRaLocationName(); $command->contactInformation = $raLocation->contactInformation->getContactInformation(); - $command->location = $raLocation->location->getLocation(); + $command->location = $raLocation->location->getLocation(); $commands[] = $command; } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Resources/config/console_commands.yml b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Resources/config/console_commands.yml index 4a58ffc2d..874251073 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Resources/config/console_commands.yml +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Resources/config/console_commands.yml @@ -1,84 +1,84 @@ services: - Surfnet\StepupMiddleware\MiddlewareBundle\Service\BootstrapCommandService: - arguments: - - "@surfnet_stepup_middleware_command_handling.pipeline.transaction_aware_pipeline" - - "@surfnet_stepup_middleware_command_handling.metadata_enricher.actor" - - "@security.token_storage" - - "@surfnet_stepup_middleware_api.repository.identity" - - "@surfnet_stepup_middleware_api.repository.unverified_second_factor" - - "@surfnet_stepup_middleware_api.repository.verified_second_factor" - - "@surfnet_stepup_middleware_api.repository.vetted_second_factor" - - "@surfnet_stepup_middleware_api.repository.institution_configuration_options" + Surfnet\StepupMiddleware\MiddlewareBundle\Service\BootstrapCommandService: + arguments: + - "@surfnet_stepup_middleware_command_handling.pipeline.transaction_aware_pipeline" + - "@surfnet_stepup_middleware_command_handling.metadata_enricher.actor" + - "@security.token_storage" + - "@surfnet_stepup_middleware_api.repository.identity" + - "@surfnet_stepup_middleware_api.repository.unverified_second_factor" + - "@surfnet_stepup_middleware_api.repository.verified_second_factor" + - "@surfnet_stepup_middleware_api.repository.vetted_second_factor" + - "@surfnet_stepup_middleware_api.repository.institution_configuration_options" - Surfnet\StepupMiddleware\MiddlewareBundle\Service\TransactionHelper: - arguments: - - "@surfnet_stepup_middleware_command_handling.pipeline.transaction_aware_pipeline" - - "@surfnet_stepup_middleware_command_handling.event_bus.buffered" - - "@surfnet_stepup_middleware_middleware.dbal_connection_helper" + Surfnet\StepupMiddleware\MiddlewareBundle\Service\TransactionHelper: + arguments: + - "@surfnet_stepup_middleware_command_handling.pipeline.transaction_aware_pipeline" + - "@surfnet_stepup_middleware_command_handling.event_bus.buffered" + - "@surfnet_stepup_middleware_middleware.dbal_connection_helper" - Surfnet\StepupMiddleware\MiddlewareBundle\Console\Command\ReplaySpecificEventsCommand: - tags: - - { name: 'console.command', command: 'stepup:event:replay' } - arguments: - - "@middleware.event_replay.event_collection" - - "@middleware.event_replay.projector_collection" - - "@middleware.event_replay.past_events_service" - - "@middleware.event_replay.transaction_aware_event_dispatcher" + Surfnet\StepupMiddleware\MiddlewareBundle\Console\Command\ReplaySpecificEventsCommand: + tags: + - { name: 'console.command', command: 'stepup:event:replay' } + arguments: + - "@middleware.event_replay.event_collection" + - "@middleware.event_replay.projector_collection" + - "@middleware.event_replay.past_events_service" + - "@middleware.event_replay.transaction_aware_event_dispatcher" - Surfnet\StepupMiddleware\MiddlewareBundle\Console\Command\ReplayEventsCommand: - tags: - - { name: 'console.command', command: 'middleware:event:replay' } - arguments: - - "@middleware.event_replay.event_stream_replayer" + Surfnet\StepupMiddleware\MiddlewareBundle\Console\Command\ReplayEventsCommand: + tags: + - { name: 'console.command', command: 'middleware:event:replay' } + arguments: + - "@middleware.event_replay.event_stream_replayer" - Surfnet\StepupMiddleware\MiddlewareBundle\Console\Command\BootstrapIdentityWithYubikeySecondFactorCommand: - tags: - - { name: 'console.command', command: 'middleware:bootstrap:identity-with-yubikey' } - arguments: - - '@Surfnet\StepupMiddleware\MiddlewareBundle\Service\BootstrapCommandService' - - "@surfnet_stepup_middleware_api.repository.identity" - - '@Surfnet\StepupMiddleware\MiddlewareBundle\Service\TransactionHelper' + Surfnet\StepupMiddleware\MiddlewareBundle\Console\Command\BootstrapIdentityWithYubikeySecondFactorCommand: + tags: + - { name: 'console.command', command: 'middleware:bootstrap:identity-with-yubikey' } + arguments: + - '@Surfnet\StepupMiddleware\MiddlewareBundle\Service\BootstrapCommandService' + - "@surfnet_stepup_middleware_api.repository.identity" + - '@Surfnet\StepupMiddleware\MiddlewareBundle\Service\TransactionHelper' - Surfnet\StepupMiddleware\MiddlewareBundle\Console\Command\EmailVerifiedSecondFactorRemindersCommand: - tags: - - { name: 'console.command', command: 'middleware:cron:email-reminder' } - arguments: - - "@surfnet_stepup_middleware_command_handling.pipeline.transaction_aware_pipeline" - - "@surfnet_stepup_middleware_command_handling.event_bus.buffered" - - "@surfnet_stepup_middleware_middleware.dbal_connection_helper" - - "@logger" + Surfnet\StepupMiddleware\MiddlewareBundle\Console\Command\EmailVerifiedSecondFactorRemindersCommand: + tags: + - { name: 'console.command', command: 'middleware:cron:email-reminder' } + arguments: + - "@surfnet_stepup_middleware_command_handling.pipeline.transaction_aware_pipeline" + - "@surfnet_stepup_middleware_command_handling.event_bus.buffered" + - "@surfnet_stepup_middleware_middleware.dbal_connection_helper" + - "@logger" - Surfnet\StepupMiddleware\MiddlewareBundle\Console\Command\BootstrapIdentityCommand: - arguments: - - '@Surfnet\StepupMiddleware\MiddlewareBundle\Service\BootstrapCommandService' - - '@Surfnet\StepupMiddleware\MiddlewareBundle\Service\TransactionHelper' - tags: - - { name: 'console.command', command: 'middleware:bootstrap:identity' } + Surfnet\StepupMiddleware\MiddlewareBundle\Console\Command\BootstrapIdentityCommand: + arguments: + - '@Surfnet\StepupMiddleware\MiddlewareBundle\Service\BootstrapCommandService' + - '@Surfnet\StepupMiddleware\MiddlewareBundle\Service\TransactionHelper' + tags: + - { name: 'console.command', command: 'middleware:bootstrap:identity' } - Surfnet\StepupMiddleware\MiddlewareBundle\Console\Command\BootstrapSmsSecondFactorCommand: - arguments: - - '@Surfnet\StepupMiddleware\MiddlewareBundle\Service\BootstrapCommandService' - - '@Surfnet\StepupMiddleware\MiddlewareBundle\Service\TransactionHelper' - tags: - - { name: 'console.command', command: 'middleware:bootstrap:sms' } + Surfnet\StepupMiddleware\MiddlewareBundle\Console\Command\BootstrapSmsSecondFactorCommand: + arguments: + - '@Surfnet\StepupMiddleware\MiddlewareBundle\Service\BootstrapCommandService' + - '@Surfnet\StepupMiddleware\MiddlewareBundle\Service\TransactionHelper' + tags: + - { name: 'console.command', command: 'middleware:bootstrap:sms' } - Surfnet\StepupMiddleware\MiddlewareBundle\Console\Command\BootstrapYubikeySecondFactorCommand: - arguments: - - '@Surfnet\StepupMiddleware\MiddlewareBundle\Service\BootstrapCommandService' - - '@Surfnet\StepupMiddleware\MiddlewareBundle\Service\TransactionHelper' - tags: - - { name: 'console.command', command: 'middleware:bootstrap:yubikey' } + Surfnet\StepupMiddleware\MiddlewareBundle\Console\Command\BootstrapYubikeySecondFactorCommand: + arguments: + - '@Surfnet\StepupMiddleware\MiddlewareBundle\Service\BootstrapCommandService' + - '@Surfnet\StepupMiddleware\MiddlewareBundle\Service\TransactionHelper' + tags: + - { name: 'console.command', command: 'middleware:bootstrap:yubikey' } - Surfnet\StepupMiddleware\MiddlewareBundle\Console\Command\BootstrapGsspSecondFactorCommand: - arguments: - - '@Surfnet\StepupMiddleware\MiddlewareBundle\Service\BootstrapCommandService' - - '@Surfnet\StepupMiddleware\MiddlewareBundle\Service\TransactionHelper' - tags: - - { name: 'console.command', command: 'middleware:bootstrap:gssp' } + Surfnet\StepupMiddleware\MiddlewareBundle\Console\Command\BootstrapGsspSecondFactorCommand: + arguments: + - '@Surfnet\StepupMiddleware\MiddlewareBundle\Service\BootstrapCommandService' + - '@Surfnet\StepupMiddleware\MiddlewareBundle\Service\TransactionHelper' + tags: + - { name: 'console.command', command: 'middleware:bootstrap:gssp' } - Surfnet\StepupMiddleware\MiddlewareBundle\Console\Command\MigrateSecondFactorCommand: - arguments: - - '@Surfnet\StepupMiddleware\MiddlewareBundle\Service\BootstrapCommandService' - - '@Surfnet\StepupMiddleware\MiddlewareBundle\Service\TransactionHelper' - tags: - - { name: 'console.command', command: 'middleware:migrate:vetted-tokens' } + Surfnet\StepupMiddleware\MiddlewareBundle\Console\Command\MigrateSecondFactorCommand: + arguments: + - '@Surfnet\StepupMiddleware\MiddlewareBundle\Service\BootstrapCommandService' + - '@Surfnet\StepupMiddleware\MiddlewareBundle\Service\TransactionHelper' + tags: + - { name: 'console.command', command: 'middleware:migrate:vetted-tokens' } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Resources/config/event_replaying.yml b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Resources/config/event_replaying.yml index e1cd08140..ed1533dc7 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Resources/config/event_replaying.yml +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Resources/config/event_replaying.yml @@ -1,40 +1,40 @@ services: - middleware.event_replay.event_collection: - class: Surfnet\StepupMiddleware\MiddlewareBundle\EventSourcing\EventCollection - arguments: - - "%registered_events%" + middleware.event_replay.event_collection: + class: Surfnet\StepupMiddleware\MiddlewareBundle\EventSourcing\EventCollection + arguments: + - "%registered_events%" - middleware.event_replay.projector_collection: - class: Surfnet\StepupMiddleware\MiddlewareBundle\EventSourcing\ProjectorCollection + middleware.event_replay.projector_collection: + class: Surfnet\StepupMiddleware\MiddlewareBundle\EventSourcing\ProjectorCollection - middleware.event_replay.transaction_aware_event_dispatcher: - class: Surfnet\StepupMiddleware\MiddlewareBundle\Service\TransactionAwareEventDispatcher - arguments: - - "@surfnet_stepup_middleware_middleware.dbal_connection_helper" - - "@middleware.event_replay.replaying_event_dispatcher" + middleware.event_replay.transaction_aware_event_dispatcher: + class: Surfnet\StepupMiddleware\MiddlewareBundle\Service\TransactionAwareEventDispatcher + arguments: + - "@surfnet_stepup_middleware_middleware.dbal_connection_helper" + - "@middleware.event_replay.replaying_event_dispatcher" - middleware.event_replay.replaying_event_dispatcher: - class: Surfnet\StepupMiddleware\MiddlewareBundle\Service\ReplayingEventDispatcher + middleware.event_replay.replaying_event_dispatcher: + class: Surfnet\StepupMiddleware\MiddlewareBundle\Service\ReplayingEventDispatcher - middleware.event_replay.past_events_service: - class: Surfnet\StepupMiddleware\MiddlewareBundle\Service\PastEventsService - arguments: - - "@middleware.event_replay.dbal_event_hydrator" + middleware.event_replay.past_events_service: + class: Surfnet\StepupMiddleware\MiddlewareBundle\Service\PastEventsService + arguments: + - "@middleware.event_replay.dbal_event_hydrator" - middleware.event_replay.dbal_event_hydrator: - public: false - class: Surfnet\StepupMiddleware\MiddlewareBundle\EventSourcing\DBALEventHydrator - arguments: - - "@doctrine.dbal.middleware_connection" - - "@surfnet_stepup.event_store.simple_serializer" - - "@surfnet_stepup.event_store.simple_serializer" - - 'event_stream' - - 'event_stream_sensitive_data' + middleware.event_replay.dbal_event_hydrator: + public: false + class: Surfnet\StepupMiddleware\MiddlewareBundle\EventSourcing\DBALEventHydrator + arguments: + - "@doctrine.dbal.middleware_connection" + - "@surfnet_stepup.event_store.simple_serializer" + - "@surfnet_stepup.event_store.simple_serializer" + - 'event_stream' + - 'event_stream_sensitive_data' - middleware.event_replay.event_stream_replayer: - public: true - class: Surfnet\StepupMiddleware\MiddlewareBundle\Service\EventStreamReplayer - arguments: - - "@surfnet_stepup_middleware_command_handling.event_bus.buffered" - - "@middleware.event_replay.dbal_event_hydrator" - - "@surfnet_stepup_middleware_middleware.dbal_connection_helper" + middleware.event_replay.event_stream_replayer: + public: true + class: Surfnet\StepupMiddleware\MiddlewareBundle\Service\EventStreamReplayer + arguments: + - "@surfnet_stepup_middleware_command_handling.event_bus.buffered" + - "@middleware.event_replay.dbal_event_hydrator" + - "@surfnet_stepup_middleware_middleware.dbal_connection_helper" diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Resources/config/services.yml b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Resources/config/services.yml index 7277bc9fd..b2e4bea2e 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Resources/config/services.yml +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Resources/config/services.yml @@ -1,47 +1,46 @@ services: - # Remove the public: true default once DI is implemented throughout the StepUp applications. See Pivotal #138225085 - _defaults: - public: true + # Remove the public: true default once DI is implemented throughout the StepUp applications. See Pivotal #138225085 + _defaults: + public: true - logger: - alias: 'monolog.logger' - public: true + logger: + alias: 'monolog.logger' + public: true - surfnet_stepup_middleware_middleware.dbal_connection_helper: - class: Surfnet\StepupMiddleware\MiddlewareBundle\Service\DBALConnectionHelper - arguments: - - - middleware: "@doctrine.dbal.middleware_connection" - gateway: "@doctrine.dbal.gateway_connection" + surfnet_stepup_middleware_middleware.dbal_connection_helper: + class: Surfnet\StepupMiddleware\MiddlewareBundle\Service\DBALConnectionHelper + arguments: + - middleware: "@doctrine.dbal.middleware_connection" + gateway: "@doctrine.dbal.gateway_connection" - surfnet_stepup_middleware_middleware.institution_configuration_provider: - class: Surfnet\StepupMiddleware\MiddlewareBundle\Migrations\InstitutionConfiguration\InstitutionConfigurationProvider - arguments: - - "@surfnet_stepup_middleware_api.service.configured_institutions" - - "@surfnet_stepup_middleware_api.service.institution_configuration_options" - - "@surfnet_stepup_middleware_api.service.ra_location" + surfnet_stepup_middleware_middleware.institution_configuration_provider: + class: Surfnet\StepupMiddleware\MiddlewareBundle\Migrations\InstitutionConfiguration\InstitutionConfigurationProvider + arguments: + - "@surfnet_stepup_middleware_api.service.configured_institutions" + - "@surfnet_stepup_middleware_api.service.institution_configuration_options" + - "@surfnet_stepup_middleware_api.service.ra_location" - surfnet_stepup_middleware_middleware.verfied_second_factor_reminder: - class: Surfnet\StepupMiddleware\MiddlewareBundle\Service\VerifiedSecondFactorReminderService - arguments: - - "@surfnet_stepup_middleware_api.repository.verified_second_factor" - - "@surfnet_stepup_middleware_api.repository.identity" - - "@surfnet_stepup_middleware_middleware.verfied_second_factor_reminder_mailer" - - "@logger" + surfnet_stepup_middleware_middleware.verfied_second_factor_reminder: + class: Surfnet\StepupMiddleware\MiddlewareBundle\Service\VerifiedSecondFactorReminderService + arguments: + - "@surfnet_stepup_middleware_api.repository.verified_second_factor" + - "@surfnet_stepup_middleware_api.repository.identity" + - "@surfnet_stepup_middleware_middleware.verfied_second_factor_reminder_mailer" + - "@logger" - surfnet_stepup_middleware_middleware.verfied_second_factor_reminder_mailer: - class: Surfnet\StepupMiddleware\MiddlewareBundle\Service\VerifiedSecondFactorReminderMailService - arguments: - - "@mailer.mailer" - - "@surfnet_stepup_middleware_command_handling.email_sender" - - "@translator" - - "@surfnet_stepup_middleware_management.service.email_template" - - "@surfnet_stepup_middleware_api.service.institution_configuration_options" - - "@surfnet_stepup_middleware_api.service.ra_listing" - - "@surfnet_stepup_middleware_api.service.ra_location" - - "" # Fallback locale + surfnet_stepup_middleware_middleware.verfied_second_factor_reminder_mailer: + class: Surfnet\StepupMiddleware\MiddlewareBundle\Service\VerifiedSecondFactorReminderMailService + arguments: + - "@mailer.mailer" + - "@surfnet_stepup_middleware_command_handling.email_sender" + - "@translator" + - "@surfnet_stepup_middleware_management.service.email_template" + - "@surfnet_stepup_middleware_api.service.institution_configuration_options" + - "@surfnet_stepup_middleware_api.service.ra_listing" + - "@surfnet_stepup_middleware_api.service.ra_location" + - "" # Fallback locale - surfnet_stepup_middleware_middleware.second_factor_display_name_resolver: - public: false - class: Surfnet\StepupMiddleware\MiddlewareBundle\Service\SecondFactorDisplayNameResolverService - arguments: ['%second_factors_display_name%'] + surfnet_stepup_middleware_middleware.second_factor_display_name_resolver: + public: false + class: Surfnet\StepupMiddleware\MiddlewareBundle\Service\SecondFactorDisplayNameResolverService + arguments: [ '%second_factors_display_name%' ] diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/BootstrapCommandService.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/BootstrapCommandService.php index e68443e4b..7e0bde2c4 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/BootstrapCommandService.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/BootstrapCommandService.php @@ -49,35 +49,18 @@ */ class BootstrapCommandService { - private Pipeline $pipeline; - private TokenStorageInterface $tokenStorage; - private MetadataEnricher $enricher; - private IdentityRepository $identityRepository; - private UnverifiedSecondFactorRepository $unverifiedSecondFactorRepository; - private VerifiedSecondFactorRepository $verifiedSecondFactorRepository; - private InstitutionConfigurationOptionsRepository $institutionConfigurationRepository; - private VettedSecondFactorRepository $vettedSecondFactorRepository; - private array $validRegistrationStatuses = ['unverified', 'verified', 'vetted']; public function __construct( - Pipeline $pipeline, - MetadataEnricher $enricher, - TokenStorageInterface $tokenStorage, - IdentityRepository $identityRepository, - UnverifiedSecondFactorRepository $unverifiedSecondFactorRepository, - VerifiedSecondFactorRepository $verifiedSecondFactorRepository, - VettedSecondFactorRepository $vettedSecondFactorRepository, - InstitutionConfigurationOptionsRepository $institutionConfigurationOptionsRepository + private readonly Pipeline $pipeline, + private readonly MetadataEnricher $enricher, + private readonly TokenStorageInterface $tokenStorage, + private readonly IdentityRepository $identityRepository, + private readonly UnverifiedSecondFactorRepository $unverifiedSecondFactorRepository, + private readonly VerifiedSecondFactorRepository $verifiedSecondFactorRepository, + private readonly VettedSecondFactorRepository $vettedSecondFactorRepository, + private readonly InstitutionConfigurationOptionsRepository $institutionConfigurationRepository, ) { - $this->pipeline = $pipeline; - $this->enricher = $enricher; - $this->tokenStorage = $tokenStorage; - $this->identityRepository = $identityRepository; - $this->unverifiedSecondFactorRepository = $unverifiedSecondFactorRepository; - $this->verifiedSecondFactorRepository = $verifiedSecondFactorRepository; - $this->institutionConfigurationRepository = $institutionConfigurationOptionsRepository; - $this->vettedSecondFactorRepository = $vettedSecondFactorRepository; } public function setToken(TokenInterface $token): void @@ -95,15 +78,17 @@ public function validRegistrationStatus($registrationStatus): void sprintf( 'Invalid argument provided for the "registration-status" argument. One of: %s is expected. Received: "%s"', implode(', ', $this->validRegistrationStatuses), - $registrationStatus - ) + $registrationStatus, + ), ); } } public function requiresMailVerification(string $institution) { - $configuration = $this->institutionConfigurationRepository->findConfigurationOptionsFor(new ConfigurationInstitution($institution)); + $configuration = $this->institutionConfigurationRepository->findConfigurationOptionsFor( + new ConfigurationInstitution($institution), + ); if ($configuration) { return $configuration->verifyEmailOption->isEnabled(); } @@ -115,14 +100,14 @@ public function vetSecondFactor( string $actorId, Identity $identity, string $secondFactorId, - string $secondFactorIdentifier - ) :void { + string $secondFactorIdentifier, + ): void { $verifiedSecondFactor = $this->verifiedSecondFactorRepository->findOneBy( - ['identityId' => $identity->id, 'type' => $tokenType] + ['identityId' => $identity->id, 'type' => $tokenType], ); $command = new VetSecondFactorCommand(); - $command->UUID = (string) Uuid::uuid4(); + $command->UUID = (string)Uuid::uuid4(); $command->authorityId = $actorId; $command->identityId = $identity->id; $command->secondFactorId = $secondFactorId; @@ -136,8 +121,6 @@ public function vetSecondFactor( } /** - * @param Institution $institution - * @param NameId $nameId * @param $commonName * @param $email * @param $preferredLocale @@ -148,9 +131,8 @@ public function createIdentity( NameId $nameId, $commonName, $email, - $preferredLocale - ): CreateIdentityCommand - { + $preferredLocale, + ): CreateIdentityCommand { $command = new CreateIdentityCommand(); $command->UUID = (string)Uuid::uuid4(); $command->id = (string)Uuid::uuid4(); @@ -202,7 +184,7 @@ public function proveYubikeyPossession($secondFactorId, $identity, $yubikeyPubli public function verifyEmail(Identity $identity, string $tokenType): void { $unverifiedSecondFactor = $this->unverifiedSecondFactorRepository->findOneBy( - ['identityId' => $identity->id, 'type' => $tokenType] + ['identityId' => $identity->id, 'type' => $tokenType], ); $command = new VerifyEmailCommand(); @@ -213,8 +195,11 @@ public function verifyEmail(Identity $identity, string $tokenType): void $this->pipeline->process($command); } - public function migrateVettedSecondFactor(Identity $sourceIdentity, Identity $targetIdentity, VettedSecondFactor $vettedSecondFactor): void - { + public function migrateVettedSecondFactor( + Identity $sourceIdentity, + Identity $targetIdentity, + VettedSecondFactor $vettedSecondFactor, + ): void { $command = new CommandHandlingMigrateSecondFactorCommand(); $command->UUID = (string)Uuid::uuid4(); $command->sourceIdentityId = $sourceIdentity->id; @@ -257,7 +242,6 @@ public function identityExists(NameId $nameId, Institution $institution): bool } /** - * @param Identity $identity * @return array|VettedSecondFactor[] */ public function getVettedSecondFactorsFromIdentity(Identity $identity): array diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/DBALConnectionHelper.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/DBALConnectionHelper.php index 710b57d3d..9b6c40399 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/DBALConnectionHelper.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/DBALConnectionHelper.php @@ -36,7 +36,7 @@ public function __construct(array $connections) { foreach ($connections as $connection) { if (!$connection instanceof Connection) { - throw InvalidArgumentException::invalidType('\Doctrine\DBAL\Connection', 'connection', $connection); + throw InvalidArgumentException::invalidType(Connection::class, 'connection', $connection); } } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php index a3edb575c..624f8d05a 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php @@ -28,12 +28,6 @@ class EventStreamReplayer { - private BufferedEventBus $eventBus; - - private DBALEventHydrator $eventHydrator; - - private DBALConnectionHelper $connectionHelper; - /** * @var string[] */ @@ -64,18 +58,15 @@ class EventStreamReplayer ]; public function __construct( - BufferedEventBus $eventBus, - DBALEventHydrator $eventHydrator, - DBALConnectionHelper $connectionHelper + private readonly BufferedEventBus $eventBus, + private readonly DBALEventHydrator $eventHydrator, + private readonly DBALConnectionHelper $connectionHelper, ) { - $this->eventBus = $eventBus; - $this->eventHydrator = $eventHydrator; - $this->connectionHelper = $connectionHelper; ProgressBar::setFormatDefinition( 'event_replay', " %message%\n" . ' %current%/%max% [%bar%] %percent:3s%%%elapsed:6s%/' - . "%estimated:-6s%\n %memory:6s%" + . "%estimated:-6s%\n %memory:6s%", ); } @@ -107,7 +98,7 @@ public function replayEvents(OutputInterface $output, $increments): void $defaultMessage = sprintf( 'Found %s Events, replaying in increments of %d', $totalEvents, - $increments + $increments, ); $preparationProgress->setMessage($defaultMessage); $preparationProgress->finish(); @@ -128,7 +119,7 @@ public function replayEvents(OutputInterface $output, $increments): void $messages[] = sprintf( ' > Publishing Event "%s" for UUID "%s"', $event->getType(), - $event->getId() + $event->getId(), ); } @@ -165,32 +156,36 @@ private function wipeReadTables(OutputInterface $output): void } $middlewareConnection = $this->connectionHelper->getConnection('middleware'); - $gatewayConnection = $this->connectionHelper->getConnection('gateway'); + $gatewayConnection = $this->connectionHelper->getConnection('gateway'); $middlewareDatabaseName = $middlewareConnection->getDatabase(); - $gatewayDatabaseName = $gatewayConnection->getDatabase(); + $gatewayDatabaseName = $gatewayConnection->getDatabase(); foreach ($this->middlewareTables as $table) { $rows = $middlewareConnection->delete($table, [1 => 1]); if ($output->getVerbosity() === OutputInterface::VERBOSITY_DEBUG) { - $output->writeln(sprintf( - 'Deleted %d rows from table %s.%s', - $rows, - $middlewareDatabaseName, - $table - )); + $output->writeln( + sprintf( + 'Deleted %d rows from table %s.%s', + $rows, + $middlewareDatabaseName, + $table, + ), + ); } } foreach ($this->gatewayTables as $table) { $rows = $gatewayConnection->delete($table, [1 => 1]); if ($output->getVerbosity() === OutputInterface::VERBOSITY_DEBUG) { - $output->writeln(sprintf( - 'Deleted %d rows from table %s.%s', - $rows, - $gatewayDatabaseName, - $table - )); + $output->writeln( + sprintf( + 'Deleted %d rows from table %s.%s', + $rows, + $gatewayDatabaseName, + $table, + ), + ); } } } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/PastEventsService.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/PastEventsService.php index 27f0cc092..3da22acb2 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/PastEventsService.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/PastEventsService.php @@ -22,17 +22,13 @@ use Surfnet\StepupMiddleware\MiddlewareBundle\EventSourcing\DBALEventHydrator; use Surfnet\StepupMiddleware\MiddlewareBundle\EventSourcing\EventCollection; -final class PastEventsService +final readonly class PastEventsService { - private DBALEventHydrator $eventHydrator; - - public function __construct(DBALEventHydrator $eventHydrator) + public function __construct(private DBALEventHydrator $eventHydrator) { - $this->eventHydrator = $eventHydrator; } /** - * @param EventCollection $events * @return DomainEventStream */ public function findEventsBy(EventCollection $events) diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/SecondFactorDisplayNameResolverService.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/SecondFactorDisplayNameResolverService.php index 4cbf9693f..c0ff7f3a8 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/SecondFactorDisplayNameResolverService.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/SecondFactorDisplayNameResolverService.php @@ -22,23 +22,15 @@ final class SecondFactorDisplayNameResolverService { - private array $secondFactors; - - /** - * @param array $secondFactors - */ - public function __construct(array $secondFactors) + public function __construct(private array $secondFactors) { - $this->secondFactors = $secondFactors; } /** - * @param SecondFactorType $secondFactorType - * * @return string */ public function resolveByType(SecondFactorType $secondFactorType): string { - return $this->secondFactors[(string) $secondFactorType] ?? ucfirst((string) $secondFactorType); + return $this->secondFactors[(string)$secondFactorType] ?? ucfirst((string)$secondFactorType); } } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/TransactionAwareEventDispatcher.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/TransactionAwareEventDispatcher.php index 721408353..a058b36bb 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/TransactionAwareEventDispatcher.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/TransactionAwareEventDispatcher.php @@ -22,16 +22,12 @@ use Broadway\ReadModel\ProjectorInterface; use Exception; -final class TransactionAwareEventDispatcher implements EventDispatcher +final readonly class TransactionAwareEventDispatcher implements EventDispatcher { - private EventDispatcher $eventDispatcher; - - private DBALConnectionHelper $connectionHelper; - - public function __construct(DBALConnectionHelper $connectionHelper, EventDispatcher $eventDispatcher) - { - $this->connectionHelper = $connectionHelper; - $this->eventDispatcher = $eventDispatcher; + public function __construct( + private DBALConnectionHelper $connectionHelper, + private EventDispatcher $eventDispatcher, + ) { } public function registerProjector(ProjectorInterface $projector): void diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/TransactionHelper.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/TransactionHelper.php index 66243218c..f0ab19800 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/TransactionHelper.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/TransactionHelper.php @@ -22,18 +22,13 @@ use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command as MiddlewareCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\Pipeline; -final class TransactionHelper +final readonly class TransactionHelper { - private Pipeline $pipeline; - /** @var EventBusInterface */ - private EventBusInterface $eventBus; - private DBALConnectionHelper $connection; - - public function __construct(Pipeline $pipeline, EventBusInterface $eventBus, DBALConnectionHelper $connection) - { - $this->pipeline = $pipeline; - $this->eventBus = $eventBus; - $this->connection = $connection; + public function __construct( + private Pipeline $pipeline, + private EventBusInterface $eventBus, + private DBALConnectionHelper $connection, + ) { } public function beginTransaction(): void diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php index 304e8fa6b..4f7f445e4 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php @@ -39,56 +39,34 @@ */ class VerifiedSecondFactorReminderMailService { - /** - * @var Mailer - */ - private Mailer $mailer; - - private Sender $sender; - /** * @var TranslatorInterface */ private $translator; - private EmailTemplateService $emailTemplateService; - - private InstitutionConfigurationOptionsService $institutionConfigurationOptionsService; - - private RaListingService $raListingService; - - private RaLocationService $raLocationService; - - private string $fallbackLocale; + private readonly string $fallbackLocale; public function __construct( - Mailer $mailer, - Sender $sender, + private readonly Mailer $mailer, + private readonly Sender $sender, TranslatorInterface $translator, - EmailTemplateService $emailTemplateService, - InstitutionConfigurationOptionsService $institutionConfigurationOptionsService, - RaListingService $raListingService, - RaLocationService $raLocationService, - string $fallbackLocale + private readonly EmailTemplateService $emailTemplateService, + private readonly InstitutionConfigurationOptionsService $institutionConfigurationOptionsService, + private readonly RaListingService $raListingService, + private readonly RaLocationService $raLocationService, + string $fallbackLocale, ) { Assertion::string($fallbackLocale, 'Fallback locale "%s" expected to be string, type %s given'); - $this->mailer = $mailer; - $this->sender = $sender; $this->translator = $translator; - $this->emailTemplateService = $emailTemplateService; - $this->institutionConfigurationOptionsService = $institutionConfigurationOptionsService; - $this->raListingService = $raListingService; - $this->raLocationService = $raLocationService; $this->fallbackLocale = $fallbackLocale; } /** - * @param VerifiedTokenInformation $tokenInformation * @return int */ public function sendReminder(VerifiedTokenInformation $tokenInformation) { - $institution = new Institution((string) $tokenInformation->getInstitution()); + $institution = new Institution((string)$tokenInformation->getInstitution()); $institutionConfigurationOptions = $this->institutionConfigurationOptionsService ->findInstitutionConfigurationOptionsFor($institution); if ($institutionConfigurationOptions->useRaLocationsOption->isEnabled()) { @@ -98,7 +76,7 @@ public function sendReminder(VerifiedTokenInformation $tokenInformation) $tokenInformation->getEmail(), $tokenInformation->getRequestedAt(), $tokenInformation->getRegistrationCode(), - $this->raLocationService->listRaLocationsFor($institution) + $this->raLocationService->listRaLocationsFor($institution), ); } @@ -111,13 +89,11 @@ public function sendReminder(VerifiedTokenInformation $tokenInformation) $tokenInformation->getEmail(), $tokenInformation->getRequestedAt(), $tokenInformation->getRegistrationCode(), - $ras + $ras, ); } - $rasWithoutRaas = array_filter($ras, function (RegistrationAuthorityCredentials $ra): bool { - return !$ra->isRaa(); - }); + $rasWithoutRaas = array_filter($ras, fn(RegistrationAuthorityCredentials $ra): bool => !$ra->isRaa()); return $this->sendReminderWithRas( $tokenInformation->getPreferredLocale(), @@ -125,7 +101,7 @@ public function sendReminder(VerifiedTokenInformation $tokenInformation) $tokenInformation->getEmail(), $tokenInformation->getRequestedAt(), $tokenInformation->getRegistrationCode(), - $rasWithoutRaas + $rasWithoutRaas, ); } @@ -144,19 +120,19 @@ private function sendReminderWithInstitution( $email, $requestedAt, $registrationCode, - $raLocations + $raLocations, ): void { $subject = $this->translator->trans( 'ss.mail.registration_email.subject', ['%commonName%' => $commonName], 'messages', - $locale + $locale, ); $emailTemplate = $this->emailTemplateService->findByName( 'second_factor_verification_reminder_with_ra_locations', $locale, - $this->fallbackLocale + $this->fallbackLocale, ); $parameters = [ @@ -183,19 +159,19 @@ private function sendReminderWithRas( $email, $requestedAt, $registrationCode, - array $ras + array $ras, ): void { $subject = $this->translator->trans( 'ss.mail.registration_email.subject', ['%commonName%' => $commonName], 'messages', - $locale + $locale, ); $emailTemplate = $this->emailTemplateService->findByName( 'second_factor_verification_reminder_with_ras', $locale, - $this->fallbackLocale + $this->fallbackLocale, ); $parameters = [ diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderService.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderService.php index a25dbe793..b20ac4713 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderService.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderService.php @@ -31,34 +31,15 @@ */ class VerifiedSecondFactorReminderService { - private VerifiedSecondFactorRepository $verifiedRepository; - - private IdentityRepository $identityRepository; - - private VerifiedSecondFactorReminderMailService $mailService; - - private LoggerInterface $logger; - - /** - * @param VerifiedSecondFactorRepository $verifiedRepository - * @param IdentityRepository $identityRepository - * @param VerifiedSecondFactorReminderMailService $mailService - * @param LoggerInterface $logger - */ public function __construct( - VerifiedSecondFactorRepository $verifiedRepository, - IdentityRepository $identityRepository, - VerifiedSecondFactorReminderMailService $mailService, - LoggerInterface $logger + private readonly VerifiedSecondFactorRepository $verifiedRepository, + private readonly IdentityRepository $identityRepository, + private readonly VerifiedSecondFactorReminderMailService $mailService, + private readonly LoggerInterface $logger, ) { - $this->verifiedRepository = $verifiedRepository; - $this->identityRepository = $identityRepository; - $this->mailService = $mailService; - $this->logger = $logger; } /** - * @param DateTime $date * @param bool $dryRun */ public function sendReminders(DateTime $date, $dryRun): void @@ -67,8 +48,8 @@ public function sendReminders(DateTime $date, $dryRun): void sprintf( 'Sending reminders for date: %s. dry run mode is %s', $date->format('Y-m-d'), - ($dryRun ? 'enabled' : 'disabled') - ) + ($dryRun ? 'enabled' : 'disabled'), + ), ); $totalNumberSent = 0; @@ -88,8 +69,8 @@ public function sendReminders(DateTime $date, $dryRun): void ($dryRun ? 'in dry run mode ' : ''), $tokenInformation->getEmail(), $tokenInformation->getTokenId(), - $tokenInformation->getTokenType() - ) + $tokenInformation->getTokenType(), + ), ); $totalNumberSent += $numberSent; } @@ -99,13 +80,12 @@ public function sendReminders(DateTime $date, $dryRun): void sprintf( '%d reminders %s been sent', $totalNumberSent, - ($dryRun ? 'would have' : 'have') - ) + ($dryRun ? 'would have' : 'have'), + ), ); } /** - * @param DateTime $date * @return VerifiedTokenInformation[] */ private function buildCollection(DateTime $date): array @@ -120,8 +100,8 @@ private function buildCollection(DateTime $date): array sprintf( 'Identity not found with id "%s" for second factor token "%s"', $token->identityId, - $token->id - ) + $token->id, + ), ); $collection[] = VerifiedTokenInformation::fromEntity($token, $identity); } catch (InvalidArgumentException $e) { diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/SurfnetStepupMiddlewareMiddlewareBundle.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/SurfnetStepupMiddlewareMiddlewareBundle.php index 665949203..d82ac1ea7 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/SurfnetStepupMiddlewareMiddlewareBundle.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/SurfnetStepupMiddlewareMiddlewareBundle.php @@ -18,12 +18,7 @@ namespace Surfnet\StepupMiddleware\MiddlewareBundle; -use Surfnet\StepupMiddleware\MiddlewareBundle\Console\Command\BootstrapIdentityWithYubikeySecondFactorCommand; -use Surfnet\StepupMiddleware\MiddlewareBundle\Console\Command\EmailVerifiedSecondFactorRemindersCommand; -use Surfnet\StepupMiddleware\MiddlewareBundle\Console\Command\ReplayEventsCommand; -use Surfnet\StepupMiddleware\MiddlewareBundle\Console\Command\ReplaySpecificEventsCommand; use Surfnet\StepupMiddleware\MiddlewareBundle\DependencyInjection\CompilerPass\CollectProjectorsForEventReplayCompilerPass; -use Symfony\Component\Console\Application; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Bundle\Bundle; diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/EventSourcing/EventCollectionTest.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/EventSourcing/EventCollectionTest.php index 28887fc27..34a651fa2 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/EventSourcing/EventCollectionTest.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/EventSourcing/EventCollectionTest.php @@ -34,8 +34,9 @@ class EventCollectionTest extends TestCase * @dataProvider emptyOrNonStringProvider * @param $emptyOrNonString */ - public function an_event_collection_must_be_created_from_an_array_of_non_empty_strings(bool|int|string|stdClass|array|null $emptyOrNonString): void - { + public function an_event_collection_must_be_created_from_an_array_of_non_empty_strings( + bool|int|string|stdClass|array|null $emptyOrNonString, + ): void { $this->expectException(InvalidArgumentException::class); $this->expectExceptionMessage('Invalid argument type: "non-empty string" expected'); @@ -66,7 +67,7 @@ public function an_event_collection_contains_given_event_names(): void $this->assertTrue( $eventCollection->contains(NewConfigurationCreatedEvent::class), - 'EventCollection should contain NewConfigurationCreatedEvent but it does not' + 'EventCollection should contain NewConfigurationCreatedEvent but it does not', ); } @@ -84,7 +85,7 @@ public function event_names_can_be_retrieved_from_an_event_collection(): void $this->assertSame( $eventNames, $actualEventNames, - 'Event names cannot be correctly retrieved from an EventCollection' + 'Event names cannot be correctly retrieved from an EventCollection', ); } @@ -98,7 +99,7 @@ public function an_event_collection_does_not_contain_given_event_names(): void $this->assertFalse( $eventCollection->contains(NewConfigurationCreatedEvent::class), - 'EventCollection should not contain NewConfigurationCreatedEvent but it does' + 'EventCollection should not contain NewConfigurationCreatedEvent but it does', ); } @@ -114,7 +115,7 @@ public function a_subset_of_events_can_be_selected_from_an_event_collection(): v $this->assertTrue( $subset->contains(NewConfigurationCreatedEvent::class), - 'EventCollection subset should contain NewConfigurationCreatedEvent but it did not' + 'EventCollection subset should contain NewConfigurationCreatedEvent but it did not', ); } @@ -148,7 +149,7 @@ public function events_in_an_event_collection_can_be_formatted_as_event_stream_c $this->assertEquals( $expectedEventTypes, $actualEventTypes, - 'The events in the event collection should have been formatted as event stream compatible event types but they have not' + 'The events in the event collection should have been formatted as event stream compatible event types but they have not', ); } @@ -161,7 +162,7 @@ public function emptyOrNonStringProvider(): array 'float' => [123], 'empty string' => [''], 'object' => [new stdClass()], - 'array' => [[]] + 'array' => [[]], ]; } } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/EventSourcing/ProjectorCollectionTest.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/EventSourcing/ProjectorCollectionTest.php index f02871567..1aa33b9a7 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/EventSourcing/ProjectorCollectionTest.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/EventSourcing/ProjectorCollectionTest.php @@ -35,7 +35,7 @@ class ProjectorCollectionTest extends TestCase */ public function projectors_can_be_added_to_a_projector_collection_during_runtime(): void { - $sraaProjector = new SraaProjector(m::mock(SraaRepository::class)); + $sraaProjector = new SraaProjector(m::mock(SraaRepository::class)); $whitelistProjector = new WhitelistProjector(m::mock(WhitelistEntryRepository::class)); $projectorCollection = new ProjectorCollection; @@ -44,11 +44,11 @@ public function projectors_can_be_added_to_a_projector_collection_during_runtime $this->assertTrue( $projectorCollection->contains($sraaProjector), - 'ProjectorCollection should have contained added SraaProjector but it did not' + 'ProjectorCollection should have contained added SraaProjector but it did not', ); $this->assertTrue( $projectorCollection->contains($whitelistProjector), - 'ProjectorCollection should have contained added WhitelistProjector but it did not' + 'ProjectorCollection should have contained added WhitelistProjector but it did not', ); } @@ -58,7 +58,7 @@ public function projectors_can_be_added_to_a_projector_collection_during_runtime */ public function projector_names_can_be_retrieved_from_a_projector_collection(): void { - $sraaProjector = new SraaProjector(m::mock(SraaRepository::class)); + $sraaProjector = new SraaProjector(m::mock(SraaRepository::class)); $whitelistProjector = new WhitelistProjector(m::mock(WhitelistEntryRepository::class)); $projectorCollection = new ProjectorCollection; @@ -66,12 +66,12 @@ public function projector_names_can_be_retrieved_from_a_projector_collection(): $projectorCollection->add($whitelistProjector); $expectedProjectorNames = [SraaProjector::class, WhitelistProjector::class]; - $actualProjectorNames = $projectorCollection->getProjectorNames(); + $actualProjectorNames = $projectorCollection->getProjectorNames(); $this->assertSame( $expectedProjectorNames, $actualProjectorNames, - 'Projector names cannot be retrieved correctly from a ProjectorCollection' + 'Projector names cannot be retrieved correctly from a ProjectorCollection', ); } @@ -81,22 +81,22 @@ public function projector_names_can_be_retrieved_from_a_projector_collection(): */ public function a_subset_of_projectors_can_be_selected_from_a_projector_collection(): void { - $sraaProjector = new SraaProjector( m::mock(SraaRepository::class)); + $sraaProjector = new SraaProjector(m::mock(SraaRepository::class)); $whitelistProjector = new WhitelistProjector(m::mock(WhitelistEntryRepository::class)); $projectorCollection = new ProjectorCollection; $projectorCollection->add($sraaProjector); $projectorCollection->add($whitelistProjector); - $projectorSelection = $projectorCollection->selectByNames([get_class($sraaProjector)]); + $projectorSelection = $projectorCollection->selectByNames([$sraaProjector::class]); $this->assertTrue( $projectorSelection->contains($sraaProjector), - 'Subset of ProjectorCollection should contain SraaProjector but it did not' + 'Subset of ProjectorCollection should contain SraaProjector but it did not', ); $this->assertFalse( $projectorSelection->contains($whitelistProjector), - 'Subset of ProjectorCollection should contain WhitelistProjector but it did not' + 'Subset of ProjectorCollection should contain WhitelistProjector but it did not', ); } @@ -109,12 +109,12 @@ public function a_subset_containing_projectors_not_present_in_a_projector_collec $this->expectException(InvalidArgumentException::class); $this->expectExceptionMessage('not present in the collection'); - $sraaProjector = new SraaProjector( m::mock(SraaRepository::class)); + $sraaProjector = new SraaProjector(m::mock(SraaRepository::class)); $nonPresentWhitelistProjector = new WhitelistProjector(m::mock(WhitelistEntryRepository::class)); $projectorCollection = new ProjectorCollection; $projectorCollection->add($sraaProjector); - $projectorCollection->selectByNames([get_class($nonPresentWhitelistProjector)]); + $projectorCollection->selectByNames([$nonPresentWhitelistProjector::class]); } } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Migrations/InstitutionConfiguration/MappedInstitutionConfigurationTest.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Migrations/InstitutionConfiguration/MappedInstitutionConfigurationTest.php index 9bd9d92ed..bc7ae5ff8 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Migrations/InstitutionConfiguration/MappedInstitutionConfigurationTest.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Migrations/InstitutionConfiguration/MappedInstitutionConfigurationTest.php @@ -59,7 +59,7 @@ public function infers_the_correct_remove_institution_configuration_command(): v $verifyEmailOption, $selfVetOption, $numberOfTokensPerIdentityOption, - $raLocations + $raLocations, ); $command = $mapped->inferRemoveInstitutionConfigurationByIdCommand(); @@ -89,7 +89,7 @@ public function infers_the_correct_create_institution_configuration_command(): v $verifyEmailOption, $selfVetOption, $numberOfTokensPerIdentityOption, - $raLocations + $raLocations, ); $command = $mapped->inferCreateInstitutionConfigurationCommand(); @@ -119,7 +119,7 @@ public function infers_the_correct_reconfigure_institution_configuration_command $verifyEmailOption, $selfVetOption, $numberOfTokensPerIdentityOption, - $raLocations + $raLocations, ); $command = $mapped->inferReconfigureInstitutionConfigurationCommand(); @@ -138,13 +138,13 @@ public function infers_the_correct_reconfigure_institution_configuration_command */ public function no_ra_locations_means_no_add_ra_location_command(): void { - $institution = new Institution('Babelfish Inc.'); - $useRaLocationsOption = new UseRaLocationsOption(true); + $institution = new Institution('Babelfish Inc.'); + $useRaLocationsOption = new UseRaLocationsOption(true); $showRaaContactInformationOption = new ShowRaaContactInformationOption(false); - $verifyEmailOption = new VerifyEmailOption(true); + $verifyEmailOption = new VerifyEmailOption(true); $selfVetOption = SelfVetOption::getDefault(); $numberOfTokensPerIdentityOption = new NumberOfTokensPerIdentityOption(1); - $raLocations = []; + $raLocations = []; $mapped = new MappedInstitutionConfiguration( $institution, @@ -153,7 +153,7 @@ public function no_ra_locations_means_no_add_ra_location_command(): void $verifyEmailOption, $selfVetOption, $numberOfTokensPerIdentityOption, - $raLocations + $raLocations, ); $commands = $mapped->inferAddRaLocationCommands(); @@ -167,20 +167,20 @@ public function no_ra_locations_means_no_add_ra_location_command(): void */ public function a_single_ra_location_means_a_single_correct_add_ra_location_command(): void { - $institution = new Institution('Babelfish Inc.'); - $useRaLocationsOption = new UseRaLocationsOption(true); + $institution = new Institution('Babelfish Inc.'); + $useRaLocationsOption = new UseRaLocationsOption(true); $showRaaContactInformationOption = new ShowRaaContactInformationOption(false); - $verifyEmailOption = new VerifyEmailOption(true); + $verifyEmailOption = new VerifyEmailOption(true); $selfVetOption = SelfVetOption::getDefault(); $numberOfTokensPerIdentityOption = new NumberOfTokensPerIdentityOption(0); - $raLocation = RaLocation::create( - (string) Uuid::uuid4(), + $raLocation = RaLocation::create( + (string)Uuid::uuid4(), $institution, new RaLocationName('Some Location'), new Location('Somewhere here or there'), - new ContactInformation('Per phone.') + new ContactInformation('Per phone.'), ); - $raLocations = [$raLocation]; + $raLocations = [$raLocation]; $mapped = new MappedInstitutionConfiguration( $institution, @@ -189,7 +189,7 @@ public function a_single_ra_location_means_a_single_correct_add_ra_location_comm $verifyEmailOption, $selfVetOption, $numberOfTokensPerIdentityOption, - $raLocations + $raLocations, ); $commands = $mapped->inferAddRaLocationCommands(); @@ -206,28 +206,28 @@ public function a_single_ra_location_means_a_single_correct_add_ra_location_comm */ public function multiple_ra_locations_mean_multiple_correct_add_ra_location_commands(): void { - $institution = new Institution('Babelfish Inc.'); - $useRaLocationsOption = new UseRaLocationsOption(true); + $institution = new Institution('Babelfish Inc.'); + $useRaLocationsOption = new UseRaLocationsOption(true); $showRaaContactInformationOption = new ShowRaaContactInformationOption(false); - $verifyEmailOption = new VerifyEmailOption(true); + $verifyEmailOption = new VerifyEmailOption(true); $selfVetOption = SelfVetOption::getDefault(); $numberOfTokensPerIdentityOption = new NumberOfTokensPerIdentityOption(2); - $firstRaLocation = RaLocation::create( - (string) Uuid::uuid4(), + $firstRaLocation = RaLocation::create( + (string)Uuid::uuid4(), $institution, new RaLocationName('Some Location'), new Location('Somewhere here or there'), - new ContactInformation('Per phone.') + new ContactInformation('Per phone.'), ); - $secondRaLocation = RaLocation::create( - (string) Uuid::uuid4(), + $secondRaLocation = RaLocation::create( + (string)Uuid::uuid4(), $institution, new RaLocationName('Somewhere else'), new Location('Utrecht, The Netherlands'), - new ContactInformation('Shout really hard') + new ContactInformation('Shout really hard'), ); - $raLocations = [$firstRaLocation, $secondRaLocation]; + $raLocations = [$firstRaLocation, $secondRaLocation]; $mapped = new MappedInstitutionConfiguration( $institution, @@ -236,7 +236,7 @@ public function multiple_ra_locations_mean_multiple_correct_add_ra_location_comm $verifyEmailOption, $selfVetOption, $numberOfTokensPerIdentityOption, - $raLocations + $raLocations, ); $commands = $mapped->inferAddRaLocationCommands(); @@ -249,7 +249,7 @@ public function multiple_ra_locations_mean_multiple_correct_add_ra_location_comm public function assertCommandMatches( AddRaLocationCommand $command, Institution $institution, - RaLocation $raLocation + RaLocation $raLocation, ): void { $this->assertEquals($institution->getInstitution(), $command->institution); $this->assertEquals($raLocation->id, $command->raLocationId); @@ -257,7 +257,7 @@ public function assertCommandMatches( $this->assertEquals($raLocation->location->getLocation(), $command->location); $this->assertEquals( $raLocation->contactInformation->getContactInformation(), - $command->contactInformation + $command->contactInformation, ); } } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Service/SecondFactorDisplayNameResolverServiceTest.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Service/SecondFactorDisplayNameResolverServiceTest.php index c5ae30c7c..127613803 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Service/SecondFactorDisplayNameResolverServiceTest.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Service/SecondFactorDisplayNameResolverServiceTest.php @@ -18,7 +18,6 @@ namespace Surfnet\StepupMiddleware\MiddlewareBundle\Tests\Service; - use PHPUnit\Framework\TestCase; use Surfnet\StepupBundle\Value\SecondFactorType; use Surfnet\StepupMiddleware\MiddlewareBundle\Service\SecondFactorDisplayNameResolverService; diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Service/VerifiedSecondFactorReminderServiceTest.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Service/VerifiedSecondFactorReminderServiceTest.php index 811e5b0df..aed457eca 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Service/VerifiedSecondFactorReminderServiceTest.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Service/VerifiedSecondFactorReminderServiceTest.php @@ -67,7 +67,7 @@ public function setUp(): void $this->verifiedSecondFactorRepository, $this->identityRepository, $this->mailService, - $this->logger + $this->logger, ); } @@ -138,7 +138,9 @@ public function test_one_token_reminders_sent(): void $this->logger ->shouldReceive('info') ->once() - ->with('Message successfully sent to "mail@example1.org" with token id "fa125c7c-c9ee-11e7-8001-000000000001" of type "yubikey"'); + ->with( + 'Message successfully sent to "mail@example1.org" with token id "fa125c7c-c9ee-11e7-8001-000000000001" of type "yubikey"', + ); $this->logger ->shouldReceive('info') @@ -188,7 +190,9 @@ public function test_one_token_reminders_sent_failing_mailer(): void $this->logger ->shouldReceive('info') ->once() - ->with('Message was not sent to "mail@example1.org" with token id "fa125c7c-c9ee-11e7-8001-000000000001" of type "yubikey"'); + ->with( + 'Message was not sent to "mail@example1.org" with token id "fa125c7c-c9ee-11e7-8001-000000000001" of type "yubikey"', + ); $this->logger ->shouldReceive('info') @@ -239,7 +243,11 @@ public function test_multiple_tokens_reminders_sent(): void $this->logger ->shouldReceive('info') - ->with(m::pattern('/^Message successfully sent to "mail@example\d.org" with token id "fa125c7c-c9ee-11e7-800\d-00000000000\d" of type "yubikey"/')) + ->with( + m::pattern( + '/^Message successfully sent to "mail@example\d.org" with token id "fa125c7c-c9ee-11e7-800\d-00000000000\d" of type "yubikey"/', + ), + ) ->times(9); $this->logger @@ -322,7 +330,9 @@ public function test_one_token_reminders_sent_dry_run(): void $this->logger ->shouldReceive('info') ->once() - ->with('Message successfully sent in dry run mode to "mail@example1.org" with token id "fa125c7c-c9ee-11e7-8001-000000000001" of type "yubikey"'); + ->with( + 'Message successfully sent in dry run mode to "mail@example1.org" with token id "fa125c7c-c9ee-11e7-8001-000000000001" of type "yubikey"', + ); $this->logger ->shouldReceive('info') @@ -367,7 +377,11 @@ public function test_multiple_tokens_reminders_sent_dry_run(): void $this->logger ->shouldReceive('info') - ->with(m::pattern('/^Message successfully sent in dry run mode to "mail@example\d.org" with token id "fa125c7c-c9ee-11e7-800\d-00000000000\d" of type "yubikey"/')) + ->with( + m::pattern( + '/^Message successfully sent in dry run mode to "mail@example\d.org" with token id "fa125c7c-c9ee-11e7-800\d-00000000000\d" of type "yubikey"/', + ), + ) ->times(9); $this->logger @@ -405,14 +419,12 @@ public function test_no_token_reminders_sent_dry_run(): void } /** - * @param int $numberOfResults - * @param DateTime $requestedAt * @return VerifiedSecondFactor[] */ private function buildVerifiedSecondFactors(int $numberOfResults, DateTime $requestedAt): array { $collection = []; - for ($i=1; $i<=$numberOfResults; $i++) { + for ($i = 1; $i <= $numberOfResults; $i++) { $token = new VerifiedSecondFactor(); $token->id = "fa125c7c-c9ee-11e7-800{$i}-00000000000{$i}"; $token->identityId = $i; @@ -427,7 +439,6 @@ private function buildVerifiedSecondFactors(int $numberOfResults, DateTime $requ } /** - * @param VerifiedSecondFactor $token * @return Identity */ private function buildIdentity(VerifiedSecondFactor $token): Identity @@ -440,6 +451,5 @@ private function buildIdentity(VerifiedSecondFactor $token): Identity $identity->email = "mail@example{$token->identityId}.org"; return $identity; - } } From c3aa9476b45f623eb1155b383fbc57f4afd1ae13 Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Tue, 27 Feb 2024 11:09:04 +0100 Subject: [PATCH 17/89] Repair the ManagerRegistry reference Many repos referred to a moved ManagerRegistry class. That was changed in this commit --- .../Configuration/Repository/AllowedSecondFactorRepository.php | 2 +- .../Repository/ConfiguredInstitutionRepository.php | 2 +- .../Repository/InstitutionAuthorizationRepository.php | 2 +- .../Repository/InstitutionConfigurationOptionsRepository.php | 2 +- .../ApiBundle/Configuration/Repository/RaLocationRepository.php | 2 +- .../ApiBundle/Identity/Repository/AuditLogRepository.php | 2 +- .../ApiBundle/Identity/Repository/AuthorizationRepository.php | 2 +- .../ApiBundle/Identity/Repository/IdentityRepository.php | 2 +- .../Repository/IdentitySelfAssertedTokenOptionsRepository.php | 2 +- .../Identity/Repository/InstitutionListingRepository.php | 2 +- .../ApiBundle/Identity/Repository/RaCandidateRepository.php | 2 +- .../ApiBundle/Identity/Repository/RaListingRepository.php | 2 +- .../ApiBundle/Identity/Repository/RaSecondFactorRepository.php | 2 +- .../ApiBundle/Identity/Repository/RecoveryTokenRepository.php | 2 +- .../Identity/Repository/SecondFactorRevocationRepository.php | 2 +- .../ApiBundle/Identity/Repository/SraaRepository.php | 2 +- .../Identity/Repository/UnverifiedSecondFactorRepository.php | 2 +- .../Identity/Repository/VerifiedSecondFactorRepository.php | 2 +- .../Identity/Repository/VettedSecondFactorRepository.php | 2 +- .../ApiBundle/Identity/Repository/VettingTypeHintRepository.php | 2 +- .../ApiBundle/Identity/Repository/WhitelistEntryRepository.php | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/AllowedSecondFactorRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/AllowedSecondFactorRepository.php index 879870426..3e00a2817 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/AllowedSecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/AllowedSecondFactorRepository.php @@ -19,7 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; -use Doctrine\Common\Persistence\ManagerRegistry; +use Doctrine\Persistence\ManagerRegistry; use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity\AllowedSecondFactor; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/ConfiguredInstitutionRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/ConfiguredInstitutionRepository.php index a4b304582..5860f1336 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/ConfiguredInstitutionRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/ConfiguredInstitutionRepository.php @@ -19,7 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; -use Doctrine\Common\Persistence\ManagerRegistry; +use Doctrine\Persistence\ManagerRegistry; use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity\ConfiguredInstitution; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionAuthorizationRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionAuthorizationRepository.php index 7ddf08077..379ea8022 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionAuthorizationRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionAuthorizationRepository.php @@ -19,7 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; -use Doctrine\Common\Persistence\ManagerRegistry; +use Doctrine\Persistence\ManagerRegistry; use Doctrine\ORM\EntityManager; use Doctrine\ORM\OptimisticLockException; use Surfnet\Stepup\Configuration\Value\Institution; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionConfigurationOptionsRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionConfigurationOptionsRepository.php index e008a03a3..eec23074d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionConfigurationOptionsRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionConfigurationOptionsRepository.php @@ -19,7 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; -use Doctrine\Common\Persistence\ManagerRegistry; +use Doctrine\Persistence\ManagerRegistry; use Doctrine\ORM\NonUniqueResultException; use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity\InstitutionConfigurationOptions; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/RaLocationRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/RaLocationRepository.php index 0211b5199..d659a8032 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/RaLocationRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/RaLocationRepository.php @@ -19,7 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; -use Doctrine\Common\Persistence\ManagerRegistry; +use Doctrine\Persistence\ManagerRegistry; use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\Stepup\Configuration\Value\RaLocationId; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity\RaLocation; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuditLogRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuditLogRepository.php index 0e352473f..5044a54e5 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuditLogRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuditLogRepository.php @@ -20,6 +20,7 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\ORM\Query; +use Doctrine\Persistence\ManagerRegistry; use Surfnet\Stepup\Identity\Event\AppointedAsRaaEvent; use Surfnet\Stepup\Identity\Event\AppointedAsRaaForInstitutionEvent; use Surfnet\Stepup\Identity\Event\AppointedAsRaEvent; @@ -55,7 +56,6 @@ use Surfnet\StepupMiddleware\ApiBundle\Exception\RuntimeException; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\AuditLogEntry; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\SecondFactorAuditLogQuery; -use Symfony\Bridge\Doctrine\ManagerRegistry; class AuditLogRepository extends ServiceEntityRepository { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php index a08889abc..6bfed0260 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php @@ -20,6 +20,7 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\ORM\Query\Expr\Join; +use Doctrine\Persistence\ManagerRegistry; use Psr\Log\LoggerInterface; use Surfnet\Stepup\Configuration\Value\InstitutionRole; use Surfnet\Stepup\Identity\Collection\InstitutionCollection; @@ -32,7 +33,6 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Identity; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\RaListing; use Surfnet\StepupMiddleware\ApiBundle\Identity\Value\AuthorityRole; -use Symfony\Bridge\Doctrine\ManagerRegistry; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php index 8e1e9df33..6ac36ff30 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php @@ -21,13 +21,13 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ORM\Query; +use Doctrine\Persistence\ManagerRegistry; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\Stepup\Identity\Value\NameId; use Surfnet\StepupMiddleware\ApiBundle\Authorization\Filter\InstitutionAuthorizationRepositoryFilter; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Identity; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\IdentityQuery; -use Symfony\Bridge\Doctrine\ManagerRegistry; class IdentityRepository extends ServiceEntityRepository { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentitySelfAssertedTokenOptionsRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentitySelfAssertedTokenOptionsRepository.php index f08b8c676..b1ac17b65 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentitySelfAssertedTokenOptionsRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentitySelfAssertedTokenOptionsRepository.php @@ -19,9 +19,9 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Repository; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; +use Doctrine\Persistence\ManagerRegistry; use Surfnet\StepupMiddleware\ApiBundle\Authorization\Filter\InstitutionAuthorizationRepositoryFilter; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\IdentitySelfAssertedTokenOptions; -use Symfony\Bridge\Doctrine\ManagerRegistry; class IdentitySelfAssertedTokenOptionsRepository extends ServiceEntityRepository { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/InstitutionListingRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/InstitutionListingRepository.php index a86d0ba67..38459867e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/InstitutionListingRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/InstitutionListingRepository.php @@ -19,9 +19,9 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Repository; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; +use Doctrine\Persistence\ManagerRegistry; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\InstitutionListing; -use Symfony\Bridge\Doctrine\ManagerRegistry; /** * @deprecated This could probably be removed and is only used in migrations diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaCandidateRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaCandidateRepository.php index 856c868ca..0e46f507f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaCandidateRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaCandidateRepository.php @@ -22,6 +22,7 @@ use Doctrine\ORM\Query; use Doctrine\ORM\Query\Expr\Join; use Doctrine\ORM\QueryBuilder; +use Doctrine\Persistence\ManagerRegistry; use Surfnet\Stepup\Identity\Value\VettingType; use Surfnet\StepupMiddleware\ApiBundle\Authorization\Filter\InstitutionAuthorizationRepositoryFilter; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity\InstitutionAuthorization; @@ -30,7 +31,6 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\RaListing; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\VettedSecondFactor; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\RaCandidateQuery; -use Symfony\Bridge\Doctrine\ManagerRegistry; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php index 38d2325bf..07c72be65 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php @@ -21,6 +21,7 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ORM\Query; +use Doctrine\Persistence\ManagerRegistry; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Authorization\Filter\InstitutionAuthorizationRepositoryFilter; @@ -28,7 +29,6 @@ use Surfnet\StepupMiddleware\ApiBundle\Exception\RuntimeException; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\RaListing; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\RaListingQuery; -use Symfony\Bridge\Doctrine\ManagerRegistry; /** * @SuppressWarnings(PHPMD.TooManyPublicMethods) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php index ad847de26..109ce4604 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php @@ -22,6 +22,7 @@ use Doctrine\DBAL\DBALException; use Doctrine\DBAL\Types\Type; use Doctrine\ORM\Query; +use Doctrine\Persistence\ManagerRegistry; use Surfnet\Stepup\Exception\RuntimeException; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\StepupMiddleware\ApiBundle\Authorization\Filter\InstitutionAuthorizationRepositoryFilter; @@ -29,7 +30,6 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\RaSecondFactor; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\RaSecondFactorQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Value\SecondFactorStatus; -use Symfony\Bridge\Doctrine\ManagerRegistry; class RaSecondFactorRepository extends ServiceEntityRepository { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RecoveryTokenRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RecoveryTokenRepository.php index 796008a80..6271b7165 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RecoveryTokenRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RecoveryTokenRepository.php @@ -21,6 +21,7 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\DBAL\Types\Type; use Doctrine\ORM\Query; +use Doctrine\Persistence\ManagerRegistry; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\StepupMiddleware\ApiBundle\Authorization\Filter\InstitutionAuthorizationRepositoryFilter; use Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\RecoveryTokenStatusType; @@ -28,7 +29,6 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\RecoveryToken; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\RecoveryTokenQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Value\RecoveryTokenStatus; -use Symfony\Bridge\Doctrine\ManagerRegistry; class RecoveryTokenRepository extends ServiceEntityRepository { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SecondFactorRevocationRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SecondFactorRevocationRepository.php index 0ee937c57..28eaecd44 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SecondFactorRevocationRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SecondFactorRevocationRepository.php @@ -19,8 +19,8 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Repository; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; +use Doctrine\Persistence\ManagerRegistry; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\SecondFactorRevocation; -use Symfony\Bridge\Doctrine\ManagerRegistry; class SecondFactorRevocationRepository extends ServiceEntityRepository { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php index 512847459..2cb9d74a4 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php @@ -19,10 +19,10 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Repository; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; +use Doctrine\Persistence\ManagerRegistry; use Surfnet\Stepup\Identity\Value\NameId; use Surfnet\StepupMiddleware\ApiBundle\Exception\InvalidArgumentException; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Sraa; -use Symfony\Bridge\Doctrine\ManagerRegistry; class SraaRepository extends ServiceEntityRepository { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/UnverifiedSecondFactorRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/UnverifiedSecondFactorRepository.php index bf9a49c5e..c77606bb0 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/UnverifiedSecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/UnverifiedSecondFactorRepository.php @@ -20,10 +20,10 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\ORM\Query; +use Doctrine\Persistence\ManagerRegistry; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\UnverifiedSecondFactor; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\UnverifiedSecondFactorQuery; -use Symfony\Bridge\Doctrine\ManagerRegistry; class UnverifiedSecondFactorRepository extends ServiceEntityRepository { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VerifiedSecondFactorRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VerifiedSecondFactorRepository.php index 6cfcc6c60..79cc5e6dd 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VerifiedSecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VerifiedSecondFactorRepository.php @@ -21,12 +21,12 @@ use DateTime; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\ORM\Query; +use Doctrine\Persistence\ManagerRegistry; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\StepupMiddleware\ApiBundle\Authorization\Filter\InstitutionAuthorizationRepositoryFilter; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\VerifiedSecondFactor; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\VerifiedSecondFactorOfIdentityQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\VerifiedSecondFactorQuery; -use Symfony\Bridge\Doctrine\ManagerRegistry; class VerifiedSecondFactorRepository extends ServiceEntityRepository { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettedSecondFactorRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettedSecondFactorRepository.php index f9e89ce24..b603df508 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettedSecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettedSecondFactorRepository.php @@ -20,10 +20,10 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\ORM\Query; +use Doctrine\Persistence\ManagerRegistry; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\VettedSecondFactor; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\VettedSecondFactorQuery; -use Symfony\Bridge\Doctrine\ManagerRegistry; class VettedSecondFactorRepository extends ServiceEntityRepository { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettingTypeHintRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettingTypeHintRepository.php index 92d7fb3a0..e48f6eec3 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettingTypeHintRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettingTypeHintRepository.php @@ -19,8 +19,8 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Repository; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; +use Doctrine\Persistence\ManagerRegistry; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\VettingTypeHint; -use Symfony\Bridge\Doctrine\ManagerRegistry; class VettingTypeHintRepository extends ServiceEntityRepository { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php index 485745501..053cb4ca2 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php @@ -20,9 +20,9 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\Persistence\ManagerRegistry; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\WhitelistEntry; -use Symfony\Bridge\Doctrine\ManagerRegistry; class WhitelistEntryRepository extends ServiceEntityRepository { From 30b5c701d0bd0dfe492c80dc1463f563b02773ef Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Tue, 27 Feb 2024 11:51:11 +0100 Subject: [PATCH 18/89] Enable autoc onfigure/wire/public:false defaults --- config/packages/services.yaml | 38 ----------------- config/routes/annotations.yaml | 7 ---- config/services.yaml | 41 +++++++++++++++++++ .../ApiBundle/Resources/config/services.yml | 4 +- .../Resources/config/services.yml | 4 ++ .../Resources/config/services.yml | 4 +- 6 files changed, 51 insertions(+), 47 deletions(-) delete mode 100644 config/packages/services.yaml delete mode 100644 config/routes/annotations.yaml diff --git a/config/packages/services.yaml b/config/packages/services.yaml deleted file mode 100644 index 05a680115..000000000 --- a/config/packages/services.yaml +++ /dev/null @@ -1,38 +0,0 @@ -services: - twig.extension.stringloader: - class: Twig_Extension_StringLoader - tags: [{ name: twig.extension }] - twig.extension.sandbox: - class: Twig_Extension_Sandbox - arguments: [ "@twig.extension.sandbox.policy" ] - tags: [{ name: twig.extension }] - twig.extension.sandbox.policy: - class: Twig_Sandbox_SecurityPolicy - arguments: - - [ if, else, elseif, for ] # Allowed tags - - [ escape, localizeddate ] # Allowed filters - - # Allowed methods - Surfnet\Stepup\Identity\Value\CommonName: - - __toString - Surfnet\Stepup\Configuration\Value\ContactInformation: - - __toString - Surfnet\Stepup\Configuration\Value\Location: - - __toString - Surfnet\Stepup\Configuration\Value\RaLocationName: - - __toString - Surfnet\Stepup\DateTime\DateTime: - - __toString - Surfnet\StepupMiddleware\ApiBundle\Identity\Value\RegistrationAuthorityCredentials: - - getCommonName - - getLocation - - getContactInformation - Surfnet\Stepup\Identity\Value\Location: - - __toString - Surfnet\Stepup\Identity\Value\ContactInformation: - - __toString - - # Allowed properties - Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity\RaLocation: - - name - - location - - contactInformation - - [] # Allowed functions \ No newline at end of file diff --git a/config/routes/annotations.yaml b/config/routes/annotations.yaml deleted file mode 100644 index 0686ce142..000000000 --- a/config/routes/annotations.yaml +++ /dev/null @@ -1,7 +0,0 @@ -#controllers: -# resource: ../../src/Controller/ -# type: annotation -# -#kernel: -# resource: ../../src/Kernel.php -# type: annotation diff --git a/config/services.yaml b/config/services.yaml index 6791096b7..cd536baa6 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -7,8 +7,49 @@ services: _defaults: autowire: true autoconfigure: true + public: false Surfnet\Stepup\Helper\SecondFactorProvePossessionHelper: arguments: - "@surfnet_stepup.service.second_factor_type" - '%skip_prove_possession_second_factors%' + + twig.extension.stringloader: + class: Twig\Extension\StringLoaderExtension + tags: [{ name: twig.extension }] + + twig.extension.sandbox: + class: Twig\Extension\SandboxExtension + arguments: [ "@twig.extension.sandbox.policy" ] + tags: [{ name: twig.extension }] + + twig.extension.sandbox.policy: + class: Twig\Sandbox\SecurityPolicy + arguments: + - [ if, else, elseif, for ] # Allowed tags + - [ escape, localizeddate ] # Allowed filters + - # Allowed methods + Surfnet\Stepup\Identity\Value\CommonName: + - __toString + Surfnet\Stepup\Configuration\Value\ContactInformation: + - __toString + Surfnet\Stepup\Configuration\Value\Location: + - __toString + Surfnet\Stepup\Configuration\Value\RaLocationName: + - __toString + Surfnet\Stepup\DateTime\DateTime: + - __toString + Surfnet\StepupMiddleware\ApiBundle\Identity\Value\RegistrationAuthorityCredentials: + - getCommonName + - getLocation + - getContactInformation + Surfnet\Stepup\Identity\Value\Location: + - __toString + Surfnet\Stepup\Identity\Value\ContactInformation: + - __toString + - # Allowed properties + Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity\RaLocation: + - name + - location + - contactInformation + - [] # Allowed functions diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/services.yml b/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/services.yml index b3e057bab..4d6f87bcf 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/services.yml +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/services.yml @@ -1,11 +1,13 @@ services: _defaults: + autowire: true + autoconfigure: true + public: false bind: $numberOfTokensPerIdentity: '%number_of_tokens_per_identity%' Surfnet\StepupMiddleware\ApiBundle\: resource: '../../*' - autowire: true exclude: '../../{DependencyInjection,Entity,Repository,Migrations,Tests,Controller}' # The ManagementBundle controllers are available as a service diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Resources/config/services.yml b/src/Surfnet/StepupMiddleware/ManagementBundle/Resources/config/services.yml index c2d4d38dc..4215a7ed5 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Resources/config/services.yml +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Resources/config/services.yml @@ -1,4 +1,8 @@ services: + _defaults: + autowire: true + autoconfigure: true + public: false Surfnet\StepupMiddleware\ManagementBundle\Controller\: resource: '../../Controller' diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Resources/config/services.yml b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Resources/config/services.yml index b2e4bea2e..d22cbb057 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Resources/config/services.yml +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Resources/config/services.yml @@ -1,7 +1,9 @@ services: # Remove the public: true default once DI is implemented throughout the StepUp applications. See Pivotal #138225085 _defaults: - public: true + autowire: true + autoconfigure: true + public: false logger: alias: 'monolog.logger' From 2094154527378581717337d507972ff792076261 Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Tue, 27 Feb 2024 11:52:06 +0100 Subject: [PATCH 19/89] Add doctrine/annotations for jms translations --- composer.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index fda47d96e..8afe2bb16 100644 --- a/composer.json +++ b/composer.json @@ -26,12 +26,13 @@ "ext-json": "*", "broadway/broadway": "^2.5", "broadway/event-store-dbal": "^0.6", + "doctrine/annotations": "^2.0", "doctrine/doctrine-bundle": "^2.11", "doctrine/doctrine-fixtures-bundle": "^3.5", "doctrine/doctrine-migrations-bundle": "^3.3", "doctrine/orm": "^3.0", "incenteev/composer-parameter-handler": "~2.0", - "jms/translation-bundle": "^2.0", + "jms/translation-bundle": "^2.2", "liip/test-fixtures-bundle": "^2.7", "nelmio/security-bundle": "^3.1", "openconext/monitor-bundle": "^4.1", @@ -42,6 +43,7 @@ "symfony/expression-language": "6.4.*", "symfony/flex": "^v2.4", "symfony/form": "6.4.*", + "symfony/framework-bundle": "6.4.*", "symfony/intl": "6.4.*", "symfony/mailer": "6.4.*", "symfony/monolog-bundle": "^v3.9", From 849b832f60a04d582eae04d2e785b792f411cd73 Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Tue, 27 Feb 2024 11:56:08 +0100 Subject: [PATCH 20/89] Change renamed contracts --- .../Identity/Service/EmailVerificationMailService.php | 7 ++----- .../Identity/Service/RegistrationMailService.php | 2 +- .../Identity/Service/SecondFactorRevocationMailService.php | 2 +- .../Identity/Service/SecondFactorVettedMailService.php | 2 +- .../Pipeline/TransactionAwarePipeline.php | 2 +- .../Configuration/Repository/EmailTemplateRepository.php | 2 +- .../Service/VerifiedSecondFactorReminderMailService.php | 2 +- 7 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/EmailVerificationMailService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/EmailVerificationMailService.php index 9af9c9f71..76deea6b9 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/EmailVerificationMailService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/EmailVerificationMailService.php @@ -26,14 +26,11 @@ use Symfony\Component\Mailer\Exception\TransportExceptionInterface; use Symfony\Component\Mailer\MailerInterface as Mailer; use Symfony\Component\Mime\Address; -use Symfony\Component\Translation\TranslatorInterface; +use Symfony\Contracts\Translation\TranslatorInterface; final class EmailVerificationMailService { - /** - * @var TranslatorInterface - */ - private $translator; + private TranslatorInterface $translator; private readonly string $emailVerificationUrlTemplate; diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php index 6b19ce8d0..652f28608 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php @@ -35,7 +35,7 @@ use Symfony\Bridge\Twig\Mime\TemplatedEmail; use Symfony\Component\Mailer\MailerInterface as Mailer; use Symfony\Component\Mime\Address; -use Symfony\Component\Translation\TranslatorInterface; +use Symfony\Contracts\Translation\TranslatorInterface; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorRevocationMailService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorRevocationMailService.php index 77c92626f..8580b5f38 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorRevocationMailService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorRevocationMailService.php @@ -32,7 +32,7 @@ use Symfony\Component\Mailer\Exception\TransportExceptionInterface; use Symfony\Component\Mailer\MailerInterface as Mailer; use Symfony\Component\Mime\Address; -use Symfony\Component\Translation\TranslatorInterface; +use Symfony\Contracts\Translation\TranslatorInterface; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorVettedMailService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorVettedMailService.php index 38989e35a..03f80c205 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorVettedMailService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorVettedMailService.php @@ -28,7 +28,7 @@ use Symfony\Bridge\Twig\Mime\TemplatedEmail; use Symfony\Component\Mailer\MailerInterface as Mailer; use Symfony\Component\Mime\Address; -use Symfony\Component\Translation\TranslatorInterface; +use Symfony\Contracts\Translation\TranslatorInterface; final class SecondFactorVettedMailService { diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/TransactionAwarePipeline.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/TransactionAwarePipeline.php index 78ba8e629..2023e488d 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/TransactionAwarePipeline.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/TransactionAwarePipeline.php @@ -18,7 +18,7 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline; -use Doctrine\DBAL\Driver\Connection; +use Doctrine\DBAL\Connection; use Exception; use Psr\Log\LoggerInterface; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Repository/EmailTemplateRepository.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Repository/EmailTemplateRepository.php index 390dd8272..1ebe15f50 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Repository/EmailTemplateRepository.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Repository/EmailTemplateRepository.php @@ -19,7 +19,7 @@ namespace Surfnet\StepupMiddleware\ManagementBundle\Configuration\Repository; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; -use Doctrine\Common\Persistence\ManagerRegistry; +use Doctrine\Persistence\ManagerRegistry; use Surfnet\StepupMiddleware\ManagementBundle\Configuration\Entity\EmailTemplate; final class EmailTemplateRepository extends ServiceEntityRepository diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php index 4f7f445e4..b6da3132e 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php @@ -32,7 +32,7 @@ use Symfony\Component\Mailer\Exception\TransportExceptionInterface; use Symfony\Component\Mailer\MailerInterface as Mailer; use Symfony\Component\Mime\Address; -use Symfony\Component\Translation\TranslatorInterface; +use Symfony\Contracts\Translation\TranslatorInterface; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) From 8554c4ec84674cfbac290b966eedbf6b0d52dbad Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Tue, 27 Feb 2024 13:44:48 +0100 Subject: [PATCH 21/89] Upgrade Doctrine Types Type definitions have been added where possible --- ci/qa/phpunit | 4 ++-- .../ApiBundle/Doctrine/Type/AuthorityRoleType.php | 14 +++++++------- .../ApiBundle/Doctrine/Type/CommonNameType.php | 10 +++++----- .../Type/ConfigurationContactInformationType.php | 8 ++++---- .../Doctrine/Type/ConfigurationInstitutionType.php | 8 ++++---- .../Doctrine/Type/ConfigurationLocationType.php | 8 ++++---- .../Doctrine/Type/ContactInformationType.php | 8 ++++---- .../ApiBundle/Doctrine/Type/DateTimeType.php | 12 ++++++------ .../ApiBundle/Doctrine/Type/DocumentNumberType.php | 12 ++++++------ .../ApiBundle/Doctrine/Type/EmailType.php | 10 +++++----- .../Doctrine/Type/InstitutionRoleType.php | 8 ++++---- .../ApiBundle/Doctrine/Type/InstitutionType.php | 10 +++++----- .../ApiBundle/Doctrine/Type/LocaleType.php | 10 +++++----- .../ApiBundle/Doctrine/Type/LocationType.php | 10 +++++----- .../ApiBundle/Doctrine/Type/NameIdType.php | 10 +++++----- .../Type/NumberOfTokensPerIdentityType.php | 8 ++++---- .../ApiBundle/Doctrine/Type/RaLocationNameType.php | 6 +++--- .../Doctrine/Type/RecoveryTokenStatusType.php | 6 +++--- .../Doctrine/Type/SecondFactorStatusType.php | 12 ++++++------ .../Doctrine/Type/SecondFactorTypeType.php | 10 +++++----- .../Doctrine/Type/SelfAssertedTokensOptionType.php | 10 +++++----- .../ApiBundle/Doctrine/Type/SelfVetOptionType.php | 10 +++++----- .../Type/ShowRaaContactInformationOptionType.php | 10 +++++----- .../ApiBundle/Doctrine/Type/SsoOn2faOptionType.php | 10 +++++----- .../Doctrine/Type/UseRaLocationsOptionType.php | 10 +++++----- .../Doctrine/Type/VerifyEmailOptionType.php | 10 +++++----- .../Doctrine/Type/VettingTypeHintsType.php | 8 ++++---- .../ApiBundle/Identity/Entity/RecoveryToken.php | 3 --- .../Tests/Doctrine/Type/AuthorityRoleTypeTest.php | 6 +++--- .../Tests/Doctrine/Type/CommonNameTypeTest.php | 6 +++--- .../ConfigurationContactInformationTypeTest.php | 6 +++--- .../Type/ConfigurationInstitutionTypeTest.php | 6 +++--- .../Type/ConfigurationLocationTypeTest.php | 6 +++--- .../Doctrine/Type/ContactInformationTypeTest.php | 6 +++--- .../Tests/Doctrine/Type/DateTimeTypeTest.php | 6 +++--- .../Tests/Doctrine/Type/DocumentNumberTypeTest.php | 6 +++--- .../Tests/Doctrine/Type/EmailTypeTest.php | 6 +++--- .../Doctrine/Type/InstitutionRoleTypeTest.php | 6 +++--- .../Tests/Doctrine/Type/InstitutionTypeTest.php | 6 +++--- .../Tests/Doctrine/Type/LocaleTypeTest.php | 6 +++--- .../Tests/Doctrine/Type/LocationTypeTest.php | 6 +++--- .../Tests/Doctrine/Type/NameIdTypeTest.php | 6 +++--- .../Type/NumberOfTokensPerIdentityTypeTest.php | 6 +++--- .../Tests/Doctrine/Type/RaLocationNameTypeTest.php | 9 +++------ .../Doctrine/Type/RecoveryTokenStatusTypeTest.php | 6 +++--- .../Doctrine/Type/SecondFactorStatusTypeTest.php | 6 +++--- .../Tests/Doctrine/Type/SelfVetOptionTypeTest.php | 6 +++--- .../ShowRaaContactInformationOptionTypeTest.php | 6 +++--- .../Doctrine/Type/UseRaLocationsOptionTypeTest.php | 6 +++--- .../Doctrine/Type/VerifyEmailOptionTypeTest.php | 6 +++--- 50 files changed, 192 insertions(+), 198 deletions(-) diff --git a/ci/qa/phpunit b/ci/qa/phpunit index 21b6cae03..f8b056acd 100755 --- a/ci/qa/phpunit +++ b/ci/qa/phpunit @@ -5,9 +5,9 @@ set -e cd $(dirname $0)/../../ -./ci/qa/create-test-db +#./ci/qa/create-test-db # PHPUnit Bridge should always be used in Symfony applications. (https://symfony.com/doc/current/components/phpunit_bridge.html) # This will create a phpunit executable in /bin/ instead of /vendor/bin/ XDEBUG_MODE=coverage ./vendor/bin/phpunit --configuration=ci/qa/phpunit.xml --coverage-text --testsuite=unit -./vendor/bin/phpunit --configuration=ci/qa/phpunit.xml --testsuite=database +#./vendor/bin/phpunit --configuration=ci/qa/phpunit.xml --testsuite=database diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/AuthorityRoleType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/AuthorityRoleType.php index f5a349d45..9bd69398d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/AuthorityRoleType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/AuthorityRoleType.php @@ -31,16 +31,16 @@ class AuthorityRoleType extends Type { public const NAME = 'authority_role'; - public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) + public function getSQLDeclaration(array $column, AbstractPlatform $platform): string { - if (!isset($fieldDeclaration['length'])) { - $fieldDeclaration['length'] = 20; + if (!isset($column['length'])) { + $column['length'] = 20; } - return $platform->getVarcharTypeDeclarationSQL($fieldDeclaration); + return $platform->getVarcharTypeDeclarationSQL($column); } - public function convertToDatabaseValue($value, AbstractPlatform $platform) + public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string { if (is_null($value)) { return $value; @@ -49,7 +49,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) return (string)$value; } - public function convertToPHPValue($value, AbstractPlatform $platform) + public function convertToPHPValue($value, AbstractPlatform $platform): ?AuthorityRole { if (is_null($value)) { return $value; @@ -70,7 +70,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) return $authorityRole; } - public function getName() + public function getName(): string { return self::NAME; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/CommonNameType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/CommonNameType.php index 40e23b159..a8b2ba0a4 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/CommonNameType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/CommonNameType.php @@ -31,12 +31,12 @@ class CommonNameType extends Type { public const NAME = 'stepup_common_name'; - public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) + public function getSQLDeclaration(array $column, AbstractPlatform $platform): string { - return $platform->getVarcharTypeDeclarationSQL($fieldDeclaration); + return $platform->getVarcharTypeDeclarationSQL($column); } - public function convertToDatabaseValue($value, AbstractPlatform $platform) + public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string { if (is_null($value)) { return $value; @@ -45,7 +45,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) return (string)$value; } - public function convertToPHPValue($value, AbstractPlatform $platform) + public function convertToPHPValue($value, AbstractPlatform $platform): ?CommonName { if (is_null($value)) { return $value; @@ -66,7 +66,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) return $commonName; } - public function getName() + public function getName(): string { return self::NAME; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationContactInformationType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationContactInformationType.php index e6822ef35..eee199dcc 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationContactInformationType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationContactInformationType.php @@ -31,9 +31,9 @@ class ConfigurationContactInformationType extends Type { public const NAME = 'stepup_configuration_contact_information'; - public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) + public function getSQLDeclaration(array $column, AbstractPlatform $platform): string { - return $platform->getClobTypeDeclarationSQL($fieldDeclaration); + return $platform->getClobTypeDeclarationSQL($column); } public function convertToDatabaseValue($value, AbstractPlatform $platform) @@ -55,7 +55,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) return $value->getContactInformation(); } - public function convertToPHPValue($value, AbstractPlatform $platform) + public function convertToPHPValue($value, AbstractPlatform $platform): ?ContactInformation { if (is_null($value)) { return $value; @@ -76,7 +76,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) return $contactInformation; } - public function getName() + public function getName(): string { return self::NAME; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationInstitutionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationInstitutionType.php index 7c93cdb67..463b79395 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationInstitutionType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationInstitutionType.php @@ -31,9 +31,9 @@ class ConfigurationInstitutionType extends Type { public const NAME = 'stepup_configuration_institution'; - public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) + public function getSQLDeclaration(array $column, AbstractPlatform $platform): string { - return $platform->getVarcharTypeDeclarationSQL($fieldDeclaration); + return $platform->getVarcharTypeDeclarationSQL($column); } public function convertToDatabaseValue($value, AbstractPlatform $platform) @@ -55,7 +55,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) return $value->getInstitution(); } - public function convertToPHPValue($value, AbstractPlatform $platform) + public function convertToPHPValue($value, AbstractPlatform $platform): ?Institution { if (is_null($value)) { return $value; @@ -76,7 +76,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) return $institution; } - public function getName() + public function getName(): string { return self::NAME; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationLocationType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationLocationType.php index 017766a87..55e8ccf88 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationLocationType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationLocationType.php @@ -31,9 +31,9 @@ class ConfigurationLocationType extends Type { public const NAME = 'stepup_configuration_location'; - public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) + public function getSQLDeclaration(array $column, AbstractPlatform $platform): string { - return $platform->getClobTypeDeclarationSQL($fieldDeclaration); + return $platform->getClobTypeDeclarationSQL($column); } public function convertToDatabaseValue($value, AbstractPlatform $platform) @@ -55,7 +55,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) return $value->getLocation(); } - public function convertToPHPValue($value, AbstractPlatform $platform) + public function convertToPHPValue($value, AbstractPlatform $platform): ?Location { if (is_null($value)) { return $value; @@ -76,7 +76,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) return $location; } - public function getName() + public function getName(): string { return self::NAME; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ContactInformationType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ContactInformationType.php index d9d8ab3ae..0933f799e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ContactInformationType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ContactInformationType.php @@ -31,9 +31,9 @@ class ContactInformationType extends Type { public const NAME = 'stepup_contact_information'; - public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) + public function getSQLDeclaration(array $column, AbstractPlatform $platform): string { - return $platform->getClobTypeDeclarationSQL($fieldDeclaration); + return $platform->getClobTypeDeclarationSQL($column); } public function convertToDatabaseValue($value, AbstractPlatform $platform) @@ -45,7 +45,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) return (string)$value; } - public function convertToPHPValue($value, AbstractPlatform $platform) + public function convertToPHPValue($value, AbstractPlatform $platform): ?ContactInformation { if (is_null($value)) { return $value; @@ -66,7 +66,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) return $contactInformation; } - public function getName() + public function getName(): string { return self::NAME; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DateTimeType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DateTimeType.php index f66137c3e..f9809b1a8 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DateTimeType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DateTimeType.php @@ -34,14 +34,14 @@ class DateTimeType extends Type public const NAME = 'stepup_datetime'; /** - * @param array $fieldDeclaration + * @param array $column * @param AbstractPlatform $platform * @return string * @throws DBALException */ - public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) + public function getSQLDeclaration(array $column, AbstractPlatform $platform): string { - return $platform->getDateTimeTypeDeclarationSQL($fieldDeclaration); + return $platform->getDateTimeTypeDeclarationSQL($column); } /** @@ -49,7 +49,7 @@ public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $pla * @param AbstractPlatform $platform * @return null|string */ - public function convertToDatabaseValue($value, AbstractPlatform $platform) + public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string { if ($value === null) { return null; @@ -67,7 +67,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) * @return null|DateTime * @throws ConversionException */ - public function convertToPHPValue($value, AbstractPlatform $platform) + public function convertToPHPValue($value, AbstractPlatform $platform): ?DateTime { if (is_null($value)) { return $value; @@ -90,7 +90,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) return new DateTime($dateTime); } - public function getName() + public function getName(): string { return self::NAME; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DocumentNumberType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DocumentNumberType.php index 236f0b747..46ce0a7ba 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DocumentNumberType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DocumentNumberType.php @@ -32,14 +32,14 @@ class DocumentNumberType extends Type public const NAME = 'stepup_document_number'; /** - * @param array $fieldDeclaration + * @param array $column * @param AbstractPlatform $platform * @return string * @throws DBALException */ - public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) + public function getSQLDeclaration(array $column, AbstractPlatform $platform): string { - return $platform->getVarcharTypeDeclarationSQL($fieldDeclaration); + return $platform->getVarcharTypeDeclarationSQL($column); } /** @@ -48,7 +48,7 @@ public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $pla * @return null|string * @throws ConversionException */ - public function convertToDatabaseValue($value, AbstractPlatform $platform) + public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string { if (is_null($value)) { return null; @@ -73,7 +73,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) * @return null|DocumentNumber * @throws ConversionException */ - public function convertToPHPValue($value, AbstractPlatform $platform) + public function convertToPHPValue($value, AbstractPlatform $platform): ?DocumentNumber { if (is_null($value)) { return null; @@ -82,7 +82,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) return new DocumentNumber($value); } - public function getName() + public function getName(): string { return self::NAME; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/EmailType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/EmailType.php index 89a51f73c..ce935f4c9 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/EmailType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/EmailType.php @@ -31,12 +31,12 @@ class EmailType extends Type { public const NAME = 'stepup_email'; - public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) + public function getSQLDeclaration(array $column, AbstractPlatform $platform): string { - return $platform->getVarcharTypeDeclarationSQL($fieldDeclaration); + return $platform->getVarcharTypeDeclarationSQL($column); } - public function convertToDatabaseValue($value, AbstractPlatform $platform) + public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string { if (is_null($value)) { return $value; @@ -45,7 +45,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) return (string)$value; } - public function convertToPHPValue($value, AbstractPlatform $platform) + public function convertToPHPValue($value, AbstractPlatform $platform): ?Email { if (is_null($value)) { return $value; @@ -66,7 +66,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) return $email; } - public function getName() + public function getName(): string { return self::NAME; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionRoleType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionRoleType.php index 13542f76c..739ae4b10 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionRoleType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionRoleType.php @@ -31,9 +31,9 @@ class InstitutionRoleType extends Type { public const NAME = 'stepup_institution_role'; - public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) + public function getSQLDeclaration(array $column, AbstractPlatform $platform): string { - return $platform->getVarcharTypeDeclarationSQL($fieldDeclaration); + return $platform->getVarcharTypeDeclarationSQL($column); } public function convertToDatabaseValue($value, AbstractPlatform $platform) @@ -55,7 +55,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) return $value->getType(); } - public function convertToPHPValue($value, AbstractPlatform $platform) + public function convertToPHPValue($value, AbstractPlatform $platform): ?InstitutionRole { if (is_null($value)) { return $value; @@ -76,7 +76,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) return $institutionRole; } - public function getName() + public function getName(): string { return self::NAME; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionType.php index 381600263..c90021a23 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionType.php @@ -31,12 +31,12 @@ class InstitutionType extends Type { public const NAME = 'institution'; - public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) + public function getSQLDeclaration(array $column, AbstractPlatform $platform): string { - return $platform->getVarcharTypeDeclarationSQL($fieldDeclaration); + return $platform->getVarcharTypeDeclarationSQL($column); } - public function convertToDatabaseValue($value, AbstractPlatform $platform) + public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string { if (is_null($value)) { return $value; @@ -45,7 +45,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) return (string)$value; } - public function convertToPHPValue($value, AbstractPlatform $platform) + public function convertToPHPValue($value, AbstractPlatform $platform): ?Institution { if (is_null($value)) { return $value; @@ -66,7 +66,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) return $institution; } - public function getName() + public function getName(): string { return self::NAME; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/LocaleType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/LocaleType.php index 89c8ce455..ce502cef8 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/LocaleType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/LocaleType.php @@ -31,12 +31,12 @@ class LocaleType extends Type { public const NAME = 'stepup_locale'; - public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) + public function getSQLDeclaration(array $column, AbstractPlatform $platform): string { - return $platform->getVarcharTypeDeclarationSQL($fieldDeclaration); + return $platform->getVarcharTypeDeclarationSQL($column); } - public function convertToDatabaseValue($value, AbstractPlatform $platform) + public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string { if (is_null($value)) { return $value; @@ -45,7 +45,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) return (string)$value; } - public function convertToPHPValue($value, AbstractPlatform $platform) + public function convertToPHPValue($value, AbstractPlatform $platform): ?Locale { if (is_null($value)) { return $value; @@ -66,7 +66,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) return $locale; } - public function getName() + public function getName(): string { return self::NAME; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/LocationType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/LocationType.php index ffb292321..c56e8432f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/LocationType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/LocationType.php @@ -31,12 +31,12 @@ class LocationType extends Type { public const NAME = 'stepup_location'; - public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) + public function getSQLDeclaration(array $column, AbstractPlatform $platform): string { - return $platform->getClobTypeDeclarationSQL($fieldDeclaration); + return $platform->getClobTypeDeclarationSQL($column); } - public function convertToDatabaseValue($value, AbstractPlatform $platform) + public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string { if (is_null($value)) { return $value; @@ -45,7 +45,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) return (string)$value; } - public function convertToPHPValue($value, AbstractPlatform $platform) + public function convertToPHPValue($value, AbstractPlatform $platform): ?Location { if (is_null($value)) { return $value; @@ -66,7 +66,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) return $location; } - public function getName() + public function getName(): string { return self::NAME; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NameIdType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NameIdType.php index 329fae98a..869d80250 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NameIdType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NameIdType.php @@ -31,12 +31,12 @@ class NameIdType extends Type { public const NAME = 'stepup_name_id'; - public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) + public function getSQLDeclaration(array $column, AbstractPlatform $platform): string { - return $platform->getVarcharTypeDeclarationSQL($fieldDeclaration); + return $platform->getVarcharTypeDeclarationSQL($column); } - public function convertToDatabaseValue($value, AbstractPlatform $platform) + public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string { if (is_null($value)) { return $value; @@ -45,7 +45,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) return (string)$value; } - public function convertToPHPValue($value, AbstractPlatform $platform) + public function convertToPHPValue($value, AbstractPlatform $platform): ?NameId { if (is_null($value)) { return $value; @@ -66,7 +66,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) return $nameId; } - public function getName() + public function getName(): string { return self::NAME; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NumberOfTokensPerIdentityType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NumberOfTokensPerIdentityType.php index 27ef1612a..3cb6e866c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NumberOfTokensPerIdentityType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NumberOfTokensPerIdentityType.php @@ -31,9 +31,9 @@ class NumberOfTokensPerIdentityType extends Type { public const NAME = 'stepup_number_of_tokens_per_identity_option'; - public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) + public function getSQLDeclaration(array $column, AbstractPlatform $platform): string { - return $platform->getIntegerTypeDeclarationSQL($fieldDeclaration); + return $platform->getIntegerTypeDeclarationSQL($column); } public function convertToDatabaseValue($value, AbstractPlatform $platform) @@ -56,7 +56,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) return $value->getNumberOfTokensPerIdentity(); } - public function convertToPHPValue($value, AbstractPlatform $platform) + public function convertToPHPValue($value, AbstractPlatform $platform): ?NumberOfTokensPerIdentityOption { if (is_null($value)) { return $value; @@ -77,7 +77,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) return $numberOfTokensPerIdentityOption; } - public function getName() + public function getName(): string { return self::NAME; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RaLocationNameType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RaLocationNameType.php index 7deae2490..9783dff7e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RaLocationNameType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RaLocationNameType.php @@ -31,7 +31,7 @@ class RaLocationNameType extends Type { public const NAME = 'stepup_ra_location_name'; - public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) + public function getSQLDeclaration(array $column, AbstractPlatform $platform): string { return $platform->getVarcharTypeDeclarationSQL([]); } @@ -55,7 +55,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) return $value->getRaLocationName(); } - public function convertToPHPValue($value, AbstractPlatform $platform) + public function convertToPHPValue($value, AbstractPlatform $platform): ?RaLocationName { if (is_null($value)) { return $value; @@ -76,7 +76,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) return $raLocationName; } - public function getName() + public function getName(): string { return self::NAME; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RecoveryTokenStatusType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RecoveryTokenStatusType.php index 996efc727..26c97a724 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RecoveryTokenStatusType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RecoveryTokenStatusType.php @@ -30,9 +30,9 @@ class RecoveryTokenStatusType extends Type { public const NAME = 'stepup_recovery_token_status'; - public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform): string + public function getSQLDeclaration(array $column, AbstractPlatform $platform): string { - return $platform->getIntegerTypeDeclarationSQL($fieldDeclaration); + return $platform->getIntegerTypeDeclarationSQL($column); } /** @@ -85,7 +85,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform): RecoveryT ); } - public function getName() + public function getName(): string { return self::NAME; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorStatusType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorStatusType.php index 5ea8a4009..d0bd3199c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorStatusType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorStatusType.php @@ -32,13 +32,13 @@ class SecondFactorStatusType extends Type public const NAME = 'stepup_second_factor_status'; /** - * @param array $fieldDeclaration + * @param array $column * @param AbstractPlatform $platform * @return string */ - public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) + public function getSQLDeclaration(array $column, AbstractPlatform $platform): string { - return $platform->getIntegerTypeDeclarationSQL($fieldDeclaration); + return $platform->getIntegerTypeDeclarationSQL($column); } /** @@ -47,7 +47,7 @@ public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $pla * @return int * @throws ConversionException */ - public function convertToDatabaseValue($value, AbstractPlatform $platform) + public function convertToDatabaseValue($value, AbstractPlatform $platform): int { if (!$value instanceof SecondFactorStatus) { throw new ConversionException( @@ -80,7 +80,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) * @return SecondFactorStatus * @throws ConversionException */ - public function convertToPHPValue($value, AbstractPlatform $platform) + public function convertToPHPValue($value, AbstractPlatform $platform): SecondFactorStatus { if ($value === '0') { return SecondFactorStatus::unverified(); @@ -103,7 +103,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) ); } - public function getName() + public function getName(): string { return self::NAME; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorTypeType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorTypeType.php index 65589f020..07e97e32a 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorTypeType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorTypeType.php @@ -31,12 +31,12 @@ class SecondFactorTypeType extends Type { public const NAME = 'stepup_second_factor_type'; - public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) + public function getSQLDeclaration(array $column, AbstractPlatform $platform): string { - return $platform->getVarcharTypeDeclarationSQL($fieldDeclaration); + return $platform->getVarcharTypeDeclarationSQL($column); } - public function convertToDatabaseValue($value, AbstractPlatform $platform) + public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string { if (is_null($value)) { return $value; @@ -45,7 +45,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) return (string)$value; } - public function convertToPHPValue($value, AbstractPlatform $platform) + public function convertToPHPValue($value, AbstractPlatform $platform): ?SecondFactorType { if (is_null($value)) { return $value; @@ -66,7 +66,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) return $secondFactorType; } - public function getName() + public function getName(): string { return self::NAME; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SelfAssertedTokensOptionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SelfAssertedTokensOptionType.php index 4ec78a6a7..9279bed32 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SelfAssertedTokensOptionType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SelfAssertedTokensOptionType.php @@ -31,12 +31,12 @@ class SelfAssertedTokensOptionType extends Type { public const NAME = 'stepup_self_asserted_tokens_option'; - public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) + public function getSQLDeclaration(array $column, AbstractPlatform $platform): string { - return $platform->getIntegerTypeDeclarationSQL($fieldDeclaration); + return $platform->getIntegerTypeDeclarationSQL($column); } - public function convertToDatabaseValue($value, AbstractPlatform $platform) + public function convertToDatabaseValue($value, AbstractPlatform $platform): ?int { if (is_null($value)) { return $value; @@ -56,7 +56,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) return (int)$value->isEnabled(); } - public function convertToPHPValue($value, AbstractPlatform $platform) + public function convertToPHPValue($value, AbstractPlatform $platform): ?SelfAssertedTokensOption { if (is_null($value)) { return $value; @@ -77,7 +77,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) return $selfAssertedTokensOption; } - public function getName() + public function getName(): string { return self::NAME; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SelfVetOptionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SelfVetOptionType.php index 9fc83c3e0..05cf575b7 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SelfVetOptionType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SelfVetOptionType.php @@ -31,12 +31,12 @@ class SelfVetOptionType extends Type { public const NAME = 'stepup_self_vet_option'; - public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) + public function getSQLDeclaration(array $column, AbstractPlatform $platform): string { - return $platform->getIntegerTypeDeclarationSQL($fieldDeclaration); + return $platform->getIntegerTypeDeclarationSQL($column); } - public function convertToDatabaseValue($value, AbstractPlatform $platform) + public function convertToDatabaseValue($value, AbstractPlatform $platform): ?int { if (is_null($value)) { return $value; @@ -56,7 +56,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) return (int)$value->isEnabled(); } - public function convertToPHPValue($value, AbstractPlatform $platform) + public function convertToPHPValue($value, AbstractPlatform $platform): ?SelfVetOption { if (is_null($value)) { return $value; @@ -77,7 +77,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) return $selfVetOption; } - public function getName() + public function getName(): string { return self::NAME; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ShowRaaContactInformationOptionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ShowRaaContactInformationOptionType.php index 8ace3e3a1..81fe0a979 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ShowRaaContactInformationOptionType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ShowRaaContactInformationOptionType.php @@ -31,12 +31,12 @@ class ShowRaaContactInformationOptionType extends Type { public const NAME = 'stepup_show_raa_contact_information_option'; - public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) + public function getSQLDeclaration(array $column, AbstractPlatform $platform): string { - return $platform->getBooleanTypeDeclarationSQL($fieldDeclaration); + return $platform->getBooleanTypeDeclarationSQL($column); } - public function convertToDatabaseValue($value, AbstractPlatform $platform) + public function convertToDatabaseValue($value, AbstractPlatform $platform): ?int { if (is_null($value)) { return $value; @@ -55,7 +55,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) return (int)$value->isEnabled(); } - public function convertToPHPValue($value, AbstractPlatform $platform) + public function convertToPHPValue($value, AbstractPlatform $platform): ?ShowRaaContactInformationOption { if (is_null($value)) { return $value; @@ -78,7 +78,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) return $showRaaContactInformationOption; } - public function getName() + public function getName(): string { return self::NAME; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SsoOn2faOptionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SsoOn2faOptionType.php index 415a18096..36dad55b7 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SsoOn2faOptionType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SsoOn2faOptionType.php @@ -31,12 +31,12 @@ class SsoOn2faOptionType extends Type { public const NAME = 'stepup_sso_on_2fa_option'; - public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) + public function getSQLDeclaration(array $column, AbstractPlatform $platform): string { - return $platform->getIntegerTypeDeclarationSQL($fieldDeclaration); + return $platform->getIntegerTypeDeclarationSQL($column); } - public function convertToDatabaseValue($value, AbstractPlatform $platform) + public function convertToDatabaseValue($value, AbstractPlatform $platform): ?int { if (is_null($value)) { return $value; @@ -56,7 +56,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) return (int)$value->isEnabled(); } - public function convertToPHPValue($value, AbstractPlatform $platform) + public function convertToPHPValue($value, AbstractPlatform $platform): ?SsoOn2faOption { if (is_null($value)) { return $value; @@ -77,7 +77,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) return $ssoOn2faOption; } - public function getName() + public function getName(): string { return self::NAME; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/UseRaLocationsOptionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/UseRaLocationsOptionType.php index 5084179b1..ff4775de2 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/UseRaLocationsOptionType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/UseRaLocationsOptionType.php @@ -31,12 +31,12 @@ class UseRaLocationsOptionType extends Type { public const NAME = 'stepup_use_ra_locations_option'; - public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) + public function getSQLDeclaration(array $column, AbstractPlatform $platform): string { - return $platform->getBooleanTypeDeclarationSQL($fieldDeclaration); + return $platform->getBooleanTypeDeclarationSQL($column); } - public function convertToDatabaseValue($value, AbstractPlatform $platform) + public function convertToDatabaseValue($value, AbstractPlatform $platform): ?int { if (is_null($value)) { return $value; @@ -55,7 +55,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) return (int)$value->isEnabled(); } - public function convertToPHPValue($value, AbstractPlatform $platform) + public function convertToPHPValue($value, AbstractPlatform $platform): ?UseRaLocationsOption { if (is_null($value)) { return $value; @@ -76,7 +76,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) return $useRaLocationsOption; } - public function getName() + public function getName(): string { return self::NAME; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VerifyEmailOptionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VerifyEmailOptionType.php index 3a46665ed..f833de453 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VerifyEmailOptionType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VerifyEmailOptionType.php @@ -31,12 +31,12 @@ class VerifyEmailOptionType extends Type { public const NAME = 'stepup_verify_email_option'; - public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) + public function getSQLDeclaration(array $column, AbstractPlatform $platform): string { - return $platform->getBooleanTypeDeclarationSQL($fieldDeclaration); + return $platform->getBooleanTypeDeclarationSQL($column); } - public function convertToDatabaseValue($value, AbstractPlatform $platform) + public function convertToDatabaseValue($value, AbstractPlatform $platform): ?int { if (is_null($value)) { return $value; @@ -55,7 +55,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) return (int)$value->isEnabled(); } - public function convertToPHPValue($value, AbstractPlatform $platform) + public function convertToPHPValue($value, AbstractPlatform $platform): ?VerifyEmailOption { if (is_null($value)) { return $value; @@ -76,7 +76,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) return $verifyEmailOption; } - public function getName() + public function getName(): string { return self::NAME; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VettingTypeHintsType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VettingTypeHintsType.php index 300b6b6f7..5fd98f392 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VettingTypeHintsType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VettingTypeHintsType.php @@ -31,9 +31,9 @@ class VettingTypeHintsType extends Type { public const NAME = 'stepup_vetting_type_hints'; - public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) + public function getSQLDeclaration(array $column, AbstractPlatform $platform): string { - return $platform->getJsonTypeDeclarationSQL($fieldDeclaration); + return $platform->getJsonTypeDeclarationSQL($column); } public function convertToDatabaseValue($value, AbstractPlatform $platform) @@ -41,7 +41,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform) return $value; } - public function convertToPHPValue($value, AbstractPlatform $platform) + public function convertToPHPValue($value, AbstractPlatform $platform): ?VettingTypeHintCollection { if (is_null($value)) { return null; @@ -63,7 +63,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform) return $vettingTypeHints; } - public function getName() + public function getName(): string { return self::NAME; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RecoveryToken.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RecoveryToken.php index a2a9db843..24bbc565c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RecoveryToken.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RecoveryToken.php @@ -31,9 +31,6 @@ #[ORM\Entity(repositoryClass: RecoveryTokenRepository::class)] class RecoveryToken implements JsonSerializable { - /** - * @var string - */ #[ORM\Id] #[ORM\Column(length: 36)] public $id; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/AuthorityRoleTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/AuthorityRoleTypeTest.php index e547efacf..0316da6f0 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/AuthorityRoleTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/AuthorityRoleTypeTest.php @@ -18,7 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; -use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; @@ -27,7 +27,7 @@ class AuthorityRoleTypeTest extends UnitTest { - private MySqlPlatform $platform; + private MariaDBPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -39,7 +39,7 @@ public static function setUpBeforeClass(): void public function setUp(): void { - $this->platform = new MySqlPlatform(); + $this->platform = new MariaDBPlatform(); } /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/CommonNameTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/CommonNameTypeTest.php index cfdd80c10..e323a3ca9 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/CommonNameTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/CommonNameTypeTest.php @@ -18,7 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; -use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; @@ -30,7 +30,7 @@ class CommonNameTypeTest extends UnitTest /** * @var MySqlPlatform */ - private MySqlPlatform $platform; + private MariaDBPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -42,7 +42,7 @@ public static function setUpBeforeClass(): void public function setUp(): void { - $this->platform = new MySqlPlatform(); + $this->platform = new MariaDBPlatform(); } /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationContactInformationTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationContactInformationTypeTest.php index 21f5e25b2..9ddb63d7c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationContactInformationTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationContactInformationTypeTest.php @@ -18,7 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; -use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; @@ -30,7 +30,7 @@ class ConfigurationContactInformationTypeTest extends UnitTest /** * @var MySqlPlatform */ - private MySqlPlatform $platform; + private MariaDBPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -45,7 +45,7 @@ public static function setUpBeforeClass(): void public function setUp(): void { - $this->platform = new MySqlPlatform(); + $this->platform = new MariaDBPlatform(); } /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationInstitutionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationInstitutionTypeTest.php index 39a4e6cad..b8931c7b4 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationInstitutionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationInstitutionTypeTest.php @@ -18,7 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; -use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; @@ -30,7 +30,7 @@ class ConfigurationInstitutionTypeTest extends UnitTest /** * @var MySqlPlatform */ - private MySqlPlatform $platform; + private MariaDBPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -45,7 +45,7 @@ public static function setUpBeforeClass(): void public function setUp(): void { - $this->platform = new MySqlPlatform(); + $this->platform = new MariaDBPlatform(); } /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationLocationTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationLocationTypeTest.php index a6c761eaf..6ab7fc6a7 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationLocationTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationLocationTypeTest.php @@ -18,7 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; -use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; @@ -30,7 +30,7 @@ class ConfigurationLocationTypeTest extends UnitTest /** * @var MySqlPlatform */ - private MySqlPlatform $platform; + private MariaDBPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -45,7 +45,7 @@ public static function setUpBeforeClass(): void public function setUp(): void { - $this->platform = new MySqlPlatform(); + $this->platform = new MariaDBPlatform(); } /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ContactInformationTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ContactInformationTypeTest.php index 05519f160..f3c1c161a 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ContactInformationTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ContactInformationTypeTest.php @@ -18,7 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; -use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; @@ -30,7 +30,7 @@ class ContactInformationTypeTest extends UnitTest /** * @var MySqlPlatform */ - private MySqlPlatform $platform; + private MariaDBPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -45,7 +45,7 @@ public static function setUpBeforeClass(): void public function setUp(): void { - $this->platform = new MySqlPlatform(); + $this->platform = new MariaDBPlatform(); } /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DateTimeTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DateTimeTypeTest.php index 4addec7aa..391d292db 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DateTimeTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DateTimeTypeTest.php @@ -20,7 +20,7 @@ use DateTime as CoreDateTime; use DateTimeZone; -use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; @@ -32,7 +32,7 @@ class DateTimeTypeTest extends UnitTest /** * @var MySqlPlatform */ - private MySqlPlatform $platform; + private MariaDBPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -44,7 +44,7 @@ public static function setUpBeforeClass(): void public function setUp(): void { - $this->platform = new MySqlPlatform(); + $this->platform = new MariaDBPlatform(); } /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DocumentNumberTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DocumentNumberTypeTest.php index 26823f250..0b4540fb7 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DocumentNumberTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DocumentNumberTypeTest.php @@ -18,7 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; -use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; @@ -31,7 +31,7 @@ class DocumentNumberTypeTest extends UnitTest /** * @var MySqlPlatform */ - private MySqlPlatform $platform; + private MariaDBPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -43,7 +43,7 @@ public static function setUpBeforeClass(): void public function setUp(): void { - $this->platform = new MySqlPlatform(); + $this->platform = new MariaDBPlatform(); } /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/EmailTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/EmailTypeTest.php index 04a8a92ea..e8151691c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/EmailTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/EmailTypeTest.php @@ -18,7 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; -use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; @@ -30,7 +30,7 @@ class EmailTypeTest extends UnitTest /** * @var MySqlPlatform */ - private MySqlPlatform $platform; + private MariaDBPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -42,7 +42,7 @@ public static function setUpBeforeClass(): void public function setUp(): void { - $this->platform = new MySqlPlatform(); + $this->platform = new MariaDBPlatform(); } /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionRoleTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionRoleTypeTest.php index 71ce66c9a..44e93268b 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionRoleTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionRoleTypeTest.php @@ -18,7 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; -use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; @@ -30,7 +30,7 @@ class InstitutionRoleTypeTest extends UnitTest /** * @var MySqlPlatform */ - private MySqlPlatform $platform; + private MariaDBPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -45,7 +45,7 @@ public static function setUpBeforeClass(): void public function setUp(): void { - $this->platform = new MySqlPlatform(); + $this->platform = new MariaDBPlatform(); } /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionTypeTest.php index 04d25cb44..cf4c68a64 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionTypeTest.php @@ -18,7 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; -use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; @@ -30,7 +30,7 @@ class InstitutionTypeTest extends UnitTest /** * @var MySqlPlatform */ - private MySqlPlatform $platform; + private MariaDBPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -45,7 +45,7 @@ public static function setUpBeforeClass(): void public function setUp(): void { - $this->platform = new MySqlPlatform(); + $this->platform = new MariaDBPlatform(); } /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocaleTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocaleTypeTest.php index 9ca377acb..8a6f3a05d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocaleTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocaleTypeTest.php @@ -18,7 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; -use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; @@ -30,7 +30,7 @@ class LocaleTypeTest extends UnitTest /** * @var MySqlPlatform */ - private MySqlPlatform $platform; + private MariaDBPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -42,7 +42,7 @@ public static function setUpBeforeClass(): void public function setUp(): void { - $this->platform = new MySqlPlatform(); + $this->platform = new MariaDBPlatform(); } /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocationTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocationTypeTest.php index 35b2af61f..38865986a 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocationTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocationTypeTest.php @@ -18,7 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; -use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; @@ -30,7 +30,7 @@ class LocationTypeTest extends UnitTest /** * @var MySqlPlatform */ - private MySqlPlatform $platform; + private MariaDBPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -45,7 +45,7 @@ public static function setUpBeforeClass(): void public function setUp(): void { - $this->platform = new MySqlPlatform(); + $this->platform = new MariaDBPlatform(); } /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NameIdTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NameIdTypeTest.php index 0f49db10d..ca72cd4fd 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NameIdTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NameIdTypeTest.php @@ -18,7 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; -use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; @@ -30,7 +30,7 @@ class NameIdTypeTest extends UnitTest /** * @var MySqlPlatform */ - private MySqlPlatform $platform; + private MariaDBPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -42,7 +42,7 @@ public static function setUpBeforeClass(): void public function setUp(): void { - $this->platform = new MySqlPlatform(); + $this->platform = new MariaDBPlatform(); } /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NumberOfTokensPerIdentityTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NumberOfTokensPerIdentityTypeTest.php index 757559693..3e1aee468 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NumberOfTokensPerIdentityTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NumberOfTokensPerIdentityTypeTest.php @@ -18,7 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; -use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; @@ -30,7 +30,7 @@ class NumberOfTokensPerIdentityTypeTest extends UnitTest /** * @var MySqlPlatform */ - private MySqlPlatform $platform; + private MariaDBPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -45,7 +45,7 @@ public static function setUpBeforeClass(): void public function setUp(): void { - $this->platform = new MySqlPlatform(); + $this->platform = new MariaDBPlatform(); } /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RaLocationNameTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RaLocationNameTypeTest.php index 9927ed939..bf155ad17 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RaLocationNameTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RaLocationNameTypeTest.php @@ -18,7 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; -use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; @@ -27,10 +27,7 @@ class RaLocationNameTypeTest extends UnitTest { - /** - * @var MySqlPlatform - */ - private MySqlPlatform $platform; + private MariaDBPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -45,7 +42,7 @@ public static function setUpBeforeClass(): void public function setUp(): void { - $this->platform = new MySqlPlatform(); + $this->platform = new MariaDBPlatform(); } /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RecoveryTokenStatusTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RecoveryTokenStatusTypeTest.php index eed9555e0..311c5aaaf 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RecoveryTokenStatusTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RecoveryTokenStatusTypeTest.php @@ -18,7 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; -use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; @@ -31,7 +31,7 @@ class RecoveryTokenStatusTypeTest extends UnitTest /** * @var MySqlPlatform */ - private MySqlPlatform $platform; + private MariaDBPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -43,7 +43,7 @@ public static function setUpBeforeClass(): void public function setUp(): void { - $this->platform = new MySqlPlatform(); + $this->platform = new MariaDBPlatform(); } public function invalidPhpValues(): array diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SecondFactorStatusTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SecondFactorStatusTypeTest.php index 9496ca03e..aaedd76dc 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SecondFactorStatusTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SecondFactorStatusTypeTest.php @@ -18,7 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; -use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; @@ -31,7 +31,7 @@ class SecondFactorStatusTypeTest extends UnitTest /** * @var MySqlPlatform */ - private MySqlPlatform $platform; + private MariaDBPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -43,7 +43,7 @@ public static function setUpBeforeClass(): void public function setUp(): void { - $this->platform = new MySqlPlatform(); + $this->platform = new MariaDBPlatform(); } public function invalidPhpValues(): array diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SelfVetOptionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SelfVetOptionTypeTest.php index bc62712e2..378f44cad 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SelfVetOptionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SelfVetOptionTypeTest.php @@ -18,7 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; -use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; @@ -30,7 +30,7 @@ class SelfVetOptionTypeTest extends UnitTest /** * @var MySqlPlatform */ - private MySqlPlatform $platform; + private MariaDBPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -45,7 +45,7 @@ public static function setUpBeforeClass(): void public function setUp(): void { - $this->platform = new MySqlPlatform(); + $this->platform = new MariaDBPlatform(); } /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ShowRaaContactInformationOptionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ShowRaaContactInformationOptionTypeTest.php index 8d90790e5..58d26d90c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ShowRaaContactInformationOptionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ShowRaaContactInformationOptionTypeTest.php @@ -18,7 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; -use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; @@ -32,7 +32,7 @@ class ShowRaaContactInformationOptionTypeTest extends UnitTest /** * @var MySqlPlatform */ - private MySqlPlatform $platform; + private MariaDBPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -47,7 +47,7 @@ public static function setUpBeforeClass(): void public function setUp(): void { - $this->platform = new MySqlPlatform(); + $this->platform = new MariaDBPlatform(); } /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/UseRaLocationsOptionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/UseRaLocationsOptionTypeTest.php index 3ebe0e69c..9ff335e34 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/UseRaLocationsOptionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/UseRaLocationsOptionTypeTest.php @@ -18,7 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; -use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; @@ -30,7 +30,7 @@ class UseRaLocationsOptionTypeTest extends UnitTest /** * @var MySqlPlatform */ - private MySqlPlatform $platform; + private MariaDBPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -45,7 +45,7 @@ public static function setUpBeforeClass(): void public function setUp(): void { - $this->platform = new MySqlPlatform(); + $this->platform = new MariaDBPlatform(); } /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/VerifyEmailOptionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/VerifyEmailOptionTypeTest.php index 9642b9a28..6ad1d150a 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/VerifyEmailOptionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/VerifyEmailOptionTypeTest.php @@ -18,7 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Doctrine\Type; -use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use PHPUnit\Framework\TestCase as UnitTest; @@ -30,7 +30,7 @@ class VerifyEmailOptionTypeTest extends UnitTest /** * @var MySqlPlatform */ - private MySqlPlatform $platform; + private MariaDBPlatform $platform; /** * Register the type, since we're forced to use the factory method. @@ -45,7 +45,7 @@ public static function setUpBeforeClass(): void public function setUp(): void { - $this->platform = new MySqlPlatform(); + $this->platform = new MariaDBPlatform(); } /** From 552da218b415b904a2b2ed02216457a020e142e8 Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Tue, 27 Feb 2024 14:15:49 +0100 Subject: [PATCH 22/89] Adhere to the vetting type loa determination --- .../Entity/SecondFactorCollection.php | 31 ++++++++++++++----- src/Surfnet/Stepup/Identity/Identity.php | 5 +++ .../Entity/SecondFactorCollectionTest.php | 7 ++++- 3 files changed, 34 insertions(+), 9 deletions(-) diff --git a/src/Surfnet/Stepup/Identity/Entity/SecondFactorCollection.php b/src/Surfnet/Stepup/Identity/Entity/SecondFactorCollection.php index cd221981b..1ce2c1d0e 100644 --- a/src/Surfnet/Stepup/Identity/Entity/SecondFactorCollection.php +++ b/src/Surfnet/Stepup/Identity/Entity/SecondFactorCollection.php @@ -19,8 +19,13 @@ namespace Surfnet\Stepup\Identity\Entity; use Doctrine\Common\Collections\ArrayCollection; +use Surfnet\Stepup\Exception\LogicException; use Surfnet\StepupBundle\Service\SecondFactorTypeService; +use Surfnet\StepupBundle\Value\VettingType; + +use function array_pop; + final class SecondFactorCollection extends ArrayCollection { /** @@ -28,13 +33,23 @@ final class SecondFactorCollection extends ArrayCollection */ public function getSecondFactorWithHighestLoa(SecondFactorTypeService $service) { - return array_reduce( - $this->toArray(), - fn(SecondFactor $carry, SecondFactor $item): SecondFactor => $service->hasEqualOrHigherLoaComparedTo( - $carry->getType(), - $item->getType(), - ) ? $carry : $item, - $this->first() ?: null, - ); + // We can only get the highest loa'ed second factor when we have a collection of + // VettedSecondFactors. The because that is the only SF type that has a vetting + // type, which is required to determine the LoA. As a vetting type can change the + // LoA. + $items = $this->toArray(); + if ($items !== [] && array_pop($items) instanceof VettedSecondFactor) { + return array_reduce( + $this->toArray(), + fn(VettedSecondFactor $carry, VettedSecondFactor $item): VettedSecondFactor => $service->hasEqualOrHigherLoaComparedTo( + $carry->getType(), + new VettingType($carry->vettingType()->type()), + $item->getType(), + new VettingType($item->vettingType()->type()), + ) ? $carry : $item, + $this->first() ?: null, + ); + } + throw new LogicException('At this moment, only getting the highest loa SF is supported for a collection of Vetted second factors'); } } diff --git a/src/Surfnet/Stepup/Identity/Identity.php b/src/Surfnet/Stepup/Identity/Identity.php index ae12be824..ca931b256 100644 --- a/src/Surfnet/Stepup/Identity/Identity.php +++ b/src/Surfnet/Stepup/Identity/Identity.php @@ -508,6 +508,11 @@ public function vetSecondFactor( ): void { $this->assertNotForgotten(); + /** The vetted second factor collection can determine highest loa based on the vetting type, + * the other can not (as the verified and unverified second factors do not have a vetting type) + * And the vetting type is used to determine if the LoA is diminished (in case of a self + * asserted token registration) + */ /** @var VettedSecondFactor|null $secondFactorWithHighestLoa */ $secondFactorWithHighestLoa = $this->vettedSecondFactors->getSecondFactorWithHighestLoa( $secondFactorTypeService, diff --git a/src/Surfnet/Stepup/Tests/Identity/Entity/SecondFactorCollectionTest.php b/src/Surfnet/Stepup/Tests/Identity/Entity/SecondFactorCollectionTest.php index d83a858c5..f9b1c53b1 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Entity/SecondFactorCollectionTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Entity/SecondFactorCollectionTest.php @@ -22,6 +22,9 @@ use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Identity\Entity\SecondFactor; use Surfnet\Stepup\Identity\Entity\SecondFactorCollection; +use Surfnet\Stepup\Identity\Entity\VettedSecondFactor; +use Surfnet\Stepup\Identity\Value\DocumentNumber; +use Surfnet\Stepup\Identity\Value\OnPremiseVettingType; use Surfnet\StepupBundle\Service\SecondFactorTypeService; use Surfnet\StepupBundle\Value\SecondFactorType; @@ -51,9 +54,11 @@ public function collection_can_return_second_factor_with_highest_loa(): void */ private function mockVettedSecondFactor(string $type) { - $mock = m::mock(SecondFactor::class); + $mock = m::mock(VettedSecondFactor::class); $mock->shouldReceive('getType') ->andReturn(new SecondFactorType($type)); + $mock->shouldReceive('vettingType') + ->andReturn(new OnPremiseVettingType(new DocumentNumber('123123'))); return $mock; } From b8873c740f6a6296ba228e16a7c29f48b751bcd8 Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Tue, 27 Feb 2024 14:28:47 +0100 Subject: [PATCH 23/89] Set $possessedSelfAssertedToken with correct type --- .../StepupMiddleware/ApiBundle/Identity/Entity/Identity.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Identity.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Identity.php index 039709f3f..4fa6d79b4 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Identity.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Identity.php @@ -71,7 +71,7 @@ class Identity implements JsonSerializable */ #[ORM\Column(type: 'stepup_locale')] public $preferredLocale; - public null $possessedSelfAssertedToken; + public ?bool $possessedSelfAssertedToken; public static function create( string $id, From 6012715b7b753b385a46f012d876225960a9d541 Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Tue, 27 Feb 2024 15:05:36 +0100 Subject: [PATCH 24/89] Improve tyep definitions for deserialize methods --- .../Configuration/Event/AllowedSecondFactorListUpdatedEvent.php | 2 +- .../Stepup/Configuration/Event/ConfigurationUpdatedEvent.php | 2 +- .../Stepup/Configuration/Event/EmailTemplatesUpdatedEvent.php | 2 +- .../Configuration/Event/IdentityProvidersUpdatedEvent.php | 2 +- .../Event/InstitutionConfigurationRemovedEvent.php | 2 +- .../Stepup/Configuration/Event/NewConfigurationCreatedEvent.php | 2 +- .../Event/NewInstitutionConfigurationCreatedEvent.php | 2 +- .../Event/NumberOfTokensPerIdentityOptionChangedEvent.php | 2 +- src/Surfnet/Stepup/Configuration/Event/RaLocationAddedEvent.php | 2 +- .../Event/RaLocationContactInformationChangedEvent.php | 2 +- .../Stepup/Configuration/Event/RaLocationRelocatedEvent.php | 2 +- .../Stepup/Configuration/Event/RaLocationRemovedEvent.php | 2 +- .../Stepup/Configuration/Event/RaLocationRenamedEvent.php | 2 +- .../Stepup/Configuration/Event/SelectRaaOptionChangedEvent.php | 2 +- .../Event/SelfAssertedTokensOptionChangedEvent.php | 2 +- .../Stepup/Configuration/Event/SelfVetOptionChangedEvent.php | 2 +- .../Stepup/Configuration/Event/ServiceProvidersUpdatedEvent.php | 2 +- .../Event/ShowRaaContactInformationOptionChangedEvent.php | 2 +- src/Surfnet/Stepup/Configuration/Event/SraaUpdatedEvent.php | 2 +- .../Configuration/Event/UseRaLocationsOptionChangedEvent.php | 2 +- .../Stepup/Configuration/Event/UseRaOptionChangedEvent.php | 2 +- .../Stepup/Configuration/Event/UseRaaOptionChangedEvent.php | 2 +- .../Configuration/Event/VerifyEmailOptionChangedEvent.php | 2 +- src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php | 2 +- .../Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php | 2 +- src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php | 2 +- .../Stepup/Identity/Event/AppointedAsRaaForInstitutionEvent.php | 2 +- .../Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php | 2 +- .../Stepup/Identity/Event/CompliedWithRevocationEvent.php | 2 +- src/Surfnet/Stepup/Identity/Event/EmailVerifiedEvent.php | 2 +- .../Identity/Event/GssfPossessionProvenAndVerifiedEvent.php | 2 +- src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenEvent.php | 2 +- .../Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php | 2 +- .../Event/IdentityAccreditedAsRaForInstitutionEvent.php | 2 +- .../Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php | 2 +- .../Event/IdentityAccreditedAsRaaForInstitutionEvent.php | 2 +- src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php | 2 +- src/Surfnet/Stepup/Identity/Event/IdentityEmailChangedEvent.php | 2 +- src/Surfnet/Stepup/Identity/Event/IdentityForgottenEvent.php | 2 +- src/Surfnet/Stepup/Identity/Event/IdentityRenamedEvent.php | 2 +- .../Stepup/Identity/Event/InstitutionsAddedToWhitelistEvent.php | 2 +- .../Identity/Event/InstitutionsRemovedFromWhitelistEvent.php | 2 +- .../Stepup/Identity/Event/LocalePreferenceExpressedEvent.php | 2 +- .../Identity/Event/PhonePossessionProvenAndVerifiedEvent.php | 2 +- .../Stepup/Identity/Event/PhonePossessionProvenEvent.php | 2 +- .../Identity/Event/PhoneRecoveryTokenPossessionProvenEvent.php | 2 +- src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php | 2 +- .../Event/RegistrationAuthorityInformationAmendedEvent.php | 2 +- ...gistrationAuthorityInformationAmendedForInstitutionEvent.php | 2 +- .../Identity/Event/RegistrationAuthorityRetractedEvent.php | 2 +- .../Event/RegistrationAuthorityRetractedForInstitutionEvent.php | 2 +- .../SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php | 2 +- src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php | 2 +- .../Stepup/Identity/Event/SecondFactorMigratedToEvent.php | 2 +- src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php | 2 +- src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php | 2 +- .../Event/SecondFactorVettedWithoutTokenProofOfPossession.php | 2 +- .../Event/U2fDevicePossessionProvenAndVerifiedEvent.php | 2 +- .../Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php | 2 +- .../Identity/Event/VettedSecondFactorsAllRevokedEvent.php | 2 +- .../Stepup/Identity/Event/VettingTypeHintsSavedEvent.php | 2 +- src/Surfnet/Stepup/Identity/Event/WhitelistCreatedEvent.php | 2 +- src/Surfnet/Stepup/Identity/Event/WhitelistReplacedEvent.php | 2 +- .../Identity/Event/YubikeyPossessionProvenAndVerifiedEvent.php | 2 +- .../Stepup/Identity/Event/YubikeyPossessionProvenEvent.php | 2 +- .../Identity/Event/YubikeySecondFactorBootstrappedEvent.php | 2 +- src/Surfnet/Stepup/Identity/Value/CommonName.php | 2 +- src/Surfnet/Stepup/Identity/Value/DocumentNumber.php | 2 +- src/Surfnet/Stepup/Identity/Value/Email.php | 2 +- src/Surfnet/Stepup/Identity/Value/EmailVerificationWindow.php | 2 +- src/Surfnet/Stepup/Identity/Value/GssfId.php | 2 +- src/Surfnet/Stepup/Identity/Value/IdentityId.php | 2 +- src/Surfnet/Stepup/Identity/Value/Institution.php | 2 +- src/Surfnet/Stepup/Identity/Value/Locale.php | 2 +- src/Surfnet/Stepup/Identity/Value/Location.php | 2 +- src/Surfnet/Stepup/Identity/Value/NameId.php | 2 +- src/Surfnet/Stepup/Identity/Value/PhoneNumber.php | 2 +- src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php | 2 +- src/Surfnet/Stepup/Identity/Value/U2fKeyHandle.php | 2 +- src/Surfnet/Stepup/Identity/Value/VettingTypeHint.php | 2 +- src/Surfnet/Stepup/Identity/Value/YubikeyPublicId.php | 2 +- .../CommandHandlingBundle/SensitiveData/SensitiveData.php | 2 +- 82 files changed, 82 insertions(+), 82 deletions(-) diff --git a/src/Surfnet/Stepup/Configuration/Event/AllowedSecondFactorListUpdatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/AllowedSecondFactorListUpdatedEvent.php index 4131d2883..cb3dd00cc 100644 --- a/src/Surfnet/Stepup/Configuration/Event/AllowedSecondFactorListUpdatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/AllowedSecondFactorListUpdatedEvent.php @@ -32,7 +32,7 @@ public function __construct( ) { } - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self( new InstitutionConfigurationId($data['institution_configuration_id']), diff --git a/src/Surfnet/Stepup/Configuration/Event/ConfigurationUpdatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/ConfigurationUpdatedEvent.php index 7f233da74..276fcc822 100644 --- a/src/Surfnet/Stepup/Configuration/Event/ConfigurationUpdatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/ConfigurationUpdatedEvent.php @@ -43,7 +43,7 @@ public function __construct($id, array $newConfiguration, array $oldConfiguratio $this->oldConfiguration = $oldConfiguration; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self( $data['id'], diff --git a/src/Surfnet/Stepup/Configuration/Event/EmailTemplatesUpdatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/EmailTemplatesUpdatedEvent.php index be857b268..42cf84533 100644 --- a/src/Surfnet/Stepup/Configuration/Event/EmailTemplatesUpdatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/EmailTemplatesUpdatedEvent.php @@ -36,7 +36,7 @@ public function __construct($configurationId, array $emailTemplates) $this->emailTemplates = $emailTemplates; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self($data['id'], $data['email_templates']); } diff --git a/src/Surfnet/Stepup/Configuration/Event/IdentityProvidersUpdatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/IdentityProvidersUpdatedEvent.php index f8d7f9300..aee223294 100644 --- a/src/Surfnet/Stepup/Configuration/Event/IdentityProvidersUpdatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/IdentityProvidersUpdatedEvent.php @@ -36,7 +36,7 @@ public function __construct($configurationId, array $identityProviders) $this->identityProviders = $identityProviders; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self($data['id'], $data['identity_providers']); } diff --git a/src/Surfnet/Stepup/Configuration/Event/InstitutionConfigurationRemovedEvent.php b/src/Surfnet/Stepup/Configuration/Event/InstitutionConfigurationRemovedEvent.php index b54e823b2..264543d36 100644 --- a/src/Surfnet/Stepup/Configuration/Event/InstitutionConfigurationRemovedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/InstitutionConfigurationRemovedEvent.php @@ -44,7 +44,7 @@ public function __construct(InstitutionConfigurationId $institutionConfiguration * @param array $data * @return InstitutionConfigurationRemovedEvent */ - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self( new InstitutionConfigurationId($data['institution_configuration_id']), diff --git a/src/Surfnet/Stepup/Configuration/Event/NewConfigurationCreatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/NewConfigurationCreatedEvent.php index 9e7b9fea2..052b12e5d 100644 --- a/src/Surfnet/Stepup/Configuration/Event/NewConfigurationCreatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/NewConfigurationCreatedEvent.php @@ -23,7 +23,7 @@ class NewConfigurationCreatedEvent extends ConfigurationEvent /** * @return mixed The object instance */ - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self($data['id']); } diff --git a/src/Surfnet/Stepup/Configuration/Event/NewInstitutionConfigurationCreatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/NewInstitutionConfigurationCreatedEvent.php index 515c12040..4afe25f42 100644 --- a/src/Surfnet/Stepup/Configuration/Event/NewInstitutionConfigurationCreatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/NewInstitutionConfigurationCreatedEvent.php @@ -101,7 +101,7 @@ public function __construct( $this->selfAssertedTokensOption = $selfAssertedTokensOption; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { if (!isset($data['verify_email_option'])) { $data['verify_email_option'] = true; diff --git a/src/Surfnet/Stepup/Configuration/Event/NumberOfTokensPerIdentityOptionChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/NumberOfTokensPerIdentityOptionChangedEvent.php index 12b7a181e..efac0cda8 100644 --- a/src/Surfnet/Stepup/Configuration/Event/NumberOfTokensPerIdentityOptionChangedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/NumberOfTokensPerIdentityOptionChangedEvent.php @@ -32,7 +32,7 @@ public function __construct( ) { } - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self( new InstitutionConfigurationId($data['institution_configuration_id']), diff --git a/src/Surfnet/Stepup/Configuration/Event/RaLocationAddedEvent.php b/src/Surfnet/Stepup/Configuration/Event/RaLocationAddedEvent.php index 73715a961..960e54cf7 100644 --- a/src/Surfnet/Stepup/Configuration/Event/RaLocationAddedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/RaLocationAddedEvent.php @@ -73,7 +73,7 @@ public function __construct( $this->contactInformation = $contactInformation; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self( new InstitutionConfigurationId($data['institution_configuration_id']), diff --git a/src/Surfnet/Stepup/Configuration/Event/RaLocationContactInformationChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/RaLocationContactInformationChangedEvent.php index de3dbcf37..2326664cb 100644 --- a/src/Surfnet/Stepup/Configuration/Event/RaLocationContactInformationChangedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/RaLocationContactInformationChangedEvent.php @@ -50,7 +50,7 @@ public function __construct( $this->contactInformation = $contactInformation; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self( new InstitutionConfigurationId($data['institution_configuration_id']), diff --git a/src/Surfnet/Stepup/Configuration/Event/RaLocationRelocatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/RaLocationRelocatedEvent.php index 6e3c7db26..0eb8c2e6f 100644 --- a/src/Surfnet/Stepup/Configuration/Event/RaLocationRelocatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/RaLocationRelocatedEvent.php @@ -50,7 +50,7 @@ public function __construct( $this->location = $location; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self( new InstitutionConfigurationId($data['institution_configuration_id']), diff --git a/src/Surfnet/Stepup/Configuration/Event/RaLocationRemovedEvent.php b/src/Surfnet/Stepup/Configuration/Event/RaLocationRemovedEvent.php index 4587b2972..f03d7308d 100644 --- a/src/Surfnet/Stepup/Configuration/Event/RaLocationRemovedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/RaLocationRemovedEvent.php @@ -48,7 +48,7 @@ public function __construct( $this->raLocationId = $raLocationId; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self( new InstitutionConfigurationId($data['institution_configuration_id']), diff --git a/src/Surfnet/Stepup/Configuration/Event/RaLocationRenamedEvent.php b/src/Surfnet/Stepup/Configuration/Event/RaLocationRenamedEvent.php index 8a4c4c3ea..3452532cf 100644 --- a/src/Surfnet/Stepup/Configuration/Event/RaLocationRenamedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/RaLocationRenamedEvent.php @@ -50,7 +50,7 @@ public function __construct( $this->raLocationName = $raLocationName; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self( new InstitutionConfigurationId($data['institution_configuration_id']), diff --git a/src/Surfnet/Stepup/Configuration/Event/SelectRaaOptionChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/SelectRaaOptionChangedEvent.php index e1a7a6a5b..a56e95a24 100644 --- a/src/Surfnet/Stepup/Configuration/Event/SelectRaaOptionChangedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/SelectRaaOptionChangedEvent.php @@ -33,7 +33,7 @@ public function __construct( ) { } - public static function deserialize(array $data) + public static function deserialize(array $data): self { $institution = new Institution($data['institution']); return new self( diff --git a/src/Surfnet/Stepup/Configuration/Event/SelfAssertedTokensOptionChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/SelfAssertedTokensOptionChangedEvent.php index 2c790eb6a..cb50563f6 100644 --- a/src/Surfnet/Stepup/Configuration/Event/SelfAssertedTokensOptionChangedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/SelfAssertedTokensOptionChangedEvent.php @@ -32,7 +32,7 @@ public function __construct( ) { } - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self( new InstitutionConfigurationId($data['institution_configuration_id']), diff --git a/src/Surfnet/Stepup/Configuration/Event/SelfVetOptionChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/SelfVetOptionChangedEvent.php index ed2870c78..17401a337 100644 --- a/src/Surfnet/Stepup/Configuration/Event/SelfVetOptionChangedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/SelfVetOptionChangedEvent.php @@ -32,7 +32,7 @@ public function __construct( ) { } - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self( new InstitutionConfigurationId($data['institution_configuration_id']), diff --git a/src/Surfnet/Stepup/Configuration/Event/ServiceProvidersUpdatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/ServiceProvidersUpdatedEvent.php index 4966b279b..5333b3314 100644 --- a/src/Surfnet/Stepup/Configuration/Event/ServiceProvidersUpdatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/ServiceProvidersUpdatedEvent.php @@ -39,7 +39,7 @@ public function __construct($configurationId, array $serviceProviders) /** * @return mixed The object instance */ - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self($data['id'], $data['service_providers']); } diff --git a/src/Surfnet/Stepup/Configuration/Event/ShowRaaContactInformationOptionChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/ShowRaaContactInformationOptionChangedEvent.php index b0499fa42..d49c34299 100644 --- a/src/Surfnet/Stepup/Configuration/Event/ShowRaaContactInformationOptionChangedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/ShowRaaContactInformationOptionChangedEvent.php @@ -32,7 +32,7 @@ public function __construct( ) { } - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self( new InstitutionConfigurationId($data['institution_configuration_id']), diff --git a/src/Surfnet/Stepup/Configuration/Event/SraaUpdatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/SraaUpdatedEvent.php index f383b4f6d..a2c78f3cf 100644 --- a/src/Surfnet/Stepup/Configuration/Event/SraaUpdatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/SraaUpdatedEvent.php @@ -36,7 +36,7 @@ public function __construct($configurationId, array $sraaList) $this->sraaList = $sraaList; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self($data['id'], $data['sraa_list']); } diff --git a/src/Surfnet/Stepup/Configuration/Event/UseRaLocationsOptionChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/UseRaLocationsOptionChangedEvent.php index 9a65c5841..9c8833bb3 100644 --- a/src/Surfnet/Stepup/Configuration/Event/UseRaLocationsOptionChangedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/UseRaLocationsOptionChangedEvent.php @@ -32,7 +32,7 @@ public function __construct( ) { } - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self( new InstitutionConfigurationId($data['institution_configuration_id']), diff --git a/src/Surfnet/Stepup/Configuration/Event/UseRaOptionChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/UseRaOptionChangedEvent.php index ebb8ec5e2..4a8e439d5 100644 --- a/src/Surfnet/Stepup/Configuration/Event/UseRaOptionChangedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/UseRaOptionChangedEvent.php @@ -33,7 +33,7 @@ public function __construct( ) { } - public static function deserialize(array $data) + public static function deserialize(array $data): self { $institution = new Institution($data['institution']); return new self( diff --git a/src/Surfnet/Stepup/Configuration/Event/UseRaaOptionChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/UseRaaOptionChangedEvent.php index c7e3427e3..8771c6a3d 100644 --- a/src/Surfnet/Stepup/Configuration/Event/UseRaaOptionChangedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/UseRaaOptionChangedEvent.php @@ -33,7 +33,7 @@ public function __construct( ) { } - public static function deserialize(array $data) + public static function deserialize(array $data): self { $institution = new Institution($data['institution']); return new self( diff --git a/src/Surfnet/Stepup/Configuration/Event/VerifyEmailOptionChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/VerifyEmailOptionChangedEvent.php index e41d6c7db..5ce13aaa0 100644 --- a/src/Surfnet/Stepup/Configuration/Event/VerifyEmailOptionChangedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/VerifyEmailOptionChangedEvent.php @@ -32,7 +32,7 @@ public function __construct( ) { } - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self( new InstitutionConfigurationId($data['institution_configuration_id']), diff --git a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php index 1b5ec5589..d4637eb4b 100644 --- a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php @@ -62,7 +62,7 @@ public function getAuditLogMetadata(): Metadata /** * @return mixed The object instance */ - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self( new IdentityId($data['identity_id']), diff --git a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php index 47123ddf1..bf3877d32 100644 --- a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php @@ -68,7 +68,7 @@ public function getAuditLogMetadata(): Metadata /** * @return mixed The object instance */ - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self( new IdentityId($data['identity_id']), diff --git a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php index cbf6df473..0d3f60f8b 100644 --- a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php @@ -62,7 +62,7 @@ public function getAuditLogMetadata(): Metadata /** * @return mixed The object instance */ - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self( new IdentityId($data['identity_id']), diff --git a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaForInstitutionEvent.php index 377f6dded..6955619de 100644 --- a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaForInstitutionEvent.php @@ -68,7 +68,7 @@ public function getAuditLogMetadata(): Metadata /** * @return mixed The object instance */ - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self( new IdentityId($data['identity_id']), diff --git a/src/Surfnet/Stepup/Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php b/src/Surfnet/Stepup/Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php index 5863e6cef..d63016883 100644 --- a/src/Surfnet/Stepup/Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php @@ -60,7 +60,7 @@ final public function __construct( $this->recoveryTokenType = $recoveryTokenType; } - final public static function deserialize(array $data) + final public static function deserialize(array $data): self { $recoveryTokenType = new RecoveryTokenType($data['recovery_token_type']); diff --git a/src/Surfnet/Stepup/Identity/Event/CompliedWithRevocationEvent.php b/src/Surfnet/Stepup/Identity/Event/CompliedWithRevocationEvent.php index 8d3751544..16388457d 100644 --- a/src/Surfnet/Stepup/Identity/Event/CompliedWithRevocationEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/CompliedWithRevocationEvent.php @@ -87,7 +87,7 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - final public static function deserialize(array $data) + final public static function deserialize(array $data): self { $secondFactorType = new SecondFactorType($data['second_factor_type']); diff --git a/src/Surfnet/Stepup/Identity/Event/EmailVerifiedEvent.php b/src/Surfnet/Stepup/Identity/Event/EmailVerifiedEvent.php index 9154a3f18..9245cfdc9 100644 --- a/src/Surfnet/Stepup/Identity/Event/EmailVerifiedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/EmailVerifiedEvent.php @@ -128,7 +128,7 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { $secondFactorType = new SecondFactorType($data['second_factor_type']); diff --git a/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenAndVerifiedEvent.php b/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenAndVerifiedEvent.php index 10b671fb4..b76a4c9f0 100644 --- a/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenAndVerifiedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenAndVerifiedEvent.php @@ -134,7 +134,7 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { // BC compatibility for event replay in test-environment only (2.8.0, fixed in 2.8.1) if (!isset($data['preferred_locale'])) { diff --git a/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenEvent.php b/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenEvent.php index 0b9a39482..ba3a0f742 100644 --- a/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenEvent.php @@ -132,7 +132,7 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { if (!isset($data['email_verification_required'])) { $data['email_verification_required'] = true; diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php index ffb72cf93..14f399325 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php @@ -94,7 +94,7 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self( new IdentityId($data['identity_id']), diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaForInstitutionEvent.php index 97eb911ef..a2da435c5 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaForInstitutionEvent.php @@ -101,7 +101,7 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self( new IdentityId($data['identity_id']), diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php index 959c896f8..da99be275 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php @@ -94,7 +94,7 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self( new IdentityId($data['identity_id']), diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaForInstitutionEvent.php index 38ded5f5e..15165bfcf 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaForInstitutionEvent.php @@ -100,7 +100,7 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self( new IdentityId($data['identity_id']), diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php index 765c1361d..4613cba5b 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php @@ -85,7 +85,7 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - public static function deserialize(array $data) + public static function deserialize(array $data): IdentityCreatedEvent { return new self( new IdentityId($data['id']), diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityEmailChangedEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityEmailChangedEvent.php index de686b7da..739d5a27b 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityEmailChangedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityEmailChangedEvent.php @@ -59,7 +59,7 @@ public function getAuditLogMetadata(): Metadata * @param array $data * @return IdentityEmailChangedEvent */ - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self( new IdentityId($data['id']), diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityForgottenEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityForgottenEvent.php index 6114c4392..be6a2eefe 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityForgottenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityForgottenEvent.php @@ -42,7 +42,7 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new IdentityForgottenEvent(new IdentityId($data['identity_id']), new Institution($data['institution'])); } diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityRenamedEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityRenamedEvent.php index 056d1e0fb..3073aacff 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityRenamedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityRenamedEvent.php @@ -59,7 +59,7 @@ public function getAuditLogMetadata(): Metadata * @param array $data * @return IdentityRenamedEvent The object instance */ - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self( new IdentityId($data['id']), diff --git a/src/Surfnet/Stepup/Identity/Event/InstitutionsAddedToWhitelistEvent.php b/src/Surfnet/Stepup/Identity/Event/InstitutionsAddedToWhitelistEvent.php index 4a99be13e..35928a83b 100644 --- a/src/Surfnet/Stepup/Identity/Event/InstitutionsAddedToWhitelistEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/InstitutionsAddedToWhitelistEvent.php @@ -36,7 +36,7 @@ public function __construct(InstitutionCollection $addedInstitutions) * @param array $data * @return InstitutionsAddedToWhitelistEvent */ - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self(InstitutionCollection::deserialize($data['added_institutions'])); } diff --git a/src/Surfnet/Stepup/Identity/Event/InstitutionsRemovedFromWhitelistEvent.php b/src/Surfnet/Stepup/Identity/Event/InstitutionsRemovedFromWhitelistEvent.php index a3a382aca..031faa6af 100644 --- a/src/Surfnet/Stepup/Identity/Event/InstitutionsRemovedFromWhitelistEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/InstitutionsRemovedFromWhitelistEvent.php @@ -36,7 +36,7 @@ public function __construct(InstitutionCollection $removedInstitutions) * @param array $data * @return InstitutionsRemovedFromWhitelistEvent */ - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self(InstitutionCollection::deserialize($data['removed_institutions'])); } diff --git a/src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php b/src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php index 0c9c618bf..7b31faceb 100644 --- a/src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php @@ -62,7 +62,7 @@ public function getAuditLogMetadata(): Metadata * @param array $data * @return IdentityRenamedEvent The object instance */ - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self( new IdentityId($data['id']), diff --git a/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenAndVerifiedEvent.php b/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenAndVerifiedEvent.php index a5b72a2a4..68ccba346 100644 --- a/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenAndVerifiedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenAndVerifiedEvent.php @@ -123,7 +123,7 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { // BC compatibility for event replay in test-environment only (2.8.0, fixed in 2.8.1) if (!isset($data['preferred_locale'])) { diff --git a/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenEvent.php b/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenEvent.php index b85697e89..9aed2bdec 100644 --- a/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenEvent.php @@ -123,7 +123,7 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { if (!isset($data['email_verification_required'])) { $data['email_verification_required'] = true; diff --git a/src/Surfnet/Stepup/Identity/Event/PhoneRecoveryTokenPossessionProvenEvent.php b/src/Surfnet/Stepup/Identity/Event/PhoneRecoveryTokenPossessionProvenEvent.php index 2693c58c8..62ec91f87 100644 --- a/src/Surfnet/Stepup/Identity/Event/PhoneRecoveryTokenPossessionProvenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/PhoneRecoveryTokenPossessionProvenEvent.php @@ -101,7 +101,7 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self( new IdentityId($data['identity_id']), diff --git a/src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php b/src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php index 189c9b1c0..0061160df 100644 --- a/src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php @@ -54,7 +54,7 @@ final public function __construct( $this->recoveryTokenType = $recoveryTokenType; } - final public static function deserialize(array $data) + final public static function deserialize(array $data): self { $recoveryTokenType = new RecoveryTokenType($data['recovery_token_type']); diff --git a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedEvent.php b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedEvent.php index a6e65cf2c..161ab0977 100644 --- a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedEvent.php @@ -84,7 +84,7 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self( new IdentityId($data['identity_id']), diff --git a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedForInstitutionEvent.php index e80e8f2f6..74d7892d7 100644 --- a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedForInstitutionEvent.php @@ -91,7 +91,7 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self( new IdentityId($data['identity_id']), diff --git a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedEvent.php b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedEvent.php index 629256767..8dc615ba3 100644 --- a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedEvent.php @@ -79,7 +79,7 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self( new IdentityId($data['identity_id']), diff --git a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedForInstitutionEvent.php index 1244051f7..3fea29a7c 100644 --- a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedForInstitutionEvent.php @@ -86,7 +86,7 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self( new IdentityId($data['identity_id']), diff --git a/src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php b/src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php index 7abb5ac3f..acb9d77e2 100644 --- a/src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php @@ -106,7 +106,7 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self( new IdentityId($data['identity_id']), diff --git a/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php b/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php index de5c11c0f..8ba12d942 100644 --- a/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php @@ -141,7 +141,7 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { // Events not having a vetting type (recorded pre 5.0) default the // vetting type to 'unknown' diff --git a/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedToEvent.php b/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedToEvent.php index ecd0bc941..8bc4f1759 100644 --- a/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedToEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedToEvent.php @@ -102,7 +102,7 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { $secondFactorType = new SecondFactorType($data['second_factor_type']); return new self( diff --git a/src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php b/src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php index 2161d19c1..35f39979a 100644 --- a/src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php @@ -80,7 +80,7 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - final public static function deserialize(array $data) + final public static function deserialize(array $data): self { $secondFactorType = new SecondFactorType($data['second_factor_type']); diff --git a/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php b/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php index 47af72b0a..8f9316498 100644 --- a/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php @@ -131,7 +131,7 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { $secondFactorType = new SecondFactorType($data['second_factor_type']); return new self( diff --git a/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php b/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php index 0b18641e8..3057fb84f 100644 --- a/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php +++ b/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php @@ -139,7 +139,7 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { $secondFactorType = new SecondFactorType($data['second_factor_type']); return new self( diff --git a/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenAndVerifiedEvent.php b/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenAndVerifiedEvent.php index fc2f3180d..952be5472 100644 --- a/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenAndVerifiedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenAndVerifiedEvent.php @@ -126,7 +126,7 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { // BC compatibility for event replay in test-environment only (2.8.0, fixed in 2.8.1) if (!isset($data['preferred_locale'])) { diff --git a/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php b/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php index 70a7771a0..c16bb4327 100644 --- a/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php @@ -126,7 +126,7 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { if (!isset($data['email_verification_required'])) { $data['email_verification_required'] = true; diff --git a/src/Surfnet/Stepup/Identity/Event/VettedSecondFactorsAllRevokedEvent.php b/src/Surfnet/Stepup/Identity/Event/VettedSecondFactorsAllRevokedEvent.php index 0fd17c4d8..ae10e81be 100644 --- a/src/Surfnet/Stepup/Identity/Event/VettedSecondFactorsAllRevokedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/VettedSecondFactorsAllRevokedEvent.php @@ -46,7 +46,7 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - final public static function deserialize(array $data) + final public static function deserialize(array $data): self { return new static( new IdentityId($data['identity_id']), diff --git a/src/Surfnet/Stepup/Identity/Event/VettingTypeHintsSavedEvent.php b/src/Surfnet/Stepup/Identity/Event/VettingTypeHintsSavedEvent.php index 2f0f77849..94188c638 100644 --- a/src/Surfnet/Stepup/Identity/Event/VettingTypeHintsSavedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/VettingTypeHintsSavedEvent.php @@ -73,7 +73,7 @@ public function getAllowlist(): array return $this->allowlist; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self( new IdentityId($data['identity_id']), diff --git a/src/Surfnet/Stepup/Identity/Event/WhitelistCreatedEvent.php b/src/Surfnet/Stepup/Identity/Event/WhitelistCreatedEvent.php index dd56036bd..59473df60 100644 --- a/src/Surfnet/Stepup/Identity/Event/WhitelistCreatedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/WhitelistCreatedEvent.php @@ -36,7 +36,7 @@ public function __construct(InstitutionCollection $institutionCollection) * @param array $data * @return WhitelistCreatedEvent */ - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self(InstitutionCollection::deserialize($data['whitelisted_institutions'])); } diff --git a/src/Surfnet/Stepup/Identity/Event/WhitelistReplacedEvent.php b/src/Surfnet/Stepup/Identity/Event/WhitelistReplacedEvent.php index a80389ae8..a5ae233b8 100644 --- a/src/Surfnet/Stepup/Identity/Event/WhitelistReplacedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/WhitelistReplacedEvent.php @@ -36,7 +36,7 @@ public function __construct(InstitutionCollection $whitelistedInstitutions) * @param array $data * @return WhitelistReplacedEvent */ - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self(InstitutionCollection::deserialize($data['whitelisted_institutions'])); } diff --git a/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenAndVerifiedEvent.php b/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenAndVerifiedEvent.php index 999bb4f3e..497bf6e2f 100644 --- a/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenAndVerifiedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenAndVerifiedEvent.php @@ -125,7 +125,7 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { // BC compatibility for event replay in test-environment only (2.8.0, fixed in 2.8.1) if (!isset($data['preferred_locale'])) { diff --git a/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenEvent.php b/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenEvent.php index 80923afee..50dcfd178 100644 --- a/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenEvent.php @@ -122,7 +122,7 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { if (!isset($data['email_verification_required'])) { $data['email_verification_required'] = true; diff --git a/src/Surfnet/Stepup/Identity/Event/YubikeySecondFactorBootstrappedEvent.php b/src/Surfnet/Stepup/Identity/Event/YubikeySecondFactorBootstrappedEvent.php index e1b9d0692..2a9334a77 100644 --- a/src/Surfnet/Stepup/Identity/Event/YubikeySecondFactorBootstrappedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/YubikeySecondFactorBootstrappedEvent.php @@ -93,7 +93,7 @@ public function serialize(): array ]; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self( new IdentityId($data['identity_id']), diff --git a/src/Surfnet/Stepup/Identity/Value/CommonName.php b/src/Surfnet/Stepup/Identity/Value/CommonName.php index 46e604ec7..5451c47e7 100644 --- a/src/Surfnet/Stepup/Identity/Value/CommonName.php +++ b/src/Surfnet/Stepup/Identity/Value/CommonName.php @@ -64,7 +64,7 @@ public function equals(CommonName $other): bool return $this->commonName === $other->commonName; } - public function jsonSerialize() + public function jsonSerialize(): string { return $this->commonName; } diff --git a/src/Surfnet/Stepup/Identity/Value/DocumentNumber.php b/src/Surfnet/Stepup/Identity/Value/DocumentNumber.php index beff460ba..57b60dbfa 100644 --- a/src/Surfnet/Stepup/Identity/Value/DocumentNumber.php +++ b/src/Surfnet/Stepup/Identity/Value/DocumentNumber.php @@ -64,7 +64,7 @@ public function equals(DocumentNumber $other): bool return $this->documentNumber === $other->documentNumber; } - public function jsonSerialize() + public function jsonSerialize(): string { return $this->documentNumber; } diff --git a/src/Surfnet/Stepup/Identity/Value/Email.php b/src/Surfnet/Stepup/Identity/Value/Email.php index 50652941d..4d92edf03 100644 --- a/src/Surfnet/Stepup/Identity/Value/Email.php +++ b/src/Surfnet/Stepup/Identity/Value/Email.php @@ -73,7 +73,7 @@ public function equals(Email $other): bool return $this->email === $other->email; } - public function jsonSerialize() + public function jsonSerialize(): string { return $this->email; } diff --git a/src/Surfnet/Stepup/Identity/Value/EmailVerificationWindow.php b/src/Surfnet/Stepup/Identity/Value/EmailVerificationWindow.php index 19e1b6310..9d1153d75 100644 --- a/src/Surfnet/Stepup/Identity/Value/EmailVerificationWindow.php +++ b/src/Surfnet/Stepup/Identity/Value/EmailVerificationWindow.php @@ -84,7 +84,7 @@ public function equals(EmailVerificationWindow $other): bool return $this->start == $other->start && $this->end == $other->end; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new EmailVerificationWindow( DateTime::fromString($data['start']), diff --git a/src/Surfnet/Stepup/Identity/Value/GssfId.php b/src/Surfnet/Stepup/Identity/Value/GssfId.php index 117f6a336..d4b63944b 100644 --- a/src/Surfnet/Stepup/Identity/Value/GssfId.php +++ b/src/Surfnet/Stepup/Identity/Value/GssfId.php @@ -53,7 +53,7 @@ public function equals($other): bool return $other instanceof self && $this->gssfId === $other->gssfId; } - public function jsonSerialize() + public function jsonSerialize(): string { return $this->gssfId; } diff --git a/src/Surfnet/Stepup/Identity/Value/IdentityId.php b/src/Surfnet/Stepup/Identity/Value/IdentityId.php index a797a94d8..1ba4b8f50 100644 --- a/src/Surfnet/Stepup/Identity/Value/IdentityId.php +++ b/src/Surfnet/Stepup/Identity/Value/IdentityId.php @@ -53,7 +53,7 @@ public function __toString(): string return $this->value; } - public function jsonSerialize() + public function jsonSerialize(): string { return $this->value; } diff --git a/src/Surfnet/Stepup/Identity/Value/Institution.php b/src/Surfnet/Stepup/Identity/Value/Institution.php index 8d1025664..848383319 100644 --- a/src/Surfnet/Stepup/Identity/Value/Institution.php +++ b/src/Surfnet/Stepup/Identity/Value/Institution.php @@ -54,7 +54,7 @@ public function equals(Institution $otherInstitution): bool return $this->institution === $otherInstitution->institution; } - public function jsonSerialize() + public function jsonSerialize(): string { return $this->institution; } diff --git a/src/Surfnet/Stepup/Identity/Value/Locale.php b/src/Surfnet/Stepup/Identity/Value/Locale.php index 619d272b3..ac30d0efd 100644 --- a/src/Surfnet/Stepup/Identity/Value/Locale.php +++ b/src/Surfnet/Stepup/Identity/Value/Locale.php @@ -54,7 +54,7 @@ public function getLocale() return $this->locale; } - public function jsonSerialize() + public function jsonSerialize(): string { return $this->locale; } diff --git a/src/Surfnet/Stepup/Identity/Value/Location.php b/src/Surfnet/Stepup/Identity/Value/Location.php index 9a11df010..395fdd6e2 100644 --- a/src/Surfnet/Stepup/Identity/Value/Location.php +++ b/src/Surfnet/Stepup/Identity/Value/Location.php @@ -54,7 +54,7 @@ public function getLocation() return $this->location; } - public function jsonSerialize() + public function jsonSerialize(): string { return $this->location; } diff --git a/src/Surfnet/Stepup/Identity/Value/NameId.php b/src/Surfnet/Stepup/Identity/Value/NameId.php index 6c6a527f4..8a29ea6a9 100644 --- a/src/Surfnet/Stepup/Identity/Value/NameId.php +++ b/src/Surfnet/Stepup/Identity/Value/NameId.php @@ -70,7 +70,7 @@ public function __toString(): string return $this->value; } - public function jsonSerialize() + public function jsonSerialize(): string { return $this->value; } diff --git a/src/Surfnet/Stepup/Identity/Value/PhoneNumber.php b/src/Surfnet/Stepup/Identity/Value/PhoneNumber.php index c151b810c..f81cb6b39 100644 --- a/src/Surfnet/Stepup/Identity/Value/PhoneNumber.php +++ b/src/Surfnet/Stepup/Identity/Value/PhoneNumber.php @@ -63,7 +63,7 @@ public function __toString(): string return $this->phoneNumber; } - public function jsonSerialize() + public function jsonSerialize(): string { return $this->phoneNumber; } diff --git a/src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php b/src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php index 63fec6a6e..64c01e406 100644 --- a/src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php +++ b/src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php @@ -81,7 +81,7 @@ public function isRaa(): bool return $this->role === self::ROLE_RAA; } - public function jsonSerialize() + public function jsonSerialize(): string { return $this->role; } diff --git a/src/Surfnet/Stepup/Identity/Value/U2fKeyHandle.php b/src/Surfnet/Stepup/Identity/Value/U2fKeyHandle.php index bef51ff6d..95e0809e5 100644 --- a/src/Surfnet/Stepup/Identity/Value/U2fKeyHandle.php +++ b/src/Surfnet/Stepup/Identity/Value/U2fKeyHandle.php @@ -70,7 +70,7 @@ public function equals($other): bool return $other instanceof self && $this->value === $other->value; } - public function jsonSerialize() + public function jsonSerialize(): string { return $this->value; } diff --git a/src/Surfnet/Stepup/Identity/Value/VettingTypeHint.php b/src/Surfnet/Stepup/Identity/Value/VettingTypeHint.php index f8f87847a..54edf09b6 100644 --- a/src/Surfnet/Stepup/Identity/Value/VettingTypeHint.php +++ b/src/Surfnet/Stepup/Identity/Value/VettingTypeHint.php @@ -31,7 +31,7 @@ public function __construct( ) { } - public function jsonSerialize() + public function jsonSerialize(): array { return [ 'locale' => $this->locale, diff --git a/src/Surfnet/Stepup/Identity/Value/YubikeyPublicId.php b/src/Surfnet/Stepup/Identity/Value/YubikeyPublicId.php index 39904b619..f6978cc9b 100644 --- a/src/Surfnet/Stepup/Identity/Value/YubikeyPublicId.php +++ b/src/Surfnet/Stepup/Identity/Value/YubikeyPublicId.php @@ -77,7 +77,7 @@ public function equals($other): bool return $other instanceof self && $this->value === $other->value; } - public function jsonSerialize() + public function jsonSerialize(): string { return $this->value; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/SensitiveData.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/SensitiveData.php index 180092508..2c7d9bb39 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/SensitiveData.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/SensitiveData.php @@ -161,7 +161,7 @@ public function getVettingType() return $this->vettingType ?: new UnknownVettingType(); } - public static function deserialize(array $data) + public static function deserialize(array $data): SensitiveData { $self = new self; From 73a50f2ddabc034432b6dbaf071e4ae7b12946e9 Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Tue, 27 Feb 2024 15:11:24 +0100 Subject: [PATCH 25/89] Repair AuthorizationServiceTest and typehint entities --- .../Stepup/Configuration/Value/AllowedSecondFactorList.php | 2 +- .../Stepup/Configuration/Value/ContactInformation.php | 2 +- src/Surfnet/Stepup/Configuration/Value/Institution.php | 2 +- .../Configuration/Value/InstitutionAuthorizationOption.php | 2 +- .../Configuration/Value/InstitutionConfigurationId.php | 2 +- src/Surfnet/Stepup/Configuration/Value/InstitutionRole.php | 2 +- src/Surfnet/Stepup/Configuration/Value/Location.php | 2 +- .../Value/NumberOfTokensPerIdentityOption.php | 2 +- src/Surfnet/Stepup/Configuration/Value/RaLocationId.php | 2 +- src/Surfnet/Stepup/Configuration/Value/RaLocationName.php | 2 +- .../Value/ShowRaaContactInformationOption.php | 2 +- .../Stepup/Configuration/Value/UseRaLocationsOption.php | 2 +- .../Stepup/Configuration/Value/VerifyEmailOption.php | 2 +- .../ApiBundle/Identity/Entity/AuditLogEntry.php | 2 +- .../ApiBundle/Identity/Entity/Identity.php | 2 +- .../Identity/Entity/IdentitySelfAssertedTokenOptions.php | 2 +- .../ApiBundle/Identity/Entity/InstitutionListing.php | 2 +- .../ApiBundle/Identity/Entity/RaCandidate.php | 2 +- .../ApiBundle/Identity/Entity/RaListing.php | 2 +- .../ApiBundle/Identity/Entity/RaSecondFactor.php | 2 +- .../ApiBundle/Identity/Entity/RecoveryToken.php | 2 +- .../ApiBundle/Identity/Entity/UnverifiedSecondFactor.php | 2 +- .../ApiBundle/Identity/Entity/VerifiedSecondFactor.php | 2 +- .../ApiBundle/Identity/Entity/VettedSecondFactor.php | 2 +- .../ApiBundle/Identity/Entity/VettingTypeHint.php | 2 +- .../ApiBundle/Identity/Entity/WhitelistEntry.php | 2 +- .../Authorization/Service/AuthorizationServiceTest.php | 7 ++++--- 27 files changed, 30 insertions(+), 29 deletions(-) diff --git a/src/Surfnet/Stepup/Configuration/Value/AllowedSecondFactorList.php b/src/Surfnet/Stepup/Configuration/Value/AllowedSecondFactorList.php index c40892dcf..c049b2292 100644 --- a/src/Surfnet/Stepup/Configuration/Value/AllowedSecondFactorList.php +++ b/src/Surfnet/Stepup/Configuration/Value/AllowedSecondFactorList.php @@ -121,7 +121,7 @@ public function getIterator() return new ArrayIterator($this->allowedSecondFactors); } - public function jsonSerialize() + public function jsonSerialize(): array { return $this->allowedSecondFactors; } diff --git a/src/Surfnet/Stepup/Configuration/Value/ContactInformation.php b/src/Surfnet/Stepup/Configuration/Value/ContactInformation.php index 02b0744d5..20b96978f 100644 --- a/src/Surfnet/Stepup/Configuration/Value/ContactInformation.php +++ b/src/Surfnet/Stepup/Configuration/Value/ContactInformation.php @@ -56,7 +56,7 @@ public function __toString(): string return $this->contactInformation; } - public function jsonSerialize() + public function jsonSerialize(): string { return $this->contactInformation; } diff --git a/src/Surfnet/Stepup/Configuration/Value/Institution.php b/src/Surfnet/Stepup/Configuration/Value/Institution.php index 24581e11f..c4cbf3029 100644 --- a/src/Surfnet/Stepup/Configuration/Value/Institution.php +++ b/src/Surfnet/Stepup/Configuration/Value/Institution.php @@ -59,7 +59,7 @@ public function __toString(): string return $this->institution; } - public function jsonSerialize() + public function jsonSerialize(): string { return $this->institution; } diff --git a/src/Surfnet/Stepup/Configuration/Value/InstitutionAuthorizationOption.php b/src/Surfnet/Stepup/Configuration/Value/InstitutionAuthorizationOption.php index fa49bb621..e0594da23 100644 --- a/src/Surfnet/Stepup/Configuration/Value/InstitutionAuthorizationOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/InstitutionAuthorizationOption.php @@ -180,7 +180,7 @@ public function isDefault() return $this->isDefault; } - public function jsonSerialize() + public function jsonSerialize(): ?array { if ($this->isDefault) { return null; diff --git a/src/Surfnet/Stepup/Configuration/Value/InstitutionConfigurationId.php b/src/Surfnet/Stepup/Configuration/Value/InstitutionConfigurationId.php index c5c44bd0f..145f1785e 100644 --- a/src/Surfnet/Stepup/Configuration/Value/InstitutionConfigurationId.php +++ b/src/Surfnet/Stepup/Configuration/Value/InstitutionConfigurationId.php @@ -89,7 +89,7 @@ public function __toString(): string return $this->institutionConfigurationId; } - public function jsonSerialize() + public function jsonSerialize(): string { return $this->institutionConfigurationId; } diff --git a/src/Surfnet/Stepup/Configuration/Value/InstitutionRole.php b/src/Surfnet/Stepup/Configuration/Value/InstitutionRole.php index 235616096..8e702ed6b 100644 --- a/src/Surfnet/Stepup/Configuration/Value/InstitutionRole.php +++ b/src/Surfnet/Stepup/Configuration/Value/InstitutionRole.php @@ -91,7 +91,7 @@ public function getType() return $this->type; } - public function jsonSerialize() + public function jsonSerialize(): string { return $this->type; } diff --git a/src/Surfnet/Stepup/Configuration/Value/Location.php b/src/Surfnet/Stepup/Configuration/Value/Location.php index b08126f90..c06997195 100644 --- a/src/Surfnet/Stepup/Configuration/Value/Location.php +++ b/src/Surfnet/Stepup/Configuration/Value/Location.php @@ -59,7 +59,7 @@ public function __toString(): string return $this->location; } - public function jsonSerialize() + public function jsonSerialize(): string { return $this->location; } diff --git a/src/Surfnet/Stepup/Configuration/Value/NumberOfTokensPerIdentityOption.php b/src/Surfnet/Stepup/Configuration/Value/NumberOfTokensPerIdentityOption.php index 630677761..6f367f205 100644 --- a/src/Surfnet/Stepup/Configuration/Value/NumberOfTokensPerIdentityOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/NumberOfTokensPerIdentityOption.php @@ -72,7 +72,7 @@ public function getNumberOfTokensPerIdentity() return $this->numberOfTokensPerIdentity; } - public function jsonSerialize() + public function jsonSerialize(): int { return $this->numberOfTokensPerIdentity; } diff --git a/src/Surfnet/Stepup/Configuration/Value/RaLocationId.php b/src/Surfnet/Stepup/Configuration/Value/RaLocationId.php index fea80723a..ffaa36baa 100644 --- a/src/Surfnet/Stepup/Configuration/Value/RaLocationId.php +++ b/src/Surfnet/Stepup/Configuration/Value/RaLocationId.php @@ -72,7 +72,7 @@ public function __toString(): string return $this->raLocationId; } - public function jsonSerialize() + public function jsonSerialize(): string { return $this->raLocationId; } diff --git a/src/Surfnet/Stepup/Configuration/Value/RaLocationName.php b/src/Surfnet/Stepup/Configuration/Value/RaLocationName.php index 079d34ca0..58a292a0e 100644 --- a/src/Surfnet/Stepup/Configuration/Value/RaLocationName.php +++ b/src/Surfnet/Stepup/Configuration/Value/RaLocationName.php @@ -59,7 +59,7 @@ public function __toString(): string return $this->raLocationName; } - public function jsonSerialize() + public function jsonSerialize(): string { return $this->raLocationName; } diff --git a/src/Surfnet/Stepup/Configuration/Value/ShowRaaContactInformationOption.php b/src/Surfnet/Stepup/Configuration/Value/ShowRaaContactInformationOption.php index 8fb17a4f8..cf1658081 100644 --- a/src/Surfnet/Stepup/Configuration/Value/ShowRaaContactInformationOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/ShowRaaContactInformationOption.php @@ -59,7 +59,7 @@ public function isEnabled() return $this->showRaaContactInformationOption; } - public function jsonSerialize() + public function jsonSerialize(): bool { return $this->showRaaContactInformationOption; } diff --git a/src/Surfnet/Stepup/Configuration/Value/UseRaLocationsOption.php b/src/Surfnet/Stepup/Configuration/Value/UseRaLocationsOption.php index a358460d7..264e24fad 100644 --- a/src/Surfnet/Stepup/Configuration/Value/UseRaLocationsOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/UseRaLocationsOption.php @@ -62,7 +62,7 @@ public function isEnabled() return $this->useRaLocationsOption; } - public function jsonSerialize() + public function jsonSerialize(): bool { return $this->useRaLocationsOption; } diff --git a/src/Surfnet/Stepup/Configuration/Value/VerifyEmailOption.php b/src/Surfnet/Stepup/Configuration/Value/VerifyEmailOption.php index 634f09b46..fa55f97b8 100644 --- a/src/Surfnet/Stepup/Configuration/Value/VerifyEmailOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/VerifyEmailOption.php @@ -59,7 +59,7 @@ public function isEnabled() return $this->verifyEmailOption; } - public function jsonSerialize() + public function jsonSerialize(): bool { return $this->verifyEmailOption; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/AuditLogEntry.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/AuditLogEntry.php index 638a86d1d..15b28abd8 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/AuditLogEntry.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/AuditLogEntry.php @@ -207,7 +207,7 @@ class AuditLogEntry implements JsonSerializable #[ORM\Column(type: 'stepup_datetime')] public $recordedOn; - public function jsonSerialize() + public function jsonSerialize(): array { return [ 'actor_id' => $this->actorId, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Identity.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Identity.php index 4fa6d79b4..f60a13eb3 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Identity.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Identity.php @@ -92,7 +92,7 @@ public static function create( return $identity; } - public function jsonSerialize() + public function jsonSerialize(): array { return [ 'id' => $this->id, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/IdentitySelfAssertedTokenOptions.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/IdentitySelfAssertedTokenOptions.php index 8e6bf4240..3fe930bc5 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/IdentitySelfAssertedTokenOptions.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/IdentitySelfAssertedTokenOptions.php @@ -69,7 +69,7 @@ public static function create( return $identitySelfAssertedTokenOptions; } - public function jsonSerialize() + public function jsonSerialize(): array { return [ 'identity_id' => (string)$this->identityId, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/InstitutionListing.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/InstitutionListing.php index 29d6df365..ed8ef6e30 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/InstitutionListing.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/InstitutionListing.php @@ -42,7 +42,7 @@ public static function createFrom(Institution $institution): self return $instance; } - public function jsonSerialize() + public function jsonSerialize(): array { return ['name' => $this->institution]; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaCandidate.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaCandidate.php index 39477323e..764222a52 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaCandidate.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaCandidate.php @@ -96,7 +96,7 @@ public static function nominate( return $candidate; } - public function jsonSerialize() + public function jsonSerialize(): array { return [ 'identity_id' => $this->identityId, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaListing.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaListing.php index 75e87cb3d..51aced080 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaListing.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaListing.php @@ -120,7 +120,7 @@ public static function create( return $entry; } - public function jsonSerialize() + public function jsonSerialize(): array { return [ 'identity_id' => $this->identityId, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaSecondFactor.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaSecondFactor.php index 1eaff9796..e7d6be771 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaSecondFactor.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaSecondFactor.php @@ -105,7 +105,7 @@ public function __construct( $this->status = SecondFactorStatus::unverified(); } - public function jsonSerialize() + public function jsonSerialize(): array { return [ 'id' => $this->id, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RecoveryToken.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RecoveryToken.php index 24bbc565c..bd8b89802 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RecoveryToken.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RecoveryToken.php @@ -79,7 +79,7 @@ class RecoveryToken implements JsonSerializable #[ORM\Column(length: 255)] public $recoveryMethodIdentifier; - public function jsonSerialize() + public function jsonSerialize(): array { return [ 'id' => $this->id, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/UnverifiedSecondFactor.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/UnverifiedSecondFactor.php index ab6cc27d3..898f02176 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/UnverifiedSecondFactor.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/UnverifiedSecondFactor.php @@ -58,7 +58,7 @@ class UnverifiedSecondFactor implements JsonSerializable #[ORM\Column(length: 32)] public $verificationNonce; - public function jsonSerialize() + public function jsonSerialize(): array { return [ 'id' => $this->id, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VerifiedSecondFactor.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VerifiedSecondFactor.php index 50dbb1b09..5089db855 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VerifiedSecondFactor.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VerifiedSecondFactor.php @@ -78,7 +78,7 @@ class VerifiedSecondFactor implements JsonSerializable #[ORM\Column(type: 'stepup_datetime')] public $registrationRequestedAt; - public function jsonSerialize() + public function jsonSerialize(): array { return [ 'id' => $this->id, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettedSecondFactor.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettedSecondFactor.php index 838dd9784..12e6386ce 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettedSecondFactor.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettedSecondFactor.php @@ -77,7 +77,7 @@ public function vettingType(): string return $this->vettingType; } - public function jsonSerialize() + public function jsonSerialize(): array { return [ 'id' => $this->id, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettingTypeHint.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettingTypeHint.php index 4e355186c..eda25072f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettingTypeHint.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettingTypeHint.php @@ -33,7 +33,7 @@ class VettingTypeHint implements JsonSerializable #[ORM\Column(type: 'stepup_vetting_type_hints')] public VettingTypeHintCollection $hints; - public function jsonSerialize() + public function jsonSerialize(): array { return [ 'institution' => $this->institution, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/WhitelistEntry.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/WhitelistEntry.php index 6449b0b8d..437054d5f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/WhitelistEntry.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/WhitelistEntry.php @@ -38,7 +38,7 @@ public static function createFrom(Institution $institution): self return $instance; } - public function jsonSerialize() + public function jsonSerialize(): string { return $this->institution; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationServiceTest.php index c0fa759f6..46a2e78b4 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationServiceTest.php @@ -18,6 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Authorization\Service; +use Doctrine\Common\Collections\ArrayCollection; use Mockery as m; use Pagerfanta\Pagerfanta; use PHPUnit\Framework\TestCase; @@ -473,7 +474,7 @@ public function test_it_allows_self_vetting_when_one_sat_present(): void $vettedSecondFactor->vettingType = VettingType::TYPE_SELF_ASSERTED_REGISTRATION; $collection = m::mock(Pagerfanta::class); - $collection->shouldReceive('getIterator')->andReturn([$vettedSecondFactor]); + $collection->shouldReceive('getIterator')->andReturn(new ArrayCollection([$vettedSecondFactor])); $this->secondFactorService ->shouldReceive('searchVettedSecondFactors') @@ -509,7 +510,7 @@ public function test_it_allows_self_vetting_when_multiple_sat_present(): void $vettedSecondFactor->vettingType = VettingType::TYPE_SELF_ASSERTED_REGISTRATION; $collection = m::mock(Pagerfanta::class); - $collection->shouldReceive('getIterator')->andReturn([$vettedSecondFactor, $vettedSecondFactor]); + $collection->shouldReceive('getIterator')->andReturn(new ArrayCollection([$vettedSecondFactor, $vettedSecondFactor])); $this->secondFactorService ->shouldReceive('searchVettedSecondFactors') @@ -546,7 +547,7 @@ public function test_it_denies_self_vetting_when_other_vetting_type(): void $vettedSecondFactor->vettingType = VettingType::TYPE_ON_PREMISE; $collection = m::mock(Pagerfanta::class); - $collection->shouldReceive('getIterator')->andReturn([$vettedSecondFactor, $vettedSecondFactor]); + $collection->shouldReceive('getIterator')->andReturn(new ArrayCollection([$vettedSecondFactor, $vettedSecondFactor])); $this->secondFactorService ->shouldReceive('searchVettedSecondFactors') From cc2fe6e64df36553f5f2dcfa55c9bd8829fd54f2 Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Wed, 28 Feb 2024 09:05:23 +0100 Subject: [PATCH 26/89] Update test-integration to use the php82 container --- .github/workflows/test-integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml index 1dd1591ad..d5c5a04b2 100644 --- a/.github/workflows/test-integration.yml +++ b/.github/workflows/test-integration.yml @@ -10,7 +10,7 @@ jobs: run: working-directory: /var/www/html/ container: - image: ghcr.io/openconext/openconext-basecontainers/php72-apache2-node16-composer2:latest + image: ghcr.io/openconext/openconext-basecontainers/php82-apache2-node20-composer2:latest volumes: - .:/var/www/html From 95f07065da8133389820438b6a18ee1389c454f4 Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Wed, 28 Feb 2024 09:06:59 +0100 Subject: [PATCH 27/89] Repair IdentityCommandHandlerTest.php --- .../Value/AllowedSecondFactorList.php | 5 +- .../Configuration/Value/RaLocationList.php | 3 +- .../Collection/InstitutionCollection.php | 7 +- .../Collection/VettingTypeHintCollection.php | 4 +- ...tingTypeHintCollection.php~Stashed changes | 84 ------------------- .../Identity/Entity/AbstractSecondFactor.php | 24 +++++- .../Stepup/Identity/Entity/SecondFactor.php | 4 + .../Identity/Entity/VettedSecondFactor.php | 1 + .../Identity/Event/IdentityCreatedEvent.php | 2 +- .../Identity/Value/ContactInformation.php | 2 +- .../Value/RegistrationAuthorityRole.php | 2 +- .../Configuration/Entity/RaLocation.php | 2 +- .../ConfigurationContactInformationType.php | 2 +- .../Type/ConfigurationInstitutionType.php | 2 +- .../Type/ConfigurationLocationType.php | 2 +- .../Doctrine/Type/ContactInformationType.php | 2 +- .../Doctrine/Type/InstitutionRoleType.php | 2 +- .../Type/NumberOfTokensPerIdentityType.php | 2 +- .../Doctrine/Type/RaLocationNameType.php | 2 +- .../Doctrine/Type/VettingTypeHintsType.php | 2 +- .../ApiBundle/Identity/Value/Profile.php | 2 +- .../RegistrationAuthorityCredentials.php | 2 +- .../JsonBasicAuthenticationEntryPoint.php | 2 +- .../ConfiguredInstitutionControllerTest.php | 6 +- .../Tests/Endpoint/SraaControllerTest.php | 2 +- .../Projector/AuditLogProjectorTest.php | 4 +- .../ProcessingAbortedExceptionListener.php | 2 +- .../SensitiveDataMessageStream.php | 3 +- .../IdentityCommandHandlerTest.php | 2 +- .../Tests/Mockery/HasInstitutionMatcher.php | 18 ++-- .../Mockery/HasInstitutionMatcherTest.php | 1 + .../HasValidConfigurationStructure.php | 2 +- .../ValidReconfigureInstitutionsRequest.php | 2 +- ...IdentityWithYubikeySecondFactorCommand.php | 2 +- ...ilVerifiedSecondFactorRemindersCommand.php | 2 +- .../Console/Command/ReplayEventsCommand.php | 28 +++---- .../Command/ReplaySpecificEventsCommand.php | 18 ++-- .../EventSourcing/EventCollection.php | 3 +- .../EventSourcing/ProjectorCollection.php | 3 +- 39 files changed, 104 insertions(+), 156 deletions(-) delete mode 100644 src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php~Stashed changes diff --git a/src/Surfnet/Stepup/Configuration/Value/AllowedSecondFactorList.php b/src/Surfnet/Stepup/Configuration/Value/AllowedSecondFactorList.php index c049b2292..30d6fd945 100644 --- a/src/Surfnet/Stepup/Configuration/Value/AllowedSecondFactorList.php +++ b/src/Surfnet/Stepup/Configuration/Value/AllowedSecondFactorList.php @@ -20,6 +20,7 @@ use ArrayIterator; use Broadway\Serializer\Serializable as SerializableInterface; +use Iterator; use IteratorAggregate; use JsonSerializable; use Surfnet\StepupBundle\Value\SecondFactorType; @@ -94,7 +95,7 @@ public function equals(AllowedSecondFactorList $other): bool return true; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { $secondFactorTypes = array_map( fn($secondFactorString): SecondFactorType => new SecondFactorType($secondFactorString), @@ -116,7 +117,7 @@ public function serialize(): array ]; } - public function getIterator() + public function getIterator(): Iterator { return new ArrayIterator($this->allowedSecondFactors); } diff --git a/src/Surfnet/Stepup/Configuration/Value/RaLocationList.php b/src/Surfnet/Stepup/Configuration/Value/RaLocationList.php index eca5d9d51..b1444a644 100644 --- a/src/Surfnet/Stepup/Configuration/Value/RaLocationList.php +++ b/src/Surfnet/Stepup/Configuration/Value/RaLocationList.php @@ -19,6 +19,7 @@ namespace Surfnet\Stepup\Configuration\Value; use ArrayIterator; +use Iterator; use IteratorAggregate; use Surfnet\Stepup\Configuration\Entity\RaLocation; use Surfnet\Stepup\Exception\LogicException; @@ -103,7 +104,7 @@ public function getById(RaLocationId $raLocationId) ); } - public function getIterator() + public function getIterator(): Iterator { return new ArrayIterator($this->raLocations); } diff --git a/src/Surfnet/Stepup/Identity/Collection/InstitutionCollection.php b/src/Surfnet/Stepup/Identity/Collection/InstitutionCollection.php index dc1903a33..afa841fb7 100644 --- a/src/Surfnet/Stepup/Identity/Collection/InstitutionCollection.php +++ b/src/Surfnet/Stepup/Identity/Collection/InstitutionCollection.php @@ -20,6 +20,7 @@ use ArrayIterator; use Broadway\Serializer\Serializable as SerializableInterface; +use Iterator; use IteratorAggregate; use JsonSerializable; use Surfnet\Stepup\Exception\RuntimeException; @@ -100,12 +101,12 @@ public function removeAllIn(InstitutionCollection $institutionCollection): void } } - public function jsonSerialize() + public function jsonSerialize(): array { return ['institutions' => $this->elements]; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { $institutions = array_map(fn($institution): Institution => new Institution($institution), $data); @@ -117,7 +118,7 @@ public function serialize(): array return array_map(fn(Institution $institution): string => (string)$institution, $this->elements); } - public function getIterator() + public function getIterator(): Iterator { return new ArrayIterator($this->elements); } diff --git a/src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php b/src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php index 672c1e860..6f0c08c3a 100644 --- a/src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php +++ b/src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php @@ -64,12 +64,12 @@ public function remove(VettingTypeHint $hint): void $this->elements = $elements; } - public function jsonSerialize() + public function jsonSerialize(): array { return $this->elements; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { $institutions = array_map( fn(array $hint): VettingTypeHint => new VettingTypeHint($hint['locale'], $hint['hint']), diff --git a/src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php~Stashed changes b/src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php~Stashed changes deleted file mode 100644 index 8661252fa..000000000 --- a/src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php~Stashed changes +++ /dev/null @@ -1,84 +0,0 @@ -add($hint); - } - } - - public function add(VettingTypeHint $hint) - { - if (in_array($hint, $this->elements)) { - throw new RuntimeException(sprintf( - 'Vetting type hint "%s" is already in this collection', - $hint - )); - } - - $this->elements[] = $hint; - } - - public function remove(VettingTypeHint $hint) - { - if (!in_array($hint, $this->elements)) { - throw new RuntimeException(sprintf( - 'Cannot remove vetting type hint "%s" from the collection as it is not in the collection', - $hint - )); - } - - $elements = array_filter($this->elements, function ($inst) use ($hint) { - return !$hint->equals($inst); - }); - $this->elements = $elements; - } - - public function jsonSerialize() - { - return ['hints' => $this->elements]; - } - - public static function deserialize(array $data) - { - $institutions = array_map(function ($hint) { - return new VettingTypeHint($hint['locale'], $hint['hint']); - }, $data); - - return new self($institutions); - } - - public function serialize(): array - { - return array_map(function (VettingTypeHint $hint) { - return $hint->jsonSerialize(); - }, $this->elements); - } -} diff --git a/src/Surfnet/Stepup/Identity/Entity/AbstractSecondFactor.php b/src/Surfnet/Stepup/Identity/Entity/AbstractSecondFactor.php index f54a6f9d8..bf3c9b231 100644 --- a/src/Surfnet/Stepup/Identity/Entity/AbstractSecondFactor.php +++ b/src/Surfnet/Stepup/Identity/Entity/AbstractSecondFactor.php @@ -20,19 +20,27 @@ use Broadway\EventSourcing\SimpleEventSourcedEntity; use Surfnet\Stepup\Identity\Value\SecondFactorIdentifier; +use Surfnet\Stepup\Identity\Value\UnknownVettingType; +use Surfnet\Stepup\Identity\Value\VettingType; use Surfnet\StepupBundle\Service\SecondFactorTypeService; use Surfnet\StepupBundle\Value\SecondFactorType; +use Surfnet\StepupBundle\Value\VettingType as StepupBundleVettingType; abstract class AbstractSecondFactor extends SimpleEventSourcedEntity implements SecondFactor { public function hasEqualOrHigherLoaComparedTo(SecondFactor $comparable, SecondFactorTypeService $service): bool { - return $comparable->hasTypeWithEqualOrLowerLoaComparedTo($this->getType(), $service); + return $comparable->hasTypeWithEqualOrLowerLoaComparedTo($this->getType(), $this->vettingType(), $service); } - public function hasTypeWithEqualOrLowerLoaComparedTo(SecondFactorType $type, SecondFactorTypeService $service): bool + public function hasTypeWithEqualOrLowerLoaComparedTo(SecondFactorType $type, VettingType $vettingType, SecondFactorTypeService $service): bool { - return $service->hasEqualOrLowerLoaComparedTo($this->getType(), $type); + // SecondFactorTypeService works with the vetting type value objects + // from the stepup bundle, so convert them. + $ownVettingType = new StepupBundleVettingType($this->vettingType()->type()); + $otherVettingType = new StepupBundleVettingType($vettingType->type()); + + return $service->hasEqualOrLowerLoaComparedTo($this->getType(), $ownVettingType, $type, $otherVettingType); } public function typeAndIdentifierAreEqual(SecondFactorType $type, SecondFactorIdentifier $identifier): bool @@ -41,4 +49,14 @@ public function typeAndIdentifierAreEqual(SecondFactorType $type, SecondFactorId $identifierIsEqual = $this->getIdentifier()->equals($identifier); return $typeIsEqual && $identifierIsEqual; } + + /** + * By default the vetting type of a token is unknown UNITL it has been vetted + * So only the VettedSecondFactor implementation returns anything other than + * the UnknownVettingType + */ + public function vettingType(): VettingType + { + return new UnknownVettingType(); + } } diff --git a/src/Surfnet/Stepup/Identity/Entity/SecondFactor.php b/src/Surfnet/Stepup/Identity/Entity/SecondFactor.php index 73778dd99..1ad3ad643 100644 --- a/src/Surfnet/Stepup/Identity/Entity/SecondFactor.php +++ b/src/Surfnet/Stepup/Identity/Entity/SecondFactor.php @@ -19,6 +19,7 @@ namespace Surfnet\Stepup\Identity\Entity; use Surfnet\Stepup\Identity\Value\SecondFactorIdentifier; +use Surfnet\Stepup\Identity\Value\VettingType; use Surfnet\StepupBundle\Service\SecondFactorTypeService; use Surfnet\StepupBundle\Value\SecondFactorType; @@ -28,6 +29,7 @@ public function hasEqualOrHigherLoaComparedTo(SecondFactor $comparable, SecondFa public function hasTypeWithEqualOrLowerLoaComparedTo( SecondFactorType $type, + VettingType $vettingType, SecondFactorTypeService $service, ): bool; @@ -36,4 +38,6 @@ public function typeAndIdentifierAreEqual(SecondFactorType $type, SecondFactorId public function getType(): SecondFactorType; public function getIdentifier(): SecondFactorIdentifier; + + public function vettingType(): VettingType; } diff --git a/src/Surfnet/Stepup/Identity/Entity/VettedSecondFactor.php b/src/Surfnet/Stepup/Identity/Entity/VettedSecondFactor.php index 6c88ce893..19831dbf3 100644 --- a/src/Surfnet/Stepup/Identity/Entity/VettedSecondFactor.php +++ b/src/Surfnet/Stepup/Identity/Entity/VettedSecondFactor.php @@ -26,6 +26,7 @@ use Surfnet\Stepup\Identity\Value\SecondFactorId; use Surfnet\Stepup\Identity\Value\SecondFactorIdentifier; use Surfnet\Stepup\Identity\Value\VettingType; +use Surfnet\StepupBundle\Service\SecondFactorTypeService; use Surfnet\StepupBundle\Value\SecondFactorType; /** diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php index 4613cba5b..859dccf48 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php @@ -85,7 +85,7 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - public static function deserialize(array $data): IdentityCreatedEvent + public static function deserialize(array $data): self { return new self( new IdentityId($data['id']), diff --git a/src/Surfnet/Stepup/Identity/Value/ContactInformation.php b/src/Surfnet/Stepup/Identity/Value/ContactInformation.php index 0ec9a1de1..6a4be94a9 100644 --- a/src/Surfnet/Stepup/Identity/Value/ContactInformation.php +++ b/src/Surfnet/Stepup/Identity/Value/ContactInformation.php @@ -54,7 +54,7 @@ public function getContactInformation() return $this->contactInformation; } - public function jsonSerialize() + public function jsonSerialize(): string { return $this->contactInformation; } diff --git a/src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php b/src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php index 64c01e406..10981cd6b 100644 --- a/src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php +++ b/src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php @@ -91,7 +91,7 @@ public function __toString(): string return (string)$this->role; } - public static function deserialize(array $data) + public static function deserialize(array $data): self { return new self($data['role']); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/RaLocation.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/RaLocation.php index 07d5d31f6..b25d4e62f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/RaLocation.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/RaLocation.php @@ -86,7 +86,7 @@ public static function create( return $raLocation; } - public function jsonSerialize() + public function jsonSerialize(): array { return [ 'id' => $this->id, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationContactInformationType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationContactInformationType.php index eee199dcc..17ed944e8 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationContactInformationType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationContactInformationType.php @@ -36,7 +36,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st return $platform->getClobTypeDeclarationSQL($column); } - public function convertToDatabaseValue($value, AbstractPlatform $platform) + public function convertToDatabaseValue($value, AbstractPlatform $platform): mixed { if (is_null($value)) { return null; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationInstitutionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationInstitutionType.php index 463b79395..71ad6605e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationInstitutionType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationInstitutionType.php @@ -36,7 +36,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st return $platform->getVarcharTypeDeclarationSQL($column); } - public function convertToDatabaseValue($value, AbstractPlatform $platform) + public function convertToDatabaseValue($value, AbstractPlatform $platform): mixed { if (is_null($value)) { return $value; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationLocationType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationLocationType.php index 55e8ccf88..ac7e68c14 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationLocationType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationLocationType.php @@ -36,7 +36,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st return $platform->getClobTypeDeclarationSQL($column); } - public function convertToDatabaseValue($value, AbstractPlatform $platform) + public function convertToDatabaseValue($value, AbstractPlatform $platform): mixed { if (is_null($value)) { return $value; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ContactInformationType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ContactInformationType.php index 0933f799e..8fa316a72 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ContactInformationType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ContactInformationType.php @@ -36,7 +36,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st return $platform->getClobTypeDeclarationSQL($column); } - public function convertToDatabaseValue($value, AbstractPlatform $platform) + public function convertToDatabaseValue($value, AbstractPlatform $platform): mixed { if (is_null($value)) { return $value; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionRoleType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionRoleType.php index 739ae4b10..4fc263f81 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionRoleType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionRoleType.php @@ -36,7 +36,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st return $platform->getVarcharTypeDeclarationSQL($column); } - public function convertToDatabaseValue($value, AbstractPlatform $platform) + public function convertToDatabaseValue($value, AbstractPlatform $platform): mixed { if (is_null($value)) { return $value; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NumberOfTokensPerIdentityType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NumberOfTokensPerIdentityType.php index 3cb6e866c..1faced276 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NumberOfTokensPerIdentityType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NumberOfTokensPerIdentityType.php @@ -36,7 +36,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st return $platform->getIntegerTypeDeclarationSQL($column); } - public function convertToDatabaseValue($value, AbstractPlatform $platform) + public function convertToDatabaseValue($value, AbstractPlatform $platform): mixed { if (is_null($value)) { return $value; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RaLocationNameType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RaLocationNameType.php index 9783dff7e..f7ef6b22e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RaLocationNameType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RaLocationNameType.php @@ -36,7 +36,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st return $platform->getVarcharTypeDeclarationSQL([]); } - public function convertToDatabaseValue($value, AbstractPlatform $platform) + public function convertToDatabaseValue($value, AbstractPlatform $platform): mixed { if (is_null($value)) { return $value; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VettingTypeHintsType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VettingTypeHintsType.php index 5fd98f392..3b0847c44 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VettingTypeHintsType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VettingTypeHintsType.php @@ -36,7 +36,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st return $platform->getJsonTypeDeclarationSQL($column); } - public function convertToDatabaseValue($value, AbstractPlatform $platform) + public function convertToDatabaseValue($value, AbstractPlatform $platform): mixed { return $value; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/Profile.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/Profile.php index 1936beed5..69f1de5fa 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/Profile.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/Profile.php @@ -34,7 +34,7 @@ public function __construct( ) { } - public function jsonSerialize() + public function jsonSerialize(): array { $profile = $this->identity->jsonSerialize(); $profile["is_sraa"] = $this->isSraa; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RegistrationAuthorityCredentials.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RegistrationAuthorityCredentials.php index c130df786..3723b8a53 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RegistrationAuthorityCredentials.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RegistrationAuthorityCredentials.php @@ -158,7 +158,7 @@ public function equals(RegistrationAuthorityCredentials $other): bool return $other->jsonSerialize() === $this->jsonSerialize(); } - public function jsonSerialize() + public function jsonSerialize(): array { return [ 'id' => $this->identityId, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Security/Http/EntryPoint/JsonBasicAuthenticationEntryPoint.php b/src/Surfnet/StepupMiddleware/ApiBundle/Security/Http/EntryPoint/JsonBasicAuthenticationEntryPoint.php index bfd192695..961111ef4 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Security/Http/EntryPoint/JsonBasicAuthenticationEntryPoint.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Security/Http/EntryPoint/JsonBasicAuthenticationEntryPoint.php @@ -36,7 +36,7 @@ public function __construct(private $realmName) /** * {@inheritdoc} */ - public function start(Request $request, AuthenticationException $authException = null) + public function start(Request $request, AuthenticationException $authException = null): Response { $authExceptionMessage = $authException instanceof AuthenticationException ? $authException->getMessage() : ''; $error = sprintf('You are required to authorise before accessing this API (%s).', $authExceptionMessage); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php index ed9ab3d53..97f4e3308 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php @@ -16,11 +16,11 @@ * limitations under the License. */ -namespace Surfnet\StepupMiddleware\AoiBundle\Tests\Endpoint; +namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Endpoint; use Generator; use Liip\TestFixturesBundle\Services\DatabaseToolCollection; -use Symfony\Bundle\FrameworkBundle\Client; +use Liip\TestFixturesBundle\Services\DatabaseTools\ORMSqliteDatabaseTool; use Symfony\Bundle\FrameworkBundle\KernelBrowser; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; use Symfony\Component\HttpFoundation\Response; @@ -42,7 +42,7 @@ class ConfiguredInstitutionControllerTest extends WebTestCase */ private string $endpoint; - private DatabaseToolCollection $databaseTool; + private ORMSqliteDatabaseTool $databaseTool; public function setUp(): void { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php index bc76481fb..957c79246 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php @@ -16,7 +16,7 @@ * limitations under the License. */ -namespace Surfnet\StepupMiddleware\AoiBundle\Tests\Endpoint; +namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Endpoint; use Generator; use Liip\TestFixturesBundle\Services\DatabaseToolCollection; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/AuditLogProjectorTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/AuditLogProjectorTest.php index 83c60f80f..ab251e6c2 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/AuditLogProjectorTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/AuditLogProjectorTest.php @@ -145,13 +145,13 @@ public function auditable_events(): array public function it_creates_entries_for_auditable_events(DomainMessage $message, AuditLogEntry $expectedEntry): void { $repository = m::mock(AuditLogRepository::class); - $repository->shouldReceive('save')->once()->with($this->spy($actualEntry)); + $repository->shouldReceive('save')->with($this->spy($actualEntry)); $identityRepository = m::mock(IdentityRepository::class); $identity = new Identity(); $identity->commonName = self::$actorCommonName; - $identityRepository->shouldReceive('find')->between(0, 1)->andReturn($identity); + $identityRepository->shouldReceive('find')->andReturn($identity); $projector = new AuditLogProjector($repository, $identityRepository); $projector->handle($message); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventListener/ProcessingAbortedExceptionListener.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventListener/ProcessingAbortedExceptionListener.php index 0d4b12188..867b82c72 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventListener/ProcessingAbortedExceptionListener.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventListener/ProcessingAbortedExceptionListener.php @@ -27,7 +27,7 @@ class ProcessingAbortedExceptionListener implements EventSubscriberInterface { - public static function getSubscribedEvents() + public static function getSubscribedEvents(): array { return [KernelEvents::EXCEPTION => 'onKernelException']; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessageStream.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessageStream.php index ae5abf850..fd2183eba 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessageStream.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessageStream.php @@ -21,6 +21,7 @@ use ArrayIterator; use Broadway\Domain\DomainEventStream; use Broadway\Domain\DomainMessage; +use Iterator; use IteratorAggregate; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Exception\SensitiveDataApplicationException; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Forgettable; @@ -63,7 +64,7 @@ public function forget(): void } } - public function getIterator() + public function getIterator(): Iterator { return new ArrayIterator($this->messages); } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php index 161b3eafa..a2889d3af 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php @@ -111,7 +111,7 @@ class IdentityCommandHandlerTest extends CommandHandlerTest private $identityProjectionRepository; /** - * @var SecondFactorTypeService + * @var SecondFactorTypeService|m\MockInterface */ private $secondFactorTypeService; diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcher.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcher.php index 1ffca0fe2..4d597aad0 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcher.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcher.php @@ -19,32 +19,30 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\Mockery; use Mockery\Exception\RuntimeException; -use Mockery\Matcher\MatcherAbstract; +use Mockery\Matcher\MatcherInterface; -final class HasInstitutionMatcher extends MatcherAbstract +final class HasInstitutionMatcher implements MatcherInterface { - public function __construct($expected) + public function __construct(private $expected) { - if (!is_string($expected)) { + if (!is_string($this->expected)) { throw new RuntimeException( sprintf('In order to use the %s, a string should be given.', self::class), ); } - - parent::__construct($expected); } - public function match(&$actual) + public function match(&$actual): bool { if (!is_object($actual)) { return false; } if (method_exists($actual, 'getInstitution')) { - return $this->_expected === $actual->getInstitution(); + return $this->expected === $actual->getInstitution(); } if (property_exists($actual, 'institution')) { - return $this->_expected === $actual->institution; + return $this->expected === $actual->institution; } return false; @@ -52,6 +50,6 @@ public function match(&$actual) public function __toString(): string { - return sprintf('', $this->_expected); + return sprintf('', $this->expected); } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcherTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcherTest.php index 3dc16f476..52b48afb4 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcherTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcherTest.php @@ -24,6 +24,7 @@ use Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\Mockery\TestObjects\ObjectWithInstitutionAccessor; use Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\Mockery\TestObjects\ObjectWithInstitutionProperty; use Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\Mockery\TestObjects\ObjectWithoutInstitutionPropertyAndAccessor; +use TypeError; class HasInstitutionMatcherTest extends TestCase { diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Constraints/HasValidConfigurationStructure.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Constraints/HasValidConfigurationStructure.php index 33c90308b..e1da93fae 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Constraints/HasValidConfigurationStructure.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Constraints/HasValidConfigurationStructure.php @@ -27,7 +27,7 @@ class HasValidConfigurationStructure extends Constraint { public $message = 'Invalid Configuration Structure'; - public function validatedBy() + public function validatedBy(): string { return 'configuration_structure_validator'; } diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Constraints/ValidReconfigureInstitutionsRequest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Constraints/ValidReconfigureInstitutionsRequest.php index fe59a0bc2..6df2381fd 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Constraints/ValidReconfigureInstitutionsRequest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Constraints/ValidReconfigureInstitutionsRequest.php @@ -24,7 +24,7 @@ class ValidReconfigureInstitutionsRequest extends Constraint { public $message = 'Invalid Reconfigure InstitutionConfiguration Structure'; - public function validatedBy() + public function validatedBy(): string { return 'reconfigure_institution_configuration_structure_validator'; } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php index 823244b30..07e2938b4 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php @@ -63,7 +63,7 @@ public function __construct( parent::__construct(); } - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { $this->bootstrapService->setToken( new AnonymousToken('cli.bootstrap-yubikey-token', 'cli', ['ROLE_SS', 'ROLE_RA', 'ROLE_MANAGEMENT']), diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/EmailVerifiedSecondFactorRemindersCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/EmailVerifiedSecondFactorRemindersCommand.php index bff44a558..d40b276bc 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/EmailVerifiedSecondFactorRemindersCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/EmailVerifiedSecondFactorRemindersCommand.php @@ -73,7 +73,7 @@ public function __construct( parent::__construct(); } - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { try { $this->validateInput($input); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplayEventsCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplayEventsCommand.php index eee751598..4d2477432 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplayEventsCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplayEventsCommand.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\MiddlewareBundle\Console\Command; use Surfnet\StepupMiddleware\MiddlewareBundle\Service\EventStreamReplayer; +use Symfony\Component\Console\Attribute\AsCommand; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Helper\FormatterHelper; use Symfony\Component\Console\Helper\QuestionHelper; @@ -27,24 +28,22 @@ use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Question\ConfirmationQuestion; use Symfony\Component\HttpKernel\KernelInterface; - +#[AsCommand( + name: 'middleware:event:replay', + description: 'Wipes all read models and repopulates the tables from the event store. Use the + --no-interaction option to perform the event replay without the additional confirmation question.' +)] class ReplayEventsCommand extends Command { - protected static $defaultName = 'middleware:event:replay'; - public function __construct(private readonly EventStreamReplayer $replayer) { parent::__construct(); } - protected function configure() + protected function configure(): void { $this - ->setDescription( - 'Wipes all read models and repopulates the tables from the event store. Use the - --no-interaction option to perform the event replay without the additional confirmation question.', - ) - ->addOption( + ->addOption( 'increments', 'i', InputOption::VALUE_REQUIRED, @@ -53,7 +52,7 @@ protected function configure() ); } - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { /** @var KernelInterface $kernel */ $kernel = $this->getApplication()->getKernel(); @@ -77,7 +76,7 @@ protected function execute(InputInterface $input, OutputInterface $output) ), ); - return; + return 1; } /** @var QuestionHelper $interrogator */ @@ -92,7 +91,7 @@ protected function execute(InputInterface $input, OutputInterface $output) if (!$interrogator->ask($input, $output, $wantToRunOnProd)) { $output->writeln('Not starting the replay'); - return; + return 1; } } @@ -105,7 +104,7 @@ protected function execute(InputInterface $input, OutputInterface $output) ), ); - return; + return 1; } if (!$noInteraction) { @@ -124,7 +123,7 @@ protected function execute(InputInterface $input, OutputInterface $output) if (!$interrogator->ask($input, $output, $areYouSure)) { $output->writeln('Replay cancelled!'); - return; + return 1; } } @@ -134,5 +133,6 @@ protected function execute(InputInterface $input, OutputInterface $output) ); $this->replayer->replayEvents($output, $increments); + return 0; } } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplaySpecificEventsCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplaySpecificEventsCommand.php index 6ccf1312f..d439d0eb2 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplaySpecificEventsCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplaySpecificEventsCommand.php @@ -22,6 +22,7 @@ use Surfnet\StepupMiddleware\MiddlewareBundle\EventSourcing\ProjectorCollection; use Surfnet\StepupMiddleware\MiddlewareBundle\Service\PastEventsService; use Surfnet\StepupMiddleware\MiddlewareBundle\Service\TransactionAwareEventDispatcher; +use Symfony\Component\Console\Attribute\AsCommand; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Helper\QuestionHelper; use Symfony\Component\Console\Input\InputInterface; @@ -29,16 +30,18 @@ use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Question\ChoiceQuestion; +#[AsCommand( + name: 'stepup:event:replay', + description: 'replay specified events for specified projectors' +)] class ReplaySpecificEventsCommand extends Command { - protected static $defaultName = 'stepup:event:replay'; public const OPTION_LIST_EVENTS = 'list-events'; public const OPTION_LIST_PROJECTORS = 'list-projectors'; - protected function configure() + protected function configure(): void { $this - ->setDescription('replay specified events for specified projectors') ->addOption( self::OPTION_LIST_EVENTS, null, @@ -62,7 +65,7 @@ public function __construct( parent::__construct(); } - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { $availableEvents = $this->collection->getEventNames(); $availableProjectors = $this->projectorCollection->getProjectorNames(); @@ -71,20 +74,20 @@ protected function execute(InputInterface $input, OutputInterface $output) $output->writeln('The following events can be replayed:'); $output->writeln(empty($availableEvents) ? 'None.' : $availableEvents); - return; + return 0; } if ($input->getOption(self::OPTION_LIST_PROJECTORS)) { $output->writeln('Events can be replayed for the following projectors:'); $output->writeln($availableProjectors === [] ? 'None.' : $availableProjectors); - return; + return 0; } if ($availableProjectors === []) { $output->writeln('There are no projectors configured to reply events for'); - return; + return 1; } /** @var QuestionHelper $questionHelper */ @@ -118,5 +121,6 @@ protected function execute(InputInterface $input, OutputInterface $output) $output->writeln('Dispatching events'); $this->eventDispatcher->dispatch($events); + return 0; } } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/EventCollection.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/EventCollection.php index 8c0c1bf37..0db6c3880 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/EventCollection.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/EventCollection.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\MiddlewareBundle\EventSourcing; use ArrayIterator; +use Iterator; use IteratorAggregate; use Surfnet\StepupMiddleware\MiddlewareBundle\Exception\InvalidArgumentException; @@ -93,7 +94,7 @@ public function contains($eventName): bool return in_array($eventName, $this->eventNames); } - public function getIterator() + public function getIterator(): Iterator { return new ArrayIterator($this->eventNames); } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/ProjectorCollection.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/ProjectorCollection.php index 12efd2fac..452dd3f40 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/ProjectorCollection.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/ProjectorCollection.php @@ -20,6 +20,7 @@ use ArrayIterator; use Broadway\EventHandling\EventListener as ProjectorInterface; +use Iterator; use IteratorAggregate; use Surfnet\StepupMiddleware\MiddlewareBundle\Exception\InvalidArgumentException; @@ -77,7 +78,7 @@ public function contains(ProjectorInterface $projector): bool return array_key_exists($projector::class, $this->projectors); } - public function getIterator() + public function getIterator(): Iterator { return new ArrayIterator($this->projectors); } From b05b471c2c7902ee266dcaa3db1e42d04dba94df Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Thu, 29 Feb 2024 09:19:40 +0100 Subject: [PATCH 28/89] Configure the Mockery TestListener This will convert mockery expectations to phpunit assertions. But all tests need to implement mockery tests. --- ci/qa/phpunit | 2 +- ci/qa/phpunit.xml | 59 ++++++++----------- composer.json | 3 +- src/Kernel.php | 2 - .../Migrations/Version20210610131957.php | 1 - .../Entity/SecondFactorCollection.php | 2 - .../Identity/Entity/VettedSecondFactor.php | 1 - .../Event/SecondFactorMigratedEvent.php | 1 - ...entSerializationAndDeserializationTest.php | 3 + .../InstitutionConfigurationTest.php | 3 + .../Value/AllowedSecondFactorListTest.php | 3 + .../Value/ContactInformationTest.php | 3 + .../InstitutionAuthorizationOptionTest.php | 3 + .../Value/InstitutionConfigurationIdTest.php | 3 + .../Value/InstitutionRoleTest.php | 4 +- .../Value/InstitutionSetTest.php | 3 + .../Configuration/Value/InstitutionTest.php | 3 + .../Configuration/Value/LocationTest.php | 3 + .../Configuration/Value/RaLocationIdTest.php | 3 + .../Value/RaLocationListTest.php | 3 + .../Value/RaLocationNameTest.php | 3 + .../ShowRaaContactInformationOptionTest.php | 3 + .../Value/UseRaLocationsOptionTest.php | 3 + .../Stepup/Tests/DateTime/DateTimeTest.php | 3 + .../Stepup/Tests/Helper/JsonHelperTest.php | 3 + .../Tests/Helper/UserDataFilterTest.php | 3 + .../Tests/Helper/UserDataFormatterTest.php | 3 + .../Collection/InstitutionCollectionTest.php | 3 + .../Entity/ConfigurableSettingsTest.php | 3 + .../Entity/SecondFactorCollectionTest.php | 3 + ...entSerializationAndDeserializationTest.php | 3 + .../Identity/Event/ForgettableEventsTest.php | 3 + ...entSerializationAndDeserializationTest.php | 3 + .../Tests/Identity/Value/CommonNameTest.php | 3 + .../Identity/Value/ContactInformationTest.php | 3 + .../Identity/Value/DocumentNumberTest.php | 3 + .../Stepup/Tests/Identity/Value/EmailTest.php | 3 + .../Value/EmailVerificationWindowTest.php | 3 + .../Tests/Identity/Value/GssfIdTest.php | 3 + .../Tests/Identity/Value/InstitutionTest.php | 3 + .../Tests/Identity/Value/LocationTest.php | 3 + .../Tests/Identity/Value/PhoneNumberTest.php | 3 + .../RecoveryTokenIdentifierFactoryTest.php | 3 + .../Value/RegistrationAuthorityRoleTest.php | 3 + .../Tests/Identity/Value/SafeStoreTest.php | 4 +- .../SecondFactorIdentifierFactoryTest.php | 3 + .../Identity/Value/StepupProviderTest.php | 3 + .../Tests/Identity/Value/TimeFrameTest.php | 3 + .../Identity/Value/YubikeyPublicIdTest.php | 3 + .../InstitutionAuthorizationRepository.php | 2 +- ...titutionConfigurationOptionsRepository.php | 2 +- .../Controller/CommandController.php | 1 - .../Controller/RaCandidateController.php | 1 - .../Request/CommandParamConverter.php | 5 -- .../ApiBundle/Service/DeprovisionService.php | 1 - ...utionAuthorizationRepositoryFilterTest.php | 3 + .../AuthorizationContextServiceTest.php | 3 + .../CommandAuthorizationServiceTest.php | 3 + .../Entity/ConfiguredInstitutionTest.php | 2 + .../Configuration/Entity/RaLocationTest.php | 2 + .../Service/AllowedSecondFactorMapTest.php | 2 + .../InstitutionAuthorizationOptionMapTest.php | 2 + .../InstitutionAuthorizationServiceTest.php | 2 + ...itutionConfigurationOptionsServiceTest.php | 3 + .../Doctrine/Type/AuthorityRoleTypeTest.php | 2 + .../Doctrine/Type/CommonNameTypeTest.php | 3 + ...onfigurationContactInformationTypeTest.php | 3 + .../Type/ConfigurationInstitutionTypeTest.php | 3 + .../Type/ConfigurationLocationTypeTest.php | 3 + .../Type/ContactInformationTypeTest.php | 3 + .../Tests/Doctrine/Type/DateTimeTypeTest.php | 3 + .../Doctrine/Type/DocumentNumberTypeTest.php | 3 + .../Tests/Doctrine/Type/EmailTypeTest.php | 3 + .../Doctrine/Type/InstitutionRoleTypeTest.php | 3 + .../Doctrine/Type/InstitutionTypeTest.php | 3 + .../Tests/Doctrine/Type/LocaleTypeTest.php | 3 + .../Tests/Doctrine/Type/LocationTypeTest.php | 3 + .../Tests/Doctrine/Type/NameIdTypeTest.php | 3 + .../NumberOfTokensPerIdentityTypeTest.php | 3 + .../Doctrine/Type/RaLocationNameTypeTest.php | 3 + .../Type/RecoveryTokenStatusTypeTest.php | 3 + .../Type/SecondFactorStatusTypeTest.php | 3 + .../Doctrine/Type/SelfVetOptionTypeTest.php | 3 + ...howRaaContactInformationOptionTypeTest.php | 4 +- .../Type/UseRaLocationsOptionTypeTest.php | 3 + .../Type/VerifyEmailOptionTypeTest.php | 3 + .../ConfiguredInstitutionControllerTest.php | 3 + .../Tests/Endpoint/SraaControllerTest.php | 3 + .../Projector/AuditLogProjectorTest.php | 3 + .../Request/CommandParamConverterTest.php | 3 + .../Request/InstitutionParamConverterTest.php | 3 + .../JsonAuthorizationResponseTest.php | 3 + .../Service/RecoveryTokenMailService.php | 1 - .../Tests/Command/AbstractCommandTest.php | 3 + .../Tests/CommandHandlerTest.php | 3 + .../ConfigurationCommandHandlerTest.php | 3 + ...itutionConfigurationCommandHandlerTest.php | 3 + .../InstitutionConfigurationProcessorTest.php | 3 + .../Tests/DateTimeHelperTest.php | 3 + .../EventHandling/BufferedEventBusTest.php | 3 + ...ndPublishToBusOnFirstCallEventListener.php | 2 + .../IdentityCommandHandlerTest.php | 1 - ...IdentityIdEnforcingEventStoreDecorator.php | 3 + .../Mockery/HasInstitutionMatcherTest.php | 4 +- .../Tests/Pipeline/AuthorizingStageTest.php | 3 + .../Tests/Pipeline/DispatchStageTest.php | 3 + .../Pipeline/EventDispatchingStageTest.php | 3 + .../Tests/Pipeline/StagedPipelineTest.php | 3 + .../Tests/Pipeline/ValidationStageTest.php | 3 + .../SensitiveDataMessageStreamTest.php | 3 + .../Tests/SensitiveData/SensitiveDataTest.php | 3 + .../Service/SensitiveDataServiceTest.php | 3 + .../Tests/Value/InstitutionTest.php | 3 + .../InstitutionConfigurationProjectorTest.php | 3 +- .../ConfigurationControllerTest.php | 3 + ...InstitutionConfigurationControllerTest.php | 3 + .../Validator/ConfigurationValidationTest.php | 3 + ...nfigureInstitutionRequestValidatorTest.php | 3 + .../Command/MigrateSecondFactorCommand.php | 1 - .../Console/Command/ReplayEventsCommand.php | 1 + .../EventSourcing/EventCollectionTest.php | 2 + .../EventSourcing/ProjectorCollectionTest.php | 1 + .../MappedInstitutionConfigurationTest.php | 3 + ...ndFactorDisplayNameResolverServiceTest.php | 2 + ...erifiedSecondFactorReminderServiceTest.php | 3 + 125 files changed, 340 insertions(+), 61 deletions(-) diff --git a/ci/qa/phpunit b/ci/qa/phpunit index f8b056acd..95df70aa6 100755 --- a/ci/qa/phpunit +++ b/ci/qa/phpunit @@ -9,5 +9,5 @@ cd $(dirname $0)/../../ # PHPUnit Bridge should always be used in Symfony applications. (https://symfony.com/doc/current/components/phpunit_bridge.html) # This will create a phpunit executable in /bin/ instead of /vendor/bin/ -XDEBUG_MODE=coverage ./vendor/bin/phpunit --configuration=ci/qa/phpunit.xml --coverage-text --testsuite=unit +XDEBUG_MODE=coverage ./vendor/bin/phpunit --configuration=ci/qa/phpunit.xml --coverage-text --testsuite=unit $1 #./vendor/bin/phpunit --configuration=ci/qa/phpunit.xml --testsuite=database diff --git a/ci/qa/phpunit.xml b/ci/qa/phpunit.xml index c859df5e3..660a2b6ad 100644 --- a/ci/qa/phpunit.xml +++ b/ci/qa/phpunit.xml @@ -1,37 +1,28 @@ - - - - - - - - - - - - - ../../src - - - - ../../tests/database - - - - - - ../../src - - - - - - + + + + ../../src + + + + + + + + + + + + ../../src + + + ../../tests/database + + + + + + diff --git a/composer.json b/composer.json index 8afe2bb16..5727952b8 100644 --- a/composer.json +++ b/composer.json @@ -38,6 +38,7 @@ "openconext/monitor-bundle": "^4.1", "pagerfanta/pagerfanta": "^4.3", "ramsey/uuid": "^4.7", + "sensio/framework-extra-bundle": "*", "surfnet/stepup-bundle": "^6.0", "symfony/asset": "6.4.*", "symfony/expression-language": "6.4.*", @@ -88,7 +89,7 @@ "phpmd": "./ci/qa/phpmd", "phpcs": "./ci/qa/phpcs", "phpcpd": "./ci/qa/phpcpd", - "phpunit": "./ci/qa/phpunit", + "phpunit": "./ci/qa/phpunit --", "post-install-cmd": [ "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters", diff --git a/src/Kernel.php b/src/Kernel.php index 15434da3b..517b77a41 100644 --- a/src/Kernel.php +++ b/src/Kernel.php @@ -8,9 +8,7 @@ use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Kernel as BaseKernel; use Symfony\Component\Routing\RouteCollectionBuilder; - use function dirname; - use const PHP_VERSION_ID; class Kernel extends BaseKernel diff --git a/src/Surfnet/Migrations/Version20210610131957.php b/src/Surfnet/Migrations/Version20210610131957.php index 076c92f7b..0846335d3 100644 --- a/src/Surfnet/Migrations/Version20210610131957.php +++ b/src/Surfnet/Migrations/Version20210610131957.php @@ -5,7 +5,6 @@ use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; - use function json_decode; use function json_encode; diff --git a/src/Surfnet/Stepup/Identity/Entity/SecondFactorCollection.php b/src/Surfnet/Stepup/Identity/Entity/SecondFactorCollection.php index 1ce2c1d0e..47f6d8306 100644 --- a/src/Surfnet/Stepup/Identity/Entity/SecondFactorCollection.php +++ b/src/Surfnet/Stepup/Identity/Entity/SecondFactorCollection.php @@ -21,9 +21,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Surfnet\Stepup\Exception\LogicException; use Surfnet\StepupBundle\Service\SecondFactorTypeService; - use Surfnet\StepupBundle\Value\VettingType; - use function array_pop; final class SecondFactorCollection extends ArrayCollection diff --git a/src/Surfnet/Stepup/Identity/Entity/VettedSecondFactor.php b/src/Surfnet/Stepup/Identity/Entity/VettedSecondFactor.php index 19831dbf3..6c88ce893 100644 --- a/src/Surfnet/Stepup/Identity/Entity/VettedSecondFactor.php +++ b/src/Surfnet/Stepup/Identity/Entity/VettedSecondFactor.php @@ -26,7 +26,6 @@ use Surfnet\Stepup\Identity\Value\SecondFactorId; use Surfnet\Stepup\Identity\Value\SecondFactorIdentifier; use Surfnet\Stepup\Identity\Value\VettingType; -use Surfnet\StepupBundle\Service\SecondFactorTypeService; use Surfnet\StepupBundle\Value\SecondFactorType; /** diff --git a/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php b/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php index 8ba12d942..25e6d6fa2 100644 --- a/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php @@ -35,7 +35,6 @@ use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Forgettable; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\RightToObtainDataInterface; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\SensitiveData; - use function array_key_exists; /** diff --git a/src/Surfnet/Stepup/Tests/Configuration/Event/EventSerializationAndDeserializationTest.php b/src/Surfnet/Stepup/Tests/Configuration/Event/EventSerializationAndDeserializationTest.php index 8f6515d87..bcdbae7ce 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Event/EventSerializationAndDeserializationTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Event/EventSerializationAndDeserializationTest.php @@ -19,6 +19,7 @@ namespace Surfnet\Stepup\Tests\Configuration\Event; use Broadway\Serializer\Serializable as SerializableInterface; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase; use Ramsey\Uuid\Uuid; use Surfnet\Stepup\Configuration\Configuration; @@ -59,6 +60,8 @@ class EventSerializationAndDeserializationTest extends TestCase { + use MockeryPHPUnitIntegration; + /** * @test * @group domain diff --git a/src/Surfnet/Stepup/Tests/Configuration/InstitutionConfigurationTest.php b/src/Surfnet/Stepup/Tests/Configuration/InstitutionConfigurationTest.php index 5a57a349e..8d2e22099 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/InstitutionConfigurationTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/InstitutionConfigurationTest.php @@ -19,6 +19,7 @@ namespace Surfnet\Stepup\Tests\Configuration; use Broadway\EventSourcing\Testing\AggregateRootScenarioTestCase; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use Surfnet\Stepup\Configuration\Event\AllowedSecondFactorListUpdatedEvent; use Surfnet\Stepup\Configuration\Event\InstitutionConfigurationRemovedEvent; use Surfnet\Stepup\Configuration\Event\NewInstitutionConfigurationCreatedEvent; @@ -43,6 +44,8 @@ class InstitutionConfigurationTest extends AggregateRootScenarioTestCase { + use MockeryPHPUnitIntegration; + /** * @test * @group aggregate diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/AllowedSecondFactorListTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/AllowedSecondFactorListTest.php index f178292a3..aed427340 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/AllowedSecondFactorListTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/AllowedSecondFactorListTest.php @@ -18,6 +18,7 @@ namespace Surfnet\Stepup\Tests\Configuration\Value; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as TestCase; use Surfnet\Stepup\Configuration\Value\AllowedSecondFactorList; use Surfnet\StepupBundle\Service\SecondFactorTypeService; @@ -25,6 +26,8 @@ class AllowedSecondFactorListTest extends TestCase { + use MockeryPHPUnitIntegration; + /** * @test * @group domain diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/ContactInformationTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/ContactInformationTest.php index f83bea058..2dc023e7a 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/ContactInformationTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/ContactInformationTest.php @@ -18,6 +18,7 @@ namespace Surfnet\Stepup\Tests\Configuration\Value; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use StdClass; use Surfnet\Stepup\Configuration\Value\ContactInformation; @@ -25,6 +26,8 @@ class ContactInformationTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @test * @group domain diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php index 8f1b289b1..7da9a0465 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php @@ -18,6 +18,7 @@ namespace Surfnet\Stepup\Tests\Configuration\Value; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as TestCase; use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\Stepup\Configuration\Value\InstitutionAuthorizationOption; @@ -26,6 +27,8 @@ class InstitutionAuthorizationOptionTest extends TestCase { + use MockeryPHPUnitIntegration; + /** * @var Institution */ diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionConfigurationIdTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionConfigurationIdTest.php index 2e1e7e903..d9a8a50ca 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionConfigurationIdTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionConfigurationIdTest.php @@ -18,6 +18,7 @@ namespace Surfnet\Stepup\Tests\Configuration\Value; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as TestCase; use StdClass; use Surfnet\Stepup\Configuration\Value\Institution; @@ -26,6 +27,8 @@ class InstitutionConfigurationIdTest extends TestCase { + use MockeryPHPUnitIntegration; + /** * @test * @group domain diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionRoleTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionRoleTest.php index 60f9efb25..2be542e49 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionRoleTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionRoleTest.php @@ -18,13 +18,15 @@ namespace Surfnet\Stepup\Tests\Configuration\Value; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as TestCase; use Surfnet\Stepup\Configuration\Value\InstitutionRole; -use Surfnet\Stepup\Configuration\Value\SelectRaaOption; use Surfnet\Stepup\Exception\InvalidArgumentException; class InstitutionRoleTest extends TestCase { + use MockeryPHPUnitIntegration; + /** * @test * @group domain diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionSetTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionSetTest.php index ceffd786c..5032d0559 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionSetTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionSetTest.php @@ -18,6 +18,7 @@ namespace Surfnet\Stepup\Tests\Configuration\Value; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\Stepup\Configuration\Value\InstitutionSet; @@ -26,6 +27,8 @@ class InstitutionSetTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @test * @group domain diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionTest.php index 9f1c2fcaf..d5cf92fcf 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionTest.php @@ -18,6 +18,7 @@ namespace Surfnet\Stepup\Tests\Configuration\Value; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use StdClass; use Surfnet\Stepup\Configuration\Value\Institution; @@ -25,6 +26,8 @@ class InstitutionTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @test * @group domain diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/LocationTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/LocationTest.php index 01c1f36dd..7596e55dc 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/LocationTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/LocationTest.php @@ -18,6 +18,7 @@ namespace Surfnet\Stepup\Tests\Configuration\Value; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use stdClass; use Surfnet\Stepup\Configuration\Value\Location; @@ -25,6 +26,8 @@ class LocationTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @test * @group domain diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php index 19e3b0ac0..2fa26fe8f 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php @@ -18,6 +18,7 @@ namespace Surfnet\Stepup\Tests\Configuration\Value; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as TestCase; use Ramsey\Uuid\Uuid; use StdClass; @@ -26,6 +27,8 @@ class RaLocationIdTest extends TestCase { + use MockeryPHPUnitIntegration; + /** * @test * @group domain diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationListTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationListTest.php index b677dcb13..497d6febe 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationListTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationListTest.php @@ -18,6 +18,7 @@ namespace Surfnet\Stepup\Tests\Configuration\Value; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as TestCase; use Ramsey\Uuid\Uuid; use Surfnet\Stepup\Configuration\Entity\RaLocation; @@ -30,6 +31,8 @@ class RaLocationListTest extends TestCase { + use MockeryPHPUnitIntegration; + /** * @test * @group domain diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationNameTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationNameTest.php index 488179efa..51d0c3876 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationNameTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationNameTest.php @@ -18,6 +18,7 @@ namespace Surfnet\Stepup\Tests\Configuration\Value; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as TestCase; use StdClass; use Surfnet\Stepup\Configuration\Value\RaLocationName; @@ -25,6 +26,8 @@ class RaLocationNameTest extends TestCase { + use MockeryPHPUnitIntegration; + /** * @test * @group domain diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/ShowRaaContactInformationOptionTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/ShowRaaContactInformationOptionTest.php index 1220ce327..d96e304ed 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/ShowRaaContactInformationOptionTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/ShowRaaContactInformationOptionTest.php @@ -18,6 +18,7 @@ namespace Surfnet\Stepup\Tests\Configuration\Value; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as TestCase; use StdClass; use Surfnet\Stepup\Configuration\Value\ShowRaaContactInformationOption; @@ -25,6 +26,8 @@ class ShowRaaContactInformationOptionTest extends TestCase { + use MockeryPHPUnitIntegration; + /** * @test * @group domain diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/UseRaLocationsOptionTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/UseRaLocationsOptionTest.php index 7639946b8..1032557e0 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/UseRaLocationsOptionTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/UseRaLocationsOptionTest.php @@ -18,6 +18,7 @@ namespace Surfnet\Stepup\Tests\Configuration\Value; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as TestCase; use StdClass; use Surfnet\Stepup\Configuration\Value\UseRaLocationsOption; @@ -25,6 +26,8 @@ class UseRaLocationsOptionTest extends TestCase { + use MockeryPHPUnitIntegration; + /** * @test * @group domain diff --git a/src/Surfnet/Stepup/Tests/DateTime/DateTimeTest.php b/src/Surfnet/Stepup/Tests/DateTime/DateTimeTest.php index fc47de7fb..26b96c80c 100644 --- a/src/Surfnet/Stepup/Tests/DateTime/DateTimeTest.php +++ b/src/Surfnet/Stepup/Tests/DateTime/DateTimeTest.php @@ -20,11 +20,14 @@ use DateInterval; use DateTime as CoreDateTime; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\DateTime\DateTime; class DateTimeTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * Might seem a bit overdone, but we rely on this specific format in quite a bit of places. If the format changes * this might lead to some unforeseen errors. This ensures that if the format is changed, this test fails and diff --git a/src/Surfnet/Stepup/Tests/Helper/JsonHelperTest.php b/src/Surfnet/Stepup/Tests/Helper/JsonHelperTest.php index 70c92c8d3..90e3a1238 100644 --- a/src/Surfnet/Stepup/Tests/Helper/JsonHelperTest.php +++ b/src/Surfnet/Stepup/Tests/Helper/JsonHelperTest.php @@ -18,6 +18,7 @@ namespace Surfnet\Stepup\Tests\Helper; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as TestCase; use StdClass; use Surfnet\Stepup\Exception\InvalidArgumentException; @@ -26,6 +27,8 @@ class JsonHelperTest extends TestCase { + use MockeryPHPUnitIntegration; + /** * @test * @group json diff --git a/src/Surfnet/Stepup/Tests/Helper/UserDataFilterTest.php b/src/Surfnet/Stepup/Tests/Helper/UserDataFilterTest.php index e89ef7bd0..141ab0776 100644 --- a/src/Surfnet/Stepup/Tests/Helper/UserDataFilterTest.php +++ b/src/Surfnet/Stepup/Tests/Helper/UserDataFilterTest.php @@ -19,6 +19,7 @@ namespace Surfnet\Stepup\Tests\Helper; use Generator; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase; use Surfnet\Stepup\DateTime\DateTime; use Surfnet\Stepup\Helper\UserDataFilter; @@ -38,6 +39,8 @@ class UserDataFilterTest extends TestCase { + use MockeryPHPUnitIntegration; + /** * @dataProvider provideEvents */ diff --git a/src/Surfnet/Stepup/Tests/Helper/UserDataFormatterTest.php b/src/Surfnet/Stepup/Tests/Helper/UserDataFormatterTest.php index f791d94ca..369af5275 100644 --- a/src/Surfnet/Stepup/Tests/Helper/UserDataFormatterTest.php +++ b/src/Surfnet/Stepup/Tests/Helper/UserDataFormatterTest.php @@ -18,11 +18,14 @@ namespace Surfnet\Stepup\Tests\Helper; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase; use Surfnet\Stepup\Helper\UserDataFormatter; class UserDataFormatterTest extends TestCase { + use MockeryPHPUnitIntegration; + public function test_data_is_formatted(): void { $formatter = new UserDataFormatter('Stepup-Middleware'); diff --git a/src/Surfnet/Stepup/Tests/Identity/Collection/InstitutionCollectionTest.php b/src/Surfnet/Stepup/Tests/Identity/Collection/InstitutionCollectionTest.php index 43d62d31a..c5d1fbd74 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Collection/InstitutionCollectionTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Collection/InstitutionCollectionTest.php @@ -18,6 +18,7 @@ namespace Surfnet\Stepup\Tests\Identity\Collection; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Exception\RuntimeException; use Surfnet\Stepup\Identity\Collection\InstitutionCollection; @@ -25,6 +26,8 @@ class InstitutionCollectionTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @test * @group domain diff --git a/src/Surfnet/Stepup/Tests/Identity/Entity/ConfigurableSettingsTest.php b/src/Surfnet/Stepup/Tests/Identity/Entity/ConfigurableSettingsTest.php index c2f4a74fe..1105eb676 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Entity/ConfigurableSettingsTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Entity/ConfigurableSettingsTest.php @@ -19,6 +19,7 @@ namespace Surfnet\Stepup\Tests\Identity\Entity; use DateTime as CoreDateTime; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\DateTime\DateTime; use Surfnet\Stepup\Identity\Entity\ConfigurableSettings; @@ -27,6 +28,8 @@ class ConfigurableSettingsTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @test * @group domain diff --git a/src/Surfnet/Stepup/Tests/Identity/Entity/SecondFactorCollectionTest.php b/src/Surfnet/Stepup/Tests/Identity/Entity/SecondFactorCollectionTest.php index f9b1c53b1..8576c929e 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Entity/SecondFactorCollectionTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Entity/SecondFactorCollectionTest.php @@ -19,6 +19,7 @@ namespace Surfnet\Stepup\Tests\Identity\Entity; use Mockery as m; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Identity\Entity\SecondFactor; use Surfnet\Stepup\Identity\Entity\SecondFactorCollection; @@ -30,6 +31,8 @@ class SecondFactorCollectionTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @test * @group domain diff --git a/src/Surfnet/Stepup/Tests/Identity/Event/EventSerializationAndDeserializationTest.php b/src/Surfnet/Stepup/Tests/Identity/Event/EventSerializationAndDeserializationTest.php index c142c6e92..fb71eff0f 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Event/EventSerializationAndDeserializationTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Event/EventSerializationAndDeserializationTest.php @@ -20,6 +20,7 @@ use Broadway\Serializer\Serializable as SerializableInterface; use DateTime as CoreDateTime; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use Ramsey\Uuid\Uuid; use Surfnet\Stepup\DateTime\DateTime; @@ -75,6 +76,8 @@ class EventSerializationAndDeserializationTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @test * @group domain diff --git a/src/Surfnet/Stepup/Tests/Identity/Event/ForgettableEventsTest.php b/src/Surfnet/Stepup/Tests/Identity/Event/ForgettableEventsTest.php index b87f45b16..007ad0b07 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Event/ForgettableEventsTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Event/ForgettableEventsTest.php @@ -18,6 +18,7 @@ namespace Surfnet\Stepup\Tests\Identity\Event; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase; use ReflectionClass; use Surfnet\Stepup\Identity\Event\CompliedWithRevocationEvent; @@ -53,6 +54,8 @@ final class ForgettableEventsTest extends TestCase { + use MockeryPHPUnitIntegration; + /** * @test * @group domain diff --git a/src/Surfnet/Stepup/Tests/Identity/Event/WhitelistEventSerializationAndDeserializationTest.php b/src/Surfnet/Stepup/Tests/Identity/Event/WhitelistEventSerializationAndDeserializationTest.php index 1c9ae51ad..2d33f7ac2 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Event/WhitelistEventSerializationAndDeserializationTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Event/WhitelistEventSerializationAndDeserializationTest.php @@ -19,6 +19,7 @@ namespace Surfnet\Stepup\Tests\Identity\Event; use Broadway\Serializer\Serializable as SerializableInterface; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Identity\Collection\InstitutionCollection; use Surfnet\Stepup\Identity\Event\InstitutionsAddedToWhitelistEvent; @@ -29,6 +30,8 @@ class WhitelistEventSerializationAndDeserializationTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @test * @group domain diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/CommonNameTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/CommonNameTest.php index cbd39d587..b9377bfc0 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/CommonNameTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/CommonNameTest.php @@ -18,6 +18,7 @@ namespace Surfnet\Stepup\Tests\Identity\Value; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use StdClass; use Surfnet\Stepup\Exception\InvalidArgumentException; @@ -25,6 +26,8 @@ class CommonNameTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @test * @group domain diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/ContactInformationTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/ContactInformationTest.php index 5b6cca367..dbe80cd29 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/ContactInformationTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/ContactInformationTest.php @@ -18,6 +18,7 @@ namespace Surfnet\Stepup\Tests\Identity\Value; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use StdClass; use Surfnet\Stepup\Exception\InvalidArgumentException; @@ -25,6 +26,8 @@ class ContactInformationTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @test * @group domain diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/DocumentNumberTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/DocumentNumberTest.php index 59d209bef..e16687617 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/DocumentNumberTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/DocumentNumberTest.php @@ -18,6 +18,7 @@ namespace Surfnet\Stepup\Tests\Identity\Value; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use StdClass; use Surfnet\Stepup\Exception\InvalidArgumentException; @@ -25,6 +26,8 @@ class DocumentNumberTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @test * @group domain diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/EmailTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/EmailTest.php index 43f7e0ae3..a95bb3825 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/EmailTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/EmailTest.php @@ -18,6 +18,7 @@ namespace Surfnet\Stepup\Tests\Identity\Value; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use StdClass; use Surfnet\Stepup\Exception\InvalidArgumentException; @@ -25,6 +26,8 @@ class EmailTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @test * @group domain diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/EmailVerificationWindowTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/EmailVerificationWindowTest.php index 7322707f0..861e18d3b 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/EmailVerificationWindowTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/EmailVerificationWindowTest.php @@ -20,6 +20,7 @@ use DateInterval; use DateTime as CoreDateTime; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase; use Surfnet\Stepup\DateTime\DateTime; use Surfnet\Stepup\Identity\Value\EmailVerificationWindow; @@ -28,6 +29,8 @@ class EmailVerificationWindowTest extends TestCase { + use MockeryPHPUnitIntegration; + /** * @test * @group domain diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/GssfIdTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/GssfIdTest.php index 4f806688f..6e05e8033 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/GssfIdTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/GssfIdTest.php @@ -18,6 +18,7 @@ namespace Surfnet\Stepup\Tests\Identity\Value; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use StdClass; use Surfnet\Stepup\Exception\InvalidArgumentException; @@ -25,6 +26,8 @@ class GssfIdTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @test * @group domain diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/InstitutionTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/InstitutionTest.php index 58598f4d2..fdabec5d6 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/InstitutionTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/InstitutionTest.php @@ -18,6 +18,7 @@ namespace Surfnet\Stepup\Tests\Identity\Value; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use StdClass; use Surfnet\Stepup\Exception\InvalidArgumentException; @@ -25,6 +26,8 @@ class InstitutionTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @test * @group domain diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/LocationTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/LocationTest.php index 7fee2ec21..b1964440e 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/LocationTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/LocationTest.php @@ -18,6 +18,7 @@ namespace Surfnet\Stepup\Tests\Identity\Value; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use StdClass; use Surfnet\Stepup\Exception\InvalidArgumentException; @@ -25,6 +26,8 @@ class LocationTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @test * @group domain diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/PhoneNumberTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/PhoneNumberTest.php index 9263a7cda..7aa40b9bb 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/PhoneNumberTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/PhoneNumberTest.php @@ -18,6 +18,7 @@ namespace Surfnet\Stepup\Tests\Identity\Value; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use StdClass; use Surfnet\Stepup\Exception\InvalidArgumentException; @@ -25,6 +26,8 @@ class PhoneNumberTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @test * @group domain diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/RecoveryTokenIdentifierFactoryTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/RecoveryTokenIdentifierFactoryTest.php index 464412e78..2bc97760a 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/RecoveryTokenIdentifierFactoryTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/RecoveryTokenIdentifierFactoryTest.php @@ -18,6 +18,7 @@ namespace Surfnet\Stepup\Tests\Identity\Value; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase; use Surfnet\Stepup\Identity\Value\HashedSecret; use Surfnet\Stepup\Identity\Value\PhoneNumber; @@ -27,6 +28,8 @@ final class RecoveryTokenIdentifierFactoryTest extends TestCase { + use MockeryPHPUnitIntegration; + /** * @group domain */ diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/RegistrationAuthorityRoleTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/RegistrationAuthorityRoleTest.php index 0a4e2fde8..a3573a5b8 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/RegistrationAuthorityRoleTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/RegistrationAuthorityRoleTest.php @@ -18,6 +18,7 @@ namespace Surfnet\Stepup\Tests\Identity\Value; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use StdClass; use Surfnet\Stepup\Exception\InvalidArgumentException; @@ -25,6 +26,8 @@ class RegistrationAuthorityRoleTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @test * @group domain diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/SafeStoreTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/SafeStoreTest.php index 5eb981f14..a113946b9 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/SafeStoreTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/SafeStoreTest.php @@ -18,17 +18,19 @@ namespace Surfnet\Stepup\Tests\Identity\Value; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Identity\Value\HashedSecret; use Surfnet\Stepup\Identity\Value\PhoneNumber; use Surfnet\Stepup\Identity\Value\RecoveryTokenIdentifier; use Surfnet\Stepup\Identity\Value\SafeStore; use Surfnet\Stepup\Identity\Value\UnhashedSecret; - use function password_verify; class SafeStoreTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @group domain */ diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/SecondFactorIdentifierFactoryTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/SecondFactorIdentifierFactoryTest.php index 1ec091995..435ffc78c 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/SecondFactorIdentifierFactoryTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/SecondFactorIdentifierFactoryTest.php @@ -18,6 +18,7 @@ namespace Surfnet\Stepup\Tests\Identity\Value; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as TestCase; use Surfnet\Stepup\Identity\Value\GssfId; use Surfnet\Stepup\Identity\Value\PhoneNumber; @@ -27,6 +28,8 @@ final class SecondFactorIdentifierFactoryTest extends TestCase { + use MockeryPHPUnitIntegration; + /** * @test * @group domain diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/StepupProviderTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/StepupProviderTest.php index 1327a4a6b..07187cf64 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/StepupProviderTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/StepupProviderTest.php @@ -18,6 +18,7 @@ namespace Surfnet\Stepup\Tests\Identity\Value; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use StdClass; use Surfnet\Stepup\Exception\InvalidArgumentException; @@ -25,6 +26,8 @@ class StepupProviderTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @test * @group domain diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/TimeFrameTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/TimeFrameTest.php index a9383b498..992035120 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/TimeFrameTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/TimeFrameTest.php @@ -18,6 +18,7 @@ namespace Surfnet\Stepup\Tests\Identity\Value; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use StdClass; use Surfnet\Stepup\Exception\InvalidArgumentException; @@ -25,6 +26,8 @@ class TimeFrameTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @test * @group domain diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/YubikeyPublicIdTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/YubikeyPublicIdTest.php index 2f2503730..c89fcc50a 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/YubikeyPublicIdTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/YubikeyPublicIdTest.php @@ -18,12 +18,15 @@ namespace Surfnet\Stepup\Tests\Identity\Value; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Exception\InvalidArgumentException; use Surfnet\Stepup\Identity\Value\YubikeyPublicId; class YubikeyPublicIdTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @test * @group domain diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionAuthorizationRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionAuthorizationRepository.php index 379ea8022..575c5716e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionAuthorizationRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionAuthorizationRepository.php @@ -19,9 +19,9 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; -use Doctrine\Persistence\ManagerRegistry; use Doctrine\ORM\EntityManager; use Doctrine\ORM\OptimisticLockException; +use Doctrine\Persistence\ManagerRegistry; use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\Stepup\Configuration\Value\InstitutionAuthorizationOption; use Surfnet\Stepup\Configuration\Value\InstitutionRole; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionConfigurationOptionsRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionConfigurationOptionsRepository.php index eec23074d..7d5beeb97 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionConfigurationOptionsRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionConfigurationOptionsRepository.php @@ -19,8 +19,8 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; -use Doctrine\Persistence\ManagerRegistry; use Doctrine\ORM\NonUniqueResultException; +use Doctrine\Persistence\ManagerRegistry; use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity\InstitutionConfigurationOptions; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php index e6c290054..10bbcad1c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php @@ -22,7 +22,6 @@ use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Authorization\Service\CommandAuthorizationService; -use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\WhitelistService; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Metadata; use Surfnet\StepupMiddleware\CommandHandlingBundle\EventSourcing\MetadataEnricher; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php index 5169695a2..5395e29af 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php @@ -28,7 +28,6 @@ use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; - use function sprintf; class RaCandidateController extends AbstractController diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php b/src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php index 49ebb5d15..eb579f7dd 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php @@ -26,11 +26,6 @@ class CommandParamConverter implements ParamConverterInterface { - /** - * @SuppressWarnings(PHPMD.MissingImport) - * The line above could be removed in newer releases were dynamic imports are allowed - * @see https://github.com/phpmd/phpmd/issues/673 - */ public function apply(Request $request, ParamConverter $configuration): void { $data = json_decode($request->getContent(), true); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Service/DeprovisionService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Service/DeprovisionService.php index 2340cdd87..2c50edb93 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Service/DeprovisionService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Service/DeprovisionService.php @@ -27,7 +27,6 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\IdentityRepository as ApiIdentityRepository; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\ForgetIdentityCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\Pipeline; - use function sprintf; class DeprovisionService implements DeprovisionServiceInterface diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Filter/InstitutionAuthorizationRepositoryFilterTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Filter/InstitutionAuthorizationRepositoryFilterTest.php index 83910f3e6..312ddad43 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Filter/InstitutionAuthorizationRepositoryFilterTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Filter/InstitutionAuthorizationRepositoryFilterTest.php @@ -20,6 +20,7 @@ use Doctrine\ORM\EntityManager; use Doctrine\ORM\QueryBuilder; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use PHPUnit_Framework_MockObject_MockObject; @@ -30,6 +31,8 @@ class InstitutionAuthorizationRepositoryFilterTest extends TestCase { + use MockeryPHPUnitIntegration; + /** * @var QueryBuilder */ diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationContextServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationContextServiceTest.php index 77529f425..d18f8cf17 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationContextServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationContextServiceTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Authorization\Service; use Mockery as m; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase; use Surfnet\Stepup\Identity\Collection\InstitutionCollection; use Surfnet\Stepup\Identity\Value\CommonName; @@ -40,6 +41,8 @@ class AuthorizationContextServiceTest extends TestCase { + use MockeryPHPUnitIntegration; + private AuthorizationContextService $service; /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php index 0f9227e8c..a7aecb99d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Authorization\Service; use Mockery as m; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase; use Psr\Log\LoggerInterface; use Ramsey\Uuid\Uuid; @@ -78,6 +79,8 @@ class CommandAuthorizationServiceTest extends TestCase { + use MockeryPHPUnitIntegration; + /** * @var WhitelistService|m\MockInterface */ diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Entity/ConfiguredInstitutionTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Entity/ConfiguredInstitutionTest.php index 2ab7ce74c..636923ec4 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Entity/ConfiguredInstitutionTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Entity/ConfiguredInstitutionTest.php @@ -18,12 +18,14 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Configuration\Entity; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as TestCase; use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity\ConfiguredInstitution; class ConfiguredInstitutionTest extends TestCase { + use MockeryPHPUnitIntegration; /** * @test * @group entity diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Entity/RaLocationTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Entity/RaLocationTest.php index 453c5502e..bb9bf4cd6 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Entity/RaLocationTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Entity/RaLocationTest.php @@ -18,6 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Configuration\Entity; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as TestCase; use Surfnet\Stepup\Configuration\Value\ContactInformation; use Surfnet\Stepup\Configuration\Value\Institution; @@ -27,6 +28,7 @@ class RaLocationTest extends TestCase { + use MockeryPHPUnitIntegration; /** * @test * @group entity diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/AllowedSecondFactorMapTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/AllowedSecondFactorMapTest.php index 07d93cd1b..9ca2ef191 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/AllowedSecondFactorMapTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/AllowedSecondFactorMapTest.php @@ -18,6 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Configuration\Service; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as TestCase; use Surfnet\Stepup\Configuration\Value\AllowedSecondFactorList; use Surfnet\Stepup\Configuration\Value\Institution; @@ -27,6 +28,7 @@ class AllowedSecondFactorMapTest extends TestCase { + use MockeryPHPUnitIntegration; /** * @test * @group domain diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationOptionMapTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationOptionMapTest.php index d3cdbd950..572025608 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationOptionMapTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationOptionMapTest.php @@ -18,6 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Configuration\Service; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase; use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\Stepup\Configuration\Value\InstitutionRole; @@ -26,6 +27,7 @@ class InstitutionAuthorizationOptionMapTest extends TestCase { + use MockeryPHPUnitIntegration; /** * @var Institution */ diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationServiceTest.php index b98bc4ad9..d00dc4392 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationServiceTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Configuration\Service; use Mockery as m; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as TestCase; use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\Stepup\Configuration\Value\InstitutionRole; @@ -28,6 +29,7 @@ class InstitutionAuthorizationServiceTest extends TestCase { + use MockeryPHPUnitIntegration; /** * @var InstitutionAuthorizationService */ diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionConfigurationOptionsServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionConfigurationOptionsServiceTest.php index ee17f9ba4..db929c8e1 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionConfigurationOptionsServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionConfigurationOptionsServiceTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Configuration\Service; use Mockery as m; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as TestCase; use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\Stepup\Configuration\Value\NumberOfTokensPerIdentityOption; @@ -28,6 +29,8 @@ class InstitutionConfigurationOptionsServiceTest extends TestCase { + use MockeryPHPUnitIntegration; + /** * @var InstitutionConfigurationOptionsService */ diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/AuthorityRoleTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/AuthorityRoleTypeTest.php index 0316da6f0..47fb8152c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/AuthorityRoleTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/AuthorityRoleTypeTest.php @@ -21,12 +21,14 @@ use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\AuthorityRoleType; use Surfnet\StepupMiddleware\ApiBundle\Identity\Value\AuthorityRole; class AuthorityRoleTypeTest extends UnitTest { + use MockeryPHPUnitIntegration; private MariaDBPlatform $platform; /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/CommonNameTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/CommonNameTypeTest.php index e323a3ca9..035aee960 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/CommonNameTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/CommonNameTypeTest.php @@ -21,12 +21,15 @@ use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Identity\Value\CommonName; use Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\CommonNameType; class CommonNameTypeTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @var MySqlPlatform */ diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationContactInformationTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationContactInformationTypeTest.php index 9ddb63d7c..00d1bbce4 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationContactInformationTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationContactInformationTypeTest.php @@ -21,12 +21,15 @@ use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Configuration\Value\ContactInformation; use Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\ConfigurationContactInformationType; class ConfigurationContactInformationTypeTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @var MySqlPlatform */ diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationInstitutionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationInstitutionTypeTest.php index b8931c7b4..a54c82ddb 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationInstitutionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationInstitutionTypeTest.php @@ -21,12 +21,15 @@ use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\ConfigurationInstitutionType; class ConfigurationInstitutionTypeTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @var MySqlPlatform */ diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationLocationTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationLocationTypeTest.php index 6ab7fc6a7..c4d1021e7 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationLocationTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationLocationTypeTest.php @@ -21,12 +21,15 @@ use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Configuration\Value\Location; use Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\ConfigurationLocationType; class ConfigurationLocationTypeTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @var MySqlPlatform */ diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ContactInformationTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ContactInformationTypeTest.php index f3c1c161a..10d7921cc 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ContactInformationTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ContactInformationTypeTest.php @@ -21,12 +21,15 @@ use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Identity\Value\ContactInformation; use Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\ContactInformationType; class ContactInformationTypeTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @var MySqlPlatform */ diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DateTimeTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DateTimeTypeTest.php index 391d292db..e4b157880 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DateTimeTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DateTimeTypeTest.php @@ -23,12 +23,15 @@ use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\DateTime\DateTime; use Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\DateTimeType; class DateTimeTypeTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @var MySqlPlatform */ diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DocumentNumberTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DocumentNumberTypeTest.php index 0b4540fb7..cdfd1e9ab 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DocumentNumberTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DocumentNumberTypeTest.php @@ -21,6 +21,7 @@ use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Exception\InvalidArgumentException; use Surfnet\Stepup\Identity\Value\DocumentNumber; @@ -28,6 +29,8 @@ class DocumentNumberTypeTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @var MySqlPlatform */ diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/EmailTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/EmailTypeTest.php index e8151691c..1128b6a72 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/EmailTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/EmailTypeTest.php @@ -21,12 +21,15 @@ use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Identity\Value\Email; use Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\EmailType; class EmailTypeTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @var MySqlPlatform */ diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionRoleTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionRoleTypeTest.php index 44e93268b..4a811bd4f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionRoleTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionRoleTypeTest.php @@ -21,12 +21,15 @@ use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Configuration\Value\InstitutionRole; use Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\InstitutionRoleType; class InstitutionRoleTypeTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @var MySqlPlatform */ diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionTypeTest.php index cf4c68a64..6a7772f4e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionTypeTest.php @@ -21,12 +21,15 @@ use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\InstitutionType; class InstitutionTypeTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @var MySqlPlatform */ diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocaleTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocaleTypeTest.php index 8a6f3a05d..110b56f47 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocaleTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocaleTypeTest.php @@ -21,12 +21,15 @@ use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Identity\Value\Locale; use Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\LocaleType; class LocaleTypeTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @var MySqlPlatform */ diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocationTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocationTypeTest.php index 38865986a..4d0549a18 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocationTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocationTypeTest.php @@ -21,12 +21,15 @@ use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Identity\Value\Location; use Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\LocationType; class LocationTypeTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @var MySqlPlatform */ diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NameIdTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NameIdTypeTest.php index ca72cd4fd..93d418f0a 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NameIdTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NameIdTypeTest.php @@ -21,12 +21,15 @@ use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Identity\Value\NameId; use Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\NameIdType; class NameIdTypeTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @var MySqlPlatform */ diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NumberOfTokensPerIdentityTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NumberOfTokensPerIdentityTypeTest.php index 3e1aee468..2f4aacd7f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NumberOfTokensPerIdentityTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NumberOfTokensPerIdentityTypeTest.php @@ -21,12 +21,15 @@ use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Configuration\Value\NumberOfTokensPerIdentityOption; use Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\NumberOfTokensPerIdentityType; class NumberOfTokensPerIdentityTypeTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @var MySqlPlatform */ diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RaLocationNameTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RaLocationNameTypeTest.php index bf155ad17..e05128fe9 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RaLocationNameTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RaLocationNameTypeTest.php @@ -21,12 +21,15 @@ use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Configuration\Value\RaLocationName; use Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\RaLocationNameType; class RaLocationNameTypeTest extends UnitTest { + use MockeryPHPUnitIntegration; + private MariaDBPlatform $platform; /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RecoveryTokenStatusTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RecoveryTokenStatusTypeTest.php index 311c5aaaf..3e79ddc17 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RecoveryTokenStatusTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RecoveryTokenStatusTypeTest.php @@ -21,6 +21,7 @@ use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use stdClass; use Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\RecoveryTokenStatusType; @@ -28,6 +29,8 @@ class RecoveryTokenStatusTypeTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @var MySqlPlatform */ diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SecondFactorStatusTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SecondFactorStatusTypeTest.php index aaedd76dc..d5ca85f14 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SecondFactorStatusTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SecondFactorStatusTypeTest.php @@ -21,6 +21,7 @@ use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use stdClass; use Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\SecondFactorStatusType; @@ -28,6 +29,8 @@ class SecondFactorStatusTypeTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @var MySqlPlatform */ diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SelfVetOptionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SelfVetOptionTypeTest.php index 378f44cad..a333103dd 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SelfVetOptionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SelfVetOptionTypeTest.php @@ -21,12 +21,15 @@ use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Configuration\Value\SelfVetOption; use Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\SelfVetOptionType; class SelfVetOptionTypeTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @var MySqlPlatform */ diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ShowRaaContactInformationOptionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ShowRaaContactInformationOptionTypeTest.php index 58d26d90c..b562c5cd0 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ShowRaaContactInformationOptionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ShowRaaContactInformationOptionTypeTest.php @@ -21,14 +21,16 @@ use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Configuration\Value\ShowRaaContactInformationOption; use Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\ShowRaaContactInformationOptionType; - use function is_numeric; class ShowRaaContactInformationOptionTypeTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @var MySqlPlatform */ diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/UseRaLocationsOptionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/UseRaLocationsOptionTypeTest.php index 9ff335e34..9cefbb413 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/UseRaLocationsOptionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/UseRaLocationsOptionTypeTest.php @@ -21,12 +21,15 @@ use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Configuration\Value\UseRaLocationsOption; use Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\UseRaLocationsOptionType; class UseRaLocationsOptionTypeTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @var MySqlPlatform */ diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/VerifyEmailOptionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/VerifyEmailOptionTypeTest.php index 6ad1d150a..feb1705b5 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/VerifyEmailOptionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/VerifyEmailOptionTypeTest.php @@ -21,12 +21,15 @@ use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Configuration\Value\VerifyEmailOption; use Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\VerifyEmailOptionType; class VerifyEmailOptionTypeTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @var MySqlPlatform */ diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php index 97f4e3308..eb4d2bb4b 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php @@ -21,12 +21,15 @@ use Generator; use Liip\TestFixturesBundle\Services\DatabaseToolCollection; use Liip\TestFixturesBundle\Services\DatabaseTools\ORMSqliteDatabaseTool; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use Symfony\Bundle\FrameworkBundle\KernelBrowser; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; use Symfony\Component\HttpFoundation\Response; class ConfiguredInstitutionControllerTest extends WebTestCase { + use MockeryPHPUnitIntegration; + /** * @var Client */ diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php index 957c79246..7daf08765 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php @@ -21,6 +21,7 @@ use Generator; use Liip\TestFixturesBundle\Services\DatabaseToolCollection; use Liip\TestFixturesBundle\Test\FixturesTrait; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use Symfony\Bundle\FrameworkBundle\Client; use Symfony\Bundle\FrameworkBundle\KernelBrowser; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; @@ -28,6 +29,8 @@ class SraaControllerTest extends WebTestCase { + use MockeryPHPUnitIntegration; + /** * @var Client */ diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/AuditLogProjectorTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/AuditLogProjectorTest.php index ab251e6c2..058b76fca 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/AuditLogProjectorTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/AuditLogProjectorTest.php @@ -23,6 +23,7 @@ use Broadway\Domain\Metadata as MessageMetadata; use DateTime as CoreDateTime; use Mockery as m; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use Mockery\Matcher\MatcherAbstract; use PHPUnit\Framework\TestCase; use Surfnet\Stepup\DateTime\DateTime as StepupDateTime; @@ -42,6 +43,8 @@ final class AuditLogProjectorTest extends TestCase { + use MockeryPHPUnitIntegration; + private static string $actorCommonName = 'Actor CommonName'; public function auditable_events(): array diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php index e6a8a30b9..b422d2008 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Request; use Mockery as m; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use Mockery\Matcher\MatcherAbstract; use PHPUnit\Framework\TestCase; use stdClass; @@ -30,6 +31,8 @@ class CommandParamConverterTest extends TestCase { + use MockeryPHPUnitIntegration; + /** * @test * @group api-bundle diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php index 39325e12a..66cdaeb27 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Request; use Mockery as m; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use Mockery\MockInterface; use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\Identity\Value\Institution; @@ -29,6 +30,8 @@ class InstitutionParamConverterTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @var MockInterface */ diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Response/JsonAuthorizationResponseTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Response/JsonAuthorizationResponseTest.php index 194844f28..992744f07 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Response/JsonAuthorizationResponseTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Response/JsonAuthorizationResponseTest.php @@ -19,12 +19,15 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Tests\Response; use Assert\InvalidArgumentException; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonAuthorizationResponse; use Symfony\Component\HttpFoundation\Response; class JsonAuthorizationResponseTest extends TestCase { + use MockeryPHPUnitIntegration; + public function test_happy_flow(): void { $response = new JsonAuthorizationResponse(200); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RecoveryTokenMailService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RecoveryTokenMailService.php index 4a287c787..bc30b0dc3 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RecoveryTokenMailService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RecoveryTokenMailService.php @@ -31,7 +31,6 @@ use Symfony\Component\Mailer\Mailer; use Symfony\Component\Mime\Address; use Symfony\Contracts\Translation\TranslatorInterface; - use function str_replace; /** diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Command/AbstractCommandTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Command/AbstractCommandTest.php index 658c971df..ad28651f5 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Command/AbstractCommandTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Command/AbstractCommandTest.php @@ -18,10 +18,13 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\Command; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; class AbstractCommandTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @test * @group command diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/CommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/CommandHandlerTest.php index b2eff853a..84a8125d3 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/CommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/CommandHandlerTest.php @@ -19,10 +19,13 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Tests; use Broadway\CommandHandling\Testing\CommandHandlerScenarioTestCase; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use Ramsey\Uuid\Uuid; abstract class CommandHandlerTest extends CommandHandlerScenarioTestCase { + use MockeryPHPUnitIntegration; + /** * @return string */ diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php index d99d6fbb6..f09810fae 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php @@ -22,6 +22,7 @@ use Broadway\EventHandling\EventBus as EventBusInterface; use Broadway\EventSourcing\AggregateFactory\PublicConstructorAggregateFactory; use Broadway\EventStore\EventStore as EventStoreInterface; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use Surfnet\Stepup\Configuration\Configuration; use Surfnet\Stepup\Configuration\Event\ConfigurationUpdatedEvent; use Surfnet\Stepup\Configuration\Event\EmailTemplatesUpdatedEvent; @@ -36,6 +37,8 @@ final class ConfigurationCommandHandlerTest extends CommandHandlerTest { + use MockeryPHPUnitIntegration; + /** * Shorthand for fixed Configuration ID. */ diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/InstitutionConfigurationCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/InstitutionConfigurationCommandHandlerTest.php index b6b62bc5e..26a8d629a 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/InstitutionConfigurationCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/InstitutionConfigurationCommandHandlerTest.php @@ -24,6 +24,7 @@ use Broadway\EventSourcing\AggregateFactory\PublicConstructorAggregateFactory; use Broadway\EventStore\EventStore as EventStoreInterface; use Broadway\Repository\AggregateNotFoundException; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use Surfnet\Stepup\Configuration\Event\AllowedSecondFactorListUpdatedEvent; use Surfnet\Stepup\Configuration\Event\InstitutionConfigurationRemovedEvent; use Surfnet\Stepup\Configuration\Event\NewInstitutionConfigurationCreatedEvent; @@ -68,6 +69,8 @@ class InstitutionConfigurationCommandHandlerTest extends CommandHandlerTest { + use MockeryPHPUnitIntegration; + /** * @test * @group command-handler diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/Processor/InstitutionConfigurationProcessorTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/Processor/InstitutionConfigurationProcessorTest.php index d0affdfd2..aaa325c20 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/Processor/InstitutionConfigurationProcessorTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/Processor/InstitutionConfigurationProcessorTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\Configuration\Processor; use Mockery; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as TestCase; use Surfnet\Stepup\Identity\Collection\InstitutionCollection; use Surfnet\Stepup\Identity\Event\IdentityCreatedEvent; @@ -39,6 +40,8 @@ class InstitutionConfigurationProcessorTest extends TestCase { + use MockeryPHPUnitIntegration; + private $pipelineMock; /** diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/DateTimeHelperTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/DateTimeHelperTest.php index d8a7625b4..888f4b9b9 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/DateTimeHelperTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/DateTimeHelperTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Tests; use DateTime as CoreDateTime; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase; use Surfnet\Stepup\DateTime\DateTime; @@ -27,6 +28,8 @@ */ class DateTimeHelperTest extends TestCase { + use MockeryPHPUnitIntegration; + /** * @test * @group testing diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/BufferedEventBusTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/BufferedEventBusTest.php index 6531b96fa..d39475f9e 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/BufferedEventBusTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/BufferedEventBusTest.php @@ -25,11 +25,14 @@ use Broadway\EventHandling\EventListener; use Doctrine\ORM\EntityManagerInterface; use Mockery as m; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase; use Surfnet\StepupMiddleware\CommandHandlingBundle\EventHandling\BufferedEventBus; class BufferedEventBusTest extends TestCase { + use MockeryPHPUnitIntegration; + /** * @test * @group event-handling diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/RecordEventsAndPublishToBusOnFirstCallEventListener.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/RecordEventsAndPublishToBusOnFirstCallEventListener.php index 752b46a65..bb674c23d 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/RecordEventsAndPublishToBusOnFirstCallEventListener.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/RecordEventsAndPublishToBusOnFirstCallEventListener.php @@ -21,10 +21,12 @@ use Broadway\Domain\DomainEventStream; use Broadway\Domain\DomainMessage; use Broadway\EventHandling\EventListener as EventListenerInterface; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use Surfnet\StepupMiddleware\CommandHandlingBundle\EventHandling\BufferedEventBus; class RecordEventsAndPublishToBusOnFirstCallEventListener implements EventListenerInterface { + use MockeryPHPUnitIntegration; private bool $firstEventHandled = false; /** diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php index a2889d3af..863592620 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php @@ -90,7 +90,6 @@ use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Service\RegistrationMailService; use Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\CommandHandlerTest; use Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\DateTimeHelper; - use function md5; /** diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityIdEnforcingEventStoreDecorator.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityIdEnforcingEventStoreDecorator.php index 07f92e6ea..dee6e9864 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityIdEnforcingEventStoreDecorator.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityIdEnforcingEventStoreDecorator.php @@ -20,11 +20,14 @@ use Broadway\Domain\DomainEventStream as DomainEventStreamInterface; use Broadway\EventStore\EventStore as EventStoreInterface; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use Surfnet\Stepup\Identity\Event\IdentityEvent; use Surfnet\StepupMiddleware\CommandHandlingBundle\Exception\InvalidArgumentException; final readonly class IdentityIdEnforcingEventStoreDecorator implements EventStoreInterface { + use MockeryPHPUnitIntegration; + public function __construct( private EventStoreInterface $decoratedEventStore, ) { diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcherTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcherTest.php index 52b48afb4..daf0896d5 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcherTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcherTest.php @@ -18,16 +18,18 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\Mockery; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use Mockery\Exception\RuntimeException; use PHPUnit\Framework\TestCase as TestCase; use stdClass; use Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\Mockery\TestObjects\ObjectWithInstitutionAccessor; use Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\Mockery\TestObjects\ObjectWithInstitutionProperty; use Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\Mockery\TestObjects\ObjectWithoutInstitutionPropertyAndAccessor; -use TypeError; class HasInstitutionMatcherTest extends TestCase { + use MockeryPHPUnitIntegration; + /** * @test * @group mockery diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/AuthorizingStageTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/AuthorizingStageTest.php index dc9470245..7602abdf2 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/AuthorizingStageTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/AuthorizingStageTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\Pipeline; use Mockery as m; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use Mockery\MockInterface; use PHPUnit\Framework\TestCase as UnitTest; use Psr\Log\NullLogger; @@ -32,6 +33,8 @@ class AuthorizingStageTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @var MockInterface mock of Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface */ diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/DispatchStageTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/DispatchStageTest.php index a7bd78f52..94473ded5 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/DispatchStageTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/DispatchStageTest.php @@ -20,6 +20,7 @@ use Broadway\CommandHandling\CommandBus; use Mockery as m; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase; use Psr\Log\NullLogger; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; @@ -27,6 +28,8 @@ class DispatchStageTest extends TestCase { + use MockeryPHPUnitIntegration; + /** * @test * @group pipeline diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/EventDispatchingStageTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/EventDispatchingStageTest.php index b4902efb1..c36755072 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/EventDispatchingStageTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/EventDispatchingStageTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\Pipeline; use Mockery as m; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use Psr\Log\NullLogger; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; @@ -28,6 +29,8 @@ class EventDispatchingStageTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @test * @group pipeline diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/StagedPipelineTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/StagedPipelineTest.php index 156883b39..5f6ca1bff 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/StagedPipelineTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/StagedPipelineTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\Pipeline; use Mockery as m; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase; use Psr\Log\NullLogger; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; @@ -27,6 +28,8 @@ class StagedPipelineTest extends TestCase { + use MockeryPHPUnitIntegration; + /** * @test * @group pipeline diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/ValidationStageTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/ValidationStageTest.php index 012fcca8a..8a8a68415 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/ValidationStageTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/ValidationStageTest.php @@ -20,6 +20,7 @@ use ArrayIterator; use Mockery as m; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase; use Psr\Log\NullLogger; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; @@ -30,6 +31,8 @@ class ValidationStageTest extends TestCase { + use MockeryPHPUnitIntegration; + /** * @test * @group pipeline diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/EventSourcing/SensitiveDataMessageStreamTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/EventSourcing/SensitiveDataMessageStreamTest.php index 4e5d0b8d9..0afae9ff7 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/EventSourcing/SensitiveDataMessageStreamTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/EventSourcing/SensitiveDataMessageStreamTest.php @@ -23,6 +23,7 @@ use Broadway\Domain\DomainMessage; use Broadway\Domain\Metadata; use Mockery as m; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as TestCase; use Surfnet\Stepup\Identity\Value\CommonName; use Surfnet\Stepup\Identity\Value\Email; @@ -34,6 +35,8 @@ final class SensitiveDataMessageStreamTest extends TestCase { + use MockeryPHPUnitIntegration; + public const EVENT_STREAM_A = 'A'; public const EVENT_STREAM_B = 'B'; diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/SensitiveDataTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/SensitiveDataTest.php index cab1f70f4..9e8c5d1b4 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/SensitiveDataTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/SensitiveDataTest.php @@ -18,6 +18,7 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\SensitiveData; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as TestCase; use Surfnet\Stepup\Identity\Value\CommonName; use Surfnet\Stepup\Identity\Value\DocumentNumber; @@ -31,6 +32,8 @@ class SensitiveDataTest extends TestCase { + use MockeryPHPUnitIntegration; + public function sensitiveDataToSerialise(): array { return [ diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/Service/SensitiveDataServiceTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/Service/SensitiveDataServiceTest.php index 8e6610561..96af9303a 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/Service/SensitiveDataServiceTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/Service/SensitiveDataServiceTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\SensitiveData\Service; use Mockery as m; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as TestCase; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\EventSourcing\SensitiveDataMessageStream; @@ -27,6 +28,8 @@ final class SensitiveDataServiceTest extends TestCase { + use MockeryPHPUnitIntegration; + /** * @test * @group sensitive-data diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Value/InstitutionTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Value/InstitutionTest.php index a3e206cf3..d0ce81bc6 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Value/InstitutionTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Value/InstitutionTest.php @@ -18,6 +18,7 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\Value; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use StdClass; use Surfnet\StepupMiddleware\CommandHandlingBundle\Exception\InvalidArgumentException; @@ -25,6 +26,8 @@ class InstitutionTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @test * @dataProvider nonStringOrNonEmptyStringProvider diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Tests/Projector/InstitutionConfigurationProjectorTest.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Tests/Projector/InstitutionConfigurationProjectorTest.php index 136f1ec9e..fa7527130 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Tests/Projector/InstitutionConfigurationProjectorTest.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Tests/Projector/InstitutionConfigurationProjectorTest.php @@ -21,6 +21,7 @@ namespace Surfnet\StepupMiddleware\GatewayBundle\Tests\Projector; use Mockery as m; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase; use Ramsey\Uuid\Uuid; use Surfnet\Stepup\Configuration\Event\SsoOn2faOptionChangedEvent; @@ -33,7 +34,7 @@ class InstitutionConfigurationProjectorTest extends TestCase { - use m\Adapter\Phpunit\MockeryPHPUnitIntegration; + use MockeryPHPUnitIntegration; private InstitutionConfigurationProjector $projector; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php index 8bc6a7e65..4bdaa88b1 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ManagementBundle\Tests\Controller; use Liip\TestFixturesBundle\Services\DatabaseToolCollection; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use Symfony\Bundle\FrameworkBundle\Client; use Symfony\Bundle\FrameworkBundle\KernelBrowser; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; @@ -26,6 +27,8 @@ class ConfigurationControllerTest extends WebTestCase { + use MockeryPHPUnitIntegration; + /** * @var Client */ diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php index 6127a12bf..6893a1cf6 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ManagementBundle\Tests\Controller; use Liip\TestFixturesBundle\Services\DatabaseToolCollection; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use Symfony\Bundle\FrameworkBundle\Client; use Symfony\Bundle\FrameworkBundle\KernelBrowser; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; @@ -26,6 +27,8 @@ class InstitutionConfigurationControllerTest extends WebTestCase { + use MockeryPHPUnitIntegration; + /** * @var Client */ diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ConfigurationValidationTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ConfigurationValidationTest.php index 0637164ea..d622f73e1 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ConfigurationValidationTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ConfigurationValidationTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ManagementBundle\Tests\Validator; use Mockery as m; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use Mockery\Matcher\MatcherAbstract; use PHPUnit\Framework\TestCase as TestCase; use Surfnet\StepupMiddleware\ManagementBundle\Validator\ConfigurationStructureValidator; @@ -32,6 +33,8 @@ final class ConfigurationValidationTest extends TestCase { + use MockeryPHPUnitIntegration; + /** * @return mixed[][] */ diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ReconfigureInstitutionRequestValidatorTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ReconfigureInstitutionRequestValidatorTest.php index b41a3e9bf..4a6161588 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ReconfigureInstitutionRequestValidatorTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ReconfigureInstitutionRequestValidatorTest.php @@ -20,6 +20,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Mockery; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use Mockery\Matcher\MatcherAbstract; use PHPUnit\Framework\TestCase; use Surfnet\Stepup\Configuration\Value\Institution; @@ -36,6 +37,8 @@ class ReconfigureInstitutionRequestValidatorTest extends TestCase { + use MockeryPHPUnitIntegration; + /** * @return mixed[][] */ diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php index 534d3b62f..fba5ed82b 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php @@ -31,7 +31,6 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken; - use function sprintf; final class MigrateSecondFactorCommand extends Command diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplayEventsCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplayEventsCommand.php index 4d2477432..e0940c55a 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplayEventsCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplayEventsCommand.php @@ -28,6 +28,7 @@ use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Question\ConfirmationQuestion; use Symfony\Component\HttpKernel\KernelInterface; + #[AsCommand( name: 'middleware:event:replay', description: 'Wipes all read models and repopulates the tables from the event store. Use the diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/EventSourcing/EventCollectionTest.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/EventSourcing/EventCollectionTest.php index 34a651fa2..e1ad14b49 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/EventSourcing/EventCollectionTest.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/EventSourcing/EventCollectionTest.php @@ -18,6 +18,7 @@ namespace Surfnet\StepupMiddleware\MiddlewareBundle\Tests\EventSourcing; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as TestCase; use stdClass; use Surfnet\Stepup\Configuration\Event\NewConfigurationCreatedEvent; @@ -27,6 +28,7 @@ class EventCollectionTest extends TestCase { + use MockeryPHPUnitIntegration; /** * @test * @group event-replay diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/EventSourcing/ProjectorCollectionTest.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/EventSourcing/ProjectorCollectionTest.php index 1aa33b9a7..603d2b44f 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/EventSourcing/ProjectorCollectionTest.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/EventSourcing/ProjectorCollectionTest.php @@ -29,6 +29,7 @@ class ProjectorCollectionTest extends TestCase { + use m\Adapter\Phpunit\MockeryPHPUnitIntegration; /** * @test * @group event-replay diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Migrations/InstitutionConfiguration/MappedInstitutionConfigurationTest.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Migrations/InstitutionConfiguration/MappedInstitutionConfigurationTest.php index bc7ae5ff8..c59303552 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Migrations/InstitutionConfiguration/MappedInstitutionConfigurationTest.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Migrations/InstitutionConfiguration/MappedInstitutionConfigurationTest.php @@ -18,6 +18,7 @@ namespace Surfnet\StepupMiddleware\MiddlewareBundle\Tests\Migrations\InstitutionConfiguration; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; use Ramsey\Uuid\Uuid; use Surfnet\Stepup\Configuration\Value\ContactInformation; @@ -38,6 +39,8 @@ class MappedInstitutionConfigurationTest extends UnitTest { + use MockeryPHPUnitIntegration; + /** * @test * @group middleware-migration diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Service/SecondFactorDisplayNameResolverServiceTest.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Service/SecondFactorDisplayNameResolverServiceTest.php index 127613803..bb5a42b01 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Service/SecondFactorDisplayNameResolverServiceTest.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Service/SecondFactorDisplayNameResolverServiceTest.php @@ -18,12 +18,14 @@ namespace Surfnet\StepupMiddleware\MiddlewareBundle\Tests\Service; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase; use Surfnet\StepupBundle\Value\SecondFactorType; use Surfnet\StepupMiddleware\MiddlewareBundle\Service\SecondFactorDisplayNameResolverService; class SecondFactorDisplayNameResolverServiceTest extends TestCase { + use MockeryPHPUnitIntegration; /** * @test diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Service/VerifiedSecondFactorReminderServiceTest.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Service/VerifiedSecondFactorReminderServiceTest.php index aed457eca..6fc86eb36 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Service/VerifiedSecondFactorReminderServiceTest.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Service/VerifiedSecondFactorReminderServiceTest.php @@ -19,6 +19,7 @@ use DateTime; use Mockery as m; +use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use Mockery\Mock; use PHPUnit\Framework\TestCase; use Psr\Log\LoggerInterface; @@ -31,6 +32,8 @@ class VerifiedSecondFactorReminderServiceTest extends TestCase { + use MockeryPHPUnitIntegration; + /** * @var VerifiedSecondFactorReminderService */ From 73c95f052440b24df5712266f7ee38df593223c3 Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Thu, 29 Feb 2024 15:03:49 +0100 Subject: [PATCH 29/89] Work on MW authorizations --- ci/qa/phpunit | 4 +- composer.json | 1 + composer.lock | 6797 +++++++++-------- config/packages/security.yaml | 9 +- config/packages/smoketest/doctrine.yaml | 6 + config/packages/smoketest/monolog.yaml | 15 +- config/packages/test/doctrine.yaml | 6 + config/packages/test/monolog.yaml | 14 +- config/routes/routes.yml | 4 +- docs/postman/2.http | 218 + docs/postman/2.json | 244 - src/Kernel.php | 13 +- .../ConfiguredInstitutionControllerTest.php | 4 +- 13 files changed, 3779 insertions(+), 3556 deletions(-) create mode 100644 docs/postman/2.http delete mode 100644 docs/postman/2.json diff --git a/ci/qa/phpunit b/ci/qa/phpunit index 95df70aa6..1ba4249d9 100755 --- a/ci/qa/phpunit +++ b/ci/qa/phpunit @@ -9,5 +9,5 @@ cd $(dirname $0)/../../ # PHPUnit Bridge should always be used in Symfony applications. (https://symfony.com/doc/current/components/phpunit_bridge.html) # This will create a phpunit executable in /bin/ instead of /vendor/bin/ -XDEBUG_MODE=coverage ./vendor/bin/phpunit --configuration=ci/qa/phpunit.xml --coverage-text --testsuite=unit $1 -#./vendor/bin/phpunit --configuration=ci/qa/phpunit.xml --testsuite=database +XDEBUG_MODE=coverage ./vendor/bin/phpunit --configuration=ci/qa/phpunit.xml --coverage-text --testsuite=unit --stop-on-error $1 +./vendor/bin/phpunit --configuration=ci/qa/phpunit.xml --testsuite=database diff --git a/composer.json b/composer.json index 5727952b8..b03e970c7 100644 --- a/composer.json +++ b/composer.json @@ -48,6 +48,7 @@ "symfony/intl": "6.4.*", "symfony/mailer": "6.4.*", "symfony/monolog-bundle": "^v3.9", + "symfony/password-hasher": "6.4.*", "symfony/security-bundle": "6.4.*", "symfony/translation": "6.4.*", "symfony/twig-bundle": "6.4.*", diff --git a/composer.lock b/composer.lock index f13533ab5..f14db44d4 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "3d07319417d2a7ebd6dc7c0a3abc4259", + "content-hash": "ce9db433d4af3c8eab0b1f37bdf28282", "packages": [ { "name": "beberlei/assert", @@ -73,6 +73,61 @@ }, "time": "2021-12-16T21:41:27+00:00" }, + { + "name": "brick/math", + "version": "0.11.0", + "source": { + "type": "git", + "url": "https://github.com/brick/math.git", + "reference": "0ad82ce168c82ba30d1c01ec86116ab52f589478" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/brick/math/zipball/0ad82ce168c82ba30d1c01ec86116ab52f589478", + "reference": "0ad82ce168c82ba30d1c01ec86116ab52f589478", + "shasum": "" + }, + "require": { + "php": "^8.0" + }, + "require-dev": { + "php-coveralls/php-coveralls": "^2.2", + "phpunit/phpunit": "^9.0", + "vimeo/psalm": "5.0.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Brick\\Math\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Arbitrary-precision arithmetic library", + "keywords": [ + "Arbitrary-precision", + "BigInteger", + "BigRational", + "arithmetic", + "bigdecimal", + "bignum", + "brick", + "math" + ], + "support": { + "issues": "https://github.com/brick/math/issues", + "source": "https://github.com/brick/math/tree/0.11.0" + }, + "funding": [ + { + "url": "https://github.com/BenMorel", + "type": "github" + } + ], + "time": "2023-01-15T23:15:59+00:00" + }, { "name": "broadway/broadway", "version": "2.5.0", @@ -164,29 +219,29 @@ }, { "name": "broadway/event-store-dbal", - "version": "0.5.0", + "version": "0.6.0", "source": { "type": "git", "url": "https://github.com/broadway/event-store-dbal.git", - "reference": "3ff2bd3d9f5d2ef5fc8c7945d3e1150a458243d6" + "reference": "7cc0b51cdd8312c4f8919d3b2f6688d85b65cc58" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/broadway/event-store-dbal/zipball/3ff2bd3d9f5d2ef5fc8c7945d3e1150a458243d6", - "reference": "3ff2bd3d9f5d2ef5fc8c7945d3e1150a458243d6", + "url": "https://api.github.com/repos/broadway/event-store-dbal/zipball/7cc0b51cdd8312c4f8919d3b2f6688d85b65cc58", + "reference": "7cc0b51cdd8312c4f8919d3b2f6688d85b65cc58", "shasum": "" }, "require": { "broadway/broadway": "^2.3.1", - "doctrine/dbal": "^2.4", + "doctrine/dbal": "^3.1", "php": ">=7.2" }, "require-dev": { - "broadway/coding-standard": "^1.0", + "broadway/coding-standard": "^1.2", "ext-pdo_sqlite": "*", "phpstan/phpstan": "@stable", - "phpunit/phpunit": "^8.0", - "ramsey/uuid": "^3.0" + "phpunit/phpunit": "^9.5", + "ramsey/uuid": "^4.0" }, "type": "library", "extra": { @@ -232,9 +287,9 @@ "description": "Event store implementation using doctrine/dbal", "support": { "issues": "https://github.com/broadway/event-store-dbal/issues", - "source": "https://github.com/broadway/event-store-dbal/tree/master" + "source": "https://github.com/broadway/event-store-dbal/tree/0.6.0" }, - "time": "2020-03-08T14:20:20+00:00" + "time": "2021-06-24T09:42:53+00:00" }, { "name": "broadway/uuid-generator", @@ -286,16 +341,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.4.0", + "version": "1.4.1", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "b66d11b7479109ab547f9405b97205640b17d385" + "reference": "3ce240142f6d59b808dd65c1f52f7a1c252e6cfd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/b66d11b7479109ab547f9405b97205640b17d385", - "reference": "b66d11b7479109ab547f9405b97205640b17d385", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/3ce240142f6d59b808dd65c1f52f7a1c252e6cfd", + "reference": "3ce240142f6d59b808dd65c1f52f7a1c252e6cfd", "shasum": "" }, "require": { @@ -342,80 +397,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.4.0" - }, - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], - "time": "2023-12-18T12:05:55+00:00" - }, - { - "name": "composer/package-versions-deprecated", - "version": "1.11.99.5", - "source": { - "type": "git", - "url": "https://github.com/composer/package-versions-deprecated.git", - "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/b4f54f74ef3453349c24a845d22392cd31e65f1d", - "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.1.0 || ^2.0", - "php": "^7 || ^8" - }, - "replace": { - "ocramius/package-versions": "1.11.99" - }, - "require-dev": { - "composer/composer": "^1.9.3 || ^2.0@dev", - "ext-zip": "^1.13", - "phpunit/phpunit": "^6.5 || ^7" - }, - "type": "composer-plugin", - "extra": { - "class": "PackageVersions\\Installer", - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "PackageVersions\\": "src/PackageVersions" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com" - }, - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be" - } - ], - "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", - "support": { - "issues": "https://github.com/composer/package-versions-deprecated/issues", - "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.5" + "source": "https://github.com/composer/ca-bundle/tree/1.4.1" }, "funding": [ { @@ -431,34 +413,34 @@ "type": "tidelift" } ], - "time": "2022-01-17T14:14:24+00:00" + "time": "2024-02-23T10:16:52+00:00" }, { "name": "doctrine/annotations", - "version": "1.14.3", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af" + "reference": "e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af", - "reference": "fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f", + "reference": "e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f", "shasum": "" }, "require": { - "doctrine/lexer": "^1 || ^2", + "doctrine/lexer": "^2 || ^3", "ext-tokenizer": "*", - "php": "^7.1 || ^8.0", + "php": "^7.2 || ^8.0", "psr/cache": "^1 || ^2 || ^3" }, "require-dev": { - "doctrine/cache": "^1.11 || ^2.0", - "doctrine/coding-standard": "^9 || ^10", - "phpstan/phpstan": "~1.4.10 || ^1.8.0", + "doctrine/cache": "^2.0", + "doctrine/coding-standard": "^10", + "phpstan/phpstan": "^1.8.0", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "symfony/cache": "^4.4 || ^5.4 || ^6", + "symfony/cache": "^5.4 || ^6", "vimeo/psalm": "^4.10" }, "suggest": { @@ -505,22 +487,22 @@ ], "support": { "issues": "https://github.com/doctrine/annotations/issues", - "source": "https://github.com/doctrine/annotations/tree/1.14.3" + "source": "https://github.com/doctrine/annotations/tree/2.0.1" }, - "time": "2023-02-01T09:20:38+00:00" + "time": "2023-02-02T22:02:53+00:00" }, { "name": "doctrine/cache", - "version": "1.13.0", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "56cd022adb5514472cb144c087393c1821911d09" + "reference": "1ca8f21980e770095a31456042471a57bc4c68fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/56cd022adb5514472cb144c087393c1821911d09", - "reference": "56cd022adb5514472cb144c087393c1821911d09", + "url": "https://api.github.com/repos/doctrine/cache/zipball/1ca8f21980e770095a31456042471a57bc4c68fb", + "reference": "1ca8f21980e770095a31456042471a57bc4c68fb", "shasum": "" }, "require": { @@ -530,19 +512,13 @@ "doctrine/common": ">2.2,<2.4" }, "require-dev": { - "alcaeus/mongo-php-adapter": "^1.1", "cache/integration-tests": "dev-master", "doctrine/coding-standard": "^9", - "mongodb/mongodb": "^1.1", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "predis/predis": "~1.0", "psr/cache": "^1.0 || ^2.0 || ^3.0", "symfony/cache": "^4.4 || ^5.4 || ^6", "symfony/var-exporter": "^4.4 || ^5.4 || ^6" }, - "suggest": { - "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver" - }, "type": "library", "autoload": { "psr-4": { @@ -590,7 +566,7 @@ ], "support": { "issues": "https://github.com/doctrine/cache/issues", - "source": "https://github.com/doctrine/cache/tree/1.13.0" + "source": "https://github.com/doctrine/cache/tree/2.2.0" }, "funding": [ { @@ -606,36 +582,38 @@ "type": "tidelift" } ], - "time": "2022-05-20T20:06:54+00:00" + "time": "2022-05-20T20:07:39+00:00" }, { "name": "doctrine/collections", - "version": "1.8.0", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/doctrine/collections.git", - "reference": "2b44dd4cbca8b5744327de78bafef5945c7e7b5e" + "reference": "07e16cd7b80a2cffed99e36b541876af172f0257" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/2b44dd4cbca8b5744327de78bafef5945c7e7b5e", - "reference": "2b44dd4cbca8b5744327de78bafef5945c7e7b5e", + "url": "https://api.github.com/repos/doctrine/collections/zipball/07e16cd7b80a2cffed99e36b541876af172f0257", + "reference": "07e16cd7b80a2cffed99e36b541876af172f0257", "shasum": "" }, "require": { - "doctrine/deprecations": "^0.5.3 || ^1", - "php": "^7.1.3 || ^8.0" + "doctrine/deprecations": "^1", + "php": "^8.1" }, "require-dev": { - "doctrine/coding-standard": "^9.0 || ^10.0", - "phpstan/phpstan": "^1.4.8", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.1.5", - "vimeo/psalm": "^4.22" + "doctrine/coding-standard": "^12", + "ext-json": "*", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-phpunit": "^1.0", + "phpunit/phpunit": "^10.5", + "vimeo/psalm": "^5.11" }, "type": "library", "autoload": { "psr-4": { - "Doctrine\\Common\\Collections\\": "lib/Doctrine/Common/Collections" + "Doctrine\\Common\\Collections\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -674,52 +652,56 @@ ], "support": { "issues": "https://github.com/doctrine/collections/issues", - "source": "https://github.com/doctrine/collections/tree/1.8.0" + "source": "https://github.com/doctrine/collections/tree/2.2.0" }, - "time": "2022-09-01T20:12:10+00:00" + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcollections", + "type": "tidelift" + } + ], + "time": "2024-02-25T22:55:36+00:00" }, { "name": "doctrine/common", - "version": "2.13.3", + "version": "3.4.3", "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "f3812c026e557892c34ef37f6ab808a6b567da7f" + "reference": "8b5e5650391f851ed58910b3e3d48a71062eeced" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/f3812c026e557892c34ef37f6ab808a6b567da7f", - "reference": "f3812c026e557892c34ef37f6ab808a6b567da7f", + "url": "https://api.github.com/repos/doctrine/common/zipball/8b5e5650391f851ed58910b3e3d48a71062eeced", + "reference": "8b5e5650391f851ed58910b3e3d48a71062eeced", "shasum": "" }, "require": { - "doctrine/annotations": "^1.0", - "doctrine/cache": "^1.0", - "doctrine/collections": "^1.0", - "doctrine/event-manager": "^1.0", - "doctrine/inflector": "^1.0", - "doctrine/lexer": "^1.0", - "doctrine/persistence": "^1.3.3", - "doctrine/reflection": "^1.0", + "doctrine/persistence": "^2.0 || ^3.0", "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^1.0", - "phpstan/phpstan": "^0.11", - "phpstan/phpstan-phpunit": "^0.11", - "phpunit/phpunit": "^7.0", + "doctrine/coding-standard": "^9.0 || ^10.0", + "doctrine/collections": "^1", + "phpstan/phpstan": "^1.4.1", + "phpstan/phpstan-phpunit": "^1", + "phpunit/phpunit": "^7.5.20 || ^8.5 || ^9.0", "squizlabs/php_codesniffer": "^3.0", - "symfony/phpunit-bridge": "^4.0.5" + "symfony/phpunit-bridge": "^6.1", + "vimeo/psalm": "^4.4" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.11.x-dev" - } - }, "autoload": { "psr-4": { - "Doctrine\\Common\\": "lib/Doctrine/Common" + "Doctrine\\Common\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -752,7 +734,7 @@ "email": "ocramius@gmail.com" } ], - "description": "PHP Doctrine Common project is a library that provides additional functionality that other Doctrine projects depend on such as better reflection support, persistence interfaces, proxies, event system and much more.", + "description": "PHP Doctrine Common project is a library that provides additional functionality that other Doctrine projects depend on such as better reflection support, proxies and much more.", "homepage": "https://www.doctrine-project.org/projects/common.html", "keywords": [ "common", @@ -761,7 +743,7 @@ ], "support": { "issues": "https://github.com/doctrine/common/issues", - "source": "https://github.com/doctrine/common/tree/2.13.x" + "source": "https://github.com/doctrine/common/tree/3.4.3" }, "funding": [ { @@ -777,39 +759,128 @@ "type": "tidelift" } ], - "time": "2020-06-05T16:46:05+00:00" + "time": "2022-10-09T11:47:59+00:00" + }, + { + "name": "doctrine/data-fixtures", + "version": "1.7.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/data-fixtures.git", + "reference": "bbcb74f2ac6dbe81a14b3c3687d7623490a0448f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/bbcb74f2ac6dbe81a14b3c3687d7623490a0448f", + "reference": "bbcb74f2ac6dbe81a14b3c3687d7623490a0448f", + "shasum": "" + }, + "require": { + "doctrine/deprecations": "^0.5.3 || ^1.0", + "doctrine/persistence": "^2.0|^3.0", + "php": "^7.4 || ^8.0" + }, + "conflict": { + "doctrine/dbal": "<3.5 || >=5", + "doctrine/orm": "<2.14 || >=4", + "doctrine/phpcr-odm": "<1.3.0" + }, + "require-dev": { + "doctrine/annotations": "^1.12 || ^2", + "doctrine/coding-standard": "^12", + "doctrine/dbal": "^3.5 || ^4", + "doctrine/mongodb-odm": "^1.3.0 || ^2.0.0", + "doctrine/orm": "^2.14 || ^3", + "ext-sqlite3": "*", + "phpstan/phpstan": "^1.10", + "phpunit/phpunit": "^9.6.13 || ^10.4.2", + "symfony/cache": "^5.4 || ^6.3 || ^7", + "symfony/var-exporter": "^5.4 || ^6.3 || ^7", + "vimeo/psalm": "^5.9" + }, + "suggest": { + "alcaeus/mongo-php-adapter": "For using MongoDB ODM 1.3 with PHP 7 (deprecated)", + "doctrine/mongodb-odm": "For loading MongoDB ODM fixtures", + "doctrine/orm": "For loading ORM fixtures", + "doctrine/phpcr-odm": "For loading PHPCR ODM fixtures" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Common\\DataFixtures\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + } + ], + "description": "Data Fixtures for all Doctrine Object Managers", + "homepage": "https://www.doctrine-project.org", + "keywords": [ + "database" + ], + "support": { + "issues": "https://github.com/doctrine/data-fixtures/issues", + "source": "https://github.com/doctrine/data-fixtures/tree/1.7.0" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdata-fixtures", + "type": "tidelift" + } + ], + "time": "2023-11-24T11:18:31+00:00" }, { "name": "doctrine/dbal", - "version": "2.13.9", + "version": "3.8.2", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "c480849ca3ad6706a39c970cdfe6888fa8a058b8" + "reference": "a19a1d05ca211f41089dffcc387733a6875196cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/c480849ca3ad6706a39c970cdfe6888fa8a058b8", - "reference": "c480849ca3ad6706a39c970cdfe6888fa8a058b8", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/a19a1d05ca211f41089dffcc387733a6875196cb", + "reference": "a19a1d05ca211f41089dffcc387733a6875196cb", "shasum": "" }, "require": { - "doctrine/cache": "^1.0|^2.0", + "composer-runtime-api": "^2", + "doctrine/cache": "^1.11|^2.0", "doctrine/deprecations": "^0.5.3|^1", - "doctrine/event-manager": "^1.0", - "ext-pdo": "*", - "php": "^7.1 || ^8" + "doctrine/event-manager": "^1|^2", + "php": "^7.4 || ^8.0", + "psr/cache": "^1|^2|^3", + "psr/log": "^1|^2|^3" }, "require-dev": { - "doctrine/coding-standard": "9.0.0", - "jetbrains/phpstorm-stubs": "2021.1", - "phpstan/phpstan": "1.4.6", - "phpunit/phpunit": "^7.5.20|^8.5|9.5.16", - "psalm/plugin-phpunit": "0.16.1", - "squizlabs/php_codesniffer": "3.6.2", - "symfony/cache": "^4.4", - "symfony/console": "^2.0.5|^3.0|^4.0|^5.0", - "vimeo/psalm": "4.22.0" + "doctrine/coding-standard": "12.0.0", + "fig/log-test": "^1", + "jetbrains/phpstorm-stubs": "2023.1", + "phpstan/phpstan": "1.10.57", + "phpstan/phpstan-strict-rules": "^1.5", + "phpunit/phpunit": "9.6.16", + "psalm/plugin-phpunit": "0.18.4", + "slevomat/coding-standard": "8.13.1", + "squizlabs/php_codesniffer": "3.8.1", + "symfony/cache": "^5.4|^6.0|^7.0", + "symfony/console": "^4.4|^5.4|^6.0|^7.0", + "vimeo/psalm": "4.30.0" }, "suggest": { "symfony/console": "For helpful console commands such as SQL execution and import of files." @@ -820,7 +891,7 @@ "type": "library", "autoload": { "psr-4": { - "Doctrine\\DBAL\\": "lib/Doctrine/DBAL" + "Doctrine\\DBAL\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -863,14 +934,13 @@ "queryobject", "sasql", "sql", - "sqlanywhere", "sqlite", "sqlserver", "sqlsrv" ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/2.13.9" + "source": "https://github.com/doctrine/dbal/tree/3.8.2" }, "funding": [ { @@ -886,7 +956,7 @@ "type": "tidelift" } ], - "time": "2022-05-02T20:28:55+00:00" + "time": "2024-02-12T18:36:36+00:00" }, { "name": "doctrine/deprecations", @@ -937,61 +1007,68 @@ }, { "name": "doctrine/doctrine-bundle", - "version": "1.12.13", + "version": "2.11.3", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "85460b85edd8f61a16ad311e7ffc5d255d3c937c" + "reference": "492725310ae9a1b5b20d6ae09fb5ae6404616e68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/85460b85edd8f61a16ad311e7ffc5d255d3c937c", - "reference": "85460b85edd8f61a16ad311e7ffc5d255d3c937c", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/492725310ae9a1b5b20d6ae09fb5ae6404616e68", + "reference": "492725310ae9a1b5b20d6ae09fb5ae6404616e68", "shasum": "" }, "require": { - "doctrine/dbal": "^2.5.12|^3.0", - "doctrine/doctrine-cache-bundle": "~1.2", - "doctrine/persistence": "^1.3.3", - "jdorn/sql-formatter": "^1.2.16", - "php": "^7.1 || ^8.0", - "symfony/cache": "^3.4.30|^4.3.3", - "symfony/config": "^3.4.30|^4.3.3", - "symfony/console": "^3.4.30|^4.3.3", - "symfony/dependency-injection": "^3.4.30|^4.3.3", - "symfony/doctrine-bridge": "^3.4.30|^4.3.3", - "symfony/framework-bundle": "^3.4.30|^4.3.3", - "symfony/service-contracts": "^1.1.1|^2.0" + "doctrine/cache": "^1.11 || ^2.0", + "doctrine/dbal": "^3.7.0 || ^4.0", + "doctrine/persistence": "^2.2 || ^3", + "doctrine/sql-formatter": "^1.0.1", + "php": "^7.4 || ^8.0", + "symfony/cache": "^5.4 || ^6.0 || ^7.0", + "symfony/config": "^5.4 || ^6.0 || ^7.0", + "symfony/console": "^5.4 || ^6.0 || ^7.0", + "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0", + "symfony/deprecation-contracts": "^2.1 || ^3", + "symfony/doctrine-bridge": "^5.4.19 || ^6.0.7 || ^7.0", + "symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0", + "symfony/polyfill-php80": "^1.15", + "symfony/service-contracts": "^1.1.1 || ^2.0 || ^3" }, "conflict": { - "doctrine/orm": "<2.6", - "twig/twig": "<1.34|>=2.0,<2.4" + "doctrine/annotations": ">=3.0", + "doctrine/orm": "<2.17 || >=4.0", + "twig/twig": "<1.34 || >=2.0 <2.4" }, "require-dev": { - "doctrine/coding-standard": "^6.0", - "doctrine/orm": "^2.6", - "ocramius/proxy-manager": "^2.1", - "php-coveralls/php-coveralls": "^2.1", - "phpunit/phpunit": "^7.5", - "symfony/phpunit-bridge": "^4.2", - "symfony/property-info": "^3.4.30|^4.3.3", - "symfony/proxy-manager-bridge": "^3.4|^4|^5", - "symfony/twig-bridge": "^3.4|^4.1", - "symfony/validator": "^3.4.30|^4.3.3", - "symfony/web-profiler-bundle": "^3.4.30|^4.3.3", - "symfony/yaml": "^3.4.30|^4.3.3", - "twig/twig": "^1.34|^2.12" + "doctrine/annotations": "^1 || ^2", + "doctrine/coding-standard": "^12", + "doctrine/deprecations": "^1.0", + "doctrine/orm": "^2.17 || ^3.0", + "friendsofphp/proxy-manager-lts": "^1.0", + "phpunit/phpunit": "^9.5.26", + "psalm/plugin-phpunit": "^0.18.4", + "psalm/plugin-symfony": "^5", + "psr/log": "^1.1.4 || ^2.0 || ^3.0", + "symfony/phpunit-bridge": "^6.1 || ^7.0", + "symfony/property-info": "^5.4 || ^6.0 || ^7.0", + "symfony/proxy-manager-bridge": "^5.4 || ^6.0 || ^7.0", + "symfony/security-bundle": "^5.4 || ^6.0 || ^7.0", + "symfony/string": "^5.4 || ^6.0 || ^7.0", + "symfony/twig-bridge": "^5.4 || ^6.0 || ^7.0", + "symfony/validator": "^5.4 || ^6.0 || ^7.0", + "symfony/var-exporter": "^5.4 || ^6.2 || ^7.0", + "symfony/web-profiler-bundle": "^5.4 || ^6.0 || ^7.0", + "symfony/yaml": "^5.4 || ^6.0 || ^7.0", + "twig/twig": "^1.34 || ^2.12 || ^3.0", + "vimeo/psalm": "^5.15" }, "suggest": { "doctrine/orm": "The Doctrine ORM integration is optional in the bundle.", + "ext-pdo": "*", "symfony/web-profiler-bundle": "To use the data collector." }, "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "2.3.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Bundle\\DoctrineBundle\\": "" @@ -1012,15 +1089,15 @@ }, { "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" + "homepage": "https://symfony.com/contributors" }, { "name": "Doctrine Project", - "homepage": "http://www.doctrine-project.org/" + "homepage": "https://www.doctrine-project.org/" } ], "description": "Symfony DoctrineBundle", - "homepage": "http://www.doctrine-project.org", + "homepage": "https://www.doctrine-project.org", "keywords": [ "database", "dbal", @@ -1029,7 +1106,7 @@ ], "support": { "issues": "https://github.com/doctrine/DoctrineBundle/issues", - "source": "https://github.com/doctrine/DoctrineBundle/tree/1.12.13" + "source": "https://github.com/doctrine/DoctrineBundle/tree/2.11.3" }, "funding": [ { @@ -1045,60 +1122,50 @@ "type": "tidelift" } ], - "time": "2020-11-14T13:38:44+00:00" + "time": "2024-02-10T20:56:20+00:00" }, { - "name": "doctrine/doctrine-cache-bundle", - "version": "1.4.0", + "name": "doctrine/doctrine-fixtures-bundle", + "version": "3.5.1", "source": { "type": "git", - "url": "https://github.com/doctrine/DoctrineCacheBundle.git", - "reference": "6bee2f9b339847e8a984427353670bad4e7bdccb" + "url": "https://github.com/doctrine/DoctrineFixturesBundle.git", + "reference": "c808a0c85c38c8ee265cc8405b456c1d2b38567d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/6bee2f9b339847e8a984427353670bad4e7bdccb", - "reference": "6bee2f9b339847e8a984427353670bad4e7bdccb", + "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/c808a0c85c38c8ee265cc8405b456c1d2b38567d", + "reference": "c808a0c85c38c8ee265cc8405b456c1d2b38567d", "shasum": "" }, "require": { - "doctrine/cache": "^1.4.2", - "doctrine/inflector": "^1.0", - "php": "^7.1", - "symfony/doctrine-bridge": "^3.4|^4.0" + "doctrine/data-fixtures": "^1.3", + "doctrine/doctrine-bundle": "^2.2", + "doctrine/orm": "^2.14.0 || ^3.0", + "doctrine/persistence": "^2.4|^3.0", + "php": "^7.4 || ^8.0", + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/doctrine-bridge": "^5.4|^6.0|^7.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0" }, - "require-dev": { - "instaclick/coding-standard": "~1.1", - "instaclick/object-calisthenics-sniffs": "dev-master", - "instaclick/symfony2-coding-standard": "dev-remaster", - "phpunit/phpunit": "^7.0", - "predis/predis": "~0.8", - "satooshi/php-coveralls": "^1.0", - "squizlabs/php_codesniffer": "~1.5", - "symfony/console": "^3.4|^4.0", - "symfony/finder": "^3.4|^4.0", - "symfony/framework-bundle": "^3.4|^4.0", - "symfony/phpunit-bridge": "^3.4|^4.0", - "symfony/security-acl": "^2.8", - "symfony/validator": "^3.4|^4.0", - "symfony/yaml": "^3.4|^4.0" + "conflict": { + "doctrine/dbal": "< 3" }, - "suggest": { - "symfony/security-acl": "For using this bundle to cache ACLs" + "require-dev": { + "doctrine/coding-standard": "^12", + "phpstan/phpstan": "^1.10.39", + "phpunit/phpunit": "^9.6.13", + "symfony/phpunit-bridge": "^6.3.6", + "vimeo/psalm": "^5.15" }, "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "1.4.x-dev" - } - }, "autoload": { "psr-4": { - "Doctrine\\Bundle\\DoctrineCacheBundle\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] + "Doctrine\\Bundle\\FixturesBundle\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1110,72 +1177,85 @@ "email": "fabien@symfony.com" }, { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" - }, - { - "name": "Fabio B. Silva", - "email": "fabio.bat.silva@gmail.com" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@hotmail.com" + "name": "Doctrine Project", + "homepage": "https://www.doctrine-project.org" }, { "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, - { - "name": "Doctrine Project", - "homepage": "http://www.doctrine-project.org/" + "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Bundle for Doctrine Cache", + "description": "Symfony DoctrineFixturesBundle", "homepage": "https://www.doctrine-project.org", "keywords": [ - "cache", - "caching" + "Fixture", + "persistence" ], "support": { - "issues": "https://github.com/doctrine/DoctrineCacheBundle/issues", - "source": "https://github.com/doctrine/DoctrineCacheBundle/tree/1.4.0" + "issues": "https://github.com/doctrine/DoctrineFixturesBundle/issues", + "source": "https://github.com/doctrine/DoctrineFixturesBundle/tree/3.5.1" }, - "abandoned": true, - "time": "2019-11-29T11:22:01+00:00" + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdoctrine-fixtures-bundle", + "type": "tidelift" + } + ], + "time": "2023-11-19T12:48:54+00:00" }, { "name": "doctrine/doctrine-migrations-bundle", - "version": "v1.3.2", + "version": "3.3.0", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineMigrationsBundle.git", - "reference": "49fa399181db4bf4f9f725126bd1cb65c4398dce" + "reference": "1dd42906a5fb9c5960723e2ebb45c68006493835" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineMigrationsBundle/zipball/49fa399181db4bf4f9f725126bd1cb65c4398dce", - "reference": "49fa399181db4bf4f9f725126bd1cb65c4398dce", + "url": "https://api.github.com/repos/doctrine/DoctrineMigrationsBundle/zipball/1dd42906a5fb9c5960723e2ebb45c68006493835", + "reference": "1dd42906a5fb9c5960723e2ebb45c68006493835", "shasum": "" }, "require": { - "doctrine/doctrine-bundle": "~1.0", - "doctrine/migrations": "^1.1", - "php": ">=5.4.0", - "symfony/framework-bundle": "~2.7|~3.3|~4.0" + "doctrine/doctrine-bundle": "^2.4", + "doctrine/migrations": "^3.2", + "php": "^7.2|^8.0", + "symfony/deprecation-contracts": "^2.1 || ^3", + "symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^7.4" + "doctrine/coding-standard": "^12", + "doctrine/orm": "^2.6 || ^3", + "doctrine/persistence": "^2.0 || ^3 ", + "phpstan/phpstan": "^1.4", + "phpstan/phpstan-deprecation-rules": "^1", + "phpstan/phpstan-phpunit": "^1", + "phpstan/phpstan-strict-rules": "^1.1", + "phpstan/phpstan-symfony": "^1.3", + "phpunit/phpunit": "^8.5|^9.5", + "psalm/plugin-phpunit": "^0.18.4", + "psalm/plugin-symfony": "^3 || ^5", + "symfony/phpunit-bridge": "^6.3 || ^7", + "symfony/var-exporter": "^5.4 || ^6 || ^7", + "vimeo/psalm": "^4.30 || ^5.15" }, "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "1.3-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Bundle\\MigrationsBundle\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1183,20 +1263,20 @@ ], "authors": [ { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" }, { "name": "Doctrine Project", - "homepage": "http://www.doctrine-project.org" + "homepage": "https://www.doctrine-project.org" }, { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], "description": "Symfony DoctrineMigrationsBundle", - "homepage": "http://www.doctrine-project.org", + "homepage": "https://www.doctrine-project.org", "keywords": [ "dbal", "migrations", @@ -1204,36 +1284,49 @@ ], "support": { "issues": "https://github.com/doctrine/DoctrineMigrationsBundle/issues", - "source": "https://github.com/doctrine/DoctrineMigrationsBundle/tree/1.3" + "source": "https://github.com/doctrine/DoctrineMigrationsBundle/tree/3.3.0" }, - "time": "2018-12-03T11:55:33+00:00" + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdoctrine-migrations-bundle", + "type": "tidelift" + } + ], + "time": "2023-11-13T19:44:41+00:00" }, { "name": "doctrine/event-manager", - "version": "1.2.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/doctrine/event-manager.git", - "reference": "95aa4cb529f1e96576f3fda9f5705ada4056a520" + "reference": "750671534e0241a7c50ea5b43f67e23eb5c96f32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/event-manager/zipball/95aa4cb529f1e96576f3fda9f5705ada4056a520", - "reference": "95aa4cb529f1e96576f3fda9f5705ada4056a520", + "url": "https://api.github.com/repos/doctrine/event-manager/zipball/750671534e0241a7c50ea5b43f67e23eb5c96f32", + "reference": "750671534e0241a7c50ea5b43f67e23eb5c96f32", "shasum": "" }, "require": { - "doctrine/deprecations": "^0.5.3 || ^1", - "php": "^7.1 || ^8.0" + "php": "^8.1" }, "conflict": { "doctrine/common": "<2.9" }, "require-dev": { - "doctrine/coding-standard": "^9 || ^10", - "phpstan/phpstan": "~1.4.10 || ^1.8.8", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.24" + "doctrine/coding-standard": "^10", + "phpstan/phpstan": "^1.8.8", + "phpunit/phpunit": "^9.5", + "vimeo/psalm": "^4.28" }, "type": "library", "autoload": { @@ -1282,7 +1375,7 @@ ], "support": { "issues": "https://github.com/doctrine/event-manager/issues", - "source": "https://github.com/doctrine/event-manager/tree/1.2.0" + "source": "https://github.com/doctrine/event-manager/tree/2.0.0" }, "funding": [ { @@ -1298,42 +1391,37 @@ "type": "tidelift" } ], - "time": "2022-10-12T20:51:15+00:00" + "time": "2022-10-12T20:59:15+00:00" }, { "name": "doctrine/inflector", - "version": "1.4.4", + "version": "2.0.10", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9" + "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9", - "reference": "4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/5817d0659c5b50c9b950feb9af7b9668e2c436bc", + "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" + "php": "^7.2 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^8.0", - "phpstan/phpstan": "^0.12", - "phpstan/phpstan-phpunit": "^0.12", - "phpstan/phpstan-strict-rules": "^0.12", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" + "doctrine/coding-standard": "^11.0", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-phpunit": "^1.1", + "phpstan/phpstan-strict-rules": "^1.3", + "phpunit/phpunit": "^8.5 || ^9.5", + "vimeo/psalm": "^4.25 || ^5.4" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, "autoload": { "psr-4": { - "Doctrine\\Inflector\\": "lib/Doctrine/Inflector", - "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector" + "Doctrine\\Inflector\\": "lib/Doctrine/Inflector" } }, "notification-url": "https://packagist.org/downloads/", @@ -1378,7 +1466,7 @@ ], "support": { "issues": "https://github.com/doctrine/inflector/issues", - "source": "https://github.com/doctrine/inflector/tree/1.4.4" + "source": "https://github.com/doctrine/inflector/tree/2.0.10" }, "funding": [ { @@ -1394,34 +1482,34 @@ "type": "tidelift" } ], - "time": "2021-04-16T17:34:40+00:00" + "time": "2024-02-18T20:23:39+00:00" }, { "name": "doctrine/instantiator", - "version": "1.5.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b" + "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b", - "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", + "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" + "php": "^8.1" }, "require-dev": { - "doctrine/coding-standard": "^9 || ^11", + "doctrine/coding-standard": "^11", "ext-pdo": "*", "ext-phar": "*", - "phpbench/phpbench": "^0.16 || ^1", - "phpstan/phpstan": "^1.4", - "phpstan/phpstan-phpunit": "^1", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.30 || ^5.4" + "phpbench/phpbench": "^1.2", + "phpstan/phpstan": "^1.9.4", + "phpstan/phpstan-phpunit": "^1.3", + "phpunit/phpunit": "^9.5.27", + "vimeo/psalm": "^5.4" }, "type": "library", "autoload": { @@ -1448,7 +1536,7 @@ ], "support": { "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/1.5.0" + "source": "https://github.com/doctrine/instantiator/tree/2.0.0" }, "funding": [ { @@ -1464,35 +1552,36 @@ "type": "tidelift" } ], - "time": "2022-12-30T00:15:36+00:00" + "time": "2022-12-30T00:23:10+00:00" }, { "name": "doctrine/lexer", - "version": "1.2.3", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229" + "reference": "31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/c268e882d4dbdd85e36e4ad69e02dc284f89d229", - "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd", + "reference": "31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" + "php": "^8.1" }, "require-dev": { - "doctrine/coding-standard": "^9.0", - "phpstan/phpstan": "^1.3", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.11" + "doctrine/coding-standard": "^12", + "phpstan/phpstan": "^1.10", + "phpunit/phpunit": "^10.5", + "psalm/plugin-phpunit": "^0.18.3", + "vimeo/psalm": "^5.21" }, "type": "library", "autoload": { "psr-4": { - "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer" + "Doctrine\\Common\\Lexer\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -1524,7 +1613,7 @@ ], "support": { "issues": "https://github.com/doctrine/lexer/issues", - "source": "https://github.com/doctrine/lexer/tree/1.2.3" + "source": "https://github.com/doctrine/lexer/tree/3.0.1" }, "funding": [ { @@ -1540,54 +1629,63 @@ "type": "tidelift" } ], - "time": "2022-02-28T11:07:21+00:00" + "time": "2024-02-05T11:56:58+00:00" }, { "name": "doctrine/migrations", - "version": "v1.8.1", + "version": "3.7.2", "source": { "type": "git", "url": "https://github.com/doctrine/migrations.git", - "reference": "215438c0eef3e5f9b7da7d09c6b90756071b43e6" + "reference": "47af29eef49f29ebee545947e8b2a4b3be318c8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/migrations/zipball/215438c0eef3e5f9b7da7d09c6b90756071b43e6", - "reference": "215438c0eef3e5f9b7da7d09c6b90756071b43e6", + "url": "https://api.github.com/repos/doctrine/migrations/zipball/47af29eef49f29ebee545947e8b2a4b3be318c8a", + "reference": "47af29eef49f29ebee545947e8b2a4b3be318c8a", "shasum": "" }, "require": { - "doctrine/dbal": "~2.6", - "ocramius/proxy-manager": "^1.0|^2.0", - "php": "^7.1", - "symfony/console": "~3.3|^4.0" + "composer-runtime-api": "^2", + "doctrine/dbal": "^3.5.1 || ^4", + "doctrine/deprecations": "^0.5.3 || ^1", + "doctrine/event-manager": "^1.2 || ^2.0", + "php": "^8.1", + "psr/log": "^1.1.3 || ^2 || ^3", + "symfony/console": "^5.4 || ^6.0 || ^7.0", + "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0", + "symfony/var-exporter": "^6.2 || ^7.0" + }, + "conflict": { + "doctrine/orm": "<2.12 || >=4" }, "require-dev": { - "doctrine/coding-standard": "^1.0", - "doctrine/orm": "~2.5", - "jdorn/sql-formatter": "~1.1", - "mikey179/vfsstream": "^1.6", - "phpunit/phpunit": "~7.0", - "squizlabs/php_codesniffer": "^3.0", - "symfony/yaml": "~3.3|^4.0" + "doctrine/coding-standard": "^12", + "doctrine/orm": "^2.13 || ^3", + "doctrine/persistence": "^2 || ^3", + "doctrine/sql-formatter": "^1.0", + "ext-pdo_sqlite": "*", + "phpstan/phpstan": "^1.10", + "phpstan/phpstan-deprecation-rules": "^1.1", + "phpstan/phpstan-phpunit": "^1.3", + "phpstan/phpstan-strict-rules": "^1.4", + "phpstan/phpstan-symfony": "^1.3", + "phpunit/phpunit": "^10.3", + "symfony/cache": "^5.4 || ^6.0 || ^7.0", + "symfony/process": "^5.4 || ^6.0 || ^7.0", + "symfony/yaml": "^5.4 || ^6.0 || ^7.0" }, "suggest": { - "jdorn/sql-formatter": "Allows to generate formatted SQL with the diff command.", + "doctrine/sql-formatter": "Allows to generate formatted SQL with the diff command.", "symfony/yaml": "Allows the use of yaml for migration configuration files." }, "bin": [ "bin/doctrine-migrations" ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "v1.8.x-dev" - } - }, "autoload": { "psr-4": { - "Doctrine\\Migrations\\": "lib/Doctrine/Migrations", - "Doctrine\\DBAL\\Migrations\\": "lib/Doctrine/DBAL/Migrations" + "Doctrine\\Migrations\\": "lib/Doctrine/Migrations" } }, "notification-url": "https://packagist.org/downloads/", @@ -1608,70 +1706,81 @@ "email": "contact@mikesimonson.com" } ], - "description": "Database Schema migrations using Doctrine DBAL", + "description": "PHP Doctrine Migrations project offer additional functionality on top of the database abstraction layer (DBAL) for versioning your database schema and easily deploying changes to it. It is a very easy to use and a powerful tool.", "homepage": "https://www.doctrine-project.org/projects/migrations.html", "keywords": [ "database", + "dbal", "migrations" ], "support": { "issues": "https://github.com/doctrine/migrations/issues", - "source": "https://github.com/doctrine/migrations/tree/1.8" + "source": "https://github.com/doctrine/migrations/tree/3.7.2" }, - "time": "2018-06-06T21:00:30+00:00" + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fmigrations", + "type": "tidelift" + } + ], + "time": "2023-12-05T11:35:05+00:00" }, { "name": "doctrine/orm", - "version": "2.7.5", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/doctrine/orm.git", - "reference": "01187c9260cd085529ddd1273665217cae659640" + "reference": "2a250b5814de192a23438c0a43e15da7e77890a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/orm/zipball/01187c9260cd085529ddd1273665217cae659640", - "reference": "01187c9260cd085529ddd1273665217cae659640", + "url": "https://api.github.com/repos/doctrine/orm/zipball/2a250b5814de192a23438c0a43e15da7e77890a7", + "reference": "2a250b5814de192a23438c0a43e15da7e77890a7", "shasum": "" }, "require": { - "composer/package-versions-deprecated": "^1.8", - "doctrine/annotations": "^1.11.1", - "doctrine/cache": "^1.9.1", - "doctrine/collections": "^1.5", - "doctrine/common": "^2.11 || ^3.0", - "doctrine/dbal": "^2.9.3", - "doctrine/event-manager": "^1.1", - "doctrine/inflector": "^1.0", - "doctrine/instantiator": "^1.3", - "doctrine/lexer": "^1.0", - "doctrine/persistence": "^1.3.3 || ^2.0", - "ext-pdo": "*", - "php": "^7.1", - "symfony/console": "^3.0|^4.0|^5.0" + "composer-runtime-api": "^2", + "doctrine/collections": "^2.1", + "doctrine/dbal": "^3.8.2 || ^4", + "doctrine/deprecations": "^0.5.3 || ^1", + "doctrine/event-manager": "^1.2 || ^2", + "doctrine/inflector": "^1.4 || ^2.0", + "doctrine/instantiator": "^1.3 || ^2", + "doctrine/lexer": "^3", + "doctrine/persistence": "^3.1.1", + "ext-ctype": "*", + "php": "^8.1", + "psr/cache": "^1 || ^2 || ^3", + "symfony/console": "^5.4 || ^6.0 || ^7.0", + "symfony/var-exporter": "~6.2.13 || ^6.3.2 || ^7.0" }, "require-dev": { - "doctrine/coding-standard": "^6.0", - "phpstan/phpstan": "^0.12.18", - "phpunit/phpunit": "^8.0", - "symfony/yaml": "^3.4|^4.0|^5.0", - "vimeo/psalm": "^3.11" + "doctrine/coding-standard": "^12.0", + "phpbench/phpbench": "^1.0", + "phpstan/phpstan": "1.10.35", + "phpunit/phpunit": "^10.4.0", + "psr/log": "^1 || ^2 || ^3", + "squizlabs/php_codesniffer": "3.7.2", + "symfony/cache": "^5.4 || ^6.2 || ^7.0", + "vimeo/psalm": "5.16.0" }, "suggest": { - "symfony/yaml": "If you want to use YAML Metadata Mapping Driver" + "ext-dom": "Provides support for XSD validation for XML mapping files", + "symfony/cache": "Provides cache support for Setup Tool with doctrine/cache 2.0" }, - "bin": [ - "bin/doctrine" - ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.7.x-dev" - } - }, "autoload": { "psr-4": { - "Doctrine\\ORM\\": "lib/Doctrine/ORM" + "Doctrine\\ORM\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -1708,51 +1817,47 @@ ], "support": { "issues": "https://github.com/doctrine/orm/issues", - "source": "https://github.com/doctrine/orm/tree/2.7.5" + "source": "https://github.com/doctrine/orm/tree/3.0.1" }, - "time": "2020-12-03T08:52:14+00:00" + "time": "2024-02-22T12:23:53+00:00" }, { "name": "doctrine/persistence", - "version": "1.3.8", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/doctrine/persistence.git", - "reference": "7a6eac9fb6f61bba91328f15aa7547f4806ca288" + "reference": "63fee8c33bef740db6730eb2a750cd3da6495603" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/persistence/zipball/7a6eac9fb6f61bba91328f15aa7547f4806ca288", - "reference": "7a6eac9fb6f61bba91328f15aa7547f4806ca288", + "url": "https://api.github.com/repos/doctrine/persistence/zipball/63fee8c33bef740db6730eb2a750cd3da6495603", + "reference": "63fee8c33bef740db6730eb2a750cd3da6495603", "shasum": "" }, "require": { - "doctrine/annotations": "^1.0", - "doctrine/cache": "^1.0", - "doctrine/collections": "^1.0", - "doctrine/event-manager": "^1.0", - "doctrine/reflection": "^1.2", - "php": "^7.1 || ^8.0" + "doctrine/event-manager": "^1 || ^2", + "php": "^7.2 || ^8.0", + "psr/cache": "^1.0 || ^2.0 || ^3.0" }, "conflict": { - "doctrine/common": "<2.10@dev" + "doctrine/common": "<2.10" }, "require-dev": { - "doctrine/coding-standard": "^6.0", - "phpstan/phpstan": "^0.11", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", - "vimeo/psalm": "^3.11" + "composer/package-versions-deprecated": "^1.11", + "doctrine/coding-standard": "^11", + "doctrine/common": "^3.0", + "phpstan/phpstan": "1.9.4", + "phpstan/phpstan-phpunit": "^1", + "phpstan/phpstan-strict-rules": "^1.1", + "phpunit/phpunit": "^8.5 || ^9.5", + "symfony/cache": "^4.4 || ^5.4 || ^6.0", + "vimeo/psalm": "4.30.0 || 5.3.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3.x-dev" - } - }, "autoload": { "psr-4": { - "Doctrine\\Common\\": "lib/Doctrine/Common", - "Doctrine\\Persistence\\": "lib/Doctrine/Persistence" + "Doctrine\\Persistence\\": "src/Persistence" } }, "notification-url": "https://packagist.org/downloads/", @@ -1786,7 +1891,7 @@ } ], "description": "The Doctrine Persistence project is a set of shared interfaces and functionality that the different Doctrine object mappers share.", - "homepage": "https://doctrine-project.org/projects/persistence.html", + "homepage": "https://www.doctrine-project.org/projects/persistence.html", "keywords": [ "mapper", "object", @@ -1796,7 +1901,7 @@ ], "support": { "issues": "https://github.com/doctrine/persistence/issues", - "source": "https://github.com/doctrine/persistence/tree/1.3.x" + "source": "https://github.com/doctrine/persistence/tree/3.2.0" }, "funding": [ { @@ -1812,41 +1917,35 @@ "type": "tidelift" } ], - "time": "2020-06-20T12:56:16+00:00" + "time": "2023-05-17T18:32:04+00:00" }, { - "name": "doctrine/reflection", - "version": "1.2.4", + "name": "doctrine/sql-formatter", + "version": "1.2.0", "source": { "type": "git", - "url": "https://github.com/doctrine/reflection.git", - "reference": "6bcea3e81ab8b3d0abe5fde5300bbc8a968960c7" + "url": "https://github.com/doctrine/sql-formatter.git", + "reference": "a321d114e0a18e6497f8a2cd6f890e000cc17ecc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/reflection/zipball/6bcea3e81ab8b3d0abe5fde5300bbc8a968960c7", - "reference": "6bcea3e81ab8b3d0abe5fde5300bbc8a968960c7", + "url": "https://api.github.com/repos/doctrine/sql-formatter/zipball/a321d114e0a18e6497f8a2cd6f890e000cc17ecc", + "reference": "a321d114e0a18e6497f8a2cd6f890e000cc17ecc", "shasum": "" }, "require": { - "doctrine/annotations": "^1.0 || ^2.0", - "ext-tokenizer": "*", "php": "^7.1 || ^8.0" }, - "conflict": { - "doctrine/common": "<2.9" - }, "require-dev": { - "doctrine/coding-standard": "^9", - "doctrine/common": "^3.3", - "phpstan/phpstan": "^1.4.10", - "phpstan/phpstan-phpunit": "^1", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5" + "bamarni/composer-bin-plugin": "^1.4" }, + "bin": [ + "bin/sql-formatter" + ], "type": "library", "autoload": { "psr-4": { - "Doctrine\\Common\\": "lib/Doctrine/Common" + "Doctrine\\SqlFormatter\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -1855,65 +1954,45 @@ ], "authors": [ { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" - }, - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - }, - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com" + "name": "Jeremy Dorn", + "email": "jeremy@jeremydorn.com", + "homepage": "https://jeremydorn.com/" } ], - "description": "The Doctrine Reflection project is a simple library used by the various Doctrine projects which adds some additional functionality on top of the reflection functionality that comes with PHP. It allows you to get the reflection information about classes, methods and properties statically.", - "homepage": "https://www.doctrine-project.org/projects/reflection.html", + "description": "a PHP SQL highlighting library", + "homepage": "https://github.com/doctrine/sql-formatter/", "keywords": [ - "reflection", - "static" + "highlight", + "sql" ], "support": { - "issues": "https://github.com/doctrine/reflection/issues", - "source": "https://github.com/doctrine/reflection/tree/1.2.4" + "issues": "https://github.com/doctrine/sql-formatter/issues", + "source": "https://github.com/doctrine/sql-formatter/tree/1.2.0" }, - "abandoned": "roave/better-reflection", - "time": "2023-07-27T18:11:59+00:00" + "time": "2023-08-16T21:49:04+00:00" }, { "name": "egulias/email-validator", - "version": "3.2.6", + "version": "4.0.2", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7" + "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7", - "reference": "e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ebaaf5be6c0286928352e054f2d5125608e5405e", + "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e", "shasum": "" }, "require": { - "doctrine/lexer": "^1.2|^2", - "php": ">=7.2", - "symfony/polyfill-intl-idn": "^1.15" + "doctrine/lexer": "^2.0 || ^3.0", + "php": ">=8.1", + "symfony/polyfill-intl-idn": "^1.26" }, "require-dev": { - "phpunit/phpunit": "^8.5.8|^9.3.3", - "vimeo/psalm": "^4" + "phpunit/phpunit": "^10.2", + "vimeo/psalm": "^5.12" }, "suggest": { "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation" @@ -1921,7 +2000,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "4.0.x-dev" } }, "autoload": { @@ -1949,7 +2028,7 @@ ], "support": { "issues": "https://github.com/egulias/EmailValidator/issues", - "source": "https://github.com/egulias/EmailValidator/tree/3.2.6" + "source": "https://github.com/egulias/EmailValidator/tree/4.0.2" }, "funding": [ { @@ -1957,41 +2036,51 @@ "type": "github" } ], - "time": "2023-06-01T07:04:22+00:00" + "time": "2023-10-06T06:47:41+00:00" }, { "name": "guzzlehttp/guzzle", - "version": "6.5.8", + "version": "7.8.1", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "a52f0440530b54fa079ce76e8c5d196a42cad981" + "reference": "41042bc7ab002487b876a0683fc8dce04ddce104" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/a52f0440530b54fa079ce76e8c5d196a42cad981", - "reference": "a52f0440530b54fa079ce76e8c5d196a42cad981", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/41042bc7ab002487b876a0683fc8dce04ddce104", + "reference": "41042bc7ab002487b876a0683fc8dce04ddce104", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^1.0", - "guzzlehttp/psr7": "^1.9", - "php": ">=5.5", - "symfony/polyfill-intl-idn": "^1.17" + "guzzlehttp/promises": "^1.5.3 || ^2.0.1", + "guzzlehttp/psr7": "^1.9.1 || ^2.5.1", + "php": "^7.2.5 || ^8.0", + "psr/http-client": "^1.0", + "symfony/deprecation-contracts": "^2.2 || ^3.0" + }, + "provide": { + "psr/http-client-implementation": "1.0" }, "require-dev": { + "bamarni/composer-bin-plugin": "^1.8.2", "ext-curl": "*", - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0", - "psr/log": "^1.1" + "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999", + "php-http/message-factory": "^1.1", + "phpunit/phpunit": "^8.5.36 || ^9.6.15", + "psr/log": "^1.1 || ^2.0 || ^3.0" }, "suggest": { + "ext-curl": "Required for CURL handler support", + "ext-intl": "Required for Internationalized Domain Name (IDN) support", "psr/log": "Required for using the Log middleware" }, "type": "library", "extra": { - "branch-alias": { - "dev-master": "6.5-dev" + "bamarni-bin": { + "bin-links": true, + "forward-command": false } }, "autoload": { @@ -2044,19 +2133,20 @@ } ], "description": "Guzzle is a PHP HTTP client library", - "homepage": "http://guzzlephp.org/", "keywords": [ "client", "curl", "framework", "http", "http client", + "psr-18", + "psr-7", "rest", "web service" ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/6.5.8" + "source": "https://github.com/guzzle/guzzle/tree/7.8.1" }, "funding": [ { @@ -2072,33 +2162,37 @@ "type": "tidelift" } ], - "time": "2022-06-20T22:16:07+00:00" + "time": "2023-12-03T20:35:24+00:00" }, { "name": "guzzlehttp/promises", - "version": "1.5.3", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e" + "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/67ab6e18aaa14d753cc148911d273f6e6cb6721e", - "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e", + "url": "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223", + "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223", "shasum": "" }, "require": { - "php": ">=5.5" + "php": "^7.2.5 || ^8.0" }, "require-dev": { - "symfony/phpunit-bridge": "^4.4 || ^5.1" + "bamarni/composer-bin-plugin": "^1.8.2", + "phpunit/phpunit": "^8.5.36 || ^9.6.15" }, "type": "library", + "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": false + } + }, "autoload": { - "files": [ - "src/functions_include.php" - ], "psr-4": { "GuzzleHttp\\Promise\\": "src/" } @@ -2135,7 +2229,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.5.3" + "source": "https://github.com/guzzle/promises/tree/2.0.2" }, "funding": [ { @@ -2151,42 +2245,48 @@ "type": "tidelift" } ], - "time": "2023-05-21T12:31:43+00:00" + "time": "2023-12-03T20:19:20+00:00" }, { "name": "guzzlehttp/psr7", - "version": "1.9.1", + "version": "2.6.2", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b" + "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/e4490cabc77465aaee90b20cfc9a770f8c04be6b", - "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/45b30f99ac27b5ca93cb4831afe16285f57b8221", + "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221", "shasum": "" }, "require": { - "php": ">=5.4.0", - "psr/http-message": "~1.0", - "ralouphie/getallheaders": "^2.0.5 || ^3.0.0" + "php": "^7.2.5 || ^8.0", + "psr/http-factory": "^1.0", + "psr/http-message": "^1.1 || ^2.0", + "ralouphie/getallheaders": "^3.0" }, "provide": { + "psr/http-factory-implementation": "1.0", "psr/http-message-implementation": "1.0" }, "require-dev": { - "ext-zlib": "*", - "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10" + "bamarni/composer-bin-plugin": "^1.8.2", + "http-interop/http-factory-tests": "^0.9", + "phpunit/phpunit": "^8.5.36 || ^9.6.15" }, "suggest": { "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" }, "type": "library", + "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": false + } + }, "autoload": { - "files": [ - "src/functions_include.php" - ], "psr-4": { "GuzzleHttp\\Psr7\\": "src/" } @@ -2225,6 +2325,11 @@ "name": "Tobias Schultze", "email": "webmaster@tubo-world.de", "homepage": "https://github.com/Tobion" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://sagikazarmark.hu" } ], "description": "PSR-7 message implementation that also provides common utility methods", @@ -2240,7 +2345,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/1.9.1" + "source": "https://github.com/guzzle/psr7/tree/2.6.2" }, "funding": [ { @@ -2256,35 +2361,37 @@ "type": "tidelift" } ], - "time": "2023-04-17T16:00:37+00:00" + "time": "2023-12-03T20:05:35+00:00" }, { "name": "incenteev/composer-parameter-handler", - "version": "v2.1.5", + "version": "v2.2.0", "source": { "type": "git", "url": "https://github.com/Incenteev/ParameterHandler.git", - "reference": "e1dd118763503f7fd766f907013e1d76d525fcc4" + "reference": "90bffce926e96b365579a2ef024aab457f4b80c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Incenteev/ParameterHandler/zipball/e1dd118763503f7fd766f907013e1d76d525fcc4", - "reference": "e1dd118763503f7fd766f907013e1d76d525fcc4", + "url": "https://api.github.com/repos/Incenteev/ParameterHandler/zipball/90bffce926e96b365579a2ef024aab457f4b80c5", + "reference": "90bffce926e96b365579a2ef024aab457f4b80c5", "shasum": "" }, "require": { - "php": ">=5.3.3", - "symfony/yaml": "^2.3 || ^3.0 || ^4.0 || ^5.0 || ^6.0" + "php": ">=7.4", + "symfony/yaml": "^5.4 || ^6.0 || ^7.0" }, "require-dev": { - "composer/composer": "^1.0@dev", - "symfony/filesystem": "^2.3 || ^3 || ^4 || ^5 || ^6.0", - "symfony/phpunit-bridge": "^3.4.47 || ^4.4.41 || ^5.4.8 || ^6.0" + "composer/composer": "^2.0@dev", + "phpspec/prophecy-phpunit": "^2.1", + "phpunit/phpunit": "^9.6", + "symfony/filesystem": "^5.4 || ^6.0 || ^7.0", + "symfony/phpunit-bridge": "^6.4.1 || ^7.0.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -2309,110 +2416,63 @@ ], "support": { "issues": "https://github.com/Incenteev/ParameterHandler/issues", - "source": "https://github.com/Incenteev/ParameterHandler/tree/v2.1.5" - }, - "time": "2022-05-25T10:57:22+00:00" - }, - { - "name": "jdorn/sql-formatter", - "version": "v1.2.17", - "source": { - "type": "git", - "url": "https://github.com/jdorn/sql-formatter.git", - "reference": "64990d96e0959dff8e059dfcdc1af130728d92bc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/jdorn/sql-formatter/zipball/64990d96e0959dff8e059dfcdc1af130728d92bc", - "reference": "64990d96e0959dff8e059dfcdc1af130728d92bc", - "shasum": "" - }, - "require": { - "php": ">=5.2.4" - }, - "require-dev": { - "phpunit/phpunit": "3.7.*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3.x-dev" - } - }, - "autoload": { - "classmap": [ - "lib" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jeremy Dorn", - "email": "jeremy@jeremydorn.com", - "homepage": "http://jeremydorn.com/" - } - ], - "description": "a PHP SQL highlighting library", - "homepage": "https://github.com/jdorn/sql-formatter/", - "keywords": [ - "highlight", - "sql" - ], - "support": { - "issues": "https://github.com/jdorn/sql-formatter/issues", - "source": "https://github.com/jdorn/sql-formatter/tree/v1.2.17" + "source": "https://github.com/Incenteev/ParameterHandler/tree/v2.2.0" }, - "time": "2014-01-12T16:20:24+00:00" + "time": "2023-12-09T10:31:14+00:00" }, { "name": "jms/translation-bundle", - "version": "1.7.0", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/schmittjoh/JMSTranslationBundle.git", - "reference": "153f4c9892bd6481eebd42c5da56666c8d0fa7ce" + "reference": "ad89a56dfe9de9485b10dc5d8893665101cd2fa3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/JMSTranslationBundle/zipball/153f4c9892bd6481eebd42c5da56666c8d0fa7ce", - "reference": "153f4c9892bd6481eebd42c5da56666c8d0fa7ce", + "url": "https://api.github.com/repos/schmittjoh/JMSTranslationBundle/zipball/ad89a56dfe9de9485b10dc5d8893665101cd2fa3", + "reference": "ad89a56dfe9de9485b10dc5d8893665101cd2fa3", "shasum": "" }, "require": { - "nikic/php-parser": "^4.9", - "php": "^7.2 || ^8.0", - "symfony/console": "^3.4 || ^4.3 || ^5.0", - "symfony/expression-language": "^3.4 || ^4.3 || ^5.0", - "symfony/framework-bundle": "^3.4.31 || ^4.3 || ^5.0", - "symfony/translation": "^3.4 || ^4.3 || ^5.0", - "symfony/translation-contracts": "^1.1 || ^2.0", - "symfony/validator": "^3.4 || ^4.3 || ^5.0", + "nikic/php-parser": "^4.9 || ^5", + "php": "^7.4 || ^8.0", + "psr/log": "^1.0 || ^2.0", + "symfony/config": "^4.3 || ^5.4 || ^6.2", + "symfony/console": "^4.3 || ^5.4 || ^6.0", + "symfony/expression-language": "^4.3 || ^5.4 || ^6.0", + "symfony/framework-bundle": "^4.3 || ^5.4 || ^6.0", + "symfony/translation": "^4.3 || ^5.4 || ^6.0", + "symfony/translation-contracts": "^1.1 || ^2.0 || ^3.0", + "symfony/validator": "^4.3 || ^5.4 || ^6.0", "twig/twig": "^1.42.4 || ^2.12.5 || ^3.0" }, "require-dev": { - "doctrine/annotations": "^1.8", - "doctrine/coding-standard": "^8.0", + "doctrine/annotations": "^1.11", + "doctrine/coding-standard": "^8.2.1", "matthiasnoback/symfony-dependency-injection-test": "^4.1", "nyholm/nsa": "^1.0.1", - "phpunit/phpunit": "^8.3", - "psr/log": "^1.0", - "sensio/framework-extra-bundle": "^5.4", - "symfony/asset": "^3.4 || ^4.3 || ^5.0", - "symfony/browser-kit": "^3.4 || ^4.3 || ^5.0", - "symfony/css-selector": "^3.4 || ^4.3 || ^5.0", - "symfony/filesystem": "^3.4 || ^4.3 || ^5.0", - "symfony/form": "^3.4 || ^4.3 || ^5.0", - "symfony/security-csrf": "^3.4 || ^4.3 || ^5.0", - "symfony/templating": "^3.4 || ^4.3 || ^5.0", - "symfony/twig-bundle": "^3.4.37 || ^4.3.11 || ^5.0" + "sensio/framework-extra-bundle": "^6.2.4", + "symfony/asset": "^4.4 || ^5.4 || ^6.4", + "symfony/browser-kit": "^4.4 || ^5.4 || ^6.4", + "symfony/css-selector": "^4.4 || ^5.4 || ^6.4", + "symfony/filesystem": "^4.4 || ^5.4 || ^6.4", + "symfony/flex": "^1.19 || ^2.0", + "symfony/form": "^4.4 || ^5.4 || ^6.4", + "symfony/phpunit-bridge": "^4.4 || ^5.4 || ^6.4", + "symfony/property-access": "^4.4 || ^5.4 || ^6.4", + "symfony/routing": "^4.4.15 || ^5.4 || ^6.4", + "symfony/security-csrf": "^4.4 || ^5.4 || ^6.4", + "symfony/templating": "^4.4 || ^5.4 || ^6.4", + "symfony/twig-bundle": "^4.4 || ^5.4 || ^6.4" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.6-dev" + "dev-master": "2.x-dev" + }, + "symfony": { + "allow-contrib": true } }, "autoload": { @@ -2444,44 +2504,54 @@ ], "support": { "issues": "https://github.com/schmittjoh/JMSTranslationBundle/issues", - "source": "https://github.com/schmittjoh/JMSTranslationBundle/tree/1.7.0" + "source": "https://github.com/schmittjoh/JMSTranslationBundle/tree/2.2.0" }, - "time": "2022-12-14T13:44:59+00:00" + "time": "2024-02-06T10:14:05+00:00" }, { "name": "liip/test-fixtures-bundle", - "version": "1.12.0", + "version": "2.7.3", "source": { "type": "git", "url": "https://github.com/liip/LiipTestFixturesBundle.git", - "reference": "252ab82556e2468780255b5c1893d8c9401624ea" + "reference": "a75285a3232383eaec8004b0f8c95573267f1aad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/liip/LiipTestFixturesBundle/zipball/252ab82556e2468780255b5c1893d8c9401624ea", - "reference": "252ab82556e2468780255b5c1893d8c9401624ea", + "url": "https://api.github.com/repos/liip/LiipTestFixturesBundle/zipball/a75285a3232383eaec8004b0f8c95573267f1aad", + "reference": "a75285a3232383eaec8004b0f8c95573267f1aad", "shasum": "" }, "require": { "doctrine/common": "^2.13 || ^3.0", - "php": "^7.2 || ^8.0", - "symfony/framework-bundle": "^3.4 || ^4.4 || ^5.0", - "symfony/yaml": "^3.4 || ^4.4 || ^5.0" + "doctrine/persistence": "^1.3.3 || ^2.0 || ^3.0", + "php": "^7.4 || ^8.0", + "symfony/deprecation-contracts": "^2.1 || ^3.0", + "symfony/event-dispatcher": "^5.4 || ^6.3 || ^7.0", + "symfony/event-dispatcher-contracts": "^1 || ^2 || ^3", + "symfony/framework-bundle": "^5.4 || ^6.3 || ^7.0", + "symfony/yaml": "^5.4 || ^6.3 || ^7.0" + }, + "conflict": { + "doctrine/annotations": "<1.2.7 || >=3.0", + "doctrine/dbal": "<2.11" }, "require-dev": { - "doctrine/data-fixtures": "^1.3", - "doctrine/doctrine-bundle": "^1.8 || ^2.0", - "doctrine/doctrine-fixtures-bundle": "^3.0.2", - "doctrine/orm": "^2.6", - "doctrine/phpcr-bundle": "^2.0", - "doctrine/phpcr-odm": "^1.3", - "jackalope/jackalope-doctrine-dbal": "^1.5", - "monolog/monolog": "^1.11 || ^2.0", - "phpunit/phpunit": "^7.5 || ^8.0", - "symfony/monolog-bridge": ">=3", + "doctrine/annotations": "^1.8.0 || ^2.0", + "doctrine/data-fixtures": "^1.7", + "doctrine/doctrine-bundle": "^2.11", + "doctrine/doctrine-fixtures-bundle": "^3.5.1 || ^4.0", + "doctrine/orm": "^2.7", + "doctrine/phpcr-bundle": "^2.4.3 || ^3.0", + "doctrine/phpcr-odm": "^1.7.2 || ^2.0", + "jackalope/jackalope-doctrine-dbal": "^1.10.1 || ^2.0", + "monolog/monolog": "^1.25.1 || ^2.0 || ^3.0", + "phpunit/phpunit": "^9.6 || ^10.4", + "symfony/doctrine-bridge": "^5.4 || ^6.3 || ^7.0", + "symfony/monolog-bridge": "^5.4 || ^6.3 || ^7.0", "symfony/monolog-bundle": "^3.2", - "symfony/phpunit-bridge": "^3.4 || ^4.4 || ^5.0", - "theofidry/alice-data-fixtures": "^1.0.1" + "symfony/phpunit-bridge": "^5.4 || ^6.3 || ^7.0", + "theofidry/alice-data-fixtures": "^1.5.2" }, "suggest": { "doctrine/dbal": "Required when using the fixture loading functionality with an ORM and SQLite", @@ -2493,7 +2563,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -2523,57 +2593,72 @@ ], "support": { "issues": "https://github.com/liip/LiipTestFixturesBundle/issues", - "source": "https://github.com/liip/LiipTestFixturesBundle/tree/1.12.0" + "source": "https://github.com/liip/LiipTestFixturesBundle/tree/2.7.3" }, - "time": "2021-07-17T16:52:27+00:00" + "time": "2024-02-25T22:34:13+00:00" }, { "name": "monolog/monolog", - "version": "1.27.1", + "version": "3.5.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "904713c5929655dc9b97288b69cfeedad610c9a1" + "reference": "c915e2634718dbc8a4a15c61b0e62e7a44e14448" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/904713c5929655dc9b97288b69cfeedad610c9a1", - "reference": "904713c5929655dc9b97288b69cfeedad610c9a1", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/c915e2634718dbc8a4a15c61b0e62e7a44e14448", + "reference": "c915e2634718dbc8a4a15c61b0e62e7a44e14448", "shasum": "" }, "require": { - "php": ">=5.3.0", - "psr/log": "~1.0" + "php": ">=8.1", + "psr/log": "^2.0 || ^3.0" }, "provide": { - "psr/log-implementation": "1.0.0" + "psr/log-implementation": "3.0.0" }, "require-dev": { - "aws/aws-sdk-php": "^2.4.9 || ^3.0", + "aws/aws-sdk-php": "^3.0", "doctrine/couchdb": "~1.0@dev", - "graylog2/gelf-php": "~1.0", - "php-amqplib/php-amqplib": "~2.4", - "php-console/php-console": "^3.1.3", - "phpstan/phpstan": "^0.12.59", - "phpunit/phpunit": "~4.5", - "ruflin/elastica": ">=0.90 <3.0", - "sentry/sentry": "^0.13", - "swiftmailer/swiftmailer": "^5.3|^6.0" + "elasticsearch/elasticsearch": "^7 || ^8", + "ext-json": "*", + "graylog2/gelf-php": "^1.4.2 || ^2.0", + "guzzlehttp/guzzle": "^7.4.5", + "guzzlehttp/psr7": "^2.2", + "mongodb/mongodb": "^1.8", + "php-amqplib/php-amqplib": "~2.4 || ^3", + "phpstan/phpstan": "^1.9", + "phpstan/phpstan-deprecation-rules": "^1.0", + "phpstan/phpstan-strict-rules": "^1.4", + "phpunit/phpunit": "^10.1", + "predis/predis": "^1.1 || ^2", + "ruflin/elastica": "^7", + "symfony/mailer": "^5.4 || ^6", + "symfony/mime": "^5.4 || ^6" }, "suggest": { "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", "doctrine/couchdb": "Allow sending log messages to a CouchDB server", + "elasticsearch/elasticsearch": "Allow sending log messages to an Elasticsearch server via official client", "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", - "ext-mongo": "Allow sending log messages to a MongoDB server", + "ext-curl": "Required to send log messages using the IFTTTHandler, the LogglyHandler, the SendGridHandler, the SlackWebhookHandler or the TelegramBotHandler", + "ext-mbstring": "Allow to work properly with unicode symbols", + "ext-mongodb": "Allow sending log messages to a MongoDB server (via driver)", + "ext-openssl": "Required to send log messages using SSL", + "ext-sockets": "Allow sending log messages to a Syslog server (via UDP driver)", "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", - "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver", + "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)", "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", - "php-console/php-console": "Allow sending log messages to Google Chrome", "rollbar/rollbar": "Allow sending log messages to Rollbar", - "ruflin/elastica": "Allow sending log messages to an Elastic Search server", - "sentry/sentry": "Allow sending log messages to a Sentry server" + "ruflin/elastica": "Allow sending log messages to an Elastic Search server" }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.x-dev" + } + }, "autoload": { "psr-4": { "Monolog\\": "src/Monolog" @@ -2587,11 +2672,11 @@ { "name": "Jordi Boggiano", "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" + "homepage": "https://seld.be" } ], "description": "Sends your logs to files, sockets, inboxes, databases and various web services", - "homepage": "http://github.com/Seldaek/monolog", + "homepage": "https://github.com/Seldaek/monolog", "keywords": [ "log", "logging", @@ -2599,7 +2684,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/1.27.1" + "source": "https://github.com/Seldaek/monolog/tree/3.5.0" }, "funding": [ { @@ -2611,54 +2696,56 @@ "type": "tidelift" } ], - "time": "2022-06-09T08:53:42+00:00" + "time": "2023-10-27T15:32:31+00:00" }, { "name": "nelmio/security-bundle", - "version": "v2.9.1", + "version": "v3.1.1", "source": { "type": "git", "url": "https://github.com/nelmio/NelmioSecurityBundle.git", - "reference": "89ac385b28496691bfa7eef24d60aec9f20021a1" + "reference": "9ae9fabf708ec5899cda46b2d764864bceaa9c8e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nelmio/NelmioSecurityBundle/zipball/89ac385b28496691bfa7eef24d60aec9f20021a1", - "reference": "89ac385b28496691bfa7eef24d60aec9f20021a1", + "url": "https://api.github.com/repos/nelmio/NelmioSecurityBundle/zipball/9ae9fabf708ec5899cda46b2d764864bceaa9c8e", + "reference": "9ae9fabf708ec5899cda46b2d764864bceaa9c8e", "shasum": "" }, "require": { - "paragonie/random_compat": "~1.0|~2.0|9.99.99", - "php": ">5.4", - "symfony/framework-bundle": "~2.3|~v3.0|~4.0|~5.0", - "symfony/security-core": "~2.3|~3.0|~4.0|~5.0", - "symfony/security-csrf": "~2.3|~3.0|~4.0|~5.0", - "symfony/security-http": "~2.3|~3.0|~4.0|~5.0", + "php": "^7.4 || ^8.0", + "symfony/framework-bundle": "^5.4 || ^6.3 || ^7.0", + "symfony/http-kernel": "^5.4 || ^6.3 || ^7.0", + "symfony/security-core": "^5.4 || ^6.3 || ^7.0", + "symfony/security-csrf": "^5.4 || ^6.3 || ^7.0", + "symfony/security-http": "^5.4 || ^6.3 || ^7.0", + "symfony/yaml": "^5.4 || ^6.3 || ^7.0", "ua-parser/uap-php": "^3.4.4" }, "require-dev": { - "doctrine/cache": "^1.0", - "psr/cache": "^1.0", - "symfony/phpunit-bridge": "^5.0.5", - "symfony/yaml": "~2.3|~3.0|~4.0|~5.0", - "twig/twig": "^1.38|^2.10|^3.0" - }, - "suggest": { - "ua-parser/uap-php": "To allow adapt CSP directives given the user-agent" + "phpstan/phpstan": "^1.4", + "phpstan/phpstan-deprecation-rules": "^1.0", + "phpstan/phpstan-phpunit": "^1.0", + "phpstan/phpstan-strict-rules": "^1.1", + "phpstan/phpstan-symfony": "^1.1", + "phpunit/phpunit": "^9.5", + "psr/cache": "^1.0 || ^2.0 || ^3.0", + "symfony/browser-kit": "^5.4 || ^6.3 || ^7.0", + "symfony/cache": "^5.4 || ^6.3 || ^7.0", + "symfony/phpunit-bridge": "^6.3 || ^7.0", + "symfony/twig-bundle": "^5.4 || ^6.3 || ^7.0", + "twig/twig": "^2.10 || ^3.0" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.9.x-dev" + "dev-master": "3.x-dev" } }, "autoload": { "psr-4": { - "Nelmio\\SecurityBundle\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] + "Nelmio\\SecurityBundle\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2680,31 +2767,33 @@ ], "support": { "issues": "https://github.com/nelmio/NelmioSecurityBundle/issues", - "source": "https://github.com/nelmio/NelmioSecurityBundle/tree/v2.9.1" + "source": "https://github.com/nelmio/NelmioSecurityBundle/tree/v3.1.1" }, - "time": "2020-05-11T08:12:17+00:00" + "time": "2024-01-17T14:32:52+00:00" }, { "name": "nikic/php-parser", - "version": "v4.18.0", + "version": "v5.0.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999" + "reference": "2218c2252c874a4624ab2f613d86ac32d227bc69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999", - "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/2218c2252c874a4624ab2f613d86ac32d227bc69", + "reference": "2218c2252c874a4624ab2f613d86ac32d227bc69", "shasum": "" }, "require": { + "ext-ctype": "*", + "ext-json": "*", "ext-tokenizer": "*", - "php": ">=7.0" + "php": ">=7.4" }, "require-dev": { "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" }, "bin": [ "bin/php-parse" @@ -2712,7 +2801,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.9-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -2736,198 +2825,290 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.1" }, - "time": "2023-12-10T21:03:43+00:00" + "time": "2024-02-21T19:24:10+00:00" }, { - "name": "ocramius/proxy-manager", - "version": "2.2.4", + "name": "openconext/monitor-bundle", + "version": "4.1.2", "source": { "type": "git", - "url": "https://github.com/Ocramius/ProxyManager.git", - "reference": "2d7cd2a79cd3ade90c46211baae1b88d47683917" + "url": "https://github.com/OpenConext/Monitor-bundle.git", + "reference": "9fad7f1c77c53fdc1fd4040a34ad4a4e0073f225" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/2d7cd2a79cd3ade90c46211baae1b88d47683917", - "reference": "2d7cd2a79cd3ade90c46211baae1b88d47683917", + "url": "https://api.github.com/repos/OpenConext/Monitor-bundle/zipball/9fad7f1c77c53fdc1fd4040a34ad4a4e0073f225", + "reference": "9fad7f1c77c53fdc1fd4040a34ad4a4e0073f225", "shasum": "" }, "require": { - "ocramius/package-versions": "^1.1.3", - "php": "^7.2.0", - "zendframework/zend-code": "^3.3.0" + "doctrine/orm": "^2.9|^3.0", + "php": ">=8.2, <9.0-dev", + "symfony/dependency-injection": "^5.4|^6.3|^7.0", + "symfony/framework-bundle": "^5.4|^6.3|^7.0", + "webmozart/assert": "^1.10" }, "require-dev": { - "couscous/couscous": "^1.6.1", - "ext-phar": "*", - "humbug/humbug": "1.0.0-RC.0@RC", - "nikic/php-parser": "^3.1.1", - "padraic/phpunit-accelerator": "dev-master@DEV", - "phpbench/phpbench": "^0.12.2", - "phpstan/phpstan": "dev-master#856eb10a81c1d27c701a83f167dc870fd8f4236a as 0.9.999", - "phpstan/phpstan-phpunit": "dev-master#5629c0a1f4a9c417cb1077cf6693ad9753895761", - "phpunit/phpunit": "^6.4.3", - "squizlabs/php_codesniffer": "^2.9.1" - }, - "suggest": { - "ocramius/generated-hydrator": "To have very fast object to array to object conversion for ghost objects", - "zendframework/zend-json": "To have the JsonRpc adapter (Remote Object feature)", - "zendframework/zend-soap": "To have the Soap adapter (Remote Object feature)", - "zendframework/zend-xmlrpc": "To have the XmlRpc adapter (Remote Object feature)" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0.x-dev" - } + "malukenho/docheader": "^1.0", + "matthiasnoback/symfony-config-test": "^4.3", + "mockery/mockery": "^1.3.5|^1.4.4", + "php-parallel-lint/php-parallel-lint": "^1.3", + "phpdocumentor/reflection-docblock": "^5.2", + "phpmd/phpmd": "^2.13", + "phpunit/php-token-stream": "^3.1.3|^4.0.4", + "phpunit/phpunit": "^9.6|^10.4", + "sebastian/phpcpd": "^4.1|^5.0|^6.0", + "squizlabs/php_codesniffer": "^3.6" }, + "type": "symfony-bundle", "autoload": { - "psr-0": { - "ProxyManager\\": "src" + "psr-4": { + "OpenConext\\MonitorBundle\\": "src" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com", - "homepage": "http://ocramius.github.io/" - } + "Apache-2.0" ], - "description": "A library providing utilities to generate, instantiate and generally operate with Object Proxies", - "homepage": "https://github.com/Ocramius/ProxyManager", + "description": "A Symfony 5/6/7 bundle that facilitates health and info endpoints to a Symfony application.", "keywords": [ - "aop", - "lazy loading", - "proxy", - "proxy pattern", - "service proxies" + "OpenConext", + "health", + "monitoring", + "stepup", + "surfnet" ], "support": { - "issues": "https://github.com/Ocramius/ProxyManager/issues", - "source": "https://github.com/Ocramius/ProxyManager/tree/2.2.4" + "issues": "https://github.com/OpenConext/Monitor-bundle/issues", + "source": "https://github.com/OpenConext/Monitor-bundle/tree/4.1.2" + }, + "time": "2024-02-28T14:23:16+00:00" + }, + { + "name": "pagerfanta/pagerfanta", + "version": "v4.3.1", + "source": { + "type": "git", + "url": "https://github.com/BabDev/Pagerfanta.git", + "reference": "098025b783b3ada2a99e02f9b9e3421a5a338bde" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/BabDev/Pagerfanta/zipball/098025b783b3ada2a99e02f9b9e3421a5a338bde", + "reference": "098025b783b3ada2a99e02f9b9e3421a5a338bde", + "shasum": "" + }, + "require": { + "ext-json": "*", + "php": "^8.1" + }, + "conflict": { + "doctrine/collections": "<1.8", + "doctrine/dbal": "<3.5", + "doctrine/mongodb-odm": "<2.4", + "doctrine/orm": "<2.14", + "doctrine/phpcr-odm": "<1.7", + "ruflin/elastica": "<7.3", + "solarium/solarium": "<6.2", + "twig/twig": "<2.13" + }, + "replace": { + "pagerfanta/core": "self.version", + "pagerfanta/doctrine-collections-adapter": "self.version", + "pagerfanta/doctrine-dbal-adapter": "self.version", + "pagerfanta/doctrine-mongodb-odm-adapter": "self.version", + "pagerfanta/doctrine-orm-adapter": "self.version", + "pagerfanta/doctrine-phpcr-odm-adapter": "self.version", + "pagerfanta/elastica-adapter": "self.version", + "pagerfanta/solarium-adapter": "self.version", + "pagerfanta/twig": "self.version" + }, + "require-dev": { + "dg/bypass-finals": "^1.5.1", + "doctrine/collections": "^1.8 || ^2.0", + "doctrine/dbal": "^3.5 || ^4.0", + "doctrine/mongodb-odm": "^2.4", + "doctrine/orm": "^2.14 || ^3.0", + "doctrine/phpcr-odm": "^1.7", + "jackalope/jackalope-doctrine-dbal": "^1.9", + "phpstan/extension-installer": "^1.3.1", + "phpstan/phpstan": "1.10.57", + "phpstan/phpstan-phpunit": "1.3.15", + "phpunit/phpunit": "10.5.9", + "rector/rector": "0.19.5", + "ruflin/elastica": "^7.3", + "solarium/solarium": "^6.2", + "symfony/cache": "^5.4 || ^6.3 || ^7.0", + "twig/twig": "^2.13 || ^3.0" + }, + "suggest": { + "twig/twig": "To integrate Pagerfanta with Twig" + }, + "type": "library", + "autoload": { + "psr-4": { + "Pagerfanta\\": "lib/Core/", + "Pagerfanta\\Twig\\": "lib/Twig/", + "Pagerfanta\\Elastica\\": "lib/Adapter/Elastica/", + "Pagerfanta\\Solarium\\": "lib/Adapter/Solarium/", + "Pagerfanta\\Doctrine\\ORM\\": "lib/Adapter/Doctrine/ORM/", + "Pagerfanta\\Doctrine\\DBAL\\": "lib/Adapter/Doctrine/DBAL/", + "Pagerfanta\\Doctrine\\PHPCRODM\\": "lib/Adapter/Doctrine/PHPCRODM/", + "Pagerfanta\\Doctrine\\MongoDBODM\\": "lib/Adapter/Doctrine/MongoDBODM/", + "Pagerfanta\\Doctrine\\Collections\\": "lib/Adapter/Doctrine/Collections/" + }, + "exclude-from-classmap": [ + "lib/**/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Pagination for PHP", + "keywords": [ + "page", + "pagination", + "paginator", + "paging" + ], + "support": { + "issues": "https://github.com/BabDev/Pagerfanta/issues", + "source": "https://github.com/BabDev/Pagerfanta/tree/v4.3.1" }, "funding": [ { - "url": "https://github.com/Ocramius", + "url": "https://github.com/mbabker", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/ocramius/proxy-manager", - "type": "tidelift" } ], - "time": "2022-03-05T18:15:28+00:00" + "time": "2024-02-01T01:32:16+00:00" }, { - "name": "openconext/monitor-bundle", - "version": "2.1.0", + "name": "psr/cache", + "version": "3.0.0", "source": { "type": "git", - "url": "https://github.com/OpenConext/Monitor-bundle.git", - "reference": "f06e967b702bc5d78d85c39ba4a90219af152a67" + "url": "https://github.com/php-fig/cache.git", + "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/OpenConext/Monitor-bundle/zipball/f06e967b702bc5d78d85c39ba4a90219af152a67", - "reference": "f06e967b702bc5d78d85c39ba4a90219af152a67", + "url": "https://api.github.com/repos/php-fig/cache/zipball/aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", + "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", "shasum": "" }, "require": { - "php": ">=5.4,<8.0-dev", - "symfony/dependency-injection": ">=3.4,<5", - "symfony/framework-bundle": ">=3.4,<5", - "webmozart/assert": "^1.2" + "php": ">=8.0.0" }, - "require-dev": { - "jakub-onderka/php-parallel-lint": "^0.9.2", - "malukenho/docheader": "^0.1.6", - "matthiasnoback/symfony-config-test": "^2.1", - "mockery/mockery": "~0.9", - "phpdocumentor/reflection-docblock": "3.3.*", - "phpmd/phpmd": "^2.6", - "phpunit/php-token-stream": "1.4.*", - "phpunit/phpunit": "^5.7", - "sebastian/phpcpd": "^3.0", - "squizlabs/php_codesniffer": "^3.1" + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } }, - "type": "symfony-bundle", "autoload": { "psr-4": { - "OpenConext\\MonitorBundle\\": "src" + "Psr\\Cache\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "Apache-2.0" + "MIT" ], - "description": "A Symfony 4 bundle that facilitates health and info endpoints to a Symfony application. The bundle is backwards compatible with Symfony 2 projects.", + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for caching libraries", "keywords": [ - "OpenConext", - "health", - "monitoring", - "stepup", - "surfnet" + "cache", + "psr", + "psr-6" ], "support": { - "issues": "https://github.com/OpenConext/Monitor-bundle/issues", - "source": "https://github.com/OpenConext/Monitor-bundle/tree/2.1.0" + "source": "https://github.com/php-fig/cache/tree/3.0.0" }, - "time": "2021-09-28T11:09:57+00:00" + "time": "2021-02-03T23:26:27+00:00" }, { - "name": "pagerfanta/pagerfanta", - "version": "v1.1.0", + "name": "psr/clock", + "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/BabDev/Pagerfanta.git", - "reference": "8400ab498e500018cff9a099ac22555e7949aa9a" + "url": "https://github.com/php-fig/clock.git", + "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/BabDev/Pagerfanta/zipball/8400ab498e500018cff9a099ac22555e7949aa9a", - "reference": "8400ab498e500018cff9a099ac22555e7949aa9a", + "url": "https://api.github.com/repos/php-fig/clock/zipball/e41a24703d4560fd0acb709162f73b8adfc3aa0d", + "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^7.0 || ^8.0" }, - "require-dev": { - "doctrine/orm": "~2.3", - "doctrine/phpcr-odm": "1.*", - "jackalope/jackalope-doctrine-dbal": "1.*", - "jmikola/geojson": "~1.0", - "mandango/mandango": "~1.0@dev", - "mandango/mondator": "~1.0@dev", - "phpunit/phpunit": "^4.8.35 | ^5.7", - "propel/propel": "~2.0@dev", - "propel/propel1": "~1.6", - "ruflin/elastica": "~1.3", - "solarium/solarium": "~3.1" + "type": "library", + "autoload": { + "psr-4": { + "Psr\\Clock\\": "src/" + } }, - "suggest": { - "doctrine/mongodb-odm": "To use the DoctrineODMMongoDBAdapter.", - "doctrine/orm": "To use the DoctrineORMAdapter.", - "doctrine/phpcr-odm": "To use the DoctrineODMPhpcrAdapter. >= 1.1.0", - "mandango/mandango": "To use the MandangoAdapter.", - "propel/propel": "To use the Propel2Adapter", - "propel/propel1": "To use the PropelAdapter", - "solarium/solarium": "To use the SolariumAdapter." + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for reading the clock.", + "homepage": "https://github.com/php-fig/clock", + "keywords": [ + "clock", + "now", + "psr", + "psr-20", + "time" + ], + "support": { + "issues": "https://github.com/php-fig/clock/issues", + "source": "https://github.com/php-fig/clock/tree/1.0.0" + }, + "time": "2022-11-25T14:36:26+00:00" + }, + { + "name": "psr/container", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "shasum": "" + }, + "require": { + "php": ">=7.4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { - "psr-0": { - "Pagerfanta\\": "src/" + "psr-4": { + "Psr\\Container\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2936,57 +3117,52 @@ ], "authors": [ { - "name": "Pablo Díez", - "email": "pablodip@gmail.com" + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" } ], - "description": "Pagination for PHP 5.3", + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", "keywords": [ - "page", - "pagination", - "paginator", - "paging" + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" ], "support": { - "issues": "https://github.com/BabDev/Pagerfanta/issues", - "source": "https://github.com/BabDev/Pagerfanta/tree/v1.1.0" + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/2.0.2" }, - "funding": [ - { - "url": "https://github.com/mbabker", - "type": "github" - } - ], - "time": "2018-05-01T10:49:10+00:00" + "time": "2021-11-05T16:47:00+00:00" }, { - "name": "paragonie/random_compat", - "version": "v2.0.21", + "name": "psr/event-dispatcher", + "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/paragonie/random_compat.git", - "reference": "96c132c7f2f7bc3230723b66e89f8f150b29d5ae" + "url": "https://github.com/php-fig/event-dispatcher.git", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/96c132c7f2f7bc3230723b66e89f8f150b29d5ae", - "reference": "96c132c7f2f7bc3230723b66e89f8f150b29d5ae", + "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0", "shasum": "" }, "require": { - "php": ">=5.2.0" - }, - "require-dev": { - "phpunit/phpunit": "*" - }, - "suggest": { - "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." + "php": ">=7.2.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, "autoload": { - "files": [ - "lib/random.php" - ] + "psr-4": { + "Psr\\EventDispatcher\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2994,41 +3170,39 @@ ], "authors": [ { - "name": "Paragon Initiative Enterprises", - "email": "security@paragonie.com", - "homepage": "https://paragonie.com" + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" } ], - "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", + "description": "Standard interfaces for event handling.", "keywords": [ - "csprng", - "polyfill", - "pseudorandom", - "random" + "events", + "psr", + "psr-14" ], "support": { - "email": "info@paragonie.com", - "issues": "https://github.com/paragonie/random_compat/issues", - "source": "https://github.com/paragonie/random_compat" + "issues": "https://github.com/php-fig/event-dispatcher/issues", + "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0" }, - "time": "2022-02-16T17:07:03+00:00" + "time": "2019-01-08T18:20:26+00:00" }, { - "name": "psr/cache", - "version": "1.0.1", + "name": "psr/http-client", + "version": "1.0.3", "source": { "type": "git", - "url": "https://github.com/php-fig/cache.git", - "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8" + "url": "https://github.com/php-fig/http-client.git", + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8", - "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90", + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^7.0 || ^8.0", + "psr/http-message": "^1.0 || ^2.0" }, "type": "library", "extra": { @@ -3038,7 +3212,7 @@ }, "autoload": { "psr-4": { - "Psr\\Cache\\": "src/" + "Psr\\Http\\Client\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -3048,41 +3222,49 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], - "description": "Common interface for caching libraries", + "description": "Common interface for HTTP clients", + "homepage": "https://github.com/php-fig/http-client", "keywords": [ - "cache", + "http", + "http-client", "psr", - "psr-6" + "psr-18" ], "support": { - "source": "https://github.com/php-fig/cache/tree/master" + "source": "https://github.com/php-fig/http-client" }, - "time": "2016-08-06T20:24:11+00:00" + "time": "2023-09-23T14:17:50+00:00" }, { - "name": "psr/container", - "version": "1.1.1", + "name": "psr/http-factory", + "version": "1.0.2", "source": { "type": "git", - "url": "https://github.com/php-fig/container.git", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf" + "url": "https://github.com/php-fig/http-factory.git", + "reference": "e616d01114759c4c489f93b099585439f795fe35" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35", + "reference": "e616d01114759c4c489f93b099585439f795fe35", "shasum": "" }, "require": { - "php": ">=7.2.0" + "php": ">=7.0.0", + "psr/http-message": "^1.0 || ^2.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, "autoload": { "psr-4": { - "Psr\\Container\\": "src/" + "Psr\\Http\\Message\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -3095,33 +3277,34 @@ "homepage": "https://www.php-fig.org/" } ], - "description": "Common Container Interface (PHP FIG PSR-11)", - "homepage": "https://github.com/php-fig/container", + "description": "Common interfaces for PSR-7 HTTP message factories", "keywords": [ - "PSR-11", - "container", - "container-interface", - "container-interop", - "psr" + "factory", + "http", + "message", + "psr", + "psr-17", + "psr-7", + "request", + "response" ], "support": { - "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/1.1.1" + "source": "https://github.com/php-fig/http-factory/tree/1.0.2" }, - "time": "2021-03-05T17:36:06+00:00" + "time": "2023-04-10T20:10:41+00:00" }, { "name": "psr/http-message", - "version": "1.1", + "version": "2.0", "source": { "type": "git", "url": "https://github.com/php-fig/http-message.git", - "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba" + "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba", - "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71", + "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71", "shasum": "" }, "require": { @@ -3130,7 +3313,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -3145,7 +3328,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for HTTP messages", @@ -3159,36 +3342,36 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-message/tree/1.1" + "source": "https://github.com/php-fig/http-message/tree/2.0" }, - "time": "2023-04-04T09:50:52+00:00" + "time": "2023-04-04T09:54:51+00:00" }, { "name": "psr/log", - "version": "1.1.4", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11" + "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11", + "url": "https://api.github.com/repos/php-fig/log/zipball/ef29f6d262798707a9edd554e2b82517ef3a9376", + "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=8.0.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { "psr-4": { - "Psr\\Log\\": "Psr/Log/" + "Psr\\Log\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -3209,9 +3392,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/1.1.4" + "source": "https://github.com/php-fig/log/tree/2.0.0" }, - "time": "2021-05-03T11:20:27+00:00" + "time": "2021-07-14T16:41:46+00:00" }, { "name": "ralouphie/getallheaders", @@ -3257,66 +3440,166 @@ }, "time": "2019-03-08T08:55:37+00:00" }, + { + "name": "ramsey/collection", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/ramsey/collection.git", + "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ramsey/collection/zipball/a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5", + "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5", + "shasum": "" + }, + "require": { + "php": "^8.1" + }, + "require-dev": { + "captainhook/plugin-composer": "^5.3", + "ergebnis/composer-normalize": "^2.28.3", + "fakerphp/faker": "^1.21", + "hamcrest/hamcrest-php": "^2.0", + "jangregor/phpstan-prophecy": "^1.0", + "mockery/mockery": "^1.5", + "php-parallel-lint/php-console-highlighter": "^1.0", + "php-parallel-lint/php-parallel-lint": "^1.3", + "phpcsstandards/phpcsutils": "^1.0.0-rc1", + "phpspec/prophecy-phpunit": "^2.0", + "phpstan/extension-installer": "^1.2", + "phpstan/phpstan": "^1.9", + "phpstan/phpstan-mockery": "^1.1", + "phpstan/phpstan-phpunit": "^1.3", + "phpunit/phpunit": "^9.5", + "psalm/plugin-mockery": "^1.1", + "psalm/plugin-phpunit": "^0.18.4", + "ramsey/coding-standard": "^2.0.3", + "ramsey/conventional-commits": "^1.3", + "vimeo/psalm": "^5.4" + }, + "type": "library", + "extra": { + "captainhook": { + "force-install": true + }, + "ramsey/conventional-commits": { + "configFile": "conventional-commits.json" + } + }, + "autoload": { + "psr-4": { + "Ramsey\\Collection\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ben Ramsey", + "email": "ben@benramsey.com", + "homepage": "https://benramsey.com" + } + ], + "description": "A PHP library for representing and manipulating collections.", + "keywords": [ + "array", + "collection", + "hash", + "map", + "queue", + "set" + ], + "support": { + "issues": "https://github.com/ramsey/collection/issues", + "source": "https://github.com/ramsey/collection/tree/2.0.0" + }, + "funding": [ + { + "url": "https://github.com/ramsey", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/ramsey/collection", + "type": "tidelift" + } + ], + "time": "2022-12-31T21:50:55+00:00" + }, { "name": "ramsey/uuid", - "version": "2.9.0", + "version": "4.7.5", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "b2ef4dd9584268d73f92f752a62bc24cd534dc9a" + "reference": "5f0df49ae5ad6efb7afa69e6bfab4e5b1e080d8e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/b2ef4dd9584268d73f92f752a62bc24cd534dc9a", - "reference": "b2ef4dd9584268d73f92f752a62bc24cd534dc9a", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/5f0df49ae5ad6efb7afa69e6bfab4e5b1e080d8e", + "reference": "5f0df49ae5ad6efb7afa69e6bfab4e5b1e080d8e", "shasum": "" }, "require": { - "paragonie/random_compat": "^1.0|^2.0", - "php": ">=5.3.3" + "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11", + "ext-json": "*", + "php": "^8.0", + "ramsey/collection": "^1.2 || ^2.0" }, "replace": { "rhumsaa/uuid": "self.version" }, "require-dev": { - "doctrine/dbal": ">=2.3", - "jakub-onderka/php-parallel-lint": "^0.9.0", - "moontoast/math": "~1.1", - "phpunit/phpunit": "~4.1|~5.0", - "satooshi/php-coveralls": "~0.6", - "squizlabs/php_codesniffer": "^2.3", - "symfony/console": "~2.3|~3.0" + "captainhook/captainhook": "^5.10", + "captainhook/plugin-composer": "^5.3", + "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", + "doctrine/annotations": "^1.8", + "ergebnis/composer-normalize": "^2.15", + "mockery/mockery": "^1.3", + "paragonie/random-lib": "^2", + "php-mock/php-mock": "^2.2", + "php-mock/php-mock-mockery": "^1.3", + "php-parallel-lint/php-parallel-lint": "^1.1", + "phpbench/phpbench": "^1.0", + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-mockery": "^1.1", + "phpstan/phpstan-phpunit": "^1.1", + "phpunit/phpunit": "^8.5 || ^9", + "ramsey/composer-repl": "^1.4", + "slevomat/coding-standard": "^8.4", + "squizlabs/php_codesniffer": "^3.5", + "vimeo/psalm": "^4.9" }, "suggest": { - "doctrine/dbal": "Allow the use of a UUID as doctrine field type.", - "moontoast/math": "Support for converting UUID to 128-bit integer (in string form).", - "symfony/console": "Support for use of the bin/uuid command line tool." + "ext-bcmath": "Enables faster math with arbitrary-precision integers using BCMath.", + "ext-gmp": "Enables faster math with arbitrary-precision integers using GMP.", + "ext-uuid": "Enables the use of PeclUuidTimeGenerator and PeclUuidRandomGenerator.", + "paragonie/random-lib": "Provides RandomLib for use with the RandomLibAdapter", + "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type." }, - "bin": [ - "bin/uuid" - ], "type": "library", + "extra": { + "captainhook": { + "force-install": true + } + }, "autoload": { + "files": [ + "src/functions.php" + ], "psr-4": { - "Rhumsaa\\Uuid\\": "src/" + "Ramsey\\Uuid\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], - "authors": [ - { - "name": "Ben Ramsey", - "homepage": "http://benramsey.com" - }, - { - "name": "Marijn Huizendveld", - "email": "marijn.huizendveld@gmail.com" - } - ], - "description": "A PHP 5.3+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).", - "homepage": "https://github.com/ramsey/uuid", + "description": "A PHP library for generating and working with universally unique identifiers (UUIDs).", "keywords": [ "guid", "identifier", @@ -3324,7 +3607,7 @@ ], "support": { "issues": "https://github.com/ramsey/uuid/issues", - "source": "https://github.com/ramsey/uuid" + "source": "https://github.com/ramsey/uuid/tree/4.7.5" }, "funding": [ { @@ -3336,7 +3619,7 @@ "type": "tidelift" } ], - "time": "2016-03-22T18:20:19+00:00" + "time": "2023-11-08T05:53:05+00:00" }, { "name": "robrichards/xmlseclibs", @@ -3382,51 +3665,51 @@ }, { "name": "sensio/framework-extra-bundle", - "version": "v5.5.7", + "version": "v6.2.10", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "6c0fa4e0e6dc3be90f7b40fa832aa47ec7dd801a" + "reference": "2f886f4b31f23c76496901acaedfedb6936ba61f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/6c0fa4e0e6dc3be90f7b40fa832aa47ec7dd801a", - "reference": "6c0fa4e0e6dc3be90f7b40fa832aa47ec7dd801a", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/2f886f4b31f23c76496901acaedfedb6936ba61f", + "reference": "2f886f4b31f23c76496901acaedfedb6936ba61f", "shasum": "" }, "require": { - "doctrine/annotations": "^1.0", - "php": ">=7.1.3", - "symfony/config": "^4.4|^5.0", - "symfony/dependency-injection": "^4.4|^5.0", - "symfony/framework-bundle": "^4.4|^5.0", - "symfony/http-kernel": "^4.4|^5.0" + "doctrine/annotations": "^1.0|^2.0", + "php": ">=7.2.5", + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/framework-bundle": "^4.4|^5.0|^6.0", + "symfony/http-kernel": "^4.4|^5.0|^6.0" }, "conflict": { "doctrine/doctrine-cache-bundle": "<1.3.1", "doctrine/persistence": "<1.3" }, "require-dev": { + "doctrine/dbal": "^2.10|^3.0", "doctrine/doctrine-bundle": "^1.11|^2.0", "doctrine/orm": "^2.5", - "nyholm/psr7": "^1.1", - "symfony/browser-kit": "^4.4|^5.0", - "symfony/dom-crawler": "^4.4|^5.0", - "symfony/expression-language": "^4.4|^5.0", - "symfony/finder": "^4.4|^5.0", - "symfony/monolog-bridge": "^4.0|^5.0", + "symfony/browser-kit": "^4.4|^5.0|^6.0", + "symfony/doctrine-bridge": "^4.4|^5.0|^6.0", + "symfony/dom-crawler": "^4.4|^5.0|^6.0", + "symfony/expression-language": "^4.4|^5.0|^6.0", + "symfony/finder": "^4.4|^5.0|^6.0", + "symfony/monolog-bridge": "^4.0|^5.0|^6.0", "symfony/monolog-bundle": "^3.2", - "symfony/phpunit-bridge": "^4.3.5|^5.0", - "symfony/psr-http-message-bridge": "^1.1", - "symfony/security-bundle": "^4.4|^5.0", - "symfony/twig-bundle": "^4.4|^5.0", - "symfony/yaml": "^4.4|^5.0", + "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0", + "symfony/security-bundle": "^4.4|^5.0|^6.0", + "symfony/twig-bundle": "^4.4|^5.0|^6.0", + "symfony/yaml": "^4.4|^5.0|^6.0", "twig/twig": "^1.34|^2.4|^3.0" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "5.5.x-dev" + "dev-master": "6.1.x-dev" } }, "autoload": { @@ -3453,54 +3736,50 @@ "controllers" ], "support": { - "issues": "https://github.com/sensiolabs/SensioFrameworkExtraBundle/issues", - "source": "https://github.com/sensiolabs/SensioFrameworkExtraBundle/tree/v5.5.7" + "source": "https://github.com/sensiolabs/SensioFrameworkExtraBundle/tree/v6.2.10" }, "abandoned": "Symfony", - "time": "2020-09-05T14:06:05+00:00" + "time": "2023-02-24T14:57:12+00:00" }, { "name": "simplesamlphp/saml2", - "version": "v3.2.6", + "version": "v4.6.11", "source": { "type": "git", "url": "https://github.com/simplesamlphp/saml2.git", - "reference": "a56e46ef8e0c5245a4ca7facc3d308b493215751" + "reference": "1b5d48753c78d02e88667068e633531c233141fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/simplesamlphp/saml2/zipball/a56e46ef8e0c5245a4ca7facc3d308b493215751", - "reference": "a56e46ef8e0c5245a4ca7facc3d308b493215751", + "url": "https://api.github.com/repos/simplesamlphp/saml2/zipball/1b5d48753c78d02e88667068e633531c233141fb", + "reference": "1b5d48753c78d02e88667068e633531c233141fb", "shasum": "" }, "require": { "ext-dom": "*", "ext-openssl": "*", "ext-zlib": "*", - "php": ">=5.4", - "psr/log": "~1.0", - "robrichards/xmlseclibs": "^3.0" + "php": ">=7.1 || ^8.0", + "psr/log": "~1.1 || ^2.0 || ^3.0", + "robrichards/xmlseclibs": "^3.1.1", + "webmozart/assert": "^1.9" }, "require-dev": { - "mockery/mockery": "~0.9", - "phpmd/phpmd": "~1.5", - "phpunit/phpunit": "~4", - "sebastian/phpcpd": "~1.4", - "sensiolabs/security-checker": "~1.1", - "squizlabs/php_codesniffer": "~1.4" + "mockery/mockery": "^1.3", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "sebastian/phpcpd": "~4.1 || ^5.0 || ^6.0", + "simplesamlphp/simplesamlphp-test-framework": "~0.1.0", + "squizlabs/php_codesniffer": "~3.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "v3.1.x-dev" + "dev-master": "v4.2.x-dev" } }, "autoload": { - "files": [ - "src/_autoload.php" - ], - "psr-0": { - "SAML2\\": "src/" + "psr-4": { + "SAML2\\": "src/SAML2" } }, "notification-url": "https://packagist.org/downloads/", @@ -3516,51 +3795,60 @@ "description": "SAML2 PHP library from SimpleSAMLphp", "support": { "issues": "https://github.com/simplesamlphp/saml2/issues", - "source": "https://github.com/simplesamlphp/saml2/tree/master" + "source": "https://github.com/simplesamlphp/saml2/tree/v4.6.11" }, - "time": "2018-11-20T11:11:28+00:00" + "time": "2024-01-25T19:39:46+00:00" }, { "name": "surfnet/stepup-bundle", - "version": "4.2.6", + "version": "6.0.13", "source": { "type": "git", "url": "https://github.com/OpenConext/Stepup-bundle.git", - "reference": "c7239a4bff489cc40ebb0dd34c5326d5dfac5046" + "reference": "c555705d44d8a6c201adefb2e8f26cd61e2d9522" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/OpenConext/Stepup-bundle/zipball/c7239a4bff489cc40ebb0dd34c5326d5dfac5046", - "reference": "c7239a4bff489cc40ebb0dd34c5326d5dfac5046", + "url": "https://api.github.com/repos/OpenConext/Stepup-bundle/zipball/c555705d44d8a6c201adefb2e8f26cd61e2d9522", + "reference": "c555705d44d8a6c201adefb2e8f26cd61e2d9522", "shasum": "" }, "require": { "ext-gmp": "*", "ext-json": "*", "ext-openssl": "*", - "guzzlehttp/guzzle": "^6.0", - "monolog/monolog": "~1.11", - "php": "^7.2", - "sensio/framework-extra-bundle": "^5.4", - "surfnet/stepup-saml-bundle": "^4.1.8", - "symfony/config": "^4.4", - "symfony/dependency-injection": "^4.4", - "symfony/form": "^4.4", - "symfony/framework-bundle": "^4.4", - "symfony/http-kernel": "^4.4", - "symfony/twig-bridge": "^4.4", - "symfony/validator": "^4.4" + "guzzlehttp/guzzle": "^7.8", + "monolog/monolog": "^3", + "php": "^8.2", + "surfnet/stepup-saml-bundle": "^6.0", + "symfony/config": "^5.4|^6.3", + "symfony/dependency-injection": "^5.4|^6.3", + "symfony/form": "^5.4|^6.3", + "symfony/framework-bundle": "^5.4|^6.3", + "symfony/http-kernel": "^5.4|^6.3", + "symfony/twig-bridge": "^5.4|^6.3", + "symfony/validator": "^5.4|^6.3" }, "require-dev": { - "mockery/mockery": "^1.3", - "phpmd/phpmd": "^2.0", - "phpunit/phpunit": "^8.0", - "sebastian/phpcpd": "^4.0", - "sensiolabs/security-checker": "^5.0", - "squizlabs/php_codesniffer": "^3.4", - "symfony/phpunit-bridge": "^4.4" + "mockery/mockery": "^1.5", + "overtrue/phplint": "*", + "phpmd/phpmd": "^2.13", + "phpstan/phpstan": "^1.10", + "phpstan/phpstan-symfony": "^1.3", + "phpunit/phpunit": "^9.6", + "sebastian/phpcpd": "^6.0", + "slevomat/coding-standard": "^8.13", + "squizlabs/php_codesniffer": "^3.7.1", + "symfony/phpunit-bridge": "^5.4|^6.3" }, "type": "library", + "extra": { + "phpstan": { + "includes": [ + "./ci/qa/extension.neon" + ] + } + }, "autoload": { "psr-4": { "Surfnet\\StepupBundle\\": "src" @@ -3570,55 +3858,67 @@ "license": [ "Apache-2.0" ], - "description": "A Symfony 3 bundle (with Symfony 4.3 support) that holds shared code and framework integration for all Step-up applications.", + "description": "A Symfony 5|6 bundle that holds shared code and framework integration for all Step-up applications.", "keywords": [ "stepup", - "suaas", - "surfnet" + "surf", + "surf secure id" ], "support": { "issues": "https://github.com/OpenConext/Stepup-bundle/issues", - "source": "https://github.com/OpenConext/Stepup-bundle/tree/4.2.6" + "source": "https://github.com/OpenConext/Stepup-bundle/tree/6.0.13" }, - "time": "2023-02-16T15:19:16+00:00" + "time": "2024-02-28T14:43:12+00:00" }, { "name": "surfnet/stepup-saml-bundle", - "version": "4.4.3", + "version": "6.0.19", "source": { "type": "git", "url": "https://github.com/OpenConext/Stepup-saml-bundle.git", - "reference": "e3f2bc55e876bbd4c40caa9235eb78a79a8d9651" + "reference": "f6f9b822bbab51322e2fd03ca90d22895233311c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/OpenConext/Stepup-saml-bundle/zipball/e3f2bc55e876bbd4c40caa9235eb78a79a8d9651", - "reference": "e3f2bc55e876bbd4c40caa9235eb78a79a8d9651", + "url": "https://api.github.com/repos/OpenConext/Stepup-saml-bundle/zipball/f6f9b822bbab51322e2fd03ca90d22895233311c", + "reference": "f6f9b822bbab51322e2fd03ca90d22895233311c", "shasum": "" }, "require": { "ext-dom": "*", "ext-openssl": "*", - "php": ">=7.2,<8.0-dev", - "robrichards/xmlseclibs": "^3.0.4", - "simplesamlphp/saml2": "3.2.*", - "symfony/dependency-injection": "^4.4", - "symfony/framework-bundle": "^4.4", - "symfony/templating": "^4.4", - "twig/twig": "^2" + "php": "^8.1", + "robrichards/xmlseclibs": "^3.1.1", + "simplesamlphp/saml2": "^4.6", + "symfony/dependency-injection": "^6.3", + "symfony/framework-bundle": "^6.3", + "symfony/security-bundle": "^6.3", + "symfony/templating": "^6.3", + "twig/twig": "^3" }, "require-dev": { - "jasny/phpunit-xsdvalidation": "^1.0", - "mockery/mockery": "~0.9", + "ext-zlib": "*", + "mbhsoft/phpunit-xsdvalidation": "^3.0", + "mockery/mockery": "^1.5", + "overtrue/phplint": "*", "phpmd/phpmd": "^2.6", - "phpunit/phpunit": "^5.7", + "phpstan/extension-installer": "^1.3", + "phpstan/phpstan": "^1.10", + "phpunit/phpunit": "^9.5", "psr/log": "~1.0", - "sebastian/exporter": "~2.0", - "sebastian/phpcpd": "^2.0", - "squizlabs/php_codesniffer": "^3.0", - "symfony/phpunit-bridge": "^4.4" + "sebastian/exporter": "^4.0.5", + "sebastian/phpcpd": "^6.0", + "squizlabs/php_codesniffer": "^3.7.1", + "symfony/phpunit-bridge": "^6.3" }, "type": "symfony-bundle", + "extra": { + "phpstan": { + "includes": [ + "./ci/qa/extension.neon" + ] + } + }, "autoload": { "psr-4": { "Surfnet\\SamlBundle\\": "src" @@ -3628,7 +3928,7 @@ "license": [ "Apache-2.0" ], - "description": "A Symfony 4 bundle that integrates the simplesamlphp\\saml2 library with Symfony.", + "description": "A Symfony 6 bundle that integrates the simplesamlphp\\saml2 library with Symfony.", "keywords": [ "SAML2", "saml", @@ -3638,34 +3938,34 @@ ], "support": { "issues": "https://github.com/OpenConext/Stepup-saml-bundle/issues", - "source": "https://github.com/OpenConext/Stepup-saml-bundle/tree/4.4.3" + "source": "https://github.com/OpenConext/Stepup-saml-bundle/tree/6.0.19" }, - "time": "2023-05-15T08:05:57+00:00" + "time": "2024-02-21T15:22:54+00:00" }, { "name": "symfony/asset", - "version": "v4.4.46", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/asset.git", - "reference": "6ef0f9f352f90c469e8b363ebc038d81a7198873" + "reference": "14b1c0fddb64af6ea626af51bb3c47af9fa19cb7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/asset/zipball/6ef0f9f352f90c469e8b363ebc038d81a7198873", - "reference": "6ef0f9f352f90c469e8b363ebc038d81a7198873", + "url": "https://api.github.com/repos/symfony/asset/zipball/14b1c0fddb64af6ea626af51bb3c47af9fa19cb7", + "reference": "14b1c0fddb64af6ea626af51bb3c47af9fa19cb7", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/polyfill-php80": "^1.16" + "php": ">=8.1" }, - "require-dev": { - "symfony/http-foundation": "^3.4|^4.0|^5.0", - "symfony/http-kernel": "^3.4|^4.0|^5.0" + "conflict": { + "symfony/http-foundation": "<5.4" }, - "suggest": { - "symfony/http-foundation": "" + "require-dev": { + "symfony/http-client": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^5.4|^6.0|^7.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -3693,7 +3993,7 @@ "description": "Manages URL generation and versioning of web assets such as CSS stylesheets, JavaScript files and image files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/asset/tree/v4.4.46" + "source": "https://github.com/symfony/asset/tree/v6.4.3" }, "funding": [ { @@ -3709,60 +4009,61 @@ "type": "tidelift" } ], - "time": "2022-08-30T22:05:24+00:00" + "time": "2024-01-23T14:51:35+00:00" }, { "name": "symfony/cache", - "version": "v4.4.48", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "3b98ed664887ad197b8ede3da2432787212eb915" + "reference": "0ef36534694c572ff526d91c7181f3edede176e7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/3b98ed664887ad197b8ede3da2432787212eb915", - "reference": "3b98ed664887ad197b8ede3da2432787212eb915", + "url": "https://api.github.com/repos/symfony/cache/zipball/0ef36534694c572ff526d91c7181f3edede176e7", + "reference": "0ef36534694c572ff526d91c7181f3edede176e7", "shasum": "" }, "require": { - "php": ">=7.1.3", - "psr/cache": "^1.0|^2.0", - "psr/log": "^1|^2|^3", - "symfony/cache-contracts": "^1.1.7|^2", - "symfony/polyfill-php73": "^1.9", - "symfony/polyfill-php80": "^1.16", - "symfony/service-contracts": "^1.1|^2", - "symfony/var-exporter": "^4.2|^5.0" + "php": ">=8.1", + "psr/cache": "^2.0|^3.0", + "psr/log": "^1.1|^2|^3", + "symfony/cache-contracts": "^2.5|^3", + "symfony/service-contracts": "^2.5|^3", + "symfony/var-exporter": "^6.3.6|^7.0" }, "conflict": { - "doctrine/dbal": "<2.7", - "symfony/dependency-injection": "<3.4", - "symfony/http-kernel": "<4.4|>=5.0", - "symfony/var-dumper": "<4.4" + "doctrine/dbal": "<2.13.1", + "symfony/dependency-injection": "<5.4", + "symfony/http-kernel": "<5.4", + "symfony/var-dumper": "<5.4" }, "provide": { - "psr/cache-implementation": "1.0|2.0", - "psr/simple-cache-implementation": "1.0|2.0", - "symfony/cache-implementation": "1.0|2.0" + "psr/cache-implementation": "2.0|3.0", + "psr/simple-cache-implementation": "1.0|2.0|3.0", + "symfony/cache-implementation": "1.1|2.0|3.0" }, "require-dev": { "cache/integration-tests": "dev-master", - "doctrine/cache": "^1.6|^2.0", - "doctrine/dbal": "^2.7|^3.0", - "predis/predis": "^1.1", - "psr/simple-cache": "^1.0|^2.0", - "symfony/config": "^4.2|^5.0", - "symfony/dependency-injection": "^3.4|^4.1|^5.0", - "symfony/filesystem": "^4.4|^5.0", - "symfony/http-kernel": "^4.4", - "symfony/var-dumper": "^4.4|^5.0" + "doctrine/dbal": "^2.13.1|^3|^4", + "predis/predis": "^1.1|^2.0", + "psr/simple-cache": "^1.0|^2.0|^3.0", + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/filesystem": "^5.4|^6.0|^7.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/var-dumper": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { "psr-4": { "Symfony\\Component\\Cache\\": "" }, + "classmap": [ + "Traits/ValueWrapper.php" + ], "exclude-from-classmap": [ "/Tests/" ] @@ -3788,7 +4089,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v4.4.48" + "source": "https://github.com/symfony/cache/tree/v6.4.4" }, "funding": [ { @@ -3804,33 +4105,30 @@ "type": "tidelift" } ], - "time": "2022-10-17T20:21:54+00:00" + "time": "2024-02-22T20:27:10+00:00" }, { "name": "symfony/cache-contracts", - "version": "v1.10.0", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/symfony/cache-contracts.git", - "reference": "a872a66e0bf7bac179c89bc96c7098bef1949f81" + "reference": "1d74b127da04ffa87aa940abe15446fa89653778" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/a872a66e0bf7bac179c89bc96c7098bef1949f81", - "reference": "a872a66e0bf7bac179c89bc96c7098bef1949f81", + "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/1d74b127da04ffa87aa940abe15446fa89653778", + "reference": "1d74b127da04ffa87aa940abe15446fa89653778", "shasum": "" }, "require": { - "php": ">=7.1.3", - "psr/cache": "^1.0|^2.0|^3.0" - }, - "suggest": { - "symfony/cache-implementation": "" + "php": ">=8.1", + "psr/cache": "^3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.1-dev" + "dev-main": "3.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -3867,7 +4165,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/cache-contracts/tree/v1.10.0" + "source": "https://github.com/symfony/cache-contracts/tree/v3.4.0" }, "funding": [ { @@ -3883,46 +4181,37 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:41:36+00:00" + "time": "2023-09-25T12:52:38+00:00" }, { - "name": "symfony/config", - "version": "v4.4.44", + "name": "symfony/clock", + "version": "v6.4.3", "source": { "type": "git", - "url": "https://github.com/symfony/config.git", - "reference": "ed42f8f9da528d2c6cae36fe1f380b0c1d8f0658" + "url": "https://github.com/symfony/clock.git", + "reference": "f48770105c544001da00b8d745873a628e0de198" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/ed42f8f9da528d2c6cae36fe1f380b0c1d8f0658", - "reference": "ed42f8f9da528d2c6cae36fe1f380b0c1d8f0658", + "url": "https://api.github.com/repos/symfony/clock/zipball/f48770105c544001da00b8d745873a628e0de198", + "reference": "f48770105c544001da00b8d745873a628e0de198", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/filesystem": "^3.4|^4.0|^5.0", - "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-php80": "^1.16", - "symfony/polyfill-php81": "^1.22" - }, - "conflict": { - "symfony/finder": "<3.4" - }, - "require-dev": { - "symfony/event-dispatcher": "^3.4|^4.0|^5.0", - "symfony/finder": "^3.4|^4.0|^5.0", - "symfony/messenger": "^4.1|^5.0", - "symfony/service-contracts": "^1.1|^2", - "symfony/yaml": "^3.4|^4.0|^5.0" + "php": ">=8.1", + "psr/clock": "^1.0", + "symfony/polyfill-php83": "^1.28" }, - "suggest": { - "symfony/yaml": "To use the yaml reference dumper" + "provide": { + "psr/clock-implementation": "1.0" }, "type": "library", "autoload": { + "files": [ + "Resources/now.php" + ], "psr-4": { - "Symfony\\Component\\Config\\": "" + "Symfony\\Component\\Clock\\": "" }, "exclude-from-classmap": [ "/Tests/" @@ -3934,18 +4223,23 @@ ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", + "description": "Decouples applications from the system clock", "homepage": "https://symfony.com", + "keywords": [ + "clock", + "psr20", + "time" + ], "support": { - "source": "https://github.com/symfony/config/tree/v4.4.44" + "source": "https://github.com/symfony/clock/tree/v6.4.3" }, "funding": [ { @@ -3961,58 +4255,43 @@ "type": "tidelift" } ], - "time": "2022-07-20T09:59:04+00:00" + "time": "2024-01-23T14:51:35+00:00" }, { - "name": "symfony/console", - "version": "v4.4.49", + "name": "symfony/config", + "version": "v6.4.4", "source": { "type": "git", - "url": "https://github.com/symfony/console.git", - "reference": "33fa45ffc81fdcc1ca368d4946da859c8cdb58d9" + "url": "https://github.com/symfony/config.git", + "reference": "6ea4affc27f2086c9d16b92ab5429ce1e3c38047" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/33fa45ffc81fdcc1ca368d4946da859c8cdb58d9", - "reference": "33fa45ffc81fdcc1ca368d4946da859c8cdb58d9", + "url": "https://api.github.com/repos/symfony/config/zipball/6ea4affc27f2086c9d16b92ab5429ce1e3c38047", + "reference": "6ea4affc27f2086c9d16b92ab5429ce1e3c38047", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php73": "^1.8", - "symfony/polyfill-php80": "^1.16", - "symfony/service-contracts": "^1.1|^2" + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/filesystem": "^5.4|^6.0|^7.0", + "symfony/polyfill-ctype": "~1.8" }, "conflict": { - "psr/log": ">=3", - "symfony/dependency-injection": "<3.4", - "symfony/event-dispatcher": "<4.3|>=5", - "symfony/lock": "<4.4", - "symfony/process": "<3.3" - }, - "provide": { - "psr/log-implementation": "1.0|2.0" + "symfony/finder": "<5.4", + "symfony/service-contracts": "<2.5" }, "require-dev": { - "psr/log": "^1|^2", - "symfony/config": "^3.4|^4.0|^5.0", - "symfony/dependency-injection": "^3.4|^4.0|^5.0", - "symfony/event-dispatcher": "^4.3", - "symfony/lock": "^4.4|^5.0", - "symfony/process": "^3.4|^4.0|^5.0", - "symfony/var-dumper": "^4.3|^5.0" - }, - "suggest": { - "psr/log": "For using the console logger", - "symfony/event-dispatcher": "", - "symfony/lock": "", - "symfony/process": "" + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/finder": "^5.4|^6.0|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/service-contracts": "^2.5|^3", + "symfony/yaml": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { "psr-4": { - "Symfony\\Component\\Console\\": "" + "Symfony\\Component\\Config\\": "" }, "exclude-from-classmap": [ "/Tests/" @@ -4032,10 +4311,10 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Eases the creation of beautiful and testable command line interfaces", + "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/console/tree/v4.4.49" + "source": "https://github.com/symfony/config/tree/v6.4.4" }, "funding": [ { @@ -4051,36 +4330,56 @@ "type": "tidelift" } ], - "time": "2022-11-05T17:10:16+00:00" + "time": "2024-02-26T07:52:26+00:00" }, { - "name": "symfony/debug", - "version": "v4.4.44", + "name": "symfony/console", + "version": "v6.4.4", "source": { "type": "git", - "url": "https://github.com/symfony/debug.git", - "reference": "1a692492190773c5310bc7877cb590c04c2f05be" + "url": "https://github.com/symfony/console.git", + "reference": "0d9e4eb5ad413075624378f474c4167ea202de78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/1a692492190773c5310bc7877cb590c04c2f05be", - "reference": "1a692492190773c5310bc7877cb590c04c2f05be", + "url": "https://api.github.com/repos/symfony/console/zipball/0d9e4eb5ad413075624378f474c4167ea202de78", + "reference": "0d9e4eb5ad413075624378f474c4167ea202de78", "shasum": "" }, "require": { - "php": ">=7.1.3", - "psr/log": "^1|^2|^3" + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/polyfill-mbstring": "~1.0", + "symfony/service-contracts": "^2.5|^3", + "symfony/string": "^5.4|^6.0|^7.0" }, "conflict": { - "symfony/http-kernel": "<3.4" + "symfony/dependency-injection": "<5.4", + "symfony/dotenv": "<5.4", + "symfony/event-dispatcher": "<5.4", + "symfony/lock": "<5.4", + "symfony/process": "<5.4" + }, + "provide": { + "psr/log-implementation": "1.0|2.0|3.0" }, "require-dev": { - "symfony/http-kernel": "^3.4|^4.0|^5.0" + "psr/log": "^1|^2|^3", + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^6.4|^7.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/lock": "^5.4|^6.0|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/stopwatch": "^5.4|^6.0|^7.0", + "symfony/var-dumper": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { "psr-4": { - "Symfony\\Component\\Debug\\": "" + "Symfony\\Component\\Console\\": "" }, "exclude-from-classmap": [ "/Tests/" @@ -4100,10 +4399,16 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Provides tools to ease debugging PHP code", + "description": "Eases the creation of beautiful and testable command line interfaces", "homepage": "https://symfony.com", + "keywords": [ + "cli", + "command-line", + "console", + "terminal" + ], "support": { - "source": "https://github.com/symfony/debug/tree/v4.4.44" + "source": "https://github.com/symfony/console/tree/v6.4.4" }, "funding": [ { @@ -4119,50 +4424,44 @@ "type": "tidelift" } ], - "abandoned": "symfony/error-handler", - "time": "2022-07-28T16:29:46+00:00" + "time": "2024-02-22T20:27:10+00:00" }, { "name": "symfony/dependency-injection", - "version": "v4.4.49", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "9065fe97dbd38a897e95ea254eb5ddfe1310f734" + "reference": "6236e5e843cb763e9d0f74245678b994afea5363" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/9065fe97dbd38a897e95ea254eb5ddfe1310f734", - "reference": "9065fe97dbd38a897e95ea254eb5ddfe1310f734", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/6236e5e843cb763e9d0f74245678b994afea5363", + "reference": "6236e5e843cb763e9d0f74245678b994afea5363", "shasum": "" }, "require": { - "php": ">=7.1.3", - "psr/container": "^1.0", - "symfony/polyfill-php80": "^1.16", - "symfony/service-contracts": "^1.1.6|^2" + "php": ">=8.1", + "psr/container": "^1.1|^2.0", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/service-contracts": "^2.5|^3.0", + "symfony/var-exporter": "^6.2.10|^7.0" }, "conflict": { - "symfony/config": "<4.3|>=5.0", - "symfony/finder": "<3.4", - "symfony/proxy-manager-bridge": "<3.4", - "symfony/yaml": "<4.4.26" + "ext-psr": "<1.1|>=2", + "symfony/config": "<6.1", + "symfony/finder": "<5.4", + "symfony/proxy-manager-bridge": "<6.3", + "symfony/yaml": "<5.4" }, "provide": { - "psr/container-implementation": "1.0", - "symfony/service-implementation": "1.0|2.0" + "psr/container-implementation": "1.1|2.0", + "symfony/service-implementation": "1.1|2.0|3.0" }, "require-dev": { - "symfony/config": "^4.3", - "symfony/expression-language": "^3.4|^4.0|^5.0", - "symfony/yaml": "^4.4.26|^5.0" - }, - "suggest": { - "symfony/config": "", - "symfony/expression-language": "For using expressions in service container configuration", - "symfony/finder": "For using double-star glob patterns or when GLOB_BRACE portability is required", - "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them", - "symfony/yaml": "" + "symfony/config": "^6.1|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/yaml": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -4190,7 +4489,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v4.4.49" + "source": "https://github.com/symfony/dependency-injection/tree/v6.4.4" }, "funding": [ { @@ -4206,29 +4505,29 @@ "type": "tidelift" } ], - "time": "2022-11-16T16:18:09+00:00" + "time": "2024-02-22T20:27:10+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v2.5.2", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" + "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf", + "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=8.1" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "2.5-dev" + "dev-main": "3.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -4257,7 +4556,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0" }, "funding": [ { @@ -4273,73 +4572,71 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2023-05-23T14:45:45+00:00" }, { "name": "symfony/doctrine-bridge", - "version": "v4.4.48", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/doctrine-bridge.git", - "reference": "8dbbec53714eb512321380d582b45ff7e074a5d6" + "reference": "e4fb1e141b00cee5de8b8a2fe7008301b6b4dabd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/doctrine-bridge/zipball/8dbbec53714eb512321380d582b45ff7e074a5d6", - "reference": "8dbbec53714eb512321380d582b45ff7e074a5d6", + "url": "https://api.github.com/repos/symfony/doctrine-bridge/zipball/e4fb1e141b00cee5de8b8a2fe7008301b6b4dabd", + "reference": "e4fb1e141b00cee5de8b8a2fe7008301b6b4dabd", "shasum": "" }, "require": { - "doctrine/event-manager": "~1.0", - "doctrine/persistence": "^1.3|^2|^3", - "php": ">=7.1.3", + "doctrine/event-manager": "^1.2|^2", + "doctrine/persistence": "^3.1", + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php80": "^1.16", - "symfony/service-contracts": "^1.1|^2" + "symfony/service-contracts": "^2.5|^3" }, "conflict": { - "doctrine/dbal": "<2.7", + "doctrine/dbal": "<2.13.1", "doctrine/lexer": "<1.1", - "doctrine/orm": "<2.6.3", - "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0", - "symfony/dependency-injection": "<3.4", - "symfony/form": "<4.4", - "symfony/http-kernel": "<4.3.7", - "symfony/messenger": "<4.3", - "symfony/proxy-manager-bridge": "<4.4.19", - "symfony/security-core": "<4.4", - "symfony/validator": "<4.4.2|<5.0.2,>=5.0" + "doctrine/orm": "<2.15", + "symfony/cache": "<5.4", + "symfony/dependency-injection": "<6.2", + "symfony/form": "<5.4.21|>=6,<6.2.7", + "symfony/http-foundation": "<6.3", + "symfony/http-kernel": "<6.2", + "symfony/lock": "<6.3", + "symfony/messenger": "<5.4", + "symfony/property-info": "<5.4", + "symfony/security-bundle": "<5.4", + "symfony/security-core": "<6.4", + "symfony/validator": "<6.4" }, "require-dev": { - "composer/package-versions-deprecated": "^1.8", - "doctrine/annotations": "^1.10.4", - "doctrine/collections": "~1.0", + "doctrine/collections": "^1.0|^2.0", "doctrine/data-fixtures": "^1.1", - "doctrine/dbal": "^2.7|^3.0", - "doctrine/orm": "^2.6.3", - "symfony/config": "^4.2|^5.0", - "symfony/dependency-injection": "^3.4|^4.0|^5.0", - "symfony/expression-language": "^3.4|^4.0|^5.0", - "symfony/form": "^4.4.41|^5.0.11", - "symfony/http-kernel": "^4.3.7", - "symfony/messenger": "^4.4|^5.0", - "symfony/property-access": "^3.4|^4.0|^5.0", - "symfony/property-info": "^3.4|^4.0|^5.0", - "symfony/proxy-manager-bridge": "^3.4|^4.0|^5.0", - "symfony/security-core": "^4.4|^5.0", - "symfony/stopwatch": "^3.4|^4.0|^5.0", - "symfony/translation": "^3.4|^4.0|^5.0", - "symfony/validator": "^4.4.2|^5.0.2", - "symfony/var-dumper": "^3.4|^4.0|^5.0" - }, - "suggest": { - "doctrine/data-fixtures": "", - "doctrine/dbal": "", - "doctrine/orm": "", - "symfony/form": "", - "symfony/property-info": "", - "symfony/validator": "" + "doctrine/dbal": "^2.13.1|^3|^4", + "doctrine/orm": "^2.15|^3", + "psr/log": "^1|^2|^3", + "symfony/cache": "^5.4|^6.0|^7.0", + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^6.2|^7.0", + "symfony/doctrine-messenger": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/form": "^5.4.21|^6.2.7|^7.0", + "symfony/http-kernel": "^6.3|^7.0", + "symfony/lock": "^6.3|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/property-access": "^5.4|^6.0|^7.0", + "symfony/property-info": "^5.4|^6.0|^7.0", + "symfony/proxy-manager-bridge": "^6.4", + "symfony/security-core": "^6.4|^7.0", + "symfony/stopwatch": "^5.4|^6.0|^7.0", + "symfony/translation": "^5.4|^6.0|^7.0", + "symfony/uid": "^5.4|^6.0|^7.0", + "symfony/validator": "^6.4|^7.0", + "symfony/var-dumper": "^5.4|^6.0|^7.0" }, "type": "symfony-bridge", "autoload": { @@ -4367,7 +4664,7 @@ "description": "Provides integration for Doctrine with various Symfony components", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/doctrine-bridge/tree/v4.4.48" + "source": "https://github.com/symfony/doctrine-bridge/tree/v6.4.4" }, "funding": [ { @@ -4383,32 +4680,39 @@ "type": "tidelift" } ], - "time": "2022-10-14T11:24:01+00:00" + "time": "2024-02-05T08:03:21+00:00" }, { "name": "symfony/error-handler", - "version": "v4.4.44", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "be731658121ef2d8be88f3a1ec938148a9237291" + "reference": "c725219bdf2afc59423c32793d5019d2a904e13a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/be731658121ef2d8be88f3a1ec938148a9237291", - "reference": "be731658121ef2d8be88f3a1ec938148a9237291", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/c725219bdf2afc59423c32793d5019d2a904e13a", + "reference": "c725219bdf2afc59423c32793d5019d2a904e13a", "shasum": "" }, "require": { - "php": ">=7.1.3", + "php": ">=8.1", "psr/log": "^1|^2|^3", - "symfony/debug": "^4.4.5", - "symfony/var-dumper": "^4.4|^5.0" + "symfony/var-dumper": "^5.4|^6.0|^7.0" + }, + "conflict": { + "symfony/deprecation-contracts": "<2.5", + "symfony/http-kernel": "<6.4" }, "require-dev": { - "symfony/http-kernel": "^4.4|^5.0", - "symfony/serializer": "^4.4|^5.0" + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/serializer": "^5.4|^6.0|^7.0" }, + "bin": [ + "Resources/bin/patch-type-declarations" + ], "type": "library", "autoload": { "psr-4": { @@ -4435,7 +4739,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v4.4.44" + "source": "https://github.com/symfony/error-handler/tree/v6.4.4" }, "funding": [ { @@ -4451,47 +4755,43 @@ "type": "tidelift" } ], - "time": "2022-07-28T16:29:46+00:00" + "time": "2024-02-22T20:27:10+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.4.44", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "1e866e9e5c1b22168e0ce5f0b467f19bba61266a" + "reference": "ae9d3a6f3003a6caf56acd7466d8d52378d44fef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/1e866e9e5c1b22168e0ce5f0b467f19bba61266a", - "reference": "1e866e9e5c1b22168e0ce5f0b467f19bba61266a", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ae9d3a6f3003a6caf56acd7466d8d52378d44fef", + "reference": "ae9d3a6f3003a6caf56acd7466d8d52378d44fef", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/event-dispatcher-contracts": "^1.1", - "symfony/polyfill-php80": "^1.16" + "php": ">=8.1", + "symfony/event-dispatcher-contracts": "^2.5|^3" }, "conflict": { - "symfony/dependency-injection": "<3.4" + "symfony/dependency-injection": "<5.4", + "symfony/service-contracts": "<2.5" }, "provide": { "psr/event-dispatcher-implementation": "1.0", - "symfony/event-dispatcher-implementation": "1.1" + "symfony/event-dispatcher-implementation": "2.0|3.0" }, "require-dev": { "psr/log": "^1|^2|^3", - "symfony/config": "^3.4|^4.0|^5.0", - "symfony/dependency-injection": "^3.4|^4.0|^5.0", - "symfony/error-handler": "~3.4|~4.4", - "symfony/expression-language": "^3.4|^4.0|^5.0", - "symfony/http-foundation": "^3.4|^4.0|^5.0", - "symfony/service-contracts": "^1.1|^2", - "symfony/stopwatch": "^3.4|^4.0|^5.0" - }, - "suggest": { - "symfony/dependency-injection": "", - "symfony/http-kernel": "" + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/error-handler": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^5.4|^6.0|^7.0", + "symfony/service-contracts": "^2.5|^3", + "symfony/stopwatch": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -4519,7 +4819,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v4.4.44" + "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.3" }, "funding": [ { @@ -4535,33 +4835,30 @@ "type": "tidelift" } ], - "time": "2022-07-20T09:59:04+00:00" + "time": "2024-01-23T14:51:35+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v1.10.0", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "761c8b8387cfe5f8026594a75fdf0a4e83ba6974" + "reference": "a76aed96a42d2b521153fb382d418e30d18b59df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/761c8b8387cfe5f8026594a75fdf0a4e83ba6974", - "reference": "761c8b8387cfe5f8026594a75fdf0a4e83ba6974", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/a76aed96a42d2b521153fb382d418e30d18b59df", + "reference": "a76aed96a42d2b521153fb382d418e30d18b59df", "shasum": "" }, "require": { - "php": ">=7.1.3" - }, - "suggest": { - "psr/event-dispatcher": "", - "symfony/event-dispatcher-implementation": "" + "php": ">=8.1", + "psr/event-dispatcher": "^1" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.1-dev" + "dev-main": "3.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -4598,7 +4895,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.10.0" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.4.0" }, "funding": [ { @@ -4614,26 +4911,27 @@ "type": "tidelift" } ], - "time": "2022-07-20T09:59:04+00:00" + "time": "2023-05-23T14:45:45+00:00" }, { "name": "symfony/expression-language", - "version": "v4.4.47", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/expression-language.git", - "reference": "e4964c7636e19f6008660f450c09121c80c2a7b9" + "reference": "b4a4ae33fbb33a99d23c5698faaecadb76ad0fe4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/expression-language/zipball/e4964c7636e19f6008660f450c09121c80c2a7b9", - "reference": "e4964c7636e19f6008660f450c09121c80c2a7b9", + "url": "https://api.github.com/repos/symfony/expression-language/zipball/b4a4ae33fbb33a99d23c5698faaecadb76ad0fe4", + "reference": "b4a4ae33fbb33a99d23c5698faaecadb76ad0fe4", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/cache": "^3.4|^4.0|^5.0", - "symfony/service-contracts": "^1.1|^2" + "php": ">=8.1", + "symfony/cache": "^5.4|^6.0|^7.0", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/service-contracts": "^2.5|^3" }, "type": "library", "autoload": { @@ -4661,7 +4959,7 @@ "description": "Provides an engine that can compile and evaluate expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/expression-language/tree/v4.4.47" + "source": "https://github.com/symfony/expression-language/tree/v6.4.3" }, "funding": [ { @@ -4677,26 +4975,26 @@ "type": "tidelift" } ], - "time": "2022-10-03T15:15:11+00:00" + "time": "2024-01-23T14:51:35+00:00" }, { "name": "symfony/filesystem", - "version": "v4.4.42", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "815412ee8971209bd4c1eecd5f4f481eacd44bf5" + "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/815412ee8971209bd4c1eecd5f4f481eacd44bf5", - "reference": "815412ee8971209bd4c1eecd5f4f481eacd44bf5", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb", + "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb", "shasum": "" }, "require": { - "php": ">=7.1.3", + "php": ">=8.1", "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-php80": "^1.16" + "symfony/polyfill-mbstring": "~1.8" }, "type": "library", "autoload": { @@ -4724,7 +5022,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v4.4.42" + "source": "https://github.com/symfony/filesystem/tree/v6.4.3" }, "funding": [ { @@ -4740,25 +5038,27 @@ "type": "tidelift" } ], - "time": "2022-05-20T08:49:14+00:00" + "time": "2024-01-23T14:51:35+00:00" }, { "name": "symfony/finder", - "version": "v4.4.44", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "66bd787edb5e42ff59d3523f623895af05043e4f" + "reference": "11d736e97f116ac375a81f96e662911a34cd50ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/66bd787edb5e42ff59d3523f623895af05043e4f", - "reference": "66bd787edb5e42ff59d3523f623895af05043e4f", + "url": "https://api.github.com/repos/symfony/finder/zipball/11d736e97f116ac375a81f96e662911a34cd50ce", + "reference": "11d736e97f116ac375a81f96e662911a34cd50ce", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/polyfill-php80": "^1.16" + "php": ">=8.1" + }, + "require-dev": { + "symfony/filesystem": "^6.0|^7.0" }, "type": "library", "autoload": { @@ -4786,7 +5086,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v4.4.44" + "source": "https://github.com/symfony/finder/tree/v6.4.0" }, "funding": [ { @@ -4802,32 +5102,32 @@ "type": "tidelift" } ], - "time": "2022-07-29T07:35:46+00:00" + "time": "2023-10-31T17:30:12+00:00" }, { "name": "symfony/flex", - "version": "v1.21.5", + "version": "v2.4.4", "source": { "type": "git", "url": "https://github.com/symfony/flex.git", - "reference": "6b46a001639f810d01f4f1b39be1291192a711d4" + "reference": "bec213c39511eda66663baa2ee7440c65f89c695" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/flex/zipball/6b46a001639f810d01f4f1b39be1291192a711d4", - "reference": "6b46a001639f810d01f4f1b39be1291192a711d4", + "url": "https://api.github.com/repos/symfony/flex/zipball/bec213c39511eda66663baa2ee7440c65f89c695", + "reference": "bec213c39511eda66663baa2ee7440c65f89c695", "shasum": "" }, "require": { - "composer-plugin-api": "^1.0|^2.0", - "php": ">=7.1" + "composer-plugin-api": "^2.1", + "php": ">=8.0" }, "require-dev": { - "composer/composer": "^1.0.2|^2.0", - "symfony/dotenv": "^4.4|^5.0|^6.0", - "symfony/filesystem": "^4.4|^5.0|^6.0", - "symfony/phpunit-bridge": "^4.4.12|^5.0|^6.0", - "symfony/process": "^4.4|^5.0|^6.0" + "composer/composer": "^2.1", + "symfony/dotenv": "^5.4|^6.0", + "symfony/filesystem": "^5.4|^6.0", + "symfony/phpunit-bridge": "^5.4|^6.0", + "symfony/process": "^5.4|^6.0" }, "type": "composer-plugin", "extra": { @@ -4851,7 +5151,7 @@ "description": "Composer plugin for Symfony", "support": { "issues": "https://github.com/symfony/flex/issues", - "source": "https://github.com/symfony/flex/tree/v1.21.5" + "source": "https://github.com/symfony/flex/tree/v2.4.4" }, "funding": [ { @@ -4867,61 +5167,60 @@ "type": "tidelift" } ], - "time": "2024-02-05T18:04:39+00:00" + "time": "2024-02-05T18:04:53+00:00" }, { "name": "symfony/form", - "version": "v4.4.48", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/form.git", - "reference": "e1d137b13e0ec2cb5c5e38debca7a510c6f858c6" + "reference": "c72cf9aab0d6c6db64358f9dd0ab391c2cc6014a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/form/zipball/e1d137b13e0ec2cb5c5e38debca7a510c6f858c6", - "reference": "e1d137b13e0ec2cb5c5e38debca7a510c6f858c6", + "url": "https://api.github.com/repos/symfony/form/zipball/c72cf9aab0d6c6db64358f9dd0ab391c2cc6014a", + "reference": "c72cf9aab0d6c6db64358f9dd0ab391c2cc6014a", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/event-dispatcher": "^4.3", - "symfony/intl": "^4.4|^5.0", - "symfony/options-resolver": "~4.3|^5.0", + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/options-resolver": "^5.4|^6.0|^7.0", "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-intl-icu": "^1.21", "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php80": "^1.16", - "symfony/property-access": "^3.4.40|^4.4.8|^5.0.8", - "symfony/service-contracts": "^1.1|^2" + "symfony/property-access": "^5.4|^6.0|^7.0", + "symfony/service-contracts": "^2.5|^3" }, "conflict": { - "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0", - "symfony/console": "<4.3", - "symfony/dependency-injection": "<3.4", - "symfony/doctrine-bridge": "<3.4", - "symfony/framework-bundle": "<3.4", - "symfony/http-kernel": "<4.4", - "symfony/intl": "<4.3", - "symfony/translation": "<4.2", - "symfony/twig-bridge": "<3.4.5|<4.0.5,>=4.0" + "symfony/console": "<5.4", + "symfony/dependency-injection": "<5.4", + "symfony/doctrine-bridge": "<5.4.21|>=6,<6.2.7", + "symfony/error-handler": "<5.4", + "symfony/framework-bundle": "<5.4", + "symfony/http-kernel": "<5.4", + "symfony/translation": "<5.4.35|>=6.0,<6.3.12|>=6.4,<6.4.3|>=7.0,<7.0.3", + "symfony/translation-contracts": "<2.5", + "symfony/twig-bridge": "<6.3" }, "require-dev": { - "doctrine/collections": "~1.0", - "symfony/config": "^3.4|^4.0|^5.0", - "symfony/console": "^4.3|^5.0", - "symfony/dependency-injection": "^3.4|^4.0|^5.0", - "symfony/expression-language": "^3.4|^4.0|^5.0", - "symfony/http-foundation": "^3.4|^4.0|^5.0", - "symfony/http-kernel": "^4.4", - "symfony/security-csrf": "^3.4|^4.0|^5.0", - "symfony/translation": "^4.2|^5.0", - "symfony/validator": "^4.4.17|^5.1.9", - "symfony/var-dumper": "^4.3|^5.0" - }, - "suggest": { - "symfony/security-csrf": "For protecting forms against CSRF attacks.", - "symfony/twig-bridge": "For templating with Twig.", - "symfony/validator": "For form validation." + "doctrine/collections": "^1.0|^2.0", + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/html-sanitizer": "^6.1|^7.0", + "symfony/http-foundation": "^5.4|^6.0|^7.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0", + "symfony/intl": "^5.4|^6.0|^7.0", + "symfony/security-core": "^6.2|^7.0", + "symfony/security-csrf": "^5.4|^6.0|^7.0", + "symfony/translation": "^5.4.35|~6.3.12|^6.4.3|^7.0.3", + "symfony/uid": "^5.4|^6.0|^7.0", + "symfony/validator": "^5.4|^6.0|^7.0", + "symfony/var-dumper": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -4949,7 +5248,7 @@ "description": "Allows to easily create, process and reuse HTML forms", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/form/tree/v4.4.48" + "source": "https://github.com/symfony/form/tree/v6.4.4" }, "funding": [ { @@ -4965,109 +5264,111 @@ "type": "tidelift" } ], - "time": "2022-10-22T05:50:33+00:00" + "time": "2024-02-12T11:14:32+00:00" }, { "name": "symfony/framework-bundle", - "version": "v4.4.51", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/framework-bundle.git", - "reference": "8f1698ff2a97be8442fb202ac93111f7b6b40781" + "reference": "c76d3881596860ead95f5444a5ce4414447f0067" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/8f1698ff2a97be8442fb202ac93111f7b6b40781", - "reference": "8f1698ff2a97be8442fb202ac93111f7b6b40781", + "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/c76d3881596860ead95f5444a5ce4414447f0067", + "reference": "c76d3881596860ead95f5444a5ce4414447f0067", "shasum": "" }, "require": { + "composer-runtime-api": ">=2.1", "ext-xml": "*", - "php": ">=7.1.3", - "symfony/cache": "^4.4|^5.0", - "symfony/config": "^4.4.11|~5.0.11|^5.1.3", - "symfony/dependency-injection": "^4.4.38|^5.0.1", - "symfony/error-handler": "^4.4.1|^5.0.1", - "symfony/filesystem": "^3.4|^4.0|^5.0", - "symfony/finder": "^3.4|^4.0|^5.0", - "symfony/http-foundation": "^4.4|^5.0", - "symfony/http-kernel": "^4.4", + "php": ">=8.1", + "symfony/cache": "^5.4|^6.0|^7.0", + "symfony/config": "^6.1|^7.0", + "symfony/dependency-injection": "^6.4|^7.0", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/error-handler": "^6.1|^7.0", + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/filesystem": "^5.4|^6.0|^7.0", + "symfony/finder": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^6.4|^7.0", + "symfony/http-kernel": "^6.4", "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php80": "^1.16", - "symfony/routing": "^4.4.12|^5.1.4" + "symfony/routing": "^6.4|^7.0" }, "conflict": { + "doctrine/annotations": "<1.13.1", "doctrine/persistence": "<1.3", - "phpdocumentor/reflection-docblock": "<3.0|>=3.2.0,<3.2.2", - "phpdocumentor/type-resolver": "<0.3.0|1.3.*", - "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0", - "symfony/asset": "<3.4", - "symfony/browser-kit": "<4.3", - "symfony/console": "<4.4.21", - "symfony/dom-crawler": "<4.3", - "symfony/dotenv": "<4.3.6", - "symfony/form": "<4.3.5", - "symfony/http-client": "<4.4", - "symfony/lock": "<4.4", - "symfony/mailer": "<4.4", - "symfony/messenger": "<4.4", - "symfony/mime": "<4.4", - "symfony/property-info": "<3.4", - "symfony/security-bundle": "<4.4", - "symfony/serializer": "<4.4", - "symfony/stopwatch": "<3.4", - "symfony/translation": "<4.4", - "symfony/twig-bridge": "<4.1.1", - "symfony/twig-bundle": "<4.4", - "symfony/validator": "<4.4", - "symfony/web-profiler-bundle": "<4.4", - "symfony/workflow": "<4.3.6" + "phpdocumentor/reflection-docblock": "<3.2.2", + "phpdocumentor/type-resolver": "<1.4.0", + "symfony/asset": "<5.4", + "symfony/asset-mapper": "<6.4", + "symfony/clock": "<6.3", + "symfony/console": "<5.4|>=7.0", + "symfony/dom-crawler": "<6.4", + "symfony/dotenv": "<5.4", + "symfony/form": "<5.4", + "symfony/http-client": "<6.3", + "symfony/lock": "<5.4", + "symfony/mailer": "<5.4", + "symfony/messenger": "<6.3", + "symfony/mime": "<6.4", + "symfony/property-access": "<5.4", + "symfony/property-info": "<5.4", + "symfony/scheduler": "<6.4.4|>=7.0.0,<7.0.4", + "symfony/security-core": "<5.4", + "symfony/security-csrf": "<5.4", + "symfony/serializer": "<6.4", + "symfony/stopwatch": "<5.4", + "symfony/translation": "<6.4", + "symfony/twig-bridge": "<5.4", + "symfony/twig-bundle": "<5.4", + "symfony/validator": "<6.4", + "symfony/web-profiler-bundle": "<6.4", + "symfony/workflow": "<6.4" }, "require-dev": { - "doctrine/annotations": "^1.10.4", - "doctrine/cache": "^1.0|^2.0", + "doctrine/annotations": "^1.13.1|^2", "doctrine/persistence": "^1.3|^2|^3", - "paragonie/sodium_compat": "^1.8", + "dragonmantank/cron-expression": "^3.1", "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", - "symfony/asset": "^3.4|^4.0|^5.0", - "symfony/browser-kit": "^4.3|^5.0", - "symfony/console": "^4.4.42|^5.4.9", - "symfony/css-selector": "^3.4|^4.0|^5.0", - "symfony/dom-crawler": "^4.4.30|^5.3.7", - "symfony/dotenv": "^4.3.6|^5.0", - "symfony/expression-language": "^3.4|^4.0|^5.0", - "symfony/form": "^4.3.5|^5.0", - "symfony/http-client": "^4.4|^5.0", - "symfony/lock": "^4.4|^5.0", - "symfony/mailer": "^4.4|^5.0", - "symfony/messenger": "^4.4|^5.0", - "symfony/mime": "^4.4|^5.0", + "seld/jsonlint": "^1.10", + "symfony/asset": "^5.4|^6.0|^7.0", + "symfony/asset-mapper": "^6.4|^7.0", + "symfony/browser-kit": "^5.4|^6.0|^7.0", + "symfony/clock": "^6.2|^7.0", + "symfony/console": "^5.4.9|^6.0.9|^7.0", + "symfony/css-selector": "^5.4|^6.0|^7.0", + "symfony/dom-crawler": "^6.4|^7.0", + "symfony/dotenv": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/form": "^5.4|^6.0|^7.0", + "symfony/html-sanitizer": "^6.1|^7.0", + "symfony/http-client": "^6.3|^7.0", + "symfony/lock": "^5.4|^6.0|^7.0", + "symfony/mailer": "^5.4|^6.0|^7.0", + "symfony/messenger": "^6.3|^7.0", + "symfony/mime": "^6.4|^7.0", + "symfony/notifier": "^5.4|^6.0|^7.0", "symfony/polyfill-intl-icu": "~1.0", - "symfony/process": "^3.4|^4.0|^5.0", - "symfony/property-info": "^3.4|^4.0|^5.0", - "symfony/security-core": "^3.4|^4.4|^5.2", - "symfony/security-csrf": "^3.4|^4.0|^5.0", - "symfony/security-http": "^3.4|^4.0|^5.0", - "symfony/serializer": "^4.4|^5.0", - "symfony/stopwatch": "^3.4|^4.0|^5.0", - "symfony/templating": "^3.4|^4.0|^5.0", - "symfony/translation": "^4.4|^5.0", - "symfony/twig-bundle": "^4.4|^5.0", - "symfony/validator": "^4.4|^5.0", - "symfony/web-link": "^4.4|^5.0", - "symfony/workflow": "^4.3.6|^5.0", - "symfony/yaml": "^3.4|^4.0|^5.0", - "twig/twig": "^1.43|^2.13|^3.0.4" - }, - "suggest": { - "ext-apcu": "For best performance of the system caches", - "symfony/console": "For using the console commands", - "symfony/form": "For using forms", - "symfony/property-info": "For using the property_info service", - "symfony/serializer": "For using the serializer service", - "symfony/validator": "For using validation", - "symfony/web-link": "For using web links, features such as preloading, prefetching or prerendering", - "symfony/yaml": "For using the debug:config and lint:yaml commands" + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/property-info": "^5.4|^6.0|^7.0", + "symfony/rate-limiter": "^5.4|^6.0|^7.0", + "symfony/scheduler": "^6.4.4|^7.0.4", + "symfony/security-bundle": "^5.4|^6.0|^7.0", + "symfony/semaphore": "^5.4|^6.0|^7.0", + "symfony/serializer": "^6.4|^7.0", + "symfony/stopwatch": "^5.4|^6.0|^7.0", + "symfony/string": "^5.4|^6.0|^7.0", + "symfony/translation": "^6.4|^7.0", + "symfony/twig-bundle": "^5.4|^6.0|^7.0", + "symfony/uid": "^5.4|^6.0|^7.0", + "symfony/validator": "^6.4|^7.0", + "symfony/web-link": "^5.4|^6.0|^7.0", + "symfony/workflow": "^6.4|^7.0", + "symfony/yaml": "^5.4|^6.0|^7.0", + "twig/twig": "^2.10|^3.0.4" }, "type": "symfony-bundle", "autoload": { @@ -5095,85 +5396,7 @@ "description": "Provides a tight integration between Symfony components and the Symfony full-stack framework", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/framework-bundle/tree/v4.4.51" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-11-05T15:42:31+00:00" - }, - { - "name": "symfony/http-client-contracts", - "version": "v1.10.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/http-client-contracts.git", - "reference": "59f37624a82635962f04c98f31aed122e539a89e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/59f37624a82635962f04c98f31aed122e539a89e", - "reference": "59f37624a82635962f04c98f31aed122e539a89e", - "shasum": "" - }, - "require": { - "php": ">=7.1.3" - }, - "suggest": { - "symfony/http-client-implementation": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.1-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Contracts\\HttpClient\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Generic abstractions related to HTTP clients", - "homepage": "https://symfony.com", - "keywords": [ - "abstractions", - "contracts", - "decoupling", - "interfaces", - "interoperability", - "standards" - ], - "support": { - "source": "https://github.com/symfony/http-client-contracts/tree/v1.10.0" + "source": "https://github.com/symfony/framework-bundle/tree/v6.4.4" }, "funding": [ { @@ -5189,31 +5412,40 @@ "type": "tidelift" } ], - "time": "2022-04-11T14:52:04+00:00" + "time": "2024-02-22T22:50:59+00:00" }, { "name": "symfony/http-foundation", - "version": "v4.4.49", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "191413c7b832c015bb38eae963f2e57498c3c173" + "reference": "ebc713bc6e6f4b53f46539fc158be85dfcd77304" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/191413c7b832c015bb38eae963f2e57498c3c173", - "reference": "191413c7b832c015bb38eae963f2e57498c3c173", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/ebc713bc6e6f4b53f46539fc158be85dfcd77304", + "reference": "ebc713bc6e6f4b53f46539fc158be85dfcd77304", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/mime": "^4.3|^5.0", + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-mbstring": "~1.1", - "symfony/polyfill-php80": "^1.16" + "symfony/polyfill-php83": "^1.27" + }, + "conflict": { + "symfony/cache": "<6.3" }, "require-dev": { - "predis/predis": "~1.0", - "symfony/expression-language": "^3.4|^4.0|^5.0" + "doctrine/dbal": "^2.13.1|^3|^4", + "predis/predis": "^1.1|^2.0", + "symfony/cache": "^6.3|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4|^7.0", + "symfony/mime": "^5.4|^6.0|^7.0", + "symfony/rate-limiter": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -5241,7 +5473,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v4.4.49" + "source": "https://github.com/symfony/http-foundation/tree/v6.4.4" }, "funding": [ { @@ -5257,67 +5489,76 @@ "type": "tidelift" } ], - "time": "2022-11-04T16:17:57+00:00" + "time": "2024-02-08T15:01:18+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.4.51", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "ad8ab192cb619ff7285c95d28c69b36d718416c7" + "reference": "7a186f64a7f02787c04e8476538624d6aa888e42" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/ad8ab192cb619ff7285c95d28c69b36d718416c7", - "reference": "ad8ab192cb619ff7285c95d28c69b36d718416c7", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/7a186f64a7f02787c04e8476538624d6aa888e42", + "reference": "7a186f64a7f02787c04e8476538624d6aa888e42", "shasum": "" }, "require": { - "php": ">=7.1.3", - "psr/log": "^1|^2", - "symfony/error-handler": "^4.4", - "symfony/event-dispatcher": "^4.4", - "symfony/http-client-contracts": "^1.1|^2", - "symfony/http-foundation": "^4.4.30|^5.3.7", - "symfony/polyfill-ctype": "^1.8", - "symfony/polyfill-php73": "^1.9", - "symfony/polyfill-php80": "^1.16" + "php": ">=8.1", + "psr/log": "^1|^2|^3", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/error-handler": "^6.4|^7.0", + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^6.4|^7.0", + "symfony/polyfill-ctype": "^1.8" }, "conflict": { - "symfony/browser-kit": "<4.3", - "symfony/config": "<3.4", - "symfony/console": ">=5", - "symfony/dependency-injection": "<4.3", - "symfony/translation": "<4.2", - "twig/twig": "<1.43|<2.13,>=2" + "symfony/browser-kit": "<5.4", + "symfony/cache": "<5.4", + "symfony/config": "<6.1", + "symfony/console": "<5.4", + "symfony/dependency-injection": "<6.4", + "symfony/doctrine-bridge": "<5.4", + "symfony/form": "<5.4", + "symfony/http-client": "<5.4", + "symfony/http-client-contracts": "<2.5", + "symfony/mailer": "<5.4", + "symfony/messenger": "<5.4", + "symfony/translation": "<5.4", + "symfony/translation-contracts": "<2.5", + "symfony/twig-bridge": "<5.4", + "symfony/validator": "<6.4", + "symfony/var-dumper": "<6.3", + "twig/twig": "<2.13" }, "provide": { - "psr/log-implementation": "1.0|2.0" + "psr/log-implementation": "1.0|2.0|3.0" }, "require-dev": { "psr/cache": "^1.0|^2.0|^3.0", - "symfony/browser-kit": "^4.3|^5.0", - "symfony/config": "^3.4|^4.0|^5.0", - "symfony/console": "^3.4|^4.0", - "symfony/css-selector": "^3.4|^4.0|^5.0", - "symfony/dependency-injection": "^4.3|^5.0", - "symfony/dom-crawler": "^3.4|^4.0|^5.0", - "symfony/expression-language": "^3.4|^4.0|^5.0", - "symfony/finder": "^3.4|^4.0|^5.0", - "symfony/process": "^3.4|^4.0|^5.0", - "symfony/routing": "^3.4|^4.0|^5.0", - "symfony/stopwatch": "^3.4|^4.0|^5.0", - "symfony/templating": "^3.4|^4.0|^5.0", - "symfony/translation": "^4.2|^5.0", - "symfony/translation-contracts": "^1.1|^2", - "twig/twig": "^1.43|^2.13|^3.0.4" - }, - "suggest": { - "symfony/browser-kit": "", - "symfony/config": "", - "symfony/console": "", - "symfony/dependency-injection": "" + "symfony/browser-kit": "^5.4|^6.0|^7.0", + "symfony/clock": "^6.2|^7.0", + "symfony/config": "^6.1|^7.0", + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/css-selector": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^6.4|^7.0", + "symfony/dom-crawler": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/finder": "^5.4|^6.0|^7.0", + "symfony/http-client-contracts": "^2.5|^3", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/property-access": "^5.4.5|^6.0.5|^7.0", + "symfony/routing": "^5.4|^6.0|^7.0", + "symfony/serializer": "^6.4.4|^7.0.4", + "symfony/stopwatch": "^5.4|^6.0|^7.0", + "symfony/translation": "^5.4|^6.0|^7.0", + "symfony/translation-contracts": "^2.5|^3", + "symfony/uid": "^5.4|^6.0|^7.0", + "symfony/validator": "^6.4|^7.0", + "symfony/var-exporter": "^6.2|^7.0", + "twig/twig": "^2.13|^3.0.4" }, "type": "library", "autoload": { @@ -5345,78 +5586,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v4.4.51" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2023-11-10T13:31:29+00:00" - }, - { - "name": "symfony/inflector", - "version": "v4.4.44", - "source": { - "type": "git", - "url": "https://github.com/symfony/inflector.git", - "reference": "66185be61805b1e44a5c4000929e700228d426cc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/inflector/zipball/66185be61805b1e44a5c4000929e700228d426cc", - "reference": "66185be61805b1e44a5c4000929e700228d426cc", - "shasum": "" - }, - "require": { - "php": ">=7.1.3", - "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-php80": "^1.16" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Inflector\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Converts words between their singular and plural forms (English only)", - "homepage": "https://symfony.com", - "keywords": [ - "inflection", - "pluralize", - "singularize", - "string", - "symfony", - "words" - ], - "support": { - "source": "https://github.com/symfony/inflector/tree/v4.4.44" + "source": "https://github.com/symfony/http-kernel/tree/v6.4.4" }, "funding": [ { @@ -5432,42 +5602,35 @@ "type": "tidelift" } ], - "abandoned": "EnglishInflector from the String component", - "time": "2022-07-20T09:59:04+00:00" + "time": "2024-02-27T06:32:13+00:00" }, { "name": "symfony/intl", - "version": "v4.4.47", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/intl.git", - "reference": "f1d0f9d91ab482d33423b788999fbb43c34a9a59" + "reference": "2628ded562ca132ed7cdea72f5ec6aaf65d94414" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/intl/zipball/f1d0f9d91ab482d33423b788999fbb43c34a9a59", - "reference": "f1d0f9d91ab482d33423b788999fbb43c34a9a59", + "url": "https://api.github.com/repos/symfony/intl/zipball/2628ded562ca132ed7cdea72f5ec6aaf65d94414", + "reference": "2628ded562ca132ed7cdea72f5ec6aaf65d94414", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/polyfill-intl-icu": "~1.0", - "symfony/polyfill-php80": "^1.16" + "php": ">=8.1" }, "require-dev": { - "symfony/filesystem": "^3.4|^4.0|^5.0" - }, - "suggest": { - "ext-intl": "to use the component with locales other than \"en\"" + "symfony/filesystem": "^5.4|^6.0|^7.0", + "symfony/finder": "^5.4|^6.0|^7.0", + "symfony/var-exporter": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { "psr-4": { "Symfony\\Component\\Intl\\": "" }, - "classmap": [ - "Resources/stubs" - ], "exclude-from-classmap": [ "/Tests/" ] @@ -5494,7 +5657,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Provides a PHP replacement layer for the C intl extension that includes additional data from the ICU library", + "description": "Provides access to the localization data of the ICU library", "homepage": "https://symfony.com", "keywords": [ "i18n", @@ -5505,7 +5668,7 @@ "localization" ], "support": { - "source": "https://github.com/symfony/intl/tree/v4.4.47" + "source": "https://github.com/symfony/intl/tree/v6.4.3" }, "funding": [ { @@ -5521,44 +5684,43 @@ "type": "tidelift" } ], - "time": "2022-10-03T15:15:11+00:00" + "time": "2024-01-23T14:51:35+00:00" }, { "name": "symfony/mailer", - "version": "v4.4.49", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "554b8c0dc2db9d74e760fd6b726f527364f03302" + "reference": "791c5d31a8204cf3db0c66faab70282307f4376b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/554b8c0dc2db9d74e760fd6b726f527364f03302", - "reference": "554b8c0dc2db9d74e760fd6b726f527364f03302", + "url": "https://api.github.com/repos/symfony/mailer/zipball/791c5d31a8204cf3db0c66faab70282307f4376b", + "reference": "791c5d31a8204cf3db0c66faab70282307f4376b", "shasum": "" }, "require": { - "egulias/email-validator": "^2.1.10|^3", - "php": ">=7.1.3", + "egulias/email-validator": "^2.1.10|^3|^4", + "php": ">=8.1", + "psr/event-dispatcher": "^1", "psr/log": "^1|^2|^3", - "symfony/event-dispatcher": "^4.3", - "symfony/mime": "^4.4.21|^5.2.6", - "symfony/polyfill-php80": "^1.16", - "symfony/service-contracts": "^1.1|^2" + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/mime": "^6.2|^7.0", + "symfony/service-contracts": "^2.5|^3" }, "conflict": { - "symfony/http-kernel": "<4.4", - "symfony/sendgrid-mailer": "<4.4" + "symfony/http-client-contracts": "<2.5", + "symfony/http-kernel": "<5.4", + "symfony/messenger": "<6.2", + "symfony/mime": "<6.2", + "symfony/twig-bridge": "<6.2.1" }, "require-dev": { - "symfony/amazon-mailer": "^4.4|^5.0", - "symfony/google-mailer": "^4.4|^5.0", - "symfony/http-client-contracts": "^1.1|^2", - "symfony/mailchimp-mailer": "^4.4|^5.0", - "symfony/mailgun-mailer": "^4.4|^5.0", - "symfony/messenger": "^4.4|^5.0", - "symfony/postmark-mailer": "^4.4|^5.0", - "symfony/sendgrid-mailer": "^4.4|^5.0" + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/http-client": "^5.4|^6.0|^7.0", + "symfony/messenger": "^6.2|^7.0", + "symfony/twig-bridge": "^6.2|^7.0" }, "type": "library", "autoload": { @@ -5586,7 +5748,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v4.4.49" + "source": "https://github.com/symfony/mailer/tree/v6.4.4" }, "funding": [ { @@ -5602,79 +5764,75 @@ "type": "tidelift" } ], - "time": "2022-11-04T06:30:35+00:00" + "time": "2024-02-03T21:33:47+00:00" }, { - "name": "symfony/maker-bundle", - "version": "v1.39.1", + "name": "symfony/mime", + "version": "v6.4.3", "source": { "type": "git", - "url": "https://github.com/symfony/maker-bundle.git", - "reference": "30c8ac13511f6df7bc9ac088f31d7a48ce6433c6" + "url": "https://github.com/symfony/mime.git", + "reference": "5017e0a9398c77090b7694be46f20eb796262a34" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/maker-bundle/zipball/30c8ac13511f6df7bc9ac088f31d7a48ce6433c6", - "reference": "30c8ac13511f6df7bc9ac088f31d7a48ce6433c6", + "url": "https://api.github.com/repos/symfony/mime/zipball/5017e0a9398c77090b7694be46f20eb796262a34", + "reference": "5017e0a9398c77090b7694be46f20eb796262a34", "shasum": "" }, "require": { - "doctrine/inflector": "^1.2|^2.0", - "nikic/php-parser": "^4.11", - "php": ">=7.1.3", - "symfony/config": "^4.4|^5.0|^6.0", - "symfony/console": "^4.4|^5.0|^6.0", - "symfony/dependency-injection": "^4.4|^5.0|^6.0", - "symfony/deprecation-contracts": "^2.2|^3", - "symfony/filesystem": "^4.4|^5.0|^6.0", - "symfony/finder": "^4.4|^5.0|^6.0", - "symfony/framework-bundle": "^4.4|^5.0|^6.0", - "symfony/http-kernel": "^4.4|^5.0|^6.0" + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/polyfill-intl-idn": "^1.10", + "symfony/polyfill-mbstring": "^1.0" }, - "require-dev": { - "composer/semver": "^3.0", - "doctrine/doctrine-bundle": "^1.12.3|^2.0", - "doctrine/orm": "^2.3", - "symfony/http-client": "^4.4|^5.0|^6.0", - "symfony/phpunit-bridge": "^4.4|^5.0|^6.0", - "symfony/polyfill-php80": "^1.16.0", - "symfony/process": "^4.4|^5.0|^6.0", - "symfony/security-core": "^4.4|^5.0|^6.0", - "symfony/yaml": "^4.4|^5.0|^6.0", - "twig/twig": "^2.0|^3.0" + "conflict": { + "egulias/email-validator": "~3.0.0", + "phpdocumentor/reflection-docblock": "<3.2.2", + "phpdocumentor/type-resolver": "<1.4.0", + "symfony/mailer": "<5.4", + "symfony/serializer": "<6.3.2" }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-main": "1.0-dev" - } + "require-dev": { + "egulias/email-validator": "^2.1.10|^3.1|^4", + "league/html-to-markdown": "^5.0", + "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/property-access": "^5.4|^6.0|^7.0", + "symfony/property-info": "^5.4|^6.0|^7.0", + "symfony/serializer": "^6.3.2|^7.0" }, + "type": "library", "autoload": { "psr-4": { - "Symfony\\Bundle\\MakerBundle\\": "src/" - } + "Symfony\\Component\\Mime\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Maker helps you create empty commands, controllers, form classes, tests and more so you can forget about writing boilerplate code.", - "homepage": "https://symfony.com/doc/current/bundles/SymfonyMakerBundle/index.html", + "description": "Allows manipulating MIME messages", + "homepage": "https://symfony.com", "keywords": [ - "code generator", - "generator", - "scaffold", - "scaffolding" + "mime", + "mime-type" ], "support": { - "issues": "https://github.com/symfony/maker-bundle/issues", - "source": "https://github.com/symfony/maker-bundle/tree/v1.39.1" + "source": "https://github.com/symfony/mime/tree/v6.4.3" }, "funding": [ { @@ -5690,40 +5848,47 @@ "type": "tidelift" } ], - "time": "2022-09-13T18:14:36+00:00" + "time": "2024-01-30T08:32:12+00:00" }, { - "name": "symfony/mime", - "version": "v4.4.47", + "name": "symfony/monolog-bridge", + "version": "v6.4.4", "source": { "type": "git", - "url": "https://github.com/symfony/mime.git", - "reference": "0eaf33cd6d1b3eaa50e7bc48b17f6e45789df35d" + "url": "https://github.com/symfony/monolog-bridge.git", + "reference": "db7468152b27242f1a4d10fabe278a2cfaa4eac0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/0eaf33cd6d1b3eaa50e7bc48b17f6e45789df35d", - "reference": "0eaf33cd6d1b3eaa50e7bc48b17f6e45789df35d", + "url": "https://api.github.com/repos/symfony/monolog-bridge/zipball/db7468152b27242f1a4d10fabe278a2cfaa4eac0", + "reference": "db7468152b27242f1a4d10fabe278a2cfaa4eac0", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/polyfill-intl-idn": "^1.10", - "symfony/polyfill-mbstring": "^1.0", - "symfony/polyfill-php80": "^1.16" + "monolog/monolog": "^1.25.1|^2|^3", + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/http-kernel": "^5.4|^6.0|^7.0", + "symfony/service-contracts": "^2.5|^3" }, "conflict": { - "egulias/email-validator": "~3.0.0", - "symfony/mailer": "<4.4" + "symfony/console": "<5.4", + "symfony/http-foundation": "<5.4", + "symfony/security-core": "<5.4" }, "require-dev": { - "egulias/email-validator": "^2.1.10|^3.1", - "symfony/dependency-injection": "^3.4|^4.1|^5.0" + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/http-client": "^5.4|^6.0|^7.0", + "symfony/mailer": "^5.4|^6.0|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/mime": "^5.4|^6.0|^7.0", + "symfony/security-core": "^5.4|^6.0|^7.0", + "symfony/var-dumper": "^5.4|^6.0|^7.0" }, - "type": "library", + "type": "symfony-bridge", "autoload": { "psr-4": { - "Symfony\\Component\\Mime\\": "" + "Symfony\\Bridge\\Monolog\\": "" }, "exclude-from-classmap": [ "/Tests/" @@ -5743,14 +5908,10 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Allows manipulating MIME messages", + "description": "Provides integration for Monolog with various Symfony components", "homepage": "https://symfony.com", - "keywords": [ - "mime", - "mime-type" - ], "support": { - "source": "https://github.com/symfony/mime/tree/v4.4.47" + "source": "https://github.com/symfony/monolog-bridge/tree/v6.4.4" }, "funding": [ { @@ -5766,48 +5927,44 @@ "type": "tidelift" } ], - "time": "2022-10-03T15:15:11+00:00" + "time": "2024-02-01T11:49:25+00:00" }, { - "name": "symfony/monolog-bridge", - "version": "v4.4.43", + "name": "symfony/monolog-bundle", + "version": "v3.10.0", "source": { "type": "git", - "url": "https://github.com/symfony/monolog-bridge.git", - "reference": "ad09c9980b912e757c4ecd8363cebf3039d1d471" + "url": "https://github.com/symfony/monolog-bundle.git", + "reference": "414f951743f4aa1fd0f5bf6a0e9c16af3fe7f181" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/monolog-bridge/zipball/ad09c9980b912e757c4ecd8363cebf3039d1d471", - "reference": "ad09c9980b912e757c4ecd8363cebf3039d1d471", + "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/414f951743f4aa1fd0f5bf6a0e9c16af3fe7f181", + "reference": "414f951743f4aa1fd0f5bf6a0e9c16af3fe7f181", "shasum": "" }, "require": { - "monolog/monolog": "^1.25.1", - "php": ">=7.1.3", - "symfony/http-kernel": "^4.3", - "symfony/polyfill-php80": "^1.16", - "symfony/service-contracts": "^1.1|^2" - }, - "conflict": { - "symfony/console": "<3.4", - "symfony/http-foundation": "<3.4" + "monolog/monolog": "^1.25.1 || ^2.0 || ^3.0", + "php": ">=7.2.5", + "symfony/config": "^5.4 || ^6.0 || ^7.0", + "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0", + "symfony/http-kernel": "^5.4 || ^6.0 || ^7.0", + "symfony/monolog-bridge": "^5.4 || ^6.0 || ^7.0" }, "require-dev": { - "symfony/console": "^3.4|^4.0|^5.0", - "symfony/http-client": "^4.4|^5.0", - "symfony/security-core": "^3.4|^4.0|^5.0", - "symfony/var-dumper": "^3.4|^4.0|^5.0" + "symfony/console": "^5.4 || ^6.0 || ^7.0", + "symfony/phpunit-bridge": "^6.3 || ^7.0", + "symfony/yaml": "^5.4 || ^6.0 || ^7.0" }, - "suggest": { - "symfony/console": "For the possibility to show log messages in console commands depending on verbosity settings.", - "symfony/http-kernel": "For using the debugging handlers together with the response life cycle of the HTTP kernel.", - "symfony/var-dumper": "For using the debugging handlers like the console handler or the log server handler." + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } }, - "type": "symfony-bridge", "autoload": { "psr-4": { - "Symfony\\Bridge\\Monolog\\": "" + "Symfony\\Bundle\\MonologBundle\\": "" }, "exclude-from-classmap": [ "/Tests/" @@ -5827,10 +5984,15 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Provides integration for Monolog with various Symfony components", + "description": "Symfony MonologBundle", "homepage": "https://symfony.com", + "keywords": [ + "log", + "logging" + ], "support": { - "source": "https://github.com/symfony/monolog-bridge/tree/v4.4.43" + "issues": "https://github.com/symfony/monolog-bundle/issues", + "source": "https://github.com/symfony/monolog-bundle/tree/v3.10.0" }, "funding": [ { @@ -5846,44 +6008,30 @@ "type": "tidelift" } ], - "time": "2022-06-16T12:12:11+00:00" + "time": "2023-11-06T17:08:13+00:00" }, { - "name": "symfony/monolog-bundle", - "version": "v3.8.0", + "name": "symfony/options-resolver", + "version": "v6.4.0", "source": { "type": "git", - "url": "https://github.com/symfony/monolog-bundle.git", - "reference": "a41bbcdc1105603b6d73a7d9a43a3788f8e0fb7d" + "url": "https://github.com/symfony/options-resolver.git", + "reference": "22301f0e7fdeaacc14318928612dee79be99860e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/a41bbcdc1105603b6d73a7d9a43a3788f8e0fb7d", - "reference": "a41bbcdc1105603b6d73a7d9a43a3788f8e0fb7d", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/22301f0e7fdeaacc14318928612dee79be99860e", + "reference": "22301f0e7fdeaacc14318928612dee79be99860e", "shasum": "" }, "require": { - "monolog/monolog": "^1.22 || ^2.0 || ^3.0", - "php": ">=7.1.3", - "symfony/config": "~4.4 || ^5.0 || ^6.0", - "symfony/dependency-injection": "^4.4 || ^5.0 || ^6.0", - "symfony/http-kernel": "~4.4 || ^5.0 || ^6.0", - "symfony/monolog-bridge": "~4.4 || ^5.0 || ^6.0" - }, - "require-dev": { - "symfony/console": "~4.4 || ^5.0 || ^6.0", - "symfony/phpunit-bridge": "^5.2 || ^6.0", - "symfony/yaml": "~4.4 || ^5.0 || ^6.0" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "3.x-dev" - } + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3" }, + "type": "library", "autoload": { "psr-4": { - "Symfony\\Bundle\\MonologBundle\\": "" + "Symfony\\Component\\OptionsResolver\\": "" }, "exclude-from-classmap": [ "/Tests/" @@ -5903,15 +6051,15 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony MonologBundle", + "description": "Provides an improved replacement for the array_replace PHP function", "homepage": "https://symfony.com", "keywords": [ - "log", - "logging" + "config", + "configuration", + "options" ], "support": { - "issues": "https://github.com/symfony/monolog-bundle/issues", - "source": "https://github.com/symfony/monolog-bundle/tree/v3.8.0" + "source": "https://github.com/symfony/options-resolver/tree/v6.4.0" }, "funding": [ { @@ -5927,30 +6075,36 @@ "type": "tidelift" } ], - "time": "2022-05-10T14:24:36+00:00" + "time": "2023-08-08T10:16:24+00:00" }, { - "name": "symfony/options-resolver", - "version": "v4.4.44", + "name": "symfony/password-hasher", + "version": "v6.4.4", "source": { "type": "git", - "url": "https://github.com/symfony/options-resolver.git", - "reference": "583f56160f716dd435f1cd721fd14b548f4bb510" + "url": "https://github.com/symfony/password-hasher.git", + "reference": "114788555e6d768d25fffdbae618cee48cbcd112" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/583f56160f716dd435f1cd721fd14b548f4bb510", - "reference": "583f56160f716dd435f1cd721fd14b548f4bb510", + "url": "https://api.github.com/repos/symfony/password-hasher/zipball/114788555e6d768d25fffdbae618cee48cbcd112", + "reference": "114788555e6d768d25fffdbae618cee48cbcd112", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/polyfill-php80": "^1.16" + "php": ">=8.1" + }, + "conflict": { + "symfony/security-core": "<5.4" + }, + "require-dev": { + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/security-core": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { "psr-4": { - "Symfony\\Component\\OptionsResolver\\": "" + "Symfony\\Component\\PasswordHasher\\": "" }, "exclude-from-classmap": [ "/Tests/" @@ -5962,23 +6116,22 @@ ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Robin Chalas", + "email": "robin.chalas@gmail.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Provides an improved replacement for the array_replace PHP function", + "description": "Provides password hashing utilities", "homepage": "https://symfony.com", "keywords": [ - "config", - "configuration", - "options" + "hashing", + "password" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v4.4.44" + "source": "https://github.com/symfony/password-hasher/tree/v6.4.4" }, "funding": [ { @@ -5994,24 +6147,24 @@ "type": "tidelift" } ], - "time": "2022-07-20T09:59:04+00:00" + "time": "2024-02-12T11:14:32+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.31.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638" + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638", - "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", "shasum": "" }, "require": { - "php": ">=7.2" + "php": ">=7.1" }, "provide": { "ext-ctype": "*" @@ -6057,7 +6210,85 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-29T20:11:03+00:00" + }, + { + "name": "symfony/polyfill-intl-grapheme", + "version": "v1.29.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-grapheme.git", + "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f", + "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for intl's grapheme_* functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "grapheme", + "intl", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0" }, "funding": [ { @@ -6073,7 +6304,7 @@ "type": "tidelift" } ], - "time": "2024-09-09T11:45:10+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-intl-icu", @@ -6326,20 +6557,20 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.31.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341" + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341", - "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", "shasum": "" }, "require": { - "php": ">=7.2" + "php": ">=7.1" }, "provide": { "ext-mbstring": "*" @@ -6386,7 +6617,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" }, "funding": [ { @@ -6402,32 +6633,40 @@ "type": "tidelift" } ], - "time": "2024-09-09T11:45:10+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.31.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "fa2ae56c44f03bed91a39bfc9822e31e7c5c38ce" + "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/fa2ae56c44f03bed91a39bfc9822e31e7c5c38ce", - "reference": "fa2ae56c44f03bed91a39bfc9822e31e7c5c38ce", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/861391a8da9a04cbad2d232ddd9e4893220d6e25", + "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25", "shasum": "" }, "require": { - "php": ">=7.2" + "php": ">=7.1" }, - "type": "metapackage", + "type": "library", "extra": { "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" } }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php72\\": "" + } + }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" @@ -6451,7 +6690,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.29.0" }, "funding": [ { @@ -6467,20 +6706,20 @@ "type": "tidelift" } ], - "time": "2024-09-09T11:45:10+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { - "name": "symfony/polyfill-php73", + "name": "symfony/polyfill-php80", "version": "v1.29.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "21bd091060673a1177ae842c0ef8fe30893114d2" + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/21bd091060673a1177ae842c0ef8fe30893114d2", - "reference": "21bd091060673a1177ae842c0ef8fe30893114d2", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", + "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", "shasum": "" }, "require": { @@ -6498,7 +6737,7 @@ "bootstrap.php" ], "psr-4": { - "Symfony\\Polyfill\\Php73\\": "" + "Symfony\\Polyfill\\Php80\\": "" }, "classmap": [ "Resources/stubs" @@ -6509,6 +6748,10 @@ "MIT" ], "authors": [ + { + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, { "name": "Nicolas Grekas", "email": "p@tchwork.com" @@ -6518,7 +6761,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", "homepage": "https://symfony.com", "keywords": [ "compatibility", @@ -6527,7 +6770,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0" }, "funding": [ { @@ -6546,21 +6789,22 @@ "time": "2024-01-29T20:11:03+00:00" }, { - "name": "symfony/polyfill-php80", + "name": "symfony/polyfill-php83", "version": "v1.29.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b" + "url": "https://github.com/symfony/polyfill-php83.git", + "reference": "86fcae159633351e5fd145d1c47de6c528f8caff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", - "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", + "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/86fcae159633351e5fd145d1c47de6c528f8caff", + "reference": "86fcae159633351e5fd145d1c47de6c528f8caff", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.1", + "symfony/polyfill-php80": "^1.14" }, "type": "library", "extra": { @@ -6574,7 +6818,7 @@ "bootstrap.php" ], "psr-4": { - "Symfony\\Polyfill\\Php80\\": "" + "Symfony\\Polyfill\\Php83\\": "" }, "classmap": [ "Resources/stubs" @@ -6585,10 +6829,6 @@ "MIT" ], "authors": [ - { - "name": "Ion Bazan", - "email": "ion.bazan@gmail.com" - }, { "name": "Nicolas Grekas", "email": "p@tchwork.com" @@ -6598,7 +6838,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "description": "Symfony polyfill backporting some PHP 8.3+ features to lower PHP versions", "homepage": "https://symfony.com", "keywords": [ "compatibility", @@ -6607,7 +6847,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-php83/tree/v1.29.0" }, "funding": [ { @@ -6626,38 +6866,34 @@ "time": "2024-01-29T20:11:03+00:00" }, { - "name": "symfony/polyfill-php81", - "version": "v1.29.0", + "name": "symfony/property-access", + "version": "v6.4.4", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d" + "url": "https://github.com/symfony/property-access.git", + "reference": "c0664db266024013e31446dd690b6bfcf218ad93" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/c565ad1e63f30e7477fc40738343c62b40bc672d", - "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d", + "url": "https://api.github.com/repos/symfony/property-access/zipball/c0664db266024013e31446dd690b6bfcf218ad93", + "reference": "c0664db266024013e31446dd690b6bfcf218ad93", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/property-info": "^5.4|^6.0|^7.0" }, - "type": "library", - "extra": { - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } + "require-dev": { + "symfony/cache": "^5.4|^6.0|^7.0" }, + "type": "library", "autoload": { - "files": [ - "bootstrap.php" - ], "psr-4": { - "Symfony\\Polyfill\\Php81\\": "" + "Symfony\\Component\\PropertyAccess\\": "" }, - "classmap": [ - "Resources/stubs" + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -6666,24 +6902,29 @@ ], "authors": [ { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" + "description": "Provides functions to read and write from/to an object or array using a simple string notation", + "homepage": "https://symfony.com", + "keywords": [ + "access", + "array", + "extraction", + "index", + "injection", + "object", + "property", + "property-path", + "reflection" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.29.0" + "source": "https://github.com/symfony/property-access/tree/v6.4.4" }, "funding": [ { @@ -6699,37 +6940,43 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-02-16T13:31:43+00:00" }, { - "name": "symfony/property-access", - "version": "v4.4.44", + "name": "symfony/property-info", + "version": "v6.4.3", "source": { "type": "git", - "url": "https://github.com/symfony/property-access.git", - "reference": "d49682f6f0764df725c95128213a38f7e0a9f358" + "url": "https://github.com/symfony/property-info.git", + "reference": "e96d740ab5ac39aa530c8eaa0720ea8169118e26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-access/zipball/d49682f6f0764df725c95128213a38f7e0a9f358", - "reference": "d49682f6f0764df725c95128213a38f7e0a9f358", + "url": "https://api.github.com/repos/symfony/property-info/zipball/e96d740ab5ac39aa530c8eaa0720ea8169118e26", + "reference": "e96d740ab5ac39aa530c8eaa0720ea8169118e26", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/inflector": "^3.4|^4.0|^5.0", - "symfony/polyfill-php80": "^1.16" + "php": ">=8.1", + "symfony/string": "^5.4|^6.0|^7.0" }, - "require-dev": { - "symfony/cache": "^3.4|^4.0|^5.0" + "conflict": { + "phpdocumentor/reflection-docblock": "<5.2", + "phpdocumentor/type-resolver": "<1.5.1", + "symfony/dependency-injection": "<5.4", + "symfony/serializer": "<6.4" }, - "suggest": { - "psr/cache-implementation": "To cache access methods." + "require-dev": { + "phpdocumentor/reflection-docblock": "^5.2", + "phpstan/phpdoc-parser": "^1.0", + "symfony/cache": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/serializer": "^6.4|^7.0" }, "type": "library", "autoload": { "psr-4": { - "Symfony\\Component\\PropertyAccess\\": "" + "Symfony\\Component\\PropertyInfo\\": "" }, "exclude-from-classmap": [ "/Tests/" @@ -6741,29 +6988,26 @@ ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Kévin Dunglas", + "email": "dunglas@gmail.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Provides functions to read and write from/to an object or array using a simple string notation", + "description": "Extracts information about PHP class' properties using metadata of popular sources", "homepage": "https://symfony.com", "keywords": [ - "access", - "array", - "extraction", - "index", - "injection", - "object", + "doctrine", + "phpdoc", "property", - "property path", - "reflection" + "symfony", + "type", + "validator" ], "support": { - "source": "https://github.com/symfony/property-access/tree/v4.4.44" + "source": "https://github.com/symfony/property-info/tree/v6.4.3" }, "funding": [ { @@ -6779,46 +7023,40 @@ "type": "tidelift" } ], - "time": "2022-06-27T13:16:42+00:00" + "time": "2024-01-23T14:51:35+00:00" }, { "name": "symfony/routing", - "version": "v4.4.44", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "f7751fd8b60a07f3f349947a309b5bdfce22d6ae" + "reference": "3b2957ad54902f0f544df83e3d58b38d7e8e5842" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/f7751fd8b60a07f3f349947a309b5bdfce22d6ae", - "reference": "f7751fd8b60a07f3f349947a309b5bdfce22d6ae", + "url": "https://api.github.com/repos/symfony/routing/zipball/3b2957ad54902f0f544df83e3d58b38d7e8e5842", + "reference": "3b2957ad54902f0f544df83e3d58b38d7e8e5842", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/polyfill-php80": "^1.16" + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3" }, "conflict": { - "symfony/config": "<4.2", - "symfony/dependency-injection": "<3.4", - "symfony/yaml": "<3.4" + "doctrine/annotations": "<1.12", + "symfony/config": "<6.2", + "symfony/dependency-injection": "<5.4", + "symfony/yaml": "<5.4" }, "require-dev": { - "doctrine/annotations": "^1.10.4", + "doctrine/annotations": "^1.12|^2", "psr/log": "^1|^2|^3", - "symfony/config": "^4.2|^5.0", - "symfony/dependency-injection": "^3.4|^4.0|^5.0", - "symfony/expression-language": "^3.4|^4.0|^5.0", - "symfony/http-foundation": "^3.4|^4.0|^5.0", - "symfony/yaml": "^3.4|^4.0|^5.0" - }, - "suggest": { - "doctrine/annotations": "For using the annotation loader", - "symfony/config": "For using the all-in-one router or any loader", - "symfony/expression-language": "For using expression matching", - "symfony/http-foundation": "For using a Symfony Request object", - "symfony/yaml": "For using the YAML loader" + "symfony/config": "^6.2|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^5.4|^6.0|^7.0", + "symfony/yaml": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -6852,7 +7090,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v4.4.44" + "source": "https://github.com/symfony/routing/tree/v6.4.3" }, "funding": [ { @@ -6868,59 +7106,75 @@ "type": "tidelift" } ], - "time": "2022-07-20T09:59:04+00:00" + "time": "2024-01-30T13:55:02+00:00" }, { "name": "symfony/security-bundle", - "version": "v4.4.50", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/security-bundle.git", - "reference": "076fd2088ada33d760758d98ff07ddedbf567946" + "reference": "dec0c2bbc3718e7afd5ddffb3679774aec60ad9a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-bundle/zipball/076fd2088ada33d760758d98ff07ddedbf567946", - "reference": "076fd2088ada33d760758d98ff07ddedbf567946", + "url": "https://api.github.com/repos/symfony/security-bundle/zipball/dec0c2bbc3718e7afd5ddffb3679774aec60ad9a", + "reference": "dec0c2bbc3718e7afd5ddffb3679774aec60ad9a", "shasum": "" }, "require": { + "composer-runtime-api": ">=2.1", "ext-xml": "*", - "php": ">=7.1.3", - "symfony/config": "^4.2|^5.0", - "symfony/dependency-injection": "^4.4|^5.0", - "symfony/http-kernel": "^4.4", - "symfony/polyfill-php80": "^1.16", - "symfony/security-core": "^4.4", - "symfony/security-csrf": "^4.2|^5.0", - "symfony/security-guard": "^4.2|^5.0", - "symfony/security-http": "^4.4.50" + "php": ">=8.1", + "symfony/clock": "^6.3|^7.0", + "symfony/config": "^6.1|^7.0", + "symfony/dependency-injection": "^6.2|^7.0", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^6.2|^7.0", + "symfony/http-kernel": "^6.2", + "symfony/password-hasher": "^5.4|^6.0|^7.0", + "symfony/security-core": "^6.2|^7.0", + "symfony/security-csrf": "^5.4|^6.0|^7.0", + "symfony/security-http": "^6.3.6|^7.0", + "symfony/service-contracts": "^2.5|^3" }, "conflict": { - "symfony/browser-kit": "<4.2", - "symfony/console": "<3.4", - "symfony/framework-bundle": "<4.4", - "symfony/ldap": "<4.4", - "symfony/twig-bundle": "<4.4" + "symfony/browser-kit": "<5.4", + "symfony/console": "<5.4", + "symfony/framework-bundle": "<6.4", + "symfony/http-client": "<5.4", + "symfony/ldap": "<5.4", + "symfony/serializer": "<6.4", + "symfony/twig-bundle": "<5.4", + "symfony/validator": "<6.4" }, "require-dev": { - "doctrine/annotations": "^1.10.4", - "symfony/asset": "^3.4|^4.0|^5.0", - "symfony/browser-kit": "^4.2|^5.0", - "symfony/console": "^3.4|^4.0|^5.0", - "symfony/css-selector": "^3.4|^4.0|^5.0", - "symfony/dom-crawler": "^3.4|^4.0|^5.0", - "symfony/expression-language": "^3.4|^4.0|^5.0", - "symfony/form": "^3.4|^4.0|^5.0", - "symfony/framework-bundle": "^4.4|^5.0", - "symfony/process": "^3.4|^4.0|^5.0", - "symfony/serializer": "^4.4|^5.0", - "symfony/translation": "^3.4|^4.0|^5.0", - "symfony/twig-bridge": "^3.4|^4.0|^5.0", - "symfony/twig-bundle": "^4.4|^5.0", - "symfony/validator": "^3.4|^4.0|^5.0", - "symfony/yaml": "^3.4|^4.0|^5.0", - "twig/twig": "^1.43|^2.13|^3.0.4" + "symfony/asset": "^5.4|^6.0|^7.0", + "symfony/browser-kit": "^5.4|^6.0|^7.0", + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/css-selector": "^5.4|^6.0|^7.0", + "symfony/dom-crawler": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/form": "^5.4|^6.0|^7.0", + "symfony/framework-bundle": "^6.4|^7.0", + "symfony/http-client": "^5.4|^6.0|^7.0", + "symfony/ldap": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/rate-limiter": "^5.4|^6.0|^7.0", + "symfony/serializer": "^6.4|^7.0", + "symfony/translation": "^5.4|^6.0|^7.0", + "symfony/twig-bridge": "^5.4|^6.0|^7.0", + "symfony/twig-bundle": "^5.4|^6.0|^7.0", + "symfony/validator": "^6.4|^7.0", + "symfony/yaml": "^5.4|^6.0|^7.0", + "twig/twig": "^2.13|^3.0.4", + "web-token/jwt-checker": "^3.1", + "web-token/jwt-signature-algorithm-ecdsa": "^3.1", + "web-token/jwt-signature-algorithm-eddsa": "^3.1", + "web-token/jwt-signature-algorithm-hmac": "^3.1", + "web-token/jwt-signature-algorithm-none": "^3.1", + "web-token/jwt-signature-algorithm-rsa": "^3.1" }, "type": "symfony-bundle", "autoload": { @@ -6948,7 +7202,7 @@ "description": "Provides a tight integration of the Security component into the Symfony full-stack framework", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/security-bundle/tree/v4.4.50" + "source": "https://github.com/symfony/security-bundle/tree/v6.4.4" }, "funding": [ { @@ -6964,50 +7218,49 @@ "type": "tidelift" } ], - "time": "2023-01-24T10:39:54+00:00" + "time": "2024-02-15T11:23:52+00:00" }, { "name": "symfony/security-core", - "version": "v4.4.48", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/security-core.git", - "reference": "423ccb332784b236dfe6c5f396d0ac49db57c914" + "reference": "bb10f630cf5b1819ff80aa3ad57a09c61268fc48" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-core/zipball/423ccb332784b236dfe6c5f396d0ac49db57c914", - "reference": "423ccb332784b236dfe6c5f396d0ac49db57c914", + "url": "https://api.github.com/repos/symfony/security-core/zipball/bb10f630cf5b1819ff80aa3ad57a09c61268fc48", + "reference": "bb10f630cf5b1819ff80aa3ad57a09c61268fc48", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/event-dispatcher-contracts": "^1.1|^2", - "symfony/polyfill-php80": "^1.16", - "symfony/service-contracts": "^1.1.6|^2" + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/event-dispatcher-contracts": "^2.5|^3", + "symfony/password-hasher": "^5.4|^6.0|^7.0", + "symfony/service-contracts": "^2.5|^3" }, "conflict": { - "symfony/event-dispatcher": "<4.3|>=5", - "symfony/ldap": "<4.4", - "symfony/security-guard": "<4.3" + "symfony/event-dispatcher": "<5.4", + "symfony/http-foundation": "<5.4", + "symfony/ldap": "<5.4", + "symfony/security-guard": "<5.4", + "symfony/translation": "<5.4.35|>=6.0,<6.3.12|>=6.4,<6.4.3|>=7.0,<7.0.3", + "symfony/validator": "<5.4" }, "require-dev": { - "psr/container": "^1.0|^2.0", + "psr/cache": "^1.0|^2.0|^3.0", + "psr/container": "^1.1|^2.0", "psr/log": "^1|^2|^3", - "symfony/event-dispatcher": "^4.3", - "symfony/expression-language": "^3.4|^4.0|^5.0", - "symfony/http-foundation": "^3.4|^4.0|^5.0", - "symfony/ldap": "^4.4|^5.0", - "symfony/translation": "^4.4|^5.0", - "symfony/validator": "^3.4.31|^4.3.4|^5.0" - }, - "suggest": { - "psr/container-implementation": "To instantiate the Security class", - "symfony/event-dispatcher": "", - "symfony/expression-language": "For using the expression voter", - "symfony/http-foundation": "", - "symfony/ldap": "For using LDAP integration", - "symfony/validator": "For using the user password constraint" + "symfony/cache": "^5.4|^6.0|^7.0", + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^5.4|^6.0|^7.0", + "symfony/ldap": "^5.4|^6.0|^7.0", + "symfony/string": "^5.4|^6.0|^7.0", + "symfony/translation": "^5.4.35|~6.3.12|^6.4.3|^7.0.3", + "symfony/validator": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -7035,7 +7288,7 @@ "description": "Symfony Security Component - Core Library", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/security-core/tree/v4.4.48" + "source": "https://github.com/symfony/security-core/tree/v6.4.3" }, "funding": [ { @@ -7051,35 +7304,31 @@ "type": "tidelift" } ], - "time": "2022-10-22T05:50:33+00:00" + "time": "2024-01-23T14:51:35+00:00" }, { "name": "symfony/security-csrf", - "version": "v4.4.37", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/security-csrf.git", - "reference": "45c956ef58135091f53732646a0acd28034f02c0" + "reference": "e10257dd26f965d75e96bbfc27e46efd943f3010" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-csrf/zipball/45c956ef58135091f53732646a0acd28034f02c0", - "reference": "45c956ef58135091f53732646a0acd28034f02c0", + "url": "https://api.github.com/repos/symfony/security-csrf/zipball/e10257dd26f965d75e96bbfc27e46efd943f3010", + "reference": "e10257dd26f965d75e96bbfc27e46efd943f3010", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/polyfill-php80": "^1.16", - "symfony/security-core": "^3.4|^4.0|^5.0" + "php": ">=8.1", + "symfony/security-core": "^5.4|^6.0|^7.0" }, "conflict": { - "symfony/http-foundation": "<3.4" + "symfony/http-foundation": "<5.4" }, "require-dev": { - "symfony/http-foundation": "^3.4|^4.0|^5.0" - }, - "suggest": { - "symfony/http-foundation": "For using the class SessionTokenStorage." + "symfony/http-foundation": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -7107,7 +7356,7 @@ "description": "Symfony Security Component - CSRF Library", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/security-csrf/tree/v4.4.37" + "source": "https://github.com/symfony/security-csrf/tree/v6.4.3" }, "funding": [ { @@ -7123,34 +7372,56 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:41:36+00:00" + "time": "2024-01-23T14:51:35+00:00" }, { - "name": "symfony/security-guard", - "version": "v4.4.46", + "name": "symfony/security-http", + "version": "v6.4.4", "source": { "type": "git", - "url": "https://github.com/symfony/security-guard.git", - "reference": "f199eb1b19db11ce254b891580728c45a7ccacfd" + "url": "https://github.com/symfony/security-http.git", + "reference": "bf7548976c19ce751c95a3d012d0dcd27409e506" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-guard/zipball/f199eb1b19db11ce254b891580728c45a7ccacfd", - "reference": "f199eb1b19db11ce254b891580728c45a7ccacfd", + "url": "https://api.github.com/repos/symfony/security-http/zipball/bf7548976c19ce751c95a3d012d0dcd27409e506", + "reference": "bf7548976c19ce751c95a3d012d0dcd27409e506", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/security-core": "^3.4.22|^4.2.3|^5.0", - "symfony/security-http": "^4.4.1" + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/http-foundation": "^6.2|^7.0", + "symfony/http-kernel": "^6.3|^7.0", + "symfony/polyfill-mbstring": "~1.0", + "symfony/property-access": "^5.4|^6.0|^7.0", + "symfony/security-core": "^6.4|^7.0", + "symfony/service-contracts": "^2.5|^3" + }, + "conflict": { + "symfony/clock": "<6.3", + "symfony/event-dispatcher": "<5.4.9|>=6,<6.0.9", + "symfony/http-client-contracts": "<3.0", + "symfony/security-bundle": "<5.4", + "symfony/security-csrf": "<5.4" }, "require-dev": { - "psr/log": "^1|^2|^3" + "psr/log": "^1|^2|^3", + "symfony/cache": "^5.4|^6.0|^7.0", + "symfony/clock": "^6.3|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/http-client-contracts": "^3.0", + "symfony/rate-limiter": "^5.4|^6.0|^7.0", + "symfony/routing": "^5.4|^6.0|^7.0", + "symfony/security-csrf": "^5.4|^6.0|^7.0", + "symfony/translation": "^5.4|^6.0|^7.0", + "web-token/jwt-checker": "^3.1", + "web-token/jwt-signature-algorithm-ecdsa": "^3.1" }, "type": "library", "autoload": { "psr-4": { - "Symfony\\Component\\Security\\Guard\\": "" + "Symfony\\Component\\Security\\Http\\": "" }, "exclude-from-classmap": [ "/Tests/" @@ -7170,10 +7441,10 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Security Component - Guard", + "description": "Symfony Security Component - HTTP Integration", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/security-guard/tree/v4.4.46" + "source": "https://github.com/symfony/security-http/tree/v6.4.4" }, "funding": [ { @@ -7189,47 +7460,112 @@ "type": "tidelift" } ], - "time": "2022-09-23T06:06:49+00:00" + "time": "2024-02-26T07:52:26+00:00" }, { - "name": "symfony/security-http", - "version": "v4.4.50", + "name": "symfony/service-contracts", + "version": "v3.4.1", "source": { "type": "git", - "url": "https://github.com/symfony/security-http.git", - "reference": "7fa4a0cac16f02cb534a6e9adcdb17385f94004f" + "url": "https://github.com/symfony/service-contracts.git", + "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-http/zipball/7fa4a0cac16f02cb534a6e9adcdb17385f94004f", - "reference": "7fa4a0cac16f02cb534a6e9adcdb17385f94004f", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0", + "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/http-foundation": "^3.4.40|^4.4.7|^5.0.7", - "symfony/http-kernel": "^4.4", - "symfony/polyfill-php80": "^1.16", - "symfony/property-access": "^3.4|^4.0|^5.0", - "symfony/security-core": "^4.4.8" + "php": ">=8.1", + "psr/container": "^1.1|^2.0" }, "conflict": { - "symfony/event-dispatcher": ">=5", - "symfony/security-csrf": "<3.4.11|~4.0,<4.0.11" + "ext-psr": "<1.1|>=2" }, - "require-dev": { - "psr/log": "^1|^2|^3", - "symfony/routing": "^3.4|^4.0|^5.0", - "symfony/security-csrf": "^3.4.11|^4.0.11|^5.0" + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.4-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } }, - "suggest": { - "symfony/routing": "For using the HttpUtils class to create sub-requests, redirect the user, and match URLs", - "symfony/security-csrf": "For using tokens to protect authentication/logout attempts" + "autoload": { + "psr-4": { + "Symfony\\Contracts\\Service\\": "" + }, + "exclude-from-classmap": [ + "/Test/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to writing services", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/service-contracts/tree/v3.4.1" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-12-26T14:02:43+00:00" + }, + { + "name": "symfony/stopwatch", + "version": "v6.4.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/stopwatch.git", + "reference": "416596166641f1f728b0a64f5b9dd07cceb410c1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/416596166641f1f728b0a64f5b9dd07cceb410c1", + "reference": "416596166641f1f728b0a64f5b9dd07cceb410c1", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/service-contracts": "^2.5|^3" }, "type": "library", "autoload": { "psr-4": { - "Symfony\\Component\\Security\\Http\\": "" + "Symfony\\Component\\Stopwatch\\": "" }, "exclude-from-classmap": [ "/Tests/" @@ -7249,10 +7585,10 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Security Component - HTTP Integration", + "description": "Provides a way to profile code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/security-http/tree/v4.4.50" + "source": "https://github.com/symfony/stopwatch/tree/v6.4.3" }, "funding": [ { @@ -7268,43 +7604,50 @@ "type": "tidelift" } ], - "time": "2023-01-24T10:39:54+00:00" + "time": "2024-01-23T14:35:58+00:00" }, { - "name": "symfony/service-contracts", - "version": "v1.10.0", + "name": "symfony/string", + "version": "v6.4.4", "source": { "type": "git", - "url": "https://github.com/symfony/service-contracts.git", - "reference": "afa00c500c2d6aea6e3b2f4862355f507bc5ebb4" + "url": "https://github.com/symfony/string.git", + "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/afa00c500c2d6aea6e3b2f4862355f507bc5ebb4", - "reference": "afa00c500c2d6aea6e3b2f4862355f507bc5ebb4", + "url": "https://api.github.com/repos/symfony/string/zipball/4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9", + "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9", "shasum": "" }, "require": { - "php": ">=7.1.3", - "psr/container": "^1.0" + "php": ">=8.1", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-intl-grapheme": "~1.0", + "symfony/polyfill-intl-normalizer": "~1.0", + "symfony/polyfill-mbstring": "~1.0" }, - "suggest": { - "symfony/service-implementation": "" + "conflict": { + "symfony/translation-contracts": "<2.5" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.1-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } + "require-dev": { + "symfony/error-handler": "^5.4|^6.0|^7.0", + "symfony/http-client": "^5.4|^6.0|^7.0", + "symfony/intl": "^6.2|^7.0", + "symfony/translation-contracts": "^2.5|^3.0", + "symfony/var-exporter": "^5.4|^6.0|^7.0" }, + "type": "library", "autoload": { + "files": [ + "Resources/functions.php" + ], "psr-4": { - "Symfony\\Contracts\\Service\\": "" - } + "Symfony\\Component\\String\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -7320,18 +7663,18 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Generic abstractions related to writing services", + "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way", "homepage": "https://symfony.com", "keywords": [ - "abstractions", - "contracts", - "decoupling", - "interfaces", - "interoperability", - "standards" + "grapheme", + "i18n", + "string", + "unicode", + "utf-8", + "utf8" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v1.10.0" + "source": "https://github.com/symfony/string/tree/v6.4.4" }, "funding": [ { @@ -7347,32 +7690,30 @@ "type": "tidelift" } ], - "time": "2022-05-27T14:01:05+00:00" + "time": "2024-02-01T13:16:41+00:00" }, { "name": "symfony/templating", - "version": "v4.4.44", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/templating.git", - "reference": "2bfe94a5ebe0176612186e5f6b6a08a480c9e1f9" + "reference": "55a64595417d6eb54ca2ad100a2ee9ca82cf1c26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/templating/zipball/2bfe94a5ebe0176612186e5f6b6a08a480c9e1f9", - "reference": "2bfe94a5ebe0176612186e5f6b6a08a480c9e1f9", + "url": "https://api.github.com/repos/symfony/templating/zipball/55a64595417d6eb54ca2ad100a2ee9ca82cf1c26", + "reference": "55a64595417d6eb54ca2ad100a2ee9ca82cf1c26", "shasum": "" }, "require": { - "php": ">=7.1.3", + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-ctype": "~1.8" }, "require-dev": { "psr/log": "^1|^2|^3" }, - "suggest": { - "psr/log-implementation": "For using debug logging in loaders" - }, "type": "library", "autoload": { "psr-4": { @@ -7399,7 +7740,7 @@ "description": "Provides all the tools needed to build any kind of template system", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/templating/tree/v4.4.44" + "source": "https://github.com/symfony/templating/tree/v6.4.3" }, "funding": [ { @@ -7415,55 +7756,61 @@ "type": "tidelift" } ], - "time": "2022-06-27T13:16:42+00:00" + "time": "2024-01-23T14:51:35+00:00" }, { "name": "symfony/translation", - "version": "v4.4.47", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "45036b1d53accc48fe9bab71ccd86d57eba0dd94" + "reference": "bce6a5a78e94566641b2594d17e48b0da3184a8e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/45036b1d53accc48fe9bab71ccd86d57eba0dd94", - "reference": "45036b1d53accc48fe9bab71ccd86d57eba0dd94", + "url": "https://api.github.com/repos/symfony/translation/zipball/bce6a5a78e94566641b2594d17e48b0da3184a8e", + "reference": "bce6a5a78e94566641b2594d17e48b0da3184a8e", "shasum": "" }, "require": { - "php": ">=7.1.3", + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php80": "^1.16", - "symfony/translation-contracts": "^1.1.6|^2" + "symfony/translation-contracts": "^2.5|^3.0" }, "conflict": { - "symfony/config": "<3.4", - "symfony/dependency-injection": "<3.4", - "symfony/http-kernel": "<4.4", - "symfony/yaml": "<3.4" + "symfony/config": "<5.4", + "symfony/console": "<5.4", + "symfony/dependency-injection": "<5.4", + "symfony/http-client-contracts": "<2.5", + "symfony/http-kernel": "<5.4", + "symfony/service-contracts": "<2.5", + "symfony/twig-bundle": "<5.4", + "symfony/yaml": "<5.4" }, "provide": { - "symfony/translation-implementation": "1.0|2.0" + "symfony/translation-implementation": "2.3|3.0" }, "require-dev": { + "nikic/php-parser": "^4.18|^5.0", "psr/log": "^1|^2|^3", - "symfony/config": "^3.4|^4.0|^5.0", - "symfony/console": "^3.4|^4.0|^5.0", - "symfony/dependency-injection": "^3.4|^4.0|^5.0", - "symfony/finder": "~2.8|~3.0|~4.0|^5.0", - "symfony/http-kernel": "^4.4", - "symfony/intl": "^3.4|^4.0|^5.0", - "symfony/service-contracts": "^1.1.2|^2", - "symfony/yaml": "^3.4|^4.0|^5.0" - }, - "suggest": { - "psr/log-implementation": "To use logging capability in translator", - "symfony/config": "", - "symfony/yaml": "" + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/finder": "^5.4|^6.0|^7.0", + "symfony/http-client-contracts": "^2.5|^3.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0", + "symfony/intl": "^5.4|^6.0|^7.0", + "symfony/polyfill-intl-icu": "^1.21", + "symfony/routing": "^5.4|^6.0|^7.0", + "symfony/service-contracts": "^2.5|^3", + "symfony/yaml": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { + "files": [ + "Resources/functions.php" + ], "psr-4": { "Symfony\\Component\\Translation\\": "" }, @@ -7488,7 +7835,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v4.4.47" + "source": "https://github.com/symfony/translation/tree/v6.4.4" }, "funding": [ { @@ -7504,32 +7851,29 @@ "type": "tidelift" } ], - "time": "2022-10-03T15:15:11+00:00" + "time": "2024-02-20T13:16:58+00:00" }, { "name": "symfony/translation-contracts", - "version": "v1.10.0", + "version": "v3.4.1", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "7462e5c4cb8b9cd152f992e8f10963b5641921f6" + "reference": "06450585bf65e978026bda220cdebca3f867fde7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/7462e5c4cb8b9cd152f992e8f10963b5641921f6", - "reference": "7462e5c4cb8b9cd152f992e8f10963b5641921f6", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/06450585bf65e978026bda220cdebca3f867fde7", + "reference": "06450585bf65e978026bda220cdebca3f867fde7", "shasum": "" }, "require": { - "php": ">=7.1.3" - }, - "suggest": { - "symfony/translation-implementation": "" + "php": ">=8.1" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.1-dev" + "dev-main": "3.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -7539,7 +7883,10 @@ "autoload": { "psr-4": { "Symfony\\Contracts\\Translation\\": "" - } + }, + "exclude-from-classmap": [ + "/Test/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -7566,7 +7913,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v1.10.0" + "source": "https://github.com/symfony/translation-contracts/tree/v3.4.1" }, "funding": [ { @@ -7582,81 +7929,73 @@ "type": "tidelift" } ], - "time": "2022-06-27T13:16:42+00:00" + "time": "2023-12-26T14:02:43+00:00" }, { "name": "symfony/twig-bridge", - "version": "v4.4.51", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/twig-bridge.git", - "reference": "83b021cd395053ed30327b9ee5d3fd60631f73f5" + "reference": "256f330026d1c97187b61aa5c29e529499877f13" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/83b021cd395053ed30327b9ee5d3fd60631f73f5", - "reference": "83b021cd395053ed30327b9ee5d3fd60631f73f5", + "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/256f330026d1c97187b61aa5c29e529499877f13", + "reference": "256f330026d1c97187b61aa5c29e529499877f13", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/polyfill-php80": "^1.16", - "symfony/translation-contracts": "^1.1|^2", - "twig/twig": "^1.43|^2.13|^3.0.4" + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/translation-contracts": "^2.5|^3", + "twig/twig": "^2.13|^3.0.4" }, "conflict": { - "symfony/console": "<3.4", - "symfony/form": "<4.4", - "symfony/http-foundation": "<4.3", - "symfony/translation": "<4.2", - "symfony/workflow": "<4.3" + "phpdocumentor/reflection-docblock": "<3.2.2", + "phpdocumentor/type-resolver": "<1.4.0", + "symfony/console": "<5.4", + "symfony/form": "<6.3", + "symfony/http-foundation": "<5.4", + "symfony/http-kernel": "<6.4", + "symfony/mime": "<6.2", + "symfony/serializer": "<6.4", + "symfony/translation": "<5.4", + "symfony/workflow": "<5.4" }, "require-dev": { - "egulias/email-validator": "^2.1.10|^3", - "symfony/asset": "^3.4|^4.0|^5.0", - "symfony/console": "^3.4|^4.0|^5.0", - "symfony/dependency-injection": "^3.4|^4.0|^5.0", - "symfony/error-handler": "^4.4|^5.0", - "symfony/expression-language": "^3.4|^4.0|^5.0", - "symfony/finder": "^3.4|^4.0|^5.0", - "symfony/form": "^4.4.17", - "symfony/http-foundation": "^4.3|^5.0", - "symfony/http-kernel": "^4.4", - "symfony/intl": "^4.4|^5.0", - "symfony/mime": "^4.3|^5.0", + "egulias/email-validator": "^2.1.10|^3|^4", + "league/html-to-markdown": "^5.0", + "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", + "symfony/asset": "^5.4|^6.0|^7.0", + "symfony/asset-mapper": "^6.3|^7.0", + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/finder": "^5.4|^6.0|^7.0", + "symfony/form": "^6.4|^7.0", + "symfony/html-sanitizer": "^6.1|^7.0", + "symfony/http-foundation": "^5.4|^6.0|^7.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/intl": "^5.4|^6.0|^7.0", + "symfony/mime": "^6.2|^7.0", "symfony/polyfill-intl-icu": "~1.0", - "symfony/routing": "^3.4|^4.0|^5.0", + "symfony/property-info": "^5.4|^6.0|^7.0", + "symfony/routing": "^5.4|^6.0|^7.0", "symfony/security-acl": "^2.8|^3.0", - "symfony/security-core": "^3.0|^4.0|^5.0", - "symfony/security-csrf": "^3.4|^4.0|^5.0", - "symfony/security-http": "^3.4|^4.0|^5.0", - "symfony/stopwatch": "^3.4|^4.0|^5.0", - "symfony/templating": "^3.4|^4.0|^5.0", - "symfony/translation": "^4.2.1|^5.0", - "symfony/web-link": "^4.4|^5.0", - "symfony/workflow": "^4.3|^5.0", - "symfony/yaml": "^3.4|^4.0|^5.0", + "symfony/security-core": "^5.4|^6.0|^7.0", + "symfony/security-csrf": "^5.4|^6.0|^7.0", + "symfony/security-http": "^5.4|^6.0|^7.0", + "symfony/serializer": "^6.4.3|^7.0.3", + "symfony/stopwatch": "^5.4|^6.0|^7.0", + "symfony/translation": "^6.1|^7.0", + "symfony/web-link": "^5.4|^6.0|^7.0", + "symfony/workflow": "^5.4|^6.0|^7.0", + "symfony/yaml": "^5.4|^6.0|^7.0", "twig/cssinliner-extra": "^2.12|^3", "twig/inky-extra": "^2.12|^3", "twig/markdown-extra": "^2.12|^3" }, - "suggest": { - "symfony/asset": "For using the AssetExtension", - "symfony/expression-language": "For using the ExpressionExtension", - "symfony/finder": "", - "symfony/form": "For using the FormExtension", - "symfony/http-kernel": "For using the HttpKernelExtension", - "symfony/routing": "For using the RoutingExtension", - "symfony/security-core": "For using the SecurityExtension", - "symfony/security-csrf": "For using the CsrfExtension", - "symfony/security-http": "For using the LogoutUrlExtension", - "symfony/stopwatch": "For using the StopwatchExtension", - "symfony/templating": "For using the TwigEngine", - "symfony/translation": "For using the TranslationExtension", - "symfony/var-dumper": "For using the DumpExtension", - "symfony/web-link": "For using the WebLinkExtension", - "symfony/yaml": "For using the YamlExtension" - }, "type": "symfony-bridge", "autoload": { "psr-4": { @@ -7683,7 +8022,7 @@ "description": "Provides integration for Twig with various Symfony components", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/twig-bridge/tree/v4.4.51" + "source": "https://github.com/symfony/twig-bridge/tree/v6.4.4" }, "funding": [ { @@ -7699,51 +8038,47 @@ "type": "tidelift" } ], - "time": "2023-11-09T21:17:38+00:00" + "time": "2024-02-15T11:26:02+00:00" }, { "name": "symfony/twig-bundle", - "version": "v4.4.41", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/twig-bundle.git", - "reference": "164c1edc69f2c7ee337323efc78a8a8a263f45ff" + "reference": "f60ba43a09d88395d05797af982588b57331ff4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bundle/zipball/164c1edc69f2c7ee337323efc78a8a8a263f45ff", - "reference": "164c1edc69f2c7ee337323efc78a8a8a263f45ff", + "url": "https://api.github.com/repos/symfony/twig-bundle/zipball/f60ba43a09d88395d05797af982588b57331ff4d", + "reference": "f60ba43a09d88395d05797af982588b57331ff4d", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/http-foundation": "^4.3|^5.0", - "symfony/http-kernel": "^4.4", - "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-php80": "^1.16", - "symfony/twig-bridge": "^4.4|^5.0", - "twig/twig": "^1.43|^2.13|^3.0.4" + "composer-runtime-api": ">=2.1", + "php": ">=8.1", + "symfony/config": "^6.1|^7.0", + "symfony/dependency-injection": "^6.1|^7.0", + "symfony/http-foundation": "^5.4|^6.0|^7.0", + "symfony/http-kernel": "^6.2", + "symfony/twig-bridge": "^6.4", + "twig/twig": "^2.13|^3.0.4" }, "conflict": { - "symfony/dependency-injection": "<4.1", - "symfony/framework-bundle": "<4.4", - "symfony/translation": "<4.2" + "symfony/framework-bundle": "<5.4", + "symfony/translation": "<5.4" }, "require-dev": { - "doctrine/annotations": "^1.10.4", - "doctrine/cache": "^1.0|^2.0", - "symfony/asset": "^3.4|^4.0|^5.0", - "symfony/dependency-injection": "^4.2.5|^5.0", - "symfony/expression-language": "^3.4|^4.0|^5.0", - "symfony/finder": "^3.4|^4.0|^5.0", - "symfony/form": "^3.4|^4.0|^5.0", - "symfony/framework-bundle": "^4.4|^5.0", - "symfony/routing": "^3.4|^4.0|^5.0", - "symfony/stopwatch": "^3.4|^4.0|^5.0", - "symfony/templating": "^3.4|^4.0|^5.0", - "symfony/translation": "^4.2|^5.0", - "symfony/web-link": "^3.4|^4.0|^5.0", - "symfony/yaml": "^3.4|^4.0|^5.0" + "symfony/asset": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/finder": "^5.4|^6.0|^7.0", + "symfony/form": "^5.4|^6.0|^7.0", + "symfony/framework-bundle": "^5.4|^6.0|^7.0", + "symfony/routing": "^5.4|^6.0|^7.0", + "symfony/stopwatch": "^5.4|^6.0|^7.0", + "symfony/translation": "^5.4|^6.0|^7.0", + "symfony/web-link": "^5.4|^6.0|^7.0", + "symfony/yaml": "^5.4|^6.0|^7.0" }, "type": "symfony-bundle", "autoload": { @@ -7771,7 +8106,7 @@ "description": "Provides a tight integration of Twig into the Symfony full-stack framework", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/twig-bundle/tree/v4.4.41" + "source": "https://github.com/symfony/twig-bundle/tree/v6.4.4" }, "funding": [ { @@ -7787,69 +8122,59 @@ "type": "tidelift" } ], - "time": "2022-04-12T15:19:55+00:00" + "time": "2024-02-15T11:23:52+00:00" }, { "name": "symfony/validator", - "version": "v4.4.48", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "54781a4c41efbd283b779110bf8ae7f263737775" + "reference": "1cf92edc9a94d16275efef949fa6748d11cc8f47" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/54781a4c41efbd283b779110bf8ae7f263737775", - "reference": "54781a4c41efbd283b779110bf8ae7f263737775", + "url": "https://api.github.com/repos/symfony/validator/zipball/1cf92edc9a94d16275efef949fa6748d11cc8f47", + "reference": "1cf92edc9a94d16275efef949fa6748d11cc8f47", "shasum": "" }, "require": { - "php": ">=7.1.3", + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php80": "^1.16", - "symfony/translation-contracts": "^1.1|^2" + "symfony/polyfill-php83": "^1.27", + "symfony/translation-contracts": "^2.5|^3" }, "conflict": { + "doctrine/annotations": "<1.13", "doctrine/lexer": "<1.1", - "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0", - "symfony/dependency-injection": "<3.4", - "symfony/http-kernel": "<4.4", - "symfony/intl": "<4.3", - "symfony/translation": ">=5.0", - "symfony/yaml": "<3.4" + "symfony/dependency-injection": "<5.4", + "symfony/expression-language": "<5.4", + "symfony/http-kernel": "<5.4", + "symfony/intl": "<5.4", + "symfony/property-info": "<5.4", + "symfony/translation": "<5.4.35|>=6.0,<6.3.12|>=6.4,<6.4.3|>=7.0,<7.0.3", + "symfony/yaml": "<5.4" }, "require-dev": { - "doctrine/annotations": "^1.10.4", - "doctrine/cache": "^1.0|^2.0", - "egulias/email-validator": "^2.1.10|^3", - "symfony/cache": "^3.4|^4.0|^5.0", - "symfony/config": "^3.4|^4.0|^5.0", - "symfony/dependency-injection": "^3.4|^4.0|^5.0", - "symfony/expression-language": "^3.4|^4.0|^5.0", - "symfony/http-client": "^4.3|^5.0", - "symfony/http-foundation": "^4.1|^5.0", - "symfony/http-kernel": "^4.4", - "symfony/intl": "^4.3|^5.0", - "symfony/mime": "^4.4|^5.0", - "symfony/property-access": "^3.4|^4.0|^5.0", - "symfony/property-info": "^3.4|^4.0|^5.0", - "symfony/translation": "^4.2", - "symfony/yaml": "^3.4|^4.0|^5.0" - }, - "suggest": { - "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.", - "doctrine/cache": "For using the default cached annotation reader.", - "egulias/email-validator": "Strict (RFC compliant) email validation", - "psr/cache-implementation": "For using the mapping cache.", - "symfony/config": "", - "symfony/expression-language": "For using the Expression validator", - "symfony/http-foundation": "", - "symfony/intl": "", - "symfony/property-access": "For accessing properties within comparison constraints", - "symfony/property-info": "To automatically add NotNull and Type constraints", - "symfony/translation": "For translating validation errors.", - "symfony/yaml": "" + "doctrine/annotations": "^1.13|^2", + "egulias/email-validator": "^2.1.10|^3|^4", + "symfony/cache": "^5.4|^6.0|^7.0", + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/finder": "^5.4|^6.0|^7.0", + "symfony/http-client": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^5.4|^6.0|^7.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0", + "symfony/intl": "^5.4|^6.0|^7.0", + "symfony/mime": "^5.4|^6.0|^7.0", + "symfony/property-access": "^5.4|^6.0|^7.0", + "symfony/property-info": "^5.4|^6.0|^7.0", + "symfony/translation": "^5.4.35|~6.3.12|^6.4.3|^7.0.3", + "symfony/yaml": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -7877,7 +8202,7 @@ "description": "Provides tools to validate values", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/validator/tree/v4.4.48" + "source": "https://github.com/symfony/validator/tree/v6.4.4" }, "funding": [ { @@ -7893,42 +8218,38 @@ "type": "tidelift" } ], - "time": "2022-10-25T13:54:11+00:00" + "time": "2024-02-22T20:27:10+00:00" }, { "name": "symfony/var-dumper", - "version": "v4.4.47", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "1069c7a3fca74578022fab6f81643248d02f8e63" + "reference": "b439823f04c98b84d4366c79507e9da6230944b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/1069c7a3fca74578022fab6f81643248d02f8e63", - "reference": "1069c7a3fca74578022fab6f81643248d02f8e63", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/b439823f04c98b84d4366c79507e9da6230944b1", + "reference": "b439823f04c98b84d4366c79507e9da6230944b1", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php72": "~1.5", - "symfony/polyfill-php80": "^1.16" + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0", - "symfony/console": "<3.4" + "symfony/console": "<5.4" }, "require-dev": { "ext-iconv": "*", - "symfony/console": "^3.4|^4.0|^5.0", - "symfony/process": "^4.4|^5.0", - "twig/twig": "^1.43|^2.13|^3.0.4" - }, - "suggest": { - "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).", - "ext-intl": "To show region name in time zone dump", - "symfony/console": "To use the ServerDumpCommand and/or the bin/var-dump-server script" + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/error-handler": "^6.3|^7.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/uid": "^5.4|^6.0|^7.0", + "twig/twig": "^2.13|^3.0.4" }, "bin": [ "Resources/bin/var-dump-server" @@ -7966,7 +8287,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v4.4.47" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.4" }, "funding": [ { @@ -7982,28 +8303,28 @@ "type": "tidelift" } ], - "time": "2022-10-03T15:15:11+00:00" + "time": "2024-02-15T11:23:52+00:00" }, { "name": "symfony/var-exporter", - "version": "v4.4.43", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "4a7a3a3d55c471d396e6d28011368b7b83cb518b" + "reference": "0bd342e24aef49fc82a21bd4eedd3e665d177e5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/4a7a3a3d55c471d396e6d28011368b7b83cb518b", - "reference": "4a7a3a3d55c471d396e6d28011368b7b83cb518b", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/0bd342e24aef49fc82a21bd4eedd3e665d177e5b", + "reference": "0bd342e24aef49fc82a21bd4eedd3e665d177e5b", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/polyfill-php80": "^1.16" + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3" }, "require-dev": { - "symfony/var-dumper": "^4.4.9|^5.0.9" + "symfony/var-dumper": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -8036,10 +8357,12 @@ "export", "hydrate", "instantiate", + "lazy-loading", + "proxy", "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v4.4.43" + "source": "https://github.com/symfony/var-exporter/tree/v6.4.4" }, "funding": [ { @@ -8055,35 +8378,36 @@ "type": "tidelift" } ], - "time": "2022-05-27T11:44:32+00:00" + "time": "2024-02-26T08:37:45+00:00" }, { "name": "symfony/yaml", - "version": "v4.4.45", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "aeccc4dc52a9e634f1d1eebeb21eacfdcff1053d" + "reference": "d75715985f0f94f978e3a8fa42533e10db921b90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/aeccc4dc52a9e634f1d1eebeb21eacfdcff1053d", - "reference": "aeccc4dc52a9e634f1d1eebeb21eacfdcff1053d", + "url": "https://api.github.com/repos/symfony/yaml/zipball/d75715985f0f94f978e3a8fa42533e10db921b90", + "reference": "d75715985f0f94f978e3a8fa42533e10db921b90", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/polyfill-ctype": "~1.8" + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/polyfill-ctype": "^1.8" }, "conflict": { - "symfony/console": "<3.4" + "symfony/console": "<5.4" }, "require-dev": { - "symfony/console": "^3.4|^4.0|^5.0" - }, - "suggest": { - "symfony/console": "For validating YAML files using the lint command" + "symfony/console": "^5.4|^6.0|^7.0" }, + "bin": [ + "Resources/bin/yaml-lint" + ], "type": "library", "autoload": { "psr-4": { @@ -8110,7 +8434,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v4.4.45" + "source": "https://github.com/symfony/yaml/tree/v6.4.3" }, "funding": [ { @@ -8126,45 +8450,47 @@ "type": "tidelift" } ], - "time": "2022-08-02T15:47:23+00:00" + "time": "2024-01-23T14:51:35+00:00" }, { - "name": "twig/extensions", - "version": "v1.5.4", + "name": "twig/extra-bundle", + "version": "v3.8.0", "source": { "type": "git", - "url": "https://github.com/twigphp/Twig-extensions.git", - "reference": "57873c8b0c1be51caa47df2cdb824490beb16202" + "url": "https://github.com/twigphp/twig-extra-bundle.git", + "reference": "32807183753de0388c8e59f7ac2d13bb47311140" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig-extensions/zipball/57873c8b0c1be51caa47df2cdb824490beb16202", - "reference": "57873c8b0c1be51caa47df2cdb824490beb16202", + "url": "https://api.github.com/repos/twigphp/twig-extra-bundle/zipball/32807183753de0388c8e59f7ac2d13bb47311140", + "reference": "32807183753de0388c8e59f7ac2d13bb47311140", "shasum": "" }, "require": { - "twig/twig": "^1.27|^2.0" + "php": ">=7.2.5", + "symfony/framework-bundle": "^5.4|^6.0|^7.0", + "symfony/twig-bundle": "^5.4|^6.0|^7.0", + "twig/twig": "^3.0" }, "require-dev": { - "symfony/phpunit-bridge": "^3.4", - "symfony/translation": "^2.7|^3.4" - }, - "suggest": { - "symfony/translation": "Allow the time_diff output to be translated" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.5-dev" - } + "league/commonmark": "^1.0|^2.0", + "symfony/phpunit-bridge": "^6.4|^7.0", + "twig/cache-extra": "^3.0", + "twig/cssinliner-extra": "^2.12|^3.0", + "twig/html-extra": "^2.12|^3.0", + "twig/inky-extra": "^2.12|^3.0", + "twig/intl-extra": "^2.12|^3.0", + "twig/markdown-extra": "^2.12|^3.0", + "twig/string-extra": "^2.12|^3.0" }, + "type": "symfony-bundle", "autoload": { - "psr-0": { - "Twig_Extensions_": "lib/" - }, "psr-4": { - "Twig\\Extensions\\": "src/" - } + "Twig\\Extra\\TwigExtraBundle\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -8173,60 +8499,59 @@ "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "email": "fabien@symfony.com", + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" } ], - "description": "Common additional features for Twig that do not directly belong in core", + "description": "A Symfony bundle for extra Twig extensions", + "homepage": "https://twig.symfony.com", "keywords": [ - "i18n", - "text" + "bundle", + "extra", + "twig" ], "support": { - "issues": "https://github.com/twigphp/Twig-extensions/issues", - "source": "https://github.com/twigphp/Twig-extensions/tree/master" + "source": "https://github.com/twigphp/twig-extra-bundle/tree/v3.8.0" }, - "abandoned": true, - "time": "2018-12-05T18:34:18+00:00" + "funding": [ + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/twig/twig", + "type": "tidelift" + } + ], + "time": "2023-11-21T14:02:01+00:00" }, { - "name": "twig/extra-bundle", - "version": "v3.3.4", + "name": "twig/intl-extra", + "version": "v3.8.0", "source": { - "type": "git", - "url": "https://github.com/twigphp/twig-extra-bundle.git", - "reference": "1fe52d84aa22b7891c7717ef904b1551c8d70100" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/twigphp/twig-extra-bundle/zipball/1fe52d84aa22b7891c7717ef904b1551c8d70100", - "reference": "1fe52d84aa22b7891c7717ef904b1551c8d70100", - "shasum": "" - }, - "require": { - "php": "^7.1.3|^8.0", - "symfony/framework-bundle": "^4.4|^5.0|^6.0", - "symfony/twig-bundle": "^4.4|^5.0|^6.0", - "twig/twig": "^2.7|^3.0" - }, - "require-dev": { - "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0", - "twig/cache-extra": "^3.0", - "twig/cssinliner-extra": "^2.12|^3.0", - "twig/html-extra": "^2.12|^3.0", - "twig/inky-extra": "^2.12|^3.0", - "twig/intl-extra": "^2.12|^3.0", - "twig/markdown-extra": "^2.12|^3.0", - "twig/string-extra": "^2.12|^3.0" + "type": "git", + "url": "https://github.com/twigphp/intl-extra.git", + "reference": "7b3db67c700735f473a265a97e1adaeba3e6ca0c" }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "3.2-dev" - } + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/twigphp/intl-extra/zipball/7b3db67c700735f473a265a97e1adaeba3e6ca0c", + "reference": "7b3db67c700735f473a265a97e1adaeba3e6ca0c", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/intl": "^5.4|^6.0|^7.0", + "twig/twig": "^3.0" + }, + "require-dev": { + "symfony/phpunit-bridge": "^6.4|^7.0" }, + "type": "library", "autoload": { "psr-4": { - "Twig\\Extra\\TwigExtraBundle\\": "" + "Twig\\Extra\\Intl\\": "" }, "exclude-from-classmap": [ "/Tests/" @@ -8244,15 +8569,14 @@ "role": "Lead Developer" } ], - "description": "A Symfony bundle for extra Twig extensions", + "description": "A Twig extension for Intl", "homepage": "https://twig.symfony.com", "keywords": [ - "bundle", - "extra", + "intl", "twig" ], "support": { - "source": "https://github.com/twigphp/twig-extra-bundle/tree/v3.3.4" + "source": "https://github.com/twigphp/intl-extra/tree/v3.8.0" }, "funding": [ { @@ -8264,42 +8588,34 @@ "type": "tidelift" } ], - "time": "2021-11-13T16:20:21+00:00" + "time": "2023-11-21T17:27:48+00:00" }, { "name": "twig/twig", - "version": "v2.16.1", + "version": "v3.8.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "19185947ec75d433a3ac650af32fc05649b95ee1" + "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/19185947ec75d433a3ac650af32fc05649b95ee1", - "reference": "19185947ec75d433a3ac650af32fc05649b95ee1", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/9d15f0ac07f44dc4217883ec6ae02fd555c6f71d", + "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d", "shasum": "" }, "require": { - "php": ">=7.1.3", + "php": ">=7.2.5", "symfony/polyfill-ctype": "^1.8", "symfony/polyfill-mbstring": "^1.3", - "symfony/polyfill-php72": "^1.8" + "symfony/polyfill-php80": "^1.22" }, "require-dev": { - "psr/container": "^1.0", - "symfony/phpunit-bridge": "^5.4.9|^6.3" + "psr/container": "^1.0|^2.0", + "symfony/phpunit-bridge": "^5.4.9|^6.3|^7.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.16-dev" - } - }, "autoload": { - "psr-0": { - "Twig_": "lib/" - }, "psr-4": { "Twig\\": "src/" } @@ -8332,7 +8648,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v2.16.1" + "source": "https://github.com/twigphp/Twig/tree/v3.8.0" }, "funding": [ { @@ -8344,7 +8660,7 @@ "type": "tidelift" } ], - "time": "2024-09-09T17:53:56+00:00" + "time": "2023-11-21T18:54:41+00:00" }, { "name": "ua-parser/uap-php", @@ -8466,160 +8782,35 @@ "source": "https://github.com/webmozarts/assert/tree/1.11.0" }, "time": "2022-06-03T18:03:27+00:00" - }, - { - "name": "zendframework/zend-code", - "version": "3.4.1", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-code.git", - "reference": "268040548f92c2bfcba164421c1add2ba43abaaa" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-code/zipball/268040548f92c2bfcba164421c1add2ba43abaaa", - "reference": "268040548f92c2bfcba164421c1add2ba43abaaa", - "shasum": "" - }, - "require": { - "php": "^7.1", - "zendframework/zend-eventmanager": "^2.6 || ^3.0" - }, - "conflict": { - "phpspec/prophecy": "<1.9.0" - }, - "require-dev": { - "doctrine/annotations": "^1.7", - "ext-phar": "*", - "phpunit/phpunit": "^7.5.16 || ^8.4", - "zendframework/zend-coding-standard": "^1.0", - "zendframework/zend-stdlib": "^2.7 || ^3.0" - }, - "suggest": { - "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features", - "zendframework/zend-stdlib": "Zend\\Stdlib component" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4.x-dev", - "dev-develop": "3.5.x-dev", - "dev-dev-4.0": "4.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Code\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Extensions to the PHP Reflection API, static code scanning, and code generation", - "keywords": [ - "ZendFramework", - "code", - "zf" - ], - "support": { - "chat": "https://zendframework-slack.herokuapp.com", - "docs": "https://docs.zendframework.com/zend-code/", - "forum": "https://discourse.zendframework.com/c/questions/components", - "issues": "https://github.com/zendframework/zend-code/issues", - "rss": "https://github.com/zendframework/zend-code/releases.atom", - "source": "https://github.com/zendframework/zend-code" - }, - "abandoned": "laminas/laminas-code", - "time": "2019-12-10T19:21:15+00:00" - }, - { - "name": "zendframework/zend-eventmanager", - "version": "3.2.1", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-eventmanager.git", - "reference": "a5e2583a211f73604691586b8406ff7296a946dd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/a5e2583a211f73604691586b8406ff7296a946dd", - "reference": "a5e2583a211f73604691586b8406ff7296a946dd", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0" - }, - "require-dev": { - "athletic/athletic": "^0.1", - "container-interop/container-interop": "^1.1.0", - "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2", - "zendframework/zend-coding-standard": "~1.0.0", - "zendframework/zend-stdlib": "^2.7.3 || ^3.0" - }, - "suggest": { - "container-interop/container-interop": "^1.1.0, to use the lazy listeners feature", - "zendframework/zend-stdlib": "^2.7.3 || ^3.0, to use the FilterChain feature" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.2-dev", - "dev-develop": "3.3-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\EventManager\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Trigger and listen to events within a PHP application", - "homepage": "https://github.com/zendframework/zend-eventmanager", - "keywords": [ - "event", - "eventmanager", - "events", - "zf2" - ], - "support": { - "issues": "https://github.com/zendframework/zend-eventmanager/issues", - "source": "https://github.com/zendframework/zend-eventmanager/tree/master" - }, - "abandoned": "laminas/laminas-eventmanager", - "time": "2018-04-25T15:33:34+00:00" } ], "packages-dev": [ { "name": "composer/pcre", - "version": "1.0.1", + "version": "3.1.1", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560" + "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/67a32d7d6f9f560b726ab25a061b38ff3a80c560", - "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560", + "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9", + "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9", "shasum": "" }, "require": { - "php": "^5.3.2 || ^7.0 || ^8.0" + "php": "^7.4 || ^8.0" }, "require-dev": { "phpstan/phpstan": "^1.3", "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^4.2 || ^5" + "symfony/phpunit-bridge": "^5" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.x-dev" + "dev-main": "3.x-dev" } }, "autoload": { @@ -8647,7 +8838,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/1.0.1" + "source": "https://github.com/composer/pcre/tree/3.1.1" }, "funding": [ { @@ -8663,31 +8854,31 @@ "type": "tidelift" } ], - "time": "2022-01-21T20:24:37+00:00" + "time": "2023-10-11T07:11:09+00:00" }, { "name": "composer/xdebug-handler", - "version": "2.0.5", + "version": "3.0.3", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a" + "reference": "ced299686f41dce890debac69273b47ffe98a40c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/9e36aeed4616366d2b690bdce11f71e9178c579a", - "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c", + "reference": "ced299686f41dce890debac69273b47ffe98a40c", "shasum": "" }, "require": { - "composer/pcre": "^1", - "php": "^5.3.2 || ^7.0 || ^8.0", + "composer/pcre": "^1 || ^2 || ^3", + "php": "^7.2.5 || ^8.0", "psr/log": "^1 || ^2 || ^3" }, "require-dev": { "phpstan/phpstan": "^1.0", "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0" + "symfony/phpunit-bridge": "^6.0" }, "type": "library", "autoload": { @@ -8713,7 +8904,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/2.0.5" + "source": "https://github.com/composer/xdebug-handler/tree/3.0.3" }, "funding": [ { @@ -8729,254 +8920,160 @@ "type": "tidelift" } ], - "time": "2022-02-24T20:20:32+00:00" + "time": "2022-02-25T21:32:43+00:00" }, { - "name": "doctrine/data-fixtures", - "version": "1.5.4", + "name": "hamcrest/hamcrest-php", + "version": "v2.0.1", "source": { "type": "git", - "url": "https://github.com/doctrine/data-fixtures.git", - "reference": "d25660094fb25ee139aac11c7f052bea169b3f88" + "url": "https://github.com/hamcrest/hamcrest-php.git", + "reference": "8c3d0a3f6af734494ad8f6fbbee0ba92422859f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/d25660094fb25ee139aac11c7f052bea169b3f88", - "reference": "d25660094fb25ee139aac11c7f052bea169b3f88", + "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/8c3d0a3f6af734494ad8f6fbbee0ba92422859f3", + "reference": "8c3d0a3f6af734494ad8f6fbbee0ba92422859f3", "shasum": "" }, "require": { - "doctrine/common": "^2.13|^3.0", - "doctrine/persistence": "^1.3.3|^2.0|^3.0", - "php": "^7.2 || ^8.0" + "php": "^5.3|^7.0|^8.0" }, - "conflict": { - "doctrine/dbal": "<2.13", - "doctrine/phpcr-odm": "<1.3.0" + "replace": { + "cordoval/hamcrest-php": "*", + "davedevelopment/hamcrest-php": "*", + "kodova/hamcrest-php": "*" }, "require-dev": { - "doctrine/coding-standard": "^10.0", - "doctrine/dbal": "^2.13 || ^3.0", - "doctrine/mongodb-odm": "^1.3.0 || ^2.0.0", - "doctrine/orm": "^2.7.0", - "ext-sqlite3": "*", - "phpstan/phpstan": "^1.5", - "phpunit/phpunit": "^8.5 || ^9.5", - "symfony/cache": "^5.0 || ^6.0", - "vimeo/psalm": "^4.10" - }, - "suggest": { - "alcaeus/mongo-php-adapter": "For using MongoDB ODM 1.3 with PHP 7 (deprecated)", - "doctrine/mongodb-odm": "For loading MongoDB ODM fixtures", - "doctrine/orm": "For loading ORM fixtures", - "doctrine/phpcr-odm": "For loading PHPCR ODM fixtures" + "phpunit/php-file-iterator": "^1.4 || ^2.0", + "phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7.0" }, "type": "library", - "autoload": { - "psr-4": { - "Doctrine\\Common\\DataFixtures\\": "lib/Doctrine/Common/DataFixtures" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" - } - ], - "description": "Data Fixtures for all Doctrine Object Managers", - "homepage": "https://www.doctrine-project.org", - "keywords": [ - "database" - ], - "support": { - "issues": "https://github.com/doctrine/data-fixtures/issues", - "source": "https://github.com/doctrine/data-fixtures/tree/1.5.4" - }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdata-fixtures", - "type": "tidelift" + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" } - ], - "time": "2022-09-20T21:13:12+00:00" - }, - { - "name": "doctrine/doctrine-fixtures-bundle", - "version": "3.4.5", - "source": { - "type": "git", - "url": "https://github.com/doctrine/DoctrineFixturesBundle.git", - "reference": "5988484f79362cd7d06564bd11be7ce622e08c87" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/5988484f79362cd7d06564bd11be7ce622e08c87", - "reference": "5988484f79362cd7d06564bd11be7ce622e08c87", - "shasum": "" - }, - "require": { - "doctrine/data-fixtures": "^1.3", - "doctrine/doctrine-bundle": "^1.11|^2.0", - "doctrine/orm": "^2.6.0", - "doctrine/persistence": "^1.3.7|^2.0|^3.0", - "php": "^7.1 || ^8.0", - "symfony/config": "^3.4|^4.3|^5.0|^6.0", - "symfony/console": "^3.4|^4.3|^5.0|^6.0", - "symfony/dependency-injection": "^3.4.47|^4.3|^5.0|^6.0", - "symfony/doctrine-bridge": "^3.4|^4.1|^5.0|^6.0", - "symfony/http-kernel": "^3.4|^4.3|^5.0|^6.0" - }, - "require-dev": { - "doctrine/coding-standard": "^9 || ^12", - "phpstan/phpstan": "^1.4.10", - "phpunit/phpunit": "^7.5.20 || ^8.5.26 || ^9.5.20", - "symfony/phpunit-bridge": "^6.0.8", - "vimeo/psalm": "^4.22" }, - "type": "symfony-bundle", "autoload": { - "psr-4": { - "Doctrine\\Bundle\\FixturesBundle\\": "" - } + "classmap": [ + "hamcrest" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Doctrine Project", - "homepage": "https://www.doctrine-project.org" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } + "BSD-3-Clause" ], - "description": "Symfony DoctrineFixturesBundle", - "homepage": "https://www.doctrine-project.org", + "description": "This is the PHP port of Hamcrest Matchers", "keywords": [ - "Fixture", - "persistence" + "test" ], "support": { - "issues": "https://github.com/doctrine/DoctrineFixturesBundle/issues", - "source": "https://github.com/doctrine/DoctrineFixturesBundle/tree/3.4.5" + "issues": "https://github.com/hamcrest/hamcrest-php/issues", + "source": "https://github.com/hamcrest/hamcrest-php/tree/v2.0.1" }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdoctrine-fixtures-bundle", - "type": "tidelift" - } - ], - "time": "2023-10-29T18:36:06+00:00" + "time": "2020-07-09T08:09:16+00:00" }, { - "name": "hamcrest/hamcrest-php", - "version": "v2.0.1", + "name": "masterminds/html5", + "version": "2.8.1", "source": { "type": "git", - "url": "https://github.com/hamcrest/hamcrest-php.git", - "reference": "8c3d0a3f6af734494ad8f6fbbee0ba92422859f3" + "url": "https://github.com/Masterminds/html5-php.git", + "reference": "f47dcf3c70c584de14f21143c55d9939631bc6cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/8c3d0a3f6af734494ad8f6fbbee0ba92422859f3", - "reference": "8c3d0a3f6af734494ad8f6fbbee0ba92422859f3", + "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f47dcf3c70c584de14f21143c55d9939631bc6cf", + "reference": "f47dcf3c70c584de14f21143c55d9939631bc6cf", "shasum": "" }, "require": { - "php": "^5.3|^7.0|^8.0" - }, - "replace": { - "cordoval/hamcrest-php": "*", - "davedevelopment/hamcrest-php": "*", - "kodova/hamcrest-php": "*" + "ext-dom": "*", + "php": ">=5.3.0" }, "require-dev": { - "phpunit/php-file-iterator": "^1.4 || ^2.0", - "phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7.0" + "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7 || ^8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.7-dev" } }, "autoload": { - "classmap": [ - "hamcrest" - ] + "psr-4": { + "Masterminds\\": "src" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" + ], + "authors": [ + { + "name": "Matt Butcher", + "email": "technosophos@gmail.com" + }, + { + "name": "Matt Farina", + "email": "matt@mattfarina.com" + }, + { + "name": "Asmir Mustafic", + "email": "goetas@gmail.com" + } ], - "description": "This is the PHP port of Hamcrest Matchers", + "description": "An HTML5 parser and serializer.", + "homepage": "http://masterminds.github.io/html5-php", "keywords": [ - "test" + "HTML5", + "dom", + "html", + "parser", + "querypath", + "serializer", + "xml" ], "support": { - "issues": "https://github.com/hamcrest/hamcrest-php/issues", - "source": "https://github.com/hamcrest/hamcrest-php/tree/v2.0.1" + "issues": "https://github.com/Masterminds/html5-php/issues", + "source": "https://github.com/Masterminds/html5-php/tree/2.8.1" }, - "time": "2020-07-09T08:09:16+00:00" + "time": "2023-05-10T11:58:31+00:00" }, { "name": "mockery/mockery", - "version": "1.3.6", + "version": "1.6.7", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "dc206df4fa314a50bbb81cf72239a305c5bbd5c0" + "reference": "0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/dc206df4fa314a50bbb81cf72239a305c5bbd5c0", - "reference": "dc206df4fa314a50bbb81cf72239a305c5bbd5c0", + "url": "https://api.github.com/repos/mockery/mockery/zipball/0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06", + "reference": "0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06", "shasum": "" }, "require": { "hamcrest/hamcrest-php": "^2.0.1", "lib-pcre": ">=7.0", - "php": ">=5.6.0" + "php": ">=7.3" + }, + "conflict": { + "phpunit/phpunit": "<8.0" }, "require-dev": { - "phpunit/phpunit": "^5.7.10|^6.5|^7.5|^8.5|^9.3" + "phpunit/phpunit": "^8.5 || ^9.6.10", + "symplify/easy-coding-standard": "^12.0.8" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3.x-dev" - } - }, "autoload": { - "psr-0": { - "Mockery": "library/" + "files": [ + "library/helpers.php", + "library/Mockery.php" + ], + "psr-4": { + "Mockery\\": "library/Mockery" } }, "notification-url": "https://packagist.org/downloads/", @@ -8987,12 +9084,20 @@ { "name": "Pádraic Brady", "email": "padraic.brady@gmail.com", - "homepage": "http://blog.astrumfutura.com" + "homepage": "https://github.com/padraic", + "role": "Author" }, { "name": "Dave Marshall", "email": "dave.marshall@atstsolutions.co.uk", - "homepage": "http://davedevelopment.co.uk" + "homepage": "https://davedevelopment.co.uk", + "role": "Developer" + }, + { + "name": "Nathanael Esayeas", + "email": "nathanael.esayeas@protonmail.com", + "homepage": "https://github.com/ghostwriter", + "role": "Lead Developer" } ], "description": "Mockery is a simple yet flexible PHP mock object framework", @@ -9010,10 +9115,13 @@ "testing" ], "support": { + "docs": "https://docs.mockery.io/", "issues": "https://github.com/mockery/mockery/issues", - "source": "https://github.com/mockery/mockery/tree/1.3.6" + "rss": "https://github.com/mockery/mockery/releases.atom", + "security": "https://github.com/mockery/mockery/security/advisories", + "source": "https://github.com/mockery/mockery" }, - "time": "2022-09-07T15:05:49+00:00" + "time": "2023-12-10T02:24:34+00:00" }, { "name": "moontoast/math", @@ -9129,73 +9237,38 @@ ], "time": "2023-03-08T13:26:56+00:00" }, - { - "name": "n98/junit-xml", - "version": "1.1.0", - "source": { - "type": "git", - "url": "https://github.com/cmuench/junit-xml.git", - "reference": "0017dd92ac8cb619f02e32f4cffd768cfe327c73" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/cmuench/junit-xml/zipball/0017dd92ac8cb619f02e32f4cffd768cfe327c73", - "reference": "0017dd92ac8cb619f02e32f4cffd768cfe327c73", - "shasum": "" - }, - "require-dev": { - "phpunit/phpunit": "^9.5.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "N98\\JUnitXml\\": "src/N98/JUnitXml" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Christian Münch", - "email": "c.muench@netz98.de" - } - ], - "description": "JUnit XML Document generation library", - "support": { - "issues": "https://github.com/cmuench/junit-xml/issues", - "source": "https://github.com/cmuench/junit-xml/tree/1.1.0" - }, - "time": "2020-12-25T09:08:58+00:00" - }, { "name": "overtrue/phplint", - "version": "3.2.0", + "version": "9.1.2", "source": { "type": "git", "url": "https://github.com/overtrue/phplint.git", - "reference": "c3021ad8cebd802ad3f4924c45f508803e0b80e5" + "reference": "7a9822c863d19fa8ec42f862c0e135da58b5cb4b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/overtrue/phplint/zipball/c3021ad8cebd802ad3f4924c45f508803e0b80e5", - "reference": "c3021ad8cebd802ad3f4924c45f508803e0b80e5", + "url": "https://api.github.com/repos/overtrue/phplint/zipball/7a9822c863d19fa8ec42f862c0e135da58b5cb4b", + "reference": "7a9822c863d19fa8ec42f862c0e135da58b5cb4b", "shasum": "" }, "require": { + "ext-dom": "*", "ext-json": "*", - "n98/junit-xml": "1.1.0", - "php": "^5.5.9 || ^7.0", - "symfony/console": "^3.2 || ^4.0 || ^5.0", - "symfony/finder": "^3.0 || ^4.0 || ^5.0", - "symfony/process": "^3.3 || ^4.0 || ^5.0", - "symfony/yaml": "^3.0 || ^4.0 || ^5.0" + "ext-mbstring": "*", + "php": "^8.1", + "symfony/cache": "^6.4 || ^7.0", + "symfony/console": "^6.4 || ^7.0", + "symfony/event-dispatcher": "^6.4 || ^7.0", + "symfony/finder": "^6.4 || ^7.0", + "symfony/options-resolver": "^6.4 || ^7.0", + "symfony/process": "^6.4 || ^7.0", + "symfony/yaml": "^6.4 || ^7.0" }, "require-dev": { - "brainmaestro/composer-git-hooks": "^2.7", - "friendsofphp/php-cs-fixer": "^2.16", - "jakub-onderka/php-console-highlighter": "^0.3.2 || ^0.4" + "bamarni/composer-bin-plugin": "^1.4", + "brainmaestro/composer-git-hooks": "^2.8.5 || 3.0.0-alpha.1", + "jetbrains/phpstorm-stubs": "^2021.3 || ^2022.3 || ^2023.3", + "php-parallel-lint/php-console-highlighter": "^1.0" }, "bin": [ "bin/phplint" @@ -9204,11 +9277,15 @@ "extra": { "hooks": { "pre-commit": [ - "composer fix-style" + "composer style:fix", + "composer code:check" ], "pre-push": [ - "composer check-style" + "composer qa:check" ] + }, + "branch-alias": { + "dev-main": "9.1.x-dev" } }, "autoload": { @@ -9224,6 +9301,10 @@ { "name": "overtrue", "email": "anzhengchao@gmail.com" + }, + { + "name": "Laurent Laville", + "homepage": "https://github.com/llaville" } ], "description": "`phplint` is a tool that can speed up linting of php files by running several lint processes at once.", @@ -9231,11 +9312,12 @@ "check", "lint", "phplint", + "static analysis", "syntax" ], "support": { "issues": "https://github.com/overtrue/phplint/issues", - "source": "https://github.com/overtrue/phplint/tree/3.2.0" + "source": "https://github.com/overtrue/phplint/tree/9.1.2" }, "funding": [ { @@ -9243,7 +9325,7 @@ "type": "github" } ], - "time": "2022-07-12T07:37:04+00:00" + "time": "2024-02-06T10:43:30+00:00" }, { "name": "paragonie/constant_time_encoding", @@ -9312,6 +9394,56 @@ }, "time": "2022-06-14T06:56:20+00:00" }, + { + "name": "paragonie/random_compat", + "version": "v9.99.100", + "source": { + "type": "git", + "url": "https://github.com/paragonie/random_compat.git", + "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a", + "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a", + "shasum": "" + }, + "require": { + "php": ">= 7" + }, + "require-dev": { + "phpunit/phpunit": "4.*|5.*", + "vimeo/psalm": "^1" + }, + "suggest": { + "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." + }, + "type": "library", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Paragon Initiative Enterprises", + "email": "security@paragonie.com", + "homepage": "https://paragonie.com" + } + ], + "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", + "keywords": [ + "csprng", + "polyfill", + "pseudorandom", + "random" + ], + "support": { + "email": "info@paragonie.com", + "issues": "https://github.com/paragonie/random_compat/issues", + "source": "https://github.com/paragonie/random_compat" + }, + "time": "2020-10-15T08:29:30+00:00" + }, { "name": "pdepend/pdepend", "version": "2.16.2", @@ -9633,16 +9765,16 @@ }, { "name": "phpseclib/phpseclib", - "version": "3.0.37", + "version": "3.0.36", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "cfa2013d0f68c062055180dd4328cc8b9d1f30b8" + "reference": "c2fb5136162d4be18fdd4da9980696f3aee96d7b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/cfa2013d0f68c062055180dd4328cc8b9d1f30b8", - "reference": "cfa2013d0f68c062055180dd4328cc8b9d1f30b8", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c2fb5136162d4be18fdd4da9980696f3aee96d7b", + "reference": "c2fb5136162d4be18fdd4da9980696f3aee96d7b", "shasum": "" }, "require": { @@ -9723,7 +9855,7 @@ ], "support": { "issues": "https://github.com/phpseclib/phpseclib/issues", - "source": "https://github.com/phpseclib/phpseclib/tree/3.0.37" + "source": "https://github.com/phpseclib/phpseclib/tree/3.0.36" }, "funding": [ { @@ -9739,44 +9871,48 @@ "type": "tidelift" } ], - "time": "2024-03-03T02:14:58+00:00" + "time": "2024-02-26T05:13:14+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "7.0.15", + "version": "9.2.30", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "819f92bba8b001d4363065928088de22f25a3a48" + "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/819f92bba8b001d4363065928088de22f25a3a48", - "reference": "819f92bba8b001d4363065928088de22f25a3a48", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca2bd87d2f9215904682a9cb9bb37dda98e76089", + "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089", "shasum": "" }, "require": { "ext-dom": "*", + "ext-libxml": "*", "ext-xmlwriter": "*", - "php": ">=7.2", - "phpunit/php-file-iterator": "^2.0.2", - "phpunit/php-text-template": "^1.2.1", - "phpunit/php-token-stream": "^3.1.3 || ^4.0", - "sebastian/code-unit-reverse-lookup": "^1.0.1", - "sebastian/environment": "^4.2.2", - "sebastian/version": "^2.0.1", - "theseer/tokenizer": "^1.1.3" + "nikic/php-parser": "^4.18 || ^5.0", + "php": ">=7.3", + "phpunit/php-file-iterator": "^3.0.3", + "phpunit/php-text-template": "^2.0.2", + "sebastian/code-unit-reverse-lookup": "^2.0.2", + "sebastian/complexity": "^2.0", + "sebastian/environment": "^5.1.2", + "sebastian/lines-of-code": "^1.0.3", + "sebastian/version": "^3.0.1", + "theseer/tokenizer": "^1.2.0" }, "require-dev": { - "phpunit/phpunit": "^8.2.2" + "phpunit/phpunit": "^9.3" }, "suggest": { - "ext-xdebug": "^2.7.2" + "ext-pcov": "PHP extension that provides line coverage", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "7.0-dev" + "dev-master": "9.2-dev" } }, "autoload": { @@ -9804,7 +9940,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/7.0.15" + "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.30" }, "funding": [ { @@ -9812,32 +9949,32 @@ "type": "github" } ], - "time": "2021-07-26T12:20:09+00:00" + "time": "2023-12-22T06:47:57+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "2.0.5", + "version": "3.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5" + "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5", - "reference": "42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", + "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -9864,7 +10001,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.5" + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6" }, "funding": [ { @@ -9872,26 +10009,38 @@ "type": "github" } ], - "time": "2021-12-02T12:42:26+00:00" + "time": "2021-12-02T12:48:52+00:00" }, { - "name": "phpunit/php-text-template", - "version": "1.2.1", + "name": "phpunit/php-invoker", + "version": "3.1.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" + "url": "https://github.com/sebastianbergmann/php-invoker.git", + "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67", + "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.3" + }, + "require-dev": { + "ext-pcntl": "*", + "phpunit/phpunit": "^9.3" + }, + "suggest": { + "ext-pcntl": "*" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1-dev" + } + }, "autoload": { "classmap": [ "src/" @@ -9908,41 +10057,47 @@ "role": "lead" } ], - "description": "Simple template engine.", - "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "description": "Invoke callables with a timeout", + "homepage": "https://github.com/sebastianbergmann/php-invoker/", "keywords": [ - "template" + "process" ], "support": { - "issues": "https://github.com/sebastianbergmann/php-text-template/issues", - "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1" + "issues": "https://github.com/sebastianbergmann/php-invoker/issues", + "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1" }, - "time": "2015-06-21T13:50:34+00:00" + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T05:58:55+00:00" }, { - "name": "phpunit/php-timer", - "version": "2.1.3", + "name": "phpunit/php-text-template", + "version": "2.0.4", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662" + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/2454ae1765516d20c4ffe103d85a58a9a3bd5662", - "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", + "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -9961,14 +10116,14 @@ "role": "lead" } ], - "description": "Utility class for timing", - "homepage": "https://github.com/sebastianbergmann/php-timer/", + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", "keywords": [ - "timer" + "template" ], "support": { - "issues": "https://github.com/sebastianbergmann/php-timer/issues", - "source": "https://github.com/sebastianbergmann/php-timer/tree/2.1.3" + "issues": "https://github.com/sebastianbergmann/php-text-template/issues", + "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4" }, "funding": [ { @@ -9976,33 +10131,32 @@ "type": "github" } ], - "time": "2020-11-30T08:20:02+00:00" + "time": "2020-10-26T05:33:50+00:00" }, { - "name": "phpunit/php-token-stream", - "version": "3.1.3", + "name": "phpunit/php-timer", + "version": "5.0.3", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "9c1da83261628cb24b6a6df371b6e312b3954768" + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9c1da83261628cb24b6a6df371b6e312b3954768", - "reference": "9c1da83261628cb24b6a6df371b6e312b3954768", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", + "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", "shasum": "" }, "require": { - "ext-tokenizer": "*", - "php": ">=7.1" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^7.0" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -10017,17 +10171,18 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "email": "sebastian@phpunit.de", + "role": "lead" } ], - "description": "Wrapper around PHP's tokenizer extension.", - "homepage": "https://github.com/sebastianbergmann/php-token-stream/", + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", "keywords": [ - "tokenizer" + "timer" ], "support": { - "issues": "https://github.com/sebastianbergmann/php-token-stream/issues", - "source": "https://github.com/sebastianbergmann/php-token-stream/tree/3.1.3" + "issues": "https://github.com/sebastianbergmann/php-timer/issues", + "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3" }, "funding": [ { @@ -10035,53 +10190,54 @@ "type": "github" } ], - "abandoned": true, - "time": "2021-07-26T12:15:06+00:00" + "time": "2020-10-26T13:16:10+00:00" }, { "name": "phpunit/phpunit", - "version": "8.5.36", + "version": "9.6.17", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "9652df58e06a681429d8cfdaec3c43d6de581d5a" + "reference": "1a156980d78a6666721b7e8e8502fe210b587fcd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9652df58e06a681429d8cfdaec3c43d6de581d5a", - "reference": "9652df58e06a681429d8cfdaec3c43d6de581d5a", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1a156980d78a6666721b7e8e8502fe210b587fcd", + "reference": "1a156980d78a6666721b7e8e8502fe210b587fcd", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.3.1", + "doctrine/instantiator": "^1.3.1 || ^2", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.10.0", + "myclabs/deep-copy": "^1.10.1", "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", - "php": ">=7.2", - "phpunit/php-code-coverage": "^7.0.12", - "phpunit/php-file-iterator": "^2.0.4", - "phpunit/php-text-template": "^1.2.1", - "phpunit/php-timer": "^2.1.2", - "sebastian/comparator": "^3.0.5", - "sebastian/diff": "^3.0.2", - "sebastian/environment": "^4.2.3", - "sebastian/exporter": "^3.1.5", - "sebastian/global-state": "^3.0.0", - "sebastian/object-enumerator": "^3.0.3", - "sebastian/resource-operations": "^2.0.1", - "sebastian/type": "^1.1.3", - "sebastian/version": "^2.0.1" + "php": ">=7.3", + "phpunit/php-code-coverage": "^9.2.28", + "phpunit/php-file-iterator": "^3.0.5", + "phpunit/php-invoker": "^3.1.1", + "phpunit/php-text-template": "^2.0.3", + "phpunit/php-timer": "^5.0.2", + "sebastian/cli-parser": "^1.0.1", + "sebastian/code-unit": "^1.0.6", + "sebastian/comparator": "^4.0.8", + "sebastian/diff": "^4.0.3", + "sebastian/environment": "^5.1.3", + "sebastian/exporter": "^4.0.5", + "sebastian/global-state": "^5.0.1", + "sebastian/object-enumerator": "^4.0.3", + "sebastian/resource-operations": "^3.0.3", + "sebastian/type": "^3.2", + "sebastian/version": "^3.0.2" }, "suggest": { "ext-soap": "To be able to generate mocks based on WSDL files", - "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage", - "phpunit/php-invoker": "To allow enforcing time limits" + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" }, "bin": [ "phpunit" @@ -10089,10 +10245,13 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "8.5-dev" + "dev-master": "9.6-dev" } }, "autoload": { + "files": [ + "src/Framework/Assert/Functions.php" + ], "classmap": [ "src/" ] @@ -10118,7 +10277,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.36" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.17" }, "funding": [ { @@ -10128,38 +10287,150 @@ { "url": "https://github.com/sebastianbergmann", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", - "type": "tidelift" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", + "type": "tidelift" + } + ], + "time": "2024-02-23T13:14:51+00:00" + }, + { + "name": "sebastian/cli-parser", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/cli-parser.git", + "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2", + "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for parsing CLI options", + "homepage": "https://github.com/sebastianbergmann/cli-parser", + "support": { + "issues": "https://github.com/sebastianbergmann/cli-parser/issues", + "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T06:08:49+00:00" + }, + { + "name": "sebastian/code-unit", + "version": "1.0.8", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit.git", + "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120", + "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Collection of value objects that represent the PHP code units", + "homepage": "https://github.com/sebastianbergmann/code-unit", + "support": { + "issues": "https://github.com/sebastianbergmann/code-unit/issues", + "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" } ], - "time": "2023-12-01T16:52:15+00:00" + "time": "2020-10-26T13:08:54+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", - "version": "1.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619" + "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619", - "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", + "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", "shasum": "" }, "require": { - "php": ">=5.6" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -10181,7 +10452,7 @@ "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", "support": { "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", - "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2" + "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3" }, "funding": [ { @@ -10189,34 +10460,34 @@ "type": "github" } ], - "time": "2020-11-30T08:15:22+00:00" + "time": "2020-09-28T05:30:19+00:00" }, { "name": "sebastian/comparator", - "version": "3.0.5", + "version": "4.0.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "1dc7ceb4a24aede938c7af2a9ed1de09609ca770" + "reference": "fa0f136dd2334583309d32b62544682ee972b51a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1dc7ceb4a24aede938c7af2a9ed1de09609ca770", - "reference": "1dc7ceb4a24aede938c7af2a9ed1de09609ca770", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a", + "reference": "fa0f136dd2334583309d32b62544682ee972b51a", "shasum": "" }, "require": { - "php": ">=7.1", - "sebastian/diff": "^3.0", - "sebastian/exporter": "^3.1" + "php": ">=7.3", + "sebastian/diff": "^4.0", + "sebastian/exporter": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -10255,7 +10526,64 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.5" + "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2022-09-14T12:41:17+00:00" + }, + { + "name": "sebastian/complexity", + "version": "2.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/complexity.git", + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a", + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a", + "shasum": "" + }, + "require": { + "nikic/php-parser": "^4.18 || ^5.0", + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for calculating the complexity of PHP code units", + "homepage": "https://github.com/sebastianbergmann/complexity", + "support": { + "issues": "https://github.com/sebastianbergmann/complexity/issues", + "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3" }, "funding": [ { @@ -10263,33 +10591,33 @@ "type": "github" } ], - "time": "2022-09-14T12:31:48+00:00" + "time": "2023-12-22T06:19:30+00:00" }, { "name": "sebastian/diff", - "version": "3.0.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "6296a0c086dd0117c1b78b059374d7fcbe7545ae" + "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/6296a0c086dd0117c1b78b059374d7fcbe7545ae", - "reference": "6296a0c086dd0117c1b78b059374d7fcbe7545ae", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131", + "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^7.5 || ^8.0", - "symfony/process": "^2 || ^3.3 || ^4" + "phpunit/phpunit": "^9.3", + "symfony/process": "^4.2 || ^5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -10321,7 +10649,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/3.0.4" + "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5" }, "funding": [ { @@ -10329,27 +10657,27 @@ "type": "github" } ], - "time": "2023-05-07T05:30:20+00:00" + "time": "2023-05-07T05:35:17+00:00" }, { "name": "sebastian/environment", - "version": "4.2.4", + "version": "5.1.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0" + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/d47bbbad83711771f167c72d4e3f25f7fcc1f8b0", - "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^7.5" + "phpunit/phpunit": "^9.3" }, "suggest": { "ext-posix": "*" @@ -10357,7 +10685,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "5.1-dev" } }, "autoload": { @@ -10384,7 +10712,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/environment/issues", - "source": "https://github.com/sebastianbergmann/environment/tree/4.2.4" + "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5" }, "funding": [ { @@ -10392,34 +10720,34 @@ "type": "github" } ], - "time": "2020-11-30T07:53:42+00:00" + "time": "2023-02-03T06:03:51+00:00" }, { "name": "sebastian/exporter", - "version": "3.1.5", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "73a9676f2833b9a7c36968f9d882589cd75511e6" + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/73a9676f2833b9a7c36968f9d882589cd75511e6", - "reference": "73a9676f2833b9a7c36968f9d882589cd75511e6", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", "shasum": "" }, "require": { - "php": ">=7.0", - "sebastian/recursion-context": "^3.0" + "php": ">=7.3", + "sebastian/recursion-context": "^4.0" }, "require-dev": { "ext-mbstring": "*", - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1.x-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -10454,14 +10782,14 @@ } ], "description": "Provides the functionality to export PHP variables for visualization", - "homepage": "http://www.github.com/sebastianbergmann/exporter", + "homepage": "https://www.github.com/sebastianbergmann/exporter", "keywords": [ "export", "exporter" ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.5" + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5" }, "funding": [ { @@ -10469,30 +10797,39 @@ "type": "github" } ], - "time": "2022-09-14T06:00:17+00:00" + "time": "2022-09-14T06:03:37+00:00" }, { - "name": "sebastian/finder-facade", - "version": "1.2.3", + "name": "sebastian/global-state", + "version": "5.0.6", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/finder-facade.git", - "reference": "167c45d131f7fc3d159f56f191a0a22228765e16" + "url": "https://github.com/sebastianbergmann/global-state.git", + "reference": "bde739e7565280bda77be70044ac1047bc007e34" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/finder-facade/zipball/167c45d131f7fc3d159f56f191a0a22228765e16", - "reference": "167c45d131f7fc3d159f56f191a0a22228765e16", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34", + "reference": "bde739e7565280bda77be70044ac1047bc007e34", "shasum": "" }, "require": { - "php": "^7.1", - "symfony/finder": "^2.3|^3.0|^4.0|^5.0", - "theseer/fdomdocument": "^1.6" + "php": ">=7.3", + "sebastian/object-reflector": "^2.0", + "sebastian/recursion-context": "^4.0" + }, + "require-dev": { + "ext-dom": "*", + "phpunit/phpunit": "^9.3" + }, + "suggest": { + "ext-uopz": "*" }, "type": "library", "extra": { - "branch-alias": [] + "branch-alias": { + "dev-master": "5.0-dev" + } }, "autoload": { "classmap": [ @@ -10506,49 +10843,51 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "email": "sebastian@phpunit.de" } ], - "description": "FinderFacade is a convenience wrapper for Symfony's Finder component.", - "homepage": "https://github.com/sebastianbergmann/finder-facade", + "description": "Snapshotting of global state", + "homepage": "http://www.github.com/sebastianbergmann/global-state", + "keywords": [ + "global state" + ], "support": { - "issues": "https://github.com/sebastianbergmann/finder-facade/issues", - "source": "https://github.com/sebastianbergmann/finder-facade/tree/1.2" + "issues": "https://github.com/sebastianbergmann/global-state/issues", + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6" }, - "abandoned": true, - "time": "2020-01-16T08:08:45+00:00" + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-08-02T09:26:13+00:00" }, { - "name": "sebastian/global-state", - "version": "3.0.3", + "name": "sebastian/lines-of-code", + "version": "1.0.4", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "66783ce213de415b451b904bfef9dda0cf9aeae0" + "url": "https://github.com/sebastianbergmann/lines-of-code.git", + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/66783ce213de415b451b904bfef9dda0cf9aeae0", - "reference": "66783ce213de415b451b904bfef9dda0cf9aeae0", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5", + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5", "shasum": "" }, "require": { - "php": ">=7.2", - "sebastian/object-reflector": "^1.1.1", - "sebastian/recursion-context": "^3.0" + "nikic/php-parser": "^4.18 || ^5.0", + "php": ">=7.3" }, "require-dev": { - "ext-dom": "*", - "phpunit/phpunit": "^8.0" - }, - "suggest": { - "ext-uopz": "*" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "1.0-dev" } }, "autoload": { @@ -10563,17 +10902,15 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "email": "sebastian@phpunit.de", + "role": "lead" } ], - "description": "Snapshotting of global state", - "homepage": "http://www.github.com/sebastianbergmann/global-state", - "keywords": [ - "global state" - ], + "description": "Library for counting the lines of code in PHP source code", + "homepage": "https://github.com/sebastianbergmann/lines-of-code", "support": { - "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/3.0.3" + "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4" }, "funding": [ { @@ -10581,34 +10918,34 @@ "type": "github" } ], - "time": "2023-08-02T09:23:32+00:00" + "time": "2023-12-22T06:20:34+00:00" }, { "name": "sebastian/object-enumerator", - "version": "3.0.4", + "version": "4.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2" + "reference": "5c9eeac41b290a3712d88851518825ad78f45c71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", - "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71", + "reference": "5c9eeac41b290a3712d88851518825ad78f45c71", "shasum": "" }, "require": { - "php": ">=7.0", - "sebastian/object-reflector": "^1.1.1", - "sebastian/recursion-context": "^3.0" + "php": ">=7.3", + "sebastian/object-reflector": "^2.0", + "sebastian/recursion-context": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -10630,7 +10967,7 @@ "homepage": "https://github.com/sebastianbergmann/object-enumerator/", "support": { "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", - "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4" + "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4" }, "funding": [ { @@ -10638,32 +10975,32 @@ "type": "github" } ], - "time": "2020-11-30T07:40:27+00:00" + "time": "2020-10-26T13:12:34+00:00" }, { "name": "sebastian/object-reflector", - "version": "1.1.2", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-reflector.git", - "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d" + "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", - "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", + "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", "shasum": "" }, "require": { - "php": ">=7.0" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -10685,7 +11022,7 @@ "homepage": "https://github.com/sebastianbergmann/object-reflector/", "support": { "issues": "https://github.com/sebastianbergmann/object-reflector/issues", - "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2" + "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4" }, "funding": [ { @@ -10693,29 +11030,29 @@ "type": "github" } ], - "time": "2020-11-30T07:37:18+00:00" + "time": "2020-10-26T13:14:26+00:00" }, { "name": "sebastian/phpcpd", - "version": "4.1.0", + "version": "6.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpcpd.git", - "reference": "0d9afa762f2400de077b2192f4a9d127de0bb78e" + "reference": "f3683aa0db2e8e09287c2bb33a595b2873ea9176" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpcpd/zipball/0d9afa762f2400de077b2192f4a9d127de0bb78e", - "reference": "0d9afa762f2400de077b2192f4a9d127de0bb78e", + "url": "https://api.github.com/repos/sebastianbergmann/phpcpd/zipball/f3683aa0db2e8e09287c2bb33a595b2873ea9176", + "reference": "f3683aa0db2e8e09287c2bb33a595b2873ea9176", "shasum": "" }, "require": { "ext-dom": "*", - "php": "^7.1", - "phpunit/php-timer": "^2.0", - "sebastian/finder-facade": "^1.1", - "sebastian/version": "^1.0|^2.0", - "symfony/console": "^2.7|^3.0|^4.0" + "php": ">=7.3", + "phpunit/php-file-iterator": "^3.0", + "phpunit/php-timer": "^5.0", + "sebastian/cli-parser": "^1.0", + "sebastian/version": "^3.0" }, "bin": [ "phpcpd" @@ -10723,7 +11060,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "6.0-dev" } }, "autoload": { @@ -10746,35 +11083,41 @@ "homepage": "https://github.com/sebastianbergmann/phpcpd", "support": { "issues": "https://github.com/sebastianbergmann/phpcpd/issues", - "source": "https://github.com/sebastianbergmann/phpcpd/tree/4.1.0" + "source": "https://github.com/sebastianbergmann/phpcpd/tree/6.0.3" }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "abandoned": true, - "time": "2018-09-17T17:17:27+00:00" + "time": "2020-12-07T05:39:23+00:00" }, { "name": "sebastian/recursion-context", - "version": "3.0.1", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb" + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/367dcba38d6e1977be014dc4b22f47a484dac7fb", - "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", "shasum": "" }, "require": { - "php": ">=7.0" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -10801,10 +11144,10 @@ } ], "description": "Provides functionality to recursively process PHP variables", - "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "homepage": "https://github.com/sebastianbergmann/recursion-context", "support": { "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.1" + "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5" }, "funding": [ { @@ -10812,29 +11155,32 @@ "type": "github" } ], - "time": "2020-11-30T07:34:24+00:00" + "time": "2023-02-03T06:07:39+00:00" }, { "name": "sebastian/resource-operations", - "version": "2.0.2", + "version": "3.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3" + "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/31d35ca87926450c44eae7e2611d45a7a65ea8b3", - "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", + "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -10856,7 +11202,7 @@ "homepage": "https://www.github.com/sebastianbergmann/resource-operations", "support": { "issues": "https://github.com/sebastianbergmann/resource-operations/issues", - "source": "https://github.com/sebastianbergmann/resource-operations/tree/2.0.2" + "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3" }, "funding": [ { @@ -10864,32 +11210,32 @@ "type": "github" } ], - "time": "2020-11-30T07:30:19+00:00" + "time": "2020-09-28T06:45:17+00:00" }, { "name": "sebastian/type", - "version": "1.1.4", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "0150cfbc4495ed2df3872fb31b26781e4e077eb4" + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/0150cfbc4495ed2df3872fb31b26781e4e077eb4", - "reference": "0150cfbc4495ed2df3872fb31b26781e4e077eb4", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", "shasum": "" }, "require": { - "php": ">=7.2" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^8.2" + "phpunit/phpunit": "^9.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "3.2-dev" } }, "autoload": { @@ -10912,7 +11258,7 @@ "homepage": "https://github.com/sebastianbergmann/type", "support": { "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/1.1.4" + "source": "https://github.com/sebastianbergmann/type/tree/3.2.1" }, "funding": [ { @@ -10920,29 +11266,29 @@ "type": "github" } ], - "time": "2020-11-30T07:25:11+00:00" + "time": "2023-02-03T06:13:03+00:00" }, { "name": "sebastian/version", - "version": "2.0.1", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/version.git", - "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019" + "reference": "c6c1022351a901512170118436c764e473f6de8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", - "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c", + "reference": "c6c1022351a901512170118436c764e473f6de8c", "shasum": "" }, "require": { - "php": ">=5.6" + "php": ">=7.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -10965,9 +11311,15 @@ "homepage": "https://github.com/sebastianbergmann/version", "support": { "issues": "https://github.com/sebastianbergmann/version/issues", - "source": "https://github.com/sebastianbergmann/version/tree/master" + "source": "https://github.com/sebastianbergmann/version/tree/3.0.2" }, - "time": "2016-10-03T07:35:21+00:00" + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T06:39:44+00:00" }, { "name": "squizlabs/php_codesniffer", @@ -11051,31 +11403,27 @@ }, { "name": "symfony/browser-kit", - "version": "v4.4.44", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "2a1ff40723ef6b29c8229a860a9c8f815ad7dbbb" + "reference": "495ffa2e6d17e199213f93768efa01af32bbf70e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/2a1ff40723ef6b29c8229a860a9c8f815ad7dbbb", - "reference": "2a1ff40723ef6b29c8229a860a9c8f815ad7dbbb", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/495ffa2e6d17e199213f93768efa01af32bbf70e", + "reference": "495ffa2e6d17e199213f93768efa01af32bbf70e", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/dom-crawler": "^3.4|^4.0|^5.0", - "symfony/polyfill-php80": "^1.16" + "php": ">=8.1", + "symfony/dom-crawler": "^5.4|^6.0|^7.0" }, "require-dev": { - "symfony/css-selector": "^3.4|^4.0|^5.0", - "symfony/http-client": "^4.3|^5.0", - "symfony/mime": "^4.3|^5.0", - "symfony/process": "^3.4|^4.0|^5.0" - }, - "suggest": { - "symfony/process": "" + "symfony/css-selector": "^5.4|^6.0|^7.0", + "symfony/http-client": "^5.4|^6.0|^7.0", + "symfony/mime": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -11103,7 +11451,7 @@ "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/browser-kit/tree/v4.4.44" + "source": "https://github.com/symfony/browser-kit/tree/v6.4.3" }, "funding": [ { @@ -11119,37 +11467,30 @@ "type": "tidelift" } ], - "time": "2022-07-25T12:56:14+00:00" + "time": "2024-01-23T14:51:35+00:00" }, { "name": "symfony/dom-crawler", - "version": "v4.4.45", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "4b8daf6c56801e6d664224261cb100b73edc78a5" + "reference": "f0e7ec3fa17000e2d0cb4557b4b47c88a6a63531" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/4b8daf6c56801e6d664224261cb100b73edc78a5", - "reference": "4b8daf6c56801e6d664224261cb100b73edc78a5", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/f0e7ec3fa17000e2d0cb4557b4b47c88a6a63531", + "reference": "f0e7ec3fa17000e2d0cb4557b4b47c88a6a63531", "shasum": "" }, "require": { - "php": ">=7.1.3", + "masterminds/html5": "^2.6", + "php": ">=8.1", "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php80": "^1.16" - }, - "conflict": { - "masterminds/html5": "<2.6" + "symfony/polyfill-mbstring": "~1.0" }, "require-dev": { - "masterminds/html5": "^2.6", - "symfony/css-selector": "^3.4|^4.0|^5.0" - }, - "suggest": { - "symfony/css-selector": "" + "symfony/css-selector": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -11177,7 +11518,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v4.4.45" + "source": "https://github.com/symfony/dom-crawler/tree/v6.4.4" }, "funding": [ { @@ -11193,27 +11534,32 @@ "type": "tidelift" } ], - "time": "2022-08-03T12:57:57+00:00" + "time": "2024-02-07T09:17:57+00:00" }, { "name": "symfony/dotenv", - "version": "v4.4.37", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/dotenv.git", - "reference": "fcedd6d382b3afc3e1e786aa4e4fc4cf06f564cf" + "reference": "f6f0a3dd102915b4c5bfdf4f4e3139a8cbf477a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dotenv/zipball/fcedd6d382b3afc3e1e786aa4e4fc4cf06f564cf", - "reference": "fcedd6d382b3afc3e1e786aa4e4fc4cf06f564cf", + "url": "https://api.github.com/repos/symfony/dotenv/zipball/f6f0a3dd102915b4c5bfdf4f4e3139a8cbf477a0", + "reference": "f6f0a3dd102915b4c5bfdf4f4e3139a8cbf477a0", "shasum": "" }, "require": { - "php": ">=7.1.3" + "php": ">=8.1" + }, + "conflict": { + "symfony/console": "<5.4", + "symfony/process": "<5.4" }, "require-dev": { - "symfony/process": "^3.4.2|^4.0|^5.0" + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -11246,7 +11592,7 @@ "environment" ], "support": { - "source": "https://github.com/symfony/dotenv/tree/v4.4.37" + "source": "https://github.com/symfony/dotenv/tree/v6.4.4" }, "funding": [ { @@ -11262,30 +11608,32 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:41:36+00:00" + "time": "2024-02-08T17:53:17+00:00" }, { "name": "symfony/phpunit-bridge", - "version": "v3.4.47", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "120273ad5d03a8deee08ca9260e2598f288f2bac" + "reference": "16ed5bdfd18e14fc7de347c8688e8ac479284222" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/120273ad5d03a8deee08ca9260e2598f288f2bac", - "reference": "120273ad5d03a8deee08ca9260e2598f288f2bac", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/16ed5bdfd18e14fc7de347c8688e8ac479284222", + "reference": "16ed5bdfd18e14fc7de347c8688e8ac479284222", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1.3" }, "conflict": { - "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0|<6.4,>=6.0|9.1.2" + "phpunit/phpunit": "<7.5|9.1.2" }, - "suggest": { - "symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader" + "require-dev": { + "symfony/deprecation-contracts": "^2.5|^3.0", + "symfony/error-handler": "^5.4|^6.0|^7.0", + "symfony/polyfill-php81": "^1.27" }, "bin": [ "bin/simple-phpunit" @@ -11322,10 +11670,10 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony PHPUnit Bridge", + "description": "Provides utilities for PHPUnit, especially user deprecation notices management", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/phpunit-bridge/tree/v3.4.47" + "source": "https://github.com/symfony/phpunit-bridge/tree/v6.4.4" }, "funding": [ { @@ -11341,25 +11689,24 @@ "type": "tidelift" } ], - "time": "2020-11-13T16:28:59+00:00" + "time": "2024-02-08T14:08:19+00:00" }, { "name": "symfony/process", - "version": "v4.4.44", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "5cee9cdc4f7805e2699d9fd66991a0e6df8252a2" + "reference": "710e27879e9be3395de2b98da3f52a946039f297" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/5cee9cdc4f7805e2699d9fd66991a0e6df8252a2", - "reference": "5cee9cdc4f7805e2699d9fd66991a0e6df8252a2", + "url": "https://api.github.com/repos/symfony/process/zipball/710e27879e9be3395de2b98da3f52a946039f297", + "reference": "710e27879e9be3395de2b98da3f52a946039f297", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/polyfill-php80": "^1.16" + "php": ">=8.1" }, "type": "library", "autoload": { @@ -11387,72 +11734,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v4.4.44" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-06-27T13:16:42+00:00" - }, - { - "name": "symfony/stopwatch", - "version": "v4.4.46", - "source": { - "type": "git", - "url": "https://github.com/symfony/stopwatch.git", - "reference": "757660703fbd139eea0001b759c6c3bf5bc3ea52" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/757660703fbd139eea0001b759c6c3bf5bc3ea52", - "reference": "757660703fbd139eea0001b759c6c3bf5bc3ea52", - "shasum": "" - }, - "require": { - "php": ">=7.1.3", - "symfony/service-contracts": "^1.0|^2" - }, - "require-dev": { - "symfony/polyfill-php72": "~1.5" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Stopwatch\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Provides a way to profile code", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/stopwatch/tree/v4.4.46" + "source": "https://github.com/symfony/process/tree/v6.4.4" }, "funding": [ { @@ -11468,42 +11750,42 @@ "type": "tidelift" } ], - "time": "2022-09-28T12:53:24+00:00" + "time": "2024-02-20T12:31:00+00:00" }, { "name": "symfony/web-profiler-bundle", - "version": "v4.4.47", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/web-profiler-bundle.git", - "reference": "c173202d8ce82fde63ec0953eaffdf065018b8f4" + "reference": "a69d7124bfb2e15638ba0a1be94f0845d8d05ee4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/web-profiler-bundle/zipball/c173202d8ce82fde63ec0953eaffdf065018b8f4", - "reference": "c173202d8ce82fde63ec0953eaffdf065018b8f4", + "url": "https://api.github.com/repos/symfony/web-profiler-bundle/zipball/a69d7124bfb2e15638ba0a1be94f0845d8d05ee4", + "reference": "a69d7124bfb2e15638ba0a1be94f0845d8d05ee4", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/config": "^4.2|^5.0", - "symfony/framework-bundle": "^4.4|^5.0", - "symfony/http-kernel": "^4.4", - "symfony/polyfill-php80": "^1.16", - "symfony/routing": "^4.3|^5.0", - "symfony/twig-bundle": "^4.2|^5.0", - "twig/twig": "^1.43|^2.13|^3.0.4" + "php": ">=8.1", + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/framework-bundle": "^6.4|^7.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/routing": "^5.4|^6.0|^7.0", + "symfony/twig-bundle": "^5.4|^6.0", + "twig/twig": "^2.13|^3.0.4" }, "conflict": { - "symfony/form": "<4.3", - "symfony/messenger": "<4.2" + "symfony/form": "<5.4", + "symfony/mailer": "<5.4", + "symfony/messenger": "<5.4", + "symfony/twig-bundle": ">=7.0" }, "require-dev": { - "symfony/browser-kit": "^4.3|^5.0", - "symfony/console": "^4.3|^5.0", - "symfony/css-selector": "^3.4|^4.0|^5.0", - "symfony/dependency-injection": "^3.4|^4.0|^5.0", - "symfony/stopwatch": "^3.4|^4.0|^5.0" + "symfony/browser-kit": "^5.4|^6.0|^7.0", + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/css-selector": "^5.4|^6.0|^7.0", + "symfony/stopwatch": "^5.4|^6.0|^7.0" }, "type": "symfony-bundle", "autoload": { @@ -11530,8 +11812,11 @@ ], "description": "Provides a development tool that gives detailed information about the execution of any request", "homepage": "https://symfony.com", + "keywords": [ + "dev" + ], "support": { - "source": "https://github.com/symfony/web-profiler-bundle/tree/v4.4.47" + "source": "https://github.com/symfony/web-profiler-bundle/tree/v6.4.4" }, "funding": [ { @@ -11547,55 +11832,7 @@ "type": "tidelift" } ], - "time": "2022-09-29T14:10:52+00:00" - }, - { - "name": "theseer/fdomdocument", - "version": "1.6.7", - "source": { - "type": "git", - "url": "https://github.com/theseer/fDOMDocument.git", - "reference": "5cddd4f9076a9a2b85c5135935bba2dcb3ed7574" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/theseer/fDOMDocument/zipball/5cddd4f9076a9a2b85c5135935bba2dcb3ed7574", - "reference": "5cddd4f9076a9a2b85c5135935bba2dcb3ed7574", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "lib-libxml": "*", - "php": ">=5.3.3" - }, - "require-dev": { - "php": ">=7.3" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "lead" - } - ], - "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.", - "homepage": "https://github.com/theseer/fDOMDocument", - "support": { - "issues": "https://github.com/theseer/fDOMDocument/issues", - "source": "https://github.com/theseer/fDOMDocument/tree/1.6.7" - }, - "abandoned": true, - "time": "2022-01-25T23:10:35+00:00" + "time": "2024-02-22T20:27:10+00:00" }, { "name": "theseer/tokenizer", @@ -11654,13 +11891,13 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "7.2.*", + "php": "^8.2", "ext-gmp": "*", "ext-json": "*" }, "platform-dev": [], "platform-overrides": { - "php": "7.2" + "php": "8.2" }, "plugin-api-version": "2.6.0" } diff --git a/config/packages/security.yaml b/config/packages/security.yaml index 8de0f5ee0..b0d7eda47 100644 --- a/config/packages/security.yaml +++ b/config/packages/security.yaml @@ -12,9 +12,9 @@ security: stateless: true access_control: - - { path: ^/management, roles: [ROLE_MANAGEMENT] } # can be expanded with hosts: or ip: - - { path: ^/deprovision, roles: [ROLE_DEPROVISION] } - - { roles: [ROLE_SS,ROLE_RA,ROLE_READ] } + - { path: ^/management, roles: [IS_AUTHENTICATED_FULLY, ROLE_MANAGEMENT] } # can be expanded with hosts: or ip: + - { path: ^/deprovision, roles: [IS_AUTHENTICATED_FULLY, ROLE_DEPROVISION] } + - { roles: [IS_AUTHENTICATED_FULLY, ROLE_SS, ROLE_RA, ROLE_READ] } providers: in_memory: @@ -37,4 +37,5 @@ security: roles: 'ROLE_DEPROVISION' password_hashers: - Symfony\Component\Security\Core\User\User: plaintext + Symfony\Component\Security\Core\User\InMemoryUser: + algorithm: plaintext diff --git a/config/packages/smoketest/doctrine.yaml b/config/packages/smoketest/doctrine.yaml index dda514cce..37fd4a81e 100644 --- a/config/packages/smoketest/doctrine.yaml +++ b/config/packages/smoketest/doctrine.yaml @@ -7,13 +7,19 @@ doctrine: host: mariadb password: mw_deploy_secret user: mw_deploy_user + options: + 1002: 0 gateway: dbname: gateway_test host: mariadb password: mw_deploy_secret user: mw_deploy_user + options: + 1002: 0 deploy: dbname: middleware_test host: mariadb password: mw_deploy_secret user: mw_deploy_user + options: + 1002: 0 diff --git a/config/packages/smoketest/monolog.yaml b/config/packages/smoketest/monolog.yaml index 918208b8d..f1a1e7e91 100644 --- a/config/packages/smoketest/monolog.yaml +++ b/config/packages/smoketest/monolog.yaml @@ -3,17 +3,10 @@ monolog: prod-signaler: type: fingers_crossed action_level: ERROR - passthru_level: DEBUG # DEV setting: this means that all message of level DEBUG or higher are always logged - #passthru_level: NOTICE # PROD setting this means that all message of level NOTICE or higher are always logged + passthru_level: NOTICE # this means that all message of level NOTICE or higher are always logged handler: main_syslog - bubble: true + bubble: false # if we handle it, nothing else should main_syslog: - type: syslog - ident: stepup-middleware - facility: user - formatter: surfnet_stepup.monolog.json_formatter - main_logfile: type: stream - handler: logfile - level: NOTICE - path: "%kernel.logs_dir%/%kernel.environment%.log" \ No newline at end of file + path: "php://stderr" + formatter: surfnet_stepup.monolog.json_formatter diff --git a/config/packages/test/doctrine.yaml b/config/packages/test/doctrine.yaml index 8315a3d98..bf9e04e0f 100644 --- a/config/packages/test/doctrine.yaml +++ b/config/packages/test/doctrine.yaml @@ -4,7 +4,13 @@ doctrine: connections: middleware: url: "sqlite:///%kernel.project_dir%/var/middleware.db" + options: + 1002: 0 gateway: url: "sqlite:///%kernel.project_dir%/var/gateway.db" + options: + 1002: 0 deploy: url: "sqlite:///%kernel.project_dir%/var/deploy.db" + options: + 1002: 0 diff --git a/config/packages/test/monolog.yaml b/config/packages/test/monolog.yaml index faf3440aa..636b38c01 100644 --- a/config/packages/test/monolog.yaml +++ b/config/packages/test/monolog.yaml @@ -1,12 +1,16 @@ monolog: handlers: - # Handlers are merged in from config.yml and config_dev.yml. They cannot be disabled or removed. The practical - # solution is to assign them the `null` handler, which discards the records. prod-signaler: - type: "null" + type: fingers_crossed + action_level: ERROR + passthru_level: NOTICE # this means that all message of level NOTICE or higher are always logged + handler: main_syslog + bubble: false # if we handle it, nothing else should main_syslog: + type: stream + path: "php://stderr" + formatter: surfnet_stepup.monolog.json_formatter + console: type: "null" main_logfile: type: "null" - console: - type: "null" diff --git a/config/routes/routes.yml b/config/routes/routes.yml index 976cdca00..7b18a027a 100644 --- a/config/routes/routes.yml +++ b/config/routes/routes.yml @@ -1,5 +1,5 @@ surfnet_stepup_middleware_management: - resource: "Surfnet/StepupMiddleware/ManagementBundle/Resources/config/routing.yml" + resource: "@SurfnetStepupMiddlewareManagementBundle/Resources/config/routing.yml" prefix: /management openconext_monitor: @@ -12,4 +12,4 @@ nelmio_security_report: methods: [POST] surfnet_stepup_middleware_api: - resource: "Surfnet/StepupMiddleware/ApiBundle/Resources/config/routing.yml" + resource: "@SurfnetStepupMiddlewareApiBundle/Resources/config/routing.yml" diff --git a/docs/postman/2.http b/docs/postman/2.http new file mode 100644 index 000000000..72f042408 --- /dev/null +++ b/docs/postman/2.http @@ -0,0 +1,218 @@ +# Step-up Middleware Configuration + +### +# @name /management/configuration +# POST the configuration +POST http://middleware.dev.openconext.local/management/configuration +Accept: application/json +Content-Type: application/json + +{ + "sraa": [ + "9971dbcf01267b11f6107d9cafb43e5b4009a955" + ], + "email_templates": { + "confirm_email": { + "nl_NL": "

Beste {{ commonName }},

\n\n

Bedankt voor het registreren van je token. Klik op onderstaande link om je e-mailadres te bevestigen:

\n

{{ verificationUrl }}

\n

Is klikken op de link niet mogelijk? Kopieer dan de link en plak deze in de adresbalk van je browser.

\n

SURFnet

", + "en_GB":"

Dear {{ commonName }},

\n\n

Thank you for registering your token. Please visit this link to verify your email address:

\n

{{ verificationUrl }}

\n

If you can not click on the URL, please copy the link and paste it in the address bar of your browser.

\n

SURFnet

" + }, + "registration_code_with_ras": { + "nl_NL": "

Beste {{ commonName }},

\n\n

Ga hier maar eens op kliken! {{ selfServiceUrl }} Bedankt voor het registreren van je token. Je token is bijna klaar voor gebruik. Ga uiterlijk {{ expirationDate|localizeddate('full', 'none', locale) }} naar de Service Desk om je token te laten activeren.

\n

Neem aub het volgende mee:

\n
    \n
  • Je token
    • \n
  • Een geldig legitimatiebewijs (paspoort, rijbewijs of nationale ID-kaart)
    • \n
  • De registratiecode uit deze e-mail
    • \n
\n\n

\n {{ registrationCode }}\n

\n\n

Service Desk medewerkers die je token kunnen activeren:

\n\n{% if ras is empty %}\n

Er zijn geen Service Desk medewerkers beschikbaar.

\n{% else %}\n
    \n {% for ra in ras %}\n
  • \n
    \n {{ ra.commonName }}
    \n {{ ra.location }}
    \n {{ ra.contactInformation }}\n
    \n
    • \n {% endfor %}\n
\n{% endif %}", + "en_GB": "

Dear {{ commonName }},

\n\n

Ga hier maar eens op kliken! {{ selfServiceUrl }} Thank you for registering your token, you are almost ready now. Please visit the Service Desk no later than {{ expirationDate|localizeddate('full', 'none', locale) }} to activate your token up.

\n

Please bring the following:

\n
    \n
  • Your token
    • \n
  • A valid identity document (passport, drivers license or national ID-card)
    • \n
  • The registration code from this e-mail
    • \n
\n\n

\n {{ registrationCode }}\n

\n\n

Service Desk employees authorized to activate your token:

\n\n{% if ras is empty %}\n

No Service Desk employees are available.

\n{% else %}\n
    \n {% for ra in ras %}\n
  • \n
    \n {{ ra.commonName }}
    \n {{ ra.location }}
    \n {{ ra.contactInformation }}\n
    \n
    • \n {% endfor %}\n
\n{% endif %}" + }, + "registration_code_with_ra_locations": { + "nl_NL": "

Beste {{ commonName }},

\n\n

Ga hier maar eens op kliken! {{ selfServiceUrl }} Bedankt voor het registreren van je token. Je token is bijna klaar voor gebruik. Ga uiterlijk {{ expirationDate|localizeddate('full', 'none', locale) }} naar de Service Desk om je token te laten activeren.

\n

Neem aub het volgende mee:

\n
    \n
  • Je token
    • \n
  • Een geldig legitimatiebewijs (paspoort, rijbewijs of nationale ID-kaart)
    • \n
  • De registratiecode uit deze e-mail
    • \n
\n\n

\n {{ registrationCode }}\n

\n\n

Locaties waar je je token kunt activeren:

\n\n{% if raLocations is empty %}\n

Er zijn geen locaties beschikbaar.

\n{% else %}\n
    \n {% for raLocation in raLocations %}\n
  • \n
    \n {{ raLocation.name }}
    \n {{ raLocation.location }}
    \n {{ raLocation.contactInformation }}\n
    \n
    • \n {% endfor %}\n
\n{% endif %}", + "en_GB": "

Dear {{ commonName }},

\n\n

Ga hier maar eens op kliken! {{ selfServiceUrl }} Thank you for registering your token, you are almost ready now. Please visit the Service Desk no later than {{ expirationDate|localizeddate('full', 'none', locale) }} to activate your token.

\n

Please bring the following:

\n
    \n
  • Your token
    • \n
  • A valid identity document (passport, drivers license or national ID-card)
    • \n
  • The registration code from this e-mail
    • \n
\n\n

\n {{ registrationCode }}\n

\n\n

Locations where your token can be activated:

\n\n{% if raLocations is empty %}\n

No locations are available.

\n{% else %}\n
    \n {% for raLocation in raLocations %}\n
  • \n
    \n {{ raLocation.name }}
    \n {{ raLocation.location }}
    \n {{ raLocation.contactInformation }}\n
    \n
    • \n {% endfor %}\n
\n{% endif %}" + }, + "second_factor_verification_reminder_with_ras": { + "nl_NL": "

Beste {{ commonName }},

\n\n

Ga hier maar eens op kliken! {{ selfServiceUrl }} Een week geleden heb je een token geregistreerd. Ga uiterlijk {{ expirationDate|localizeddate('full', 'none', locale) }} naar de Service Desk om je token te laten activeren.

\n

Neem aub het volgende mee:

\n
    \n
  • Je token
    • \n
  • Een geldig legitimatiebewijs (paspoort, rijbewijs of nationale ID-kaart)
    • \n
  • De registratiecode uit deze e-mail
    • \n
\n\n

\n {{ registrationCode }}\n

\n\n

Service Desk medewerkers die je token kunnen activeren:

\n\n{% if ras is empty %}\n

Er zijn geen Service Desk medewerkers beschikbaar.

\n{% else %}\n
    \n {% for ra in ras %}\n
  • \n
    \n {{ ra.commonName }}
    \n {{ ra.location }}
    \n {{ ra.contactInformation }}\n
    \n
    • \n {% endfor %}\n
\n{% endif %}", + "en_GB": "

Dear {{ commonName }},

\n\n

Ga hier maar eens op kliken! {{ selfServiceUrl }} One week ago, you registered a token. Please visit the Service Desk no later than {{ expirationDate|localizeddate('full', 'none', locale) }} to activate your token.

\n

Please bring the following:

\n
    \n
  • Your token
    • \n
  • A valid identity document (passport, drivers license or national ID-card)
    • \n
  • The registration code from this e-mail
    • \n
\n\n

\n {{ registrationCode }}\n

\n\n

Service Desk employees authorized to activate your token:

\n\n{% if ras is empty %}\n

No Service Desk employees are available.

\n{% else %}\n
    \n {% for ra in ras %}\n
  • \n
    \n {{ ra.commonName }}
    \n {{ ra.location }}
    \n {{ ra.contactInformation }}\n
    \n
    • \n {% endfor %}\n
\n{% endif %}" + }, + "second_factor_verification_reminder_with_ra_locations": { + "nl_NL": "

Beste {{ commonName }},

\n\n

Ga hier maar eens op kliken! {{ selfServiceUrl }} Een week geleden heb je een token geregistreerd. Ga uiterlijk {{ expirationDate|localizeddate('full', 'none', locale) }} naar de Service Desk om je token te laten activeren.

\n

Neem aub het volgende mee:

\n
    \n
  • Je token
    • \n
  • Een geldig legitimatiebewijs (paspoort, rijbewijs of nationale ID-kaart)
    • \n
  • De registratiecode uit deze e-mail
    • \n
\n\n

\n {{ registrationCode }}\n

\n\n

Locaties waar je je token kunt activeren:

\n\n{% if raLocations is empty %}\n

Er zijn geen locaties beschikbaar.

\n{% else %}\n
    \n {% for raLocation in raLocations %}\n
  • \n
    \n {{ raLocation.name }}
    \n {{ raLocation.location }}
    \n {{ raLocation.contactInformation }}\n
    \n
    • \n {% endfor %}\n
\n{% endif %}", + "en_GB": "

Dear {{ commonName }},

\n\n

Ga hier maar eens op kliken! {{ selfServiceUrl }} One week ago, you registered a token. Please visit the Service Desk no later than {{ expirationDate|localizeddate('full', 'none', locale) }} to activate your token.

\n

Please bring the following:

\n
    \n
  • Your token
    • \n
  • A valid identity document (passport, drivers license or national ID-card)
    • \n
  • The registration code from this e-mail
    • \n
\n\n

\n {{ registrationCode }}\n

\n\n

Locations where your token can be activated:

\n\n{% if raLocations is empty %}\n

No locations are available.

\n{% else %}\n
    \n {% for raLocation in raLocations %}\n
  • \n
    \n {{ raLocation.name }}
    \n {{ raLocation.location }}
    \n {{ raLocation.contactInformation }}\n
    \n
    • \n {% endfor %}\n
\n{% endif %}" + }, + "vetted": { + "nl_NL": "

Beste {{ commonName }},

\n\n

Bedankt voor het activeren van je token. Je token is nu klaar voor gebruik. Ga hier maar eens op kliken! {{ selfServiceUrl }}

", + "en_GB": "

Dear {{ commonName }},

\n\n

Thank you for activating your token. Your token is now ready for use. Ga hier maar eens op kliken! {{ selfServiceUrl }}

" + }, + "second_factor_revoked": { + "nl_NL": "

Beste {{ commonName }},

Ga hier maar eens op kliken! {{ selfServiceUrl }}{% if isRevokedByRa %}De registratie van je {{ tokenType }} token met ID {{ tokenIdentifier }} is verwijderd door een beheerder.{% else %}Je hebt de registratie voor je {{ tokenType }} token met ID {{ tokenIdentifier }} verwijderd. Neem direct contact op met de helpdesk van je instelling als je dit zelf niet gedaan hebt, omdat dit kan betekenen dat je account gecompromitteerd is.{% endif %}

Je kunt dit token niet meer gebruiken om in te loggen bij op SURFconext aangesloten services die een tweede inlogstap vereisen.

Wil je een nieuw token aanvragen? Ga dan naar {{ selfServiceUrl }} en doorloop het registratieproces opnieuw.

Voor meer informatie kun je terecht op onze wiki: https://support.surfconext.nl/faq-sterke-authenticatie

Met vriendelijke groet,

SURFnet

", + "en_GB": "

Dear {{ commonName }},

Ga hier maar eens op kliken! {{ selfServiceUrl }}{% if isRevokedByRa %}The registration of your {{ tokenType }} with ID {{ tokenIdentifier }} was deleted by an administrator.{% else %}You have deleted the registration of your {{ tokenType }} token with ID {{ tokenIdentifier }}. If you did not delete your token you must immediately contact the support desk of your institution, as this may indicate that your account has been compromised.{% endif %}

You can no longer use this token to access SURFconext services that require two-step authentication.

Do you want to replace your token? Please visit {{ selfServiceUrl }} and register a new token.

For more info please visit our wiki: https://support.surfconext.nl/faq-strong-authentication

Best regards,

SURFnet

" + }, + "recovery_token_created": { + "nl_NL": "

Beste {{ commonName }},

Bedankt voor het registreren van je [recovery token]. Je token is nu klaar voor gebruik. Je kunt dit token gebruiken wanneer je een second factor token dat je verloren bent opnieuw wilt activeren.

Met vriendelijke groet,

SURFnet

", + "en_GB": "

Dear {{ commonName }},

Thank you for registering your [recovery token]. Your token is ready to use. You can use this token to restore a second factor token that you lost.

Best regards,

SURFnet

" + }, + "recovery_token_revoked": { + "nl_NL": "

Beste {{ commonName }},

{% if isRevokedByRa %}De registratie van je {{ tokenType }} recovery token met ID {{ tokenIdentifier }} is verwijderd door een beheerder.{% else %}Je hebt de registratie voor je {{ tokenType }} recovery token met ID {{ tokenIdentifier }} verwijderd. Neem direct contact op met de helpdesk van je instelling als je dit zelf niet gedaan hebt, omdat dit kan betekenen dat je account gecompromitteerd is.{% endif %}

Je kunt dit token niet meer gebruiken om second factor tokens te recoveren.

Met vriendelijke groet,

SURFnet

", + "en_GB": "

Dear {{ commonName }},

{% if isRevokedByRa %}The registration of your [recovery token] {{ tokenType }} with ID {{ tokenIdentifier }} was deleted by an administrator.{% else %}You have deleted the registration of your {{ tokenType }} token with ID {{ tokenIdentifier }}. If you did not delete your [recovery token] you must immediately contact the support desk of your institution, as this may indicate that your account has been compromised.{% endif %}

You can no longer use this [recovery token] to restore a lost second factor token.

Best regards,

SURFnet

" + } + + }, + "gateway": { + "identity_providers": [], + "service_providers": [ + { + "entity_id": "https://ss-dev.stepup.coin.surf.net/app_dev.php/authentication/metadata", + "public_key": "MIIEJTCCAw2gAwIBAgIJANug+o++1X5IMA0GCSqGSIb3DQEBCwUAMIGoMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MRwwGgYDVQQDDBNTVVJGbmV0IERldmVsb3BtZW50MSswKQYJKoZIhvcNAQkBFhxzdXJmY29uZXh0LWJlaGVlckBzdXJmbmV0Lm5sMB4XDTE0MTAyMDEyMzkxMVoXDTE0MTExOTEyMzkxMVowgagxCzAJBgNVBAYTAk5MMRAwDgYDVQQIDAdVdHJlY2h0MRAwDgYDVQQHDAdVdHJlY2h0MRUwEwYDVQQKDAxTVVJGbmV0IEIuVi4xEzARBgNVBAsMClNVUkZjb25leHQxHDAaBgNVBAMME1NVUkZuZXQgRGV2ZWxvcG1lbnQxKzApBgkqhkiG9w0BCQEWHHN1cmZjb25leHQtYmVoZWVyQHN1cmZuZXQubmwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDXuSSBeNJY3d4p060oNRSuAER5nLWT6AIVbv3XrXhcgSwc9m2b8u3ksp14pi8FbaNHAYW3MjlKgnLlopYIylzKD/6Ut/clEx67aO9Hpqsc0HmIP0It6q2bf5yUZ71E4CN2HtQceO5DsEYpe5M7D5i64kS2A7e2NYWVdA5Z01DqUpQGRBc+uMzOwyif6StBiMiLrZH3n2r5q5aVaXU4Vy5EE4VShv3Mp91sgXJj/v155fv0wShgl681v8yf2u2ZMb7NKnQRA4zM2Ng2EUAyy6PQ+Jbn+rALSm1YgiJdVuSlTLhvgwbiHGO2XgBi7bTHhlqSrJFK3Gs4zwIsop/XqQRBAgMBAAGjUDBOMB0GA1UdDgQWBBQCJmcoa/F7aM3jIFN7Bd4uzWRgzjAfBgNVHSMEGDAWgBQCJmcoa/F7aM3jIFN7Bd4uzWRgzjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBd80GpWKjp1J+Dgp0blVAox1s/WPWQlex9xrx1GEYbc5elp3svS+S82s7dFm2llHrrNOBt1HZVC+TdW4f+MR1xq8O5lOYjDRsosxZc/u9jVsYWYc3M9bQAx8VyJ8VGpcAK+fLqRNabYlqTnj/t9bzX8fS90sp8JsALV4g84Aj0G8RpYJokw+pJUmOpuxsZN5U84MmLPnVfmrnuCVh/HkiLNV2c8Pk8LSomg6q1M1dQUTsz/HVxcOhHLj/owwh3IzXf/KXV/E8vSYW8o4WWCAnruYOWdJMI4Z8NG1Mfv7zvb7U3FL1C/KLV04DqzALXGj+LVmxtDvuxqC042apoIDQV", + "acs": [ + "https://ss-dev.stepup.coin.surf.net/app_dev.php/authentication/consume-assertion" + ], + "loa": { + "__default__": "https://gw-dev.stepup.coin.surf.net/authentication/loa1" + }, + "assertion_encryption_enabled": false, + "blacklisted_encryption_algorithms": [], + "second_factor_only": false, + "second_factor_only_nameid_patterns": [] + }, + { + "entity_id": "https://ss-dev.stepup.coin.surf.net/app_dev.php/registration/gssf/tiqr/metadata", + "public_key": "MIIEJTCCAw2gAwIBAgIJANug+o++1X5IMA0GCSqGSIb3DQEBCwUAMIGoMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MRwwGgYDVQQDDBNTVVJGbmV0IERldmVsb3BtZW50MSswKQYJKoZIhvcNAQkBFhxzdXJmY29uZXh0LWJlaGVlckBzdXJmbmV0Lm5sMB4XDTE0MTAyMDEyMzkxMVoXDTE0MTExOTEyMzkxMVowgagxCzAJBgNVBAYTAk5MMRAwDgYDVQQIDAdVdHJlY2h0MRAwDgYDVQQHDAdVdHJlY2h0MRUwEwYDVQQKDAxTVVJGbmV0IEIuVi4xEzARBgNVBAsMClNVUkZjb25leHQxHDAaBgNVBAMME1NVUkZuZXQgRGV2ZWxvcG1lbnQxKzApBgkqhkiG9w0BCQEWHHN1cmZjb25leHQtYmVoZWVyQHN1cmZuZXQubmwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDXuSSBeNJY3d4p060oNRSuAER5nLWT6AIVbv3XrXhcgSwc9m2b8u3ksp14pi8FbaNHAYW3MjlKgnLlopYIylzKD/6Ut/clEx67aO9Hpqsc0HmIP0It6q2bf5yUZ71E4CN2HtQceO5DsEYpe5M7D5i64kS2A7e2NYWVdA5Z01DqUpQGRBc+uMzOwyif6StBiMiLrZH3n2r5q5aVaXU4Vy5EE4VShv3Mp91sgXJj/v155fv0wShgl681v8yf2u2ZMb7NKnQRA4zM2Ng2EUAyy6PQ+Jbn+rALSm1YgiJdVuSlTLhvgwbiHGO2XgBi7bTHhlqSrJFK3Gs4zwIsop/XqQRBAgMBAAGjUDBOMB0GA1UdDgQWBBQCJmcoa/F7aM3jIFN7Bd4uzWRgzjAfBgNVHSMEGDAWgBQCJmcoa/F7aM3jIFN7Bd4uzWRgzjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBd80GpWKjp1J+Dgp0blVAox1s/WPWQlex9xrx1GEYbc5elp3svS+S82s7dFm2llHrrNOBt1HZVC+TdW4f+MR1xq8O5lOYjDRsosxZc/u9jVsYWYc3M9bQAx8VyJ8VGpcAK+fLqRNabYlqTnj/t9bzX8fS90sp8JsALV4g84Aj0G8RpYJokw+pJUmOpuxsZN5U84MmLPnVfmrnuCVh/HkiLNV2c8Pk8LSomg6q1M1dQUTsz/HVxcOhHLj/owwh3IzXf/KXV/E8vSYW8o4WWCAnruYOWdJMI4Z8NG1Mfv7zvb7U3FL1C/KLV04DqzALXGj+LVmxtDvuxqC042apoIDQV", + "acs": [ + "https://ss-dev.stepup.coin.surf.net/app_dev.php/registration/gssf/tiqr/consume-assertion" + ], + "loa": { + "__default__": "https://gw-dev.stepup.coin.surf.net/authentication/loa1" + }, + "assertion_encryption_enabled": false, + "blacklisted_encryption_algorithms": [], + "second_factor_only": false, + "second_factor_only_nameid_patterns": [] + }, + { + "entity_id": "https://ra-dev.stepup.coin.surf.net/app_dev.php/vetting-procedure/gssf/tiqr/metadata", + "public_key": "MIIEJTCCAw2gAwIBAgIJANug+o++1X5IMA0GCSqGSIb3DQEBCwUAMIGoMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MRwwGgYDVQQDDBNTVVJGbmV0IERldmVsb3BtZW50MSswKQYJKoZIhvcNAQkBFhxzdXJmY29uZXh0LWJlaGVlckBzdXJmbmV0Lm5sMB4XDTE0MTAyMDEyMzkxMVoXDTE0MTExOTEyMzkxMVowgagxCzAJBgNVBAYTAk5MMRAwDgYDVQQIDAdVdHJlY2h0MRAwDgYDVQQHDAdVdHJlY2h0MRUwEwYDVQQKDAxTVVJGbmV0IEIuVi4xEzARBgNVBAsMClNVUkZjb25leHQxHDAaBgNVBAMME1NVUkZuZXQgRGV2ZWxvcG1lbnQxKzApBgkqhkiG9w0BCQEWHHN1cmZjb25leHQtYmVoZWVyQHN1cmZuZXQubmwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDXuSSBeNJY3d4p060oNRSuAER5nLWT6AIVbv3XrXhcgSwc9m2b8u3ksp14pi8FbaNHAYW3MjlKgnLlopYIylzKD/6Ut/clEx67aO9Hpqsc0HmIP0It6q2bf5yUZ71E4CN2HtQceO5DsEYpe5M7D5i64kS2A7e2NYWVdA5Z01DqUpQGRBc+uMzOwyif6StBiMiLrZH3n2r5q5aVaXU4Vy5EE4VShv3Mp91sgXJj/v155fv0wShgl681v8yf2u2ZMb7NKnQRA4zM2Ng2EUAyy6PQ+Jbn+rALSm1YgiJdVuSlTLhvgwbiHGO2XgBi7bTHhlqSrJFK3Gs4zwIsop/XqQRBAgMBAAGjUDBOMB0GA1UdDgQWBBQCJmcoa/F7aM3jIFN7Bd4uzWRgzjAfBgNVHSMEGDAWgBQCJmcoa/F7aM3jIFN7Bd4uzWRgzjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBd80GpWKjp1J+Dgp0blVAox1s/WPWQlex9xrx1GEYbc5elp3svS+S82s7dFm2llHrrNOBt1HZVC+TdW4f+MR1xq8O5lOYjDRsosxZc/u9jVsYWYc3M9bQAx8VyJ8VGpcAK+fLqRNabYlqTnj/t9bzX8fS90sp8JsALV4g84Aj0G8RpYJokw+pJUmOpuxsZN5U84MmLPnVfmrnuCVh/HkiLNV2c8Pk8LSomg6q1M1dQUTsz/HVxcOhHLj/owwh3IzXf/KXV/E8vSYW8o4WWCAnruYOWdJMI4Z8NG1Mfv7zvb7U3FL1C/KLV04DqzALXGj+LVmxtDvuxqC042apoIDQV", + "acs": [ + "https://ra-dev.stepup.coin.surf.net/app_dev.php/vetting-procedure/gssf/tiqr/verify" + ], + "loa": { + "__default__": "https://gw-dev.stepup.coin.surf.net/authentication/loa1" + }, + "assertion_encryption_enabled": false, + "blacklisted_encryption_algorithms": [], + "second_factor_only": false, + "second_factor_only_nameid_patterns": [] + }, + { + "entity_id": "https://ra-dev.stepup.coin.surf.net/app_dev.php/authentication/metadata", + "public_key": "MIIEJTCCAw2gAwIBAgIJANug+o++1X5IMA0GCSqGSIb3DQEBCwUAMIGoMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MRwwGgYDVQQDDBNTVVJGbmV0IERldmVsb3BtZW50MSswKQYJKoZIhvcNAQkBFhxzdXJmY29uZXh0LWJlaGVlckBzdXJmbmV0Lm5sMB4XDTE0MTAyMDEyMzkxMVoXDTE0MTExOTEyMzkxMVowgagxCzAJBgNVBAYTAk5MMRAwDgYDVQQIDAdVdHJlY2h0MRAwDgYDVQQHDAdVdHJlY2h0MRUwEwYDVQQKDAxTVVJGbmV0IEIuVi4xEzARBgNVBAsMClNVUkZjb25leHQxHDAaBgNVBAMME1NVUkZuZXQgRGV2ZWxvcG1lbnQxKzApBgkqhkiG9w0BCQEWHHN1cmZjb25leHQtYmVoZWVyQHN1cmZuZXQubmwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDXuSSBeNJY3d4p060oNRSuAER5nLWT6AIVbv3XrXhcgSwc9m2b8u3ksp14pi8FbaNHAYW3MjlKgnLlopYIylzKD/6Ut/clEx67aO9Hpqsc0HmIP0It6q2bf5yUZ71E4CN2HtQceO5DsEYpe5M7D5i64kS2A7e2NYWVdA5Z01DqUpQGRBc+uMzOwyif6StBiMiLrZH3n2r5q5aVaXU4Vy5EE4VShv3Mp91sgXJj/v155fv0wShgl681v8yf2u2ZMb7NKnQRA4zM2Ng2EUAyy6PQ+Jbn+rALSm1YgiJdVuSlTLhvgwbiHGO2XgBi7bTHhlqSrJFK3Gs4zwIsop/XqQRBAgMBAAGjUDBOMB0GA1UdDgQWBBQCJmcoa/F7aM3jIFN7Bd4uzWRgzjAfBgNVHSMEGDAWgBQCJmcoa/F7aM3jIFN7Bd4uzWRgzjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBd80GpWKjp1J+Dgp0blVAox1s/WPWQlex9xrx1GEYbc5elp3svS+S82s7dFm2llHrrNOBt1HZVC+TdW4f+MR1xq8O5lOYjDRsosxZc/u9jVsYWYc3M9bQAx8VyJ8VGpcAK+fLqRNabYlqTnj/t9bzX8fS90sp8JsALV4g84Aj0G8RpYJokw+pJUmOpuxsZN5U84MmLPnVfmrnuCVh/HkiLNV2c8Pk8LSomg6q1M1dQUTsz/HVxcOhHLj/owwh3IzXf/KXV/E8vSYW8o4WWCAnruYOWdJMI4Z8NG1Mfv7zvb7U3FL1C/KLV04DqzALXGj+LVmxtDvuxqC042apoIDQV", + "acs": [ + "https://ra-dev.stepup.coin.surf.net/app_dev.php/authentication/consume-assertion" + ], + "loa": { + "__default__": "https://gw-dev.stepup.coin.surf.net/authentication/loa3" + }, + "assertion_encryption_enabled": false, + "blacklisted_encryption_algorithms": [], + "second_factor_only": false, + "second_factor_only_nameid_patterns": [] + } + ] + } +} + +### +# @name /management/whitelist +# Get whitelist +GET http://middleware.dev.openconext.local/management/whitelist +Accept: application/json +Content-Type: application/json + +### +# @name /management/whitelist/add +# Add institutions to the whitelist +POST http://middleware.dev.openconext.local/management/whitelist/add +Accept: application/json +Content-Type: application/json + +{ + "institutions": [ + "institution-a.example.com", + "institution-b.example.com", + "institution-c.example.com", + "institution-d.example.com", + "institution-e.example.com", + "institution-f.example.com", + "institution-g.example.com", + "institution-h.example.com", + "institution-i.example.com", + "institution-j.example.com" + ] +} + +### +# @name /management/whitelist/remove +# Remove an institution from the whitelist +POST http://middleware.dev.openconext.local/management/whitelist/remove +Accept: application/json +Content-Type: application/json + +{ + "institutions": [ + "miko.organisation.example.commm" + ] +} + +### +# @name /management/whitelist/replace +# Replace the Institution Whitelist +POST http://middleware.dev.openconext.local/management/whitelist/replace +Accept: application/json +Content-Type: application/json + +{ + "institutions": [ + "dev.organisation.example", + "institution-a.example.com", + "institution-b.example.com", + "institution-c.example.com", + "institution-d.example.com", + "institution-e.example.com", + "institution-f.example.com", + "institution-g.example.com", + "institution-h.example.com", + "institution-i.example.com", + "institution-j.example.com" + ] +} + +### +# @name /management/forget-identity +# - POST body must contain `name_id` and `institution` +POST http://middleware.dev.openconext.local/management/forget-identity +Accept: application/json +Content-Type: application/json + +{ + "name_id": "2592ab2afb52eea9a61f5db90febd631966d49f5", + "institution": "Ibuildings" +} + +### +# @name /management/institution-configuration +# GET the institution configuration options +GET http://middleware.stepup.example.com/management/institution-configuration? + XDEBUG_SESSION_START=PHPSTORM +Accept: application/json +Content-Type: application/json + +### +# @name /management/institution-configuration +# POST the institution configuration options to reconfigure +POST http://middleware.stepup.example.com/management/institution-configuration? + XDEBUG_SESSION_START=PHPSTORM +Accept: application/json +Content-Type: application/json + +{ + "institution-a.example.com": { + "use_ra_locations": true, + "show_raa_contact_information": true, + "verify_email": false, + "self_vet": true, + "number_of_tokens_per_identity": 2, + "allowed_second_factors": [] + } +} diff --git a/docs/postman/2.json b/docs/postman/2.json deleted file mode 100644 index f4a63757d..000000000 --- a/docs/postman/2.json +++ /dev/null @@ -1,244 +0,0 @@ -{ - "info": { - "_postman_id": "de0779e0-b489-4676-ac07-93a5ab3587db", - "name": "Step-up Middleware Configuration", - "description": "All sorts of configuration requests.", - "schema": "https://schema.getpostman.com/json/collection/v2.0.0/collection.json" - }, - "item": [ - { - "name": "/management/configuration", - "request": { - "method": "POST", - "header": [ - { - "key": "Accept", - "value": "application/json" - }, - { - "key": "Content-Type", - "value": "application/json" - } - ], - "body": { - "mode": "raw", - "raw": "{\n \"sraa\": [\n \"9971dbcf01267b11f6107d9cafb43e5b4009a955\"\n ],\n \"email_templates\": {\n \"confirm_email\": {\n \"nl_NL\": \"

Beste {{ commonName }},

\\n\\n

Bedankt voor het registreren van je token. Klik op onderstaande link om je e-mailadres te bevestigen:

\\n

{{ verificationUrl }}

\\n

Is klikken op de link niet mogelijk? Kopieer dan de link en plak deze in de adresbalk van je browser.

\\n

SURFnet

\",\n \"en_GB\":\"

Dear {{ commonName }},

\\n\\n

Thank you for registering your token. Please visit this link to verify your email address:

\\n

{{ verificationUrl }}

\\n

If you can not click on the URL, please copy the link and paste it in the address bar of your browser.

\\n

SURFnet

\"\n },\n \"registration_code_with_ras\": {\n \"nl_NL\": \"

Beste {{ commonName }},

\\n\\n

Ga hier maar eens op kliken! {{ selfServiceUrl }} Bedankt voor het registreren van je token. Je token is bijna klaar voor gebruik. Ga uiterlijk {{ expirationDate|localizeddate('full', 'none', locale) }} naar de Service Desk om je token te laten activeren.

\\n

Neem aub het volgende mee:

\\n
    \\n
  • Je token
    • \\n
  • Een geldig legitimatiebewijs (paspoort, rijbewijs of nationale ID-kaart)
    • \\n
  • De registratiecode uit deze e-mail
    • \\n
\\n\\n

\\n {{ registrationCode }}\\n

\\n\\n

Service Desk medewerkers die je token kunnen activeren:

\\n\\n{% if ras is empty %}\\n

Er zijn geen Service Desk medewerkers beschikbaar.

\\n{% else %}\\n
    \\n {% for ra in ras %}\\n
  • \\n
    \\n {{ ra.commonName }}
    \\n {{ ra.location }}
    \\n {{ ra.contactInformation }}\\n
    \\n
    • \\n {% endfor %}\\n
\\n{% endif %}\",\n \"en_GB\": \"

Dear {{ commonName }},

\\n\\n

Ga hier maar eens op kliken! {{ selfServiceUrl }} Thank you for registering your token, you are almost ready now. Please visit the Service Desk no later than {{ expirationDate|localizeddate('full', 'none', locale) }} to activate your token up.

\\n

Please bring the following:

\\n
    \\n
  • Your token
    • \\n
  • A valid identity document (passport, drivers license or national ID-card)
    • \\n
  • The registration code from this e-mail
    • \\n
\\n\\n

\\n {{ registrationCode }}\\n

\\n\\n

Service Desk employees authorized to activate your token:

\\n\\n{% if ras is empty %}\\n

No Service Desk employees are available.

\\n{% else %}\\n
    \\n {% for ra in ras %}\\n
  • \\n
    \\n {{ ra.commonName }}
    \\n {{ ra.location }}
    \\n {{ ra.contactInformation }}\\n
    \\n
    • \\n {% endfor %}\\n
\\n{% endif %}\"\n },\n \"registration_code_with_ra_locations\": {\n \"nl_NL\": \"

Beste {{ commonName }},

\\n\\n

Ga hier maar eens op kliken! {{ selfServiceUrl }} Bedankt voor het registreren van je token. Je token is bijna klaar voor gebruik. Ga uiterlijk {{ expirationDate|localizeddate('full', 'none', locale) }} naar de Service Desk om je token te laten activeren.

\\n

Neem aub het volgende mee:

\\n
    \\n
  • Je token
    • \\n
  • Een geldig legitimatiebewijs (paspoort, rijbewijs of nationale ID-kaart)
    • \\n
  • De registratiecode uit deze e-mail
    • \\n
\\n\\n

\\n {{ registrationCode }}\\n

\\n\\n

Locaties waar je je token kunt activeren:

\\n\\n{% if raLocations is empty %}\\n

Er zijn geen locaties beschikbaar.

\\n{% else %}\\n
    \\n {% for raLocation in raLocations %}\\n
  • \\n
    \\n {{ raLocation.name }}
    \\n {{ raLocation.location }}
    \\n {{ raLocation.contactInformation }}\\n
    \\n
    • \\n {% endfor %}\\n
\\n{% endif %}\",\n \"en_GB\": \"

Dear {{ commonName }},

\\n\\n

Ga hier maar eens op kliken! {{ selfServiceUrl }} Thank you for registering your token, you are almost ready now. Please visit the Service Desk no later than {{ expirationDate|localizeddate('full', 'none', locale) }} to activate your token.

\\n

Please bring the following:

\\n
    \\n
  • Your token
    • \\n
  • A valid identity document (passport, drivers license or national ID-card)
    • \\n
  • The registration code from this e-mail
    • \\n
\\n\\n

\\n {{ registrationCode }}\\n

\\n\\n

Locations where your token can be activated:

\\n\\n{% if raLocations is empty %}\\n

No locations are available.

\\n{% else %}\\n
    \\n {% for raLocation in raLocations %}\\n
  • \\n
    \\n {{ raLocation.name }}
    \\n {{ raLocation.location }}
    \\n {{ raLocation.contactInformation }}\\n
    \\n
    • \\n {% endfor %}\\n
\\n{% endif %}\"\n },\n \"second_factor_verification_reminder_with_ras\": {\n \"nl_NL\": \"

Beste {{ commonName }},

\\n\\n

Ga hier maar eens op kliken! {{ selfServiceUrl }} Een week geleden heb je een token geregistreerd. Ga uiterlijk {{ expirationDate|localizeddate('full', 'none', locale) }} naar de Service Desk om je token te laten activeren.

\\n

Neem aub het volgende mee:

\\n
    \\n
  • Je token
    • \\n
  • Een geldig legitimatiebewijs (paspoort, rijbewijs of nationale ID-kaart)
    • \\n
  • De registratiecode uit deze e-mail
    • \\n
\\n\\n

\\n {{ registrationCode }}\\n

\\n\\n

Service Desk medewerkers die je token kunnen activeren:

\\n\\n{% if ras is empty %}\\n

Er zijn geen Service Desk medewerkers beschikbaar.

\\n{% else %}\\n
    \\n {% for ra in ras %}\\n
  • \\n
    \\n {{ ra.commonName }}
    \\n {{ ra.location }}
    \\n {{ ra.contactInformation }}\\n
    \\n
    • \\n {% endfor %}\\n
\\n{% endif %}\",\n \"en_GB\": \"

Dear {{ commonName }},

\\n\\n

Ga hier maar eens op kliken! {{ selfServiceUrl }} One week ago, you registered a token. Please visit the Service Desk no later than {{ expirationDate|localizeddate('full', 'none', locale) }} to activate your token.

\\n

Please bring the following:

\\n
    \\n
  • Your token
    • \\n
  • A valid identity document (passport, drivers license or national ID-card)
    • \\n
  • The registration code from this e-mail
    • \\n
\\n\\n

\\n {{ registrationCode }}\\n

\\n\\n

Service Desk employees authorized to activate your token:

\\n\\n{% if ras is empty %}\\n

No Service Desk employees are available.

\\n{% else %}\\n
    \\n {% for ra in ras %}\\n
  • \\n
    \\n {{ ra.commonName }}
    \\n {{ ra.location }}
    \\n {{ ra.contactInformation }}\\n
    \\n
    • \\n {% endfor %}\\n
\\n{% endif %}\"\n },\n \"second_factor_verification_reminder_with_ra_locations\": {\n \"nl_NL\": \"

Beste {{ commonName }},

\\n\\n

Ga hier maar eens op kliken! {{ selfServiceUrl }} Een week geleden heb je een token geregistreerd. Ga uiterlijk {{ expirationDate|localizeddate('full', 'none', locale) }} naar de Service Desk om je token te laten activeren.

\\n

Neem aub het volgende mee:

\\n
    \\n
  • Je token
    • \\n
  • Een geldig legitimatiebewijs (paspoort, rijbewijs of nationale ID-kaart)
    • \\n
  • De registratiecode uit deze e-mail
    • \\n
\\n\\n

\\n {{ registrationCode }}\\n

\\n\\n

Locaties waar je je token kunt activeren:

\\n\\n{% if raLocations is empty %}\\n

Er zijn geen locaties beschikbaar.

\\n{% else %}\\n
    \\n {% for raLocation in raLocations %}\\n
  • \\n
    \\n {{ raLocation.name }}
    \\n {{ raLocation.location }}
    \\n {{ raLocation.contactInformation }}\\n
    \\n
    • \\n {% endfor %}\\n
\\n{% endif %}\",\n \"en_GB\": \"

Dear {{ commonName }},

\\n\\n

Ga hier maar eens op kliken! {{ selfServiceUrl }} One week ago, you registered a token. Please visit the Service Desk no later than {{ expirationDate|localizeddate('full', 'none', locale) }} to activate your token.

\\n

Please bring the following:

\\n
    \\n
  • Your token
    • \\n
  • A valid identity document (passport, drivers license or national ID-card)
    • \\n
  • The registration code from this e-mail
    • \\n
\\n\\n

\\n {{ registrationCode }}\\n

\\n\\n

Locations where your token can be activated:

\\n\\n{% if raLocations is empty %}\\n

No locations are available.

\\n{% else %}\\n
    \\n {% for raLocation in raLocations %}\\n
  • \\n
    \\n {{ raLocation.name }}
    \\n {{ raLocation.location }}
    \\n {{ raLocation.contactInformation }}\\n
    \\n
    • \\n {% endfor %}\\n
\\n{% endif %}\"\n },\n \"vetted\": {\n \"nl_NL\": \"

Beste {{ commonName }},

\\n\\n

Bedankt voor het activeren van je token. Je token is nu klaar voor gebruik. Ga hier maar eens op kliken! {{ selfServiceUrl }}

\",\n \"en_GB\": \"

Dear {{ commonName }},

\\n\\n

Thank you for activating your token. Your token is now ready for use. Ga hier maar eens op kliken! {{ selfServiceUrl }}

\"\n },\n \"second_factor_revoked\": {\n \"nl_NL\": \"

Beste {{ commonName }},

Ga hier maar eens op kliken! {{ selfServiceUrl }}{% if isRevokedByRa %}De registratie van je {{ tokenType }} token met ID {{ tokenIdentifier }} is verwijderd door een beheerder.{% else %}Je hebt de registratie voor je {{ tokenType }} token met ID {{ tokenIdentifier }} verwijderd. Neem direct contact op met de helpdesk van je instelling als je dit zelf niet gedaan hebt, omdat dit kan betekenen dat je account gecompromitteerd is.{% endif %}

Je kunt dit token niet meer gebruiken om in te loggen bij op SURFconext aangesloten services die een tweede inlogstap vereisen.

Wil je een nieuw token aanvragen? Ga dan naar {{ selfServiceUrl }} en doorloop het registratieproces opnieuw.

Voor meer informatie kun je terecht op onze wiki: https://support.surfconext.nl/faq-sterke-authenticatie

Met vriendelijke groet,

SURFnet

\",\n \"en_GB\": \"

Dear {{ commonName }},

Ga hier maar eens op kliken! {{ selfServiceUrl }}{% if isRevokedByRa %}The registration of your {{ tokenType }} with ID {{ tokenIdentifier }} was deleted by an administrator.{% else %}You have deleted the registration of your {{ tokenType }} token with ID {{ tokenIdentifier }}. If you did not delete your token you must immediately contact the support desk of your institution, as this may indicate that your account has been compromised.{% endif %}

You can no longer use this token to access SURFconext services that require two-step authentication.

Do you want to replace your token? Please visit {{ selfServiceUrl }} and register a new token.

For more info please visit our wiki: https://support.surfconext.nl/faq-strong-authentication

Best regards,

SURFnet

\"\n },\n \"recovery_token_created\": {\n \"nl_NL\": \"

Beste {{ commonName }},

Bedankt voor het registreren van je [recovery token]. Je token is nu klaar voor gebruik. Je kunt dit token gebruiken wanneer je een second factor token dat je verloren bent opnieuw wilt activeren.

Met vriendelijke groet,

SURFnet

\",\n \"en_GB\": \"

Dear {{ commonName }},

Thank you for registering your [recovery token]. Your token is ready to use. You can use this token to restore a second factor token that you lost.

Best regards,

SURFnet

\"\n },\n \"recovery_token_revoked\": {\n \"nl_NL\": \"

Beste {{ commonName }},

{% if isRevokedByRa %}De registratie van je {{ tokenType }} recovery token met ID {{ tokenIdentifier }} is verwijderd door een beheerder.{% else %}Je hebt de registratie voor je {{ tokenType }} recovery token met ID {{ tokenIdentifier }} verwijderd. Neem direct contact op met de helpdesk van je instelling als je dit zelf niet gedaan hebt, omdat dit kan betekenen dat je account gecompromitteerd is.{% endif %}

Je kunt dit token niet meer gebruiken om second factor tokens te recoveren.

Met vriendelijke groet,

SURFnet

\",\n \"en_GB\": \"

Dear {{ commonName }},

{% if isRevokedByRa %}The registration of your [recovery token] {{ tokenType }} with ID {{ tokenIdentifier }} was deleted by an administrator.{% else %}You have deleted the registration of your {{ tokenType }} token with ID {{ tokenIdentifier }}. If you did not delete your [recovery token] you must immediately contact the support desk of your institution, as this may indicate that your account has been compromised.{% endif %}

You can no longer use this [recovery token] to restore a lost second factor token.

Best regards,

SURFnet

\"\n }\n\n },\n \"gateway\": {\n \"identity_providers\": [],\n \"service_providers\": [\n {\n \"entity_id\": \"https://ss-dev.stepup.coin.surf.net/app_dev.php/authentication/metadata\",\n \"public_key\": \"MIIEJTCCAw2gAwIBAgIJANug+o++1X5IMA0GCSqGSIb3DQEBCwUAMIGoMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MRwwGgYDVQQDDBNTVVJGbmV0IERldmVsb3BtZW50MSswKQYJKoZIhvcNAQkBFhxzdXJmY29uZXh0LWJlaGVlckBzdXJmbmV0Lm5sMB4XDTE0MTAyMDEyMzkxMVoXDTE0MTExOTEyMzkxMVowgagxCzAJBgNVBAYTAk5MMRAwDgYDVQQIDAdVdHJlY2h0MRAwDgYDVQQHDAdVdHJlY2h0MRUwEwYDVQQKDAxTVVJGbmV0IEIuVi4xEzARBgNVBAsMClNVUkZjb25leHQxHDAaBgNVBAMME1NVUkZuZXQgRGV2ZWxvcG1lbnQxKzApBgkqhkiG9w0BCQEWHHN1cmZjb25leHQtYmVoZWVyQHN1cmZuZXQubmwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDXuSSBeNJY3d4p060oNRSuAER5nLWT6AIVbv3XrXhcgSwc9m2b8u3ksp14pi8FbaNHAYW3MjlKgnLlopYIylzKD/6Ut/clEx67aO9Hpqsc0HmIP0It6q2bf5yUZ71E4CN2HtQceO5DsEYpe5M7D5i64kS2A7e2NYWVdA5Z01DqUpQGRBc+uMzOwyif6StBiMiLrZH3n2r5q5aVaXU4Vy5EE4VShv3Mp91sgXJj/v155fv0wShgl681v8yf2u2ZMb7NKnQRA4zM2Ng2EUAyy6PQ+Jbn+rALSm1YgiJdVuSlTLhvgwbiHGO2XgBi7bTHhlqSrJFK3Gs4zwIsop/XqQRBAgMBAAGjUDBOMB0GA1UdDgQWBBQCJmcoa/F7aM3jIFN7Bd4uzWRgzjAfBgNVHSMEGDAWgBQCJmcoa/F7aM3jIFN7Bd4uzWRgzjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBd80GpWKjp1J+Dgp0blVAox1s/WPWQlex9xrx1GEYbc5elp3svS+S82s7dFm2llHrrNOBt1HZVC+TdW4f+MR1xq8O5lOYjDRsosxZc/u9jVsYWYc3M9bQAx8VyJ8VGpcAK+fLqRNabYlqTnj/t9bzX8fS90sp8JsALV4g84Aj0G8RpYJokw+pJUmOpuxsZN5U84MmLPnVfmrnuCVh/HkiLNV2c8Pk8LSomg6q1M1dQUTsz/HVxcOhHLj/owwh3IzXf/KXV/E8vSYW8o4WWCAnruYOWdJMI4Z8NG1Mfv7zvb7U3FL1C/KLV04DqzALXGj+LVmxtDvuxqC042apoIDQV\",\n \"acs\": [\n \"https://ss-dev.stepup.coin.surf.net/app_dev.php/authentication/consume-assertion\"\n ], \n \"loa\": {\n \"__default__\": \"https://gw-dev.stepup.coin.surf.net/authentication/loa1\"\n },\n \"assertion_encryption_enabled\": false,\n \"blacklisted_encryption_algorithms\": [],\n \"second_factor_only\": false,\n \"second_factor_only_nameid_patterns\": []\n },\n {\n \"entity_id\": \"https://ss-dev.stepup.coin.surf.net/app_dev.php/registration/gssf/tiqr/metadata\",\n \"public_key\": \"MIIEJTCCAw2gAwIBAgIJANug+o++1X5IMA0GCSqGSIb3DQEBCwUAMIGoMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MRwwGgYDVQQDDBNTVVJGbmV0IERldmVsb3BtZW50MSswKQYJKoZIhvcNAQkBFhxzdXJmY29uZXh0LWJlaGVlckBzdXJmbmV0Lm5sMB4XDTE0MTAyMDEyMzkxMVoXDTE0MTExOTEyMzkxMVowgagxCzAJBgNVBAYTAk5MMRAwDgYDVQQIDAdVdHJlY2h0MRAwDgYDVQQHDAdVdHJlY2h0MRUwEwYDVQQKDAxTVVJGbmV0IEIuVi4xEzARBgNVBAsMClNVUkZjb25leHQxHDAaBgNVBAMME1NVUkZuZXQgRGV2ZWxvcG1lbnQxKzApBgkqhkiG9w0BCQEWHHN1cmZjb25leHQtYmVoZWVyQHN1cmZuZXQubmwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDXuSSBeNJY3d4p060oNRSuAER5nLWT6AIVbv3XrXhcgSwc9m2b8u3ksp14pi8FbaNHAYW3MjlKgnLlopYIylzKD/6Ut/clEx67aO9Hpqsc0HmIP0It6q2bf5yUZ71E4CN2HtQceO5DsEYpe5M7D5i64kS2A7e2NYWVdA5Z01DqUpQGRBc+uMzOwyif6StBiMiLrZH3n2r5q5aVaXU4Vy5EE4VShv3Mp91sgXJj/v155fv0wShgl681v8yf2u2ZMb7NKnQRA4zM2Ng2EUAyy6PQ+Jbn+rALSm1YgiJdVuSlTLhvgwbiHGO2XgBi7bTHhlqSrJFK3Gs4zwIsop/XqQRBAgMBAAGjUDBOMB0GA1UdDgQWBBQCJmcoa/F7aM3jIFN7Bd4uzWRgzjAfBgNVHSMEGDAWgBQCJmcoa/F7aM3jIFN7Bd4uzWRgzjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBd80GpWKjp1J+Dgp0blVAox1s/WPWQlex9xrx1GEYbc5elp3svS+S82s7dFm2llHrrNOBt1HZVC+TdW4f+MR1xq8O5lOYjDRsosxZc/u9jVsYWYc3M9bQAx8VyJ8VGpcAK+fLqRNabYlqTnj/t9bzX8fS90sp8JsALV4g84Aj0G8RpYJokw+pJUmOpuxsZN5U84MmLPnVfmrnuCVh/HkiLNV2c8Pk8LSomg6q1M1dQUTsz/HVxcOhHLj/owwh3IzXf/KXV/E8vSYW8o4WWCAnruYOWdJMI4Z8NG1Mfv7zvb7U3FL1C/KLV04DqzALXGj+LVmxtDvuxqC042apoIDQV\",\n \"acs\": [\n \"https://ss-dev.stepup.coin.surf.net/app_dev.php/registration/gssf/tiqr/consume-assertion\"\n ], \n \"loa\": {\n \"__default__\": \"https://gw-dev.stepup.coin.surf.net/authentication/loa1\"\n },\n \"assertion_encryption_enabled\": false,\n \"blacklisted_encryption_algorithms\": [],\n \"second_factor_only\": false,\n \"second_factor_only_nameid_patterns\": []\n },\n {\n \"entity_id\": \"https://ra-dev.stepup.coin.surf.net/app_dev.php/vetting-procedure/gssf/tiqr/metadata\",\n \"public_key\": \"MIIEJTCCAw2gAwIBAgIJANug+o++1X5IMA0GCSqGSIb3DQEBCwUAMIGoMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MRwwGgYDVQQDDBNTVVJGbmV0IERldmVsb3BtZW50MSswKQYJKoZIhvcNAQkBFhxzdXJmY29uZXh0LWJlaGVlckBzdXJmbmV0Lm5sMB4XDTE0MTAyMDEyMzkxMVoXDTE0MTExOTEyMzkxMVowgagxCzAJBgNVBAYTAk5MMRAwDgYDVQQIDAdVdHJlY2h0MRAwDgYDVQQHDAdVdHJlY2h0MRUwEwYDVQQKDAxTVVJGbmV0IEIuVi4xEzARBgNVBAsMClNVUkZjb25leHQxHDAaBgNVBAMME1NVUkZuZXQgRGV2ZWxvcG1lbnQxKzApBgkqhkiG9w0BCQEWHHN1cmZjb25leHQtYmVoZWVyQHN1cmZuZXQubmwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDXuSSBeNJY3d4p060oNRSuAER5nLWT6AIVbv3XrXhcgSwc9m2b8u3ksp14pi8FbaNHAYW3MjlKgnLlopYIylzKD/6Ut/clEx67aO9Hpqsc0HmIP0It6q2bf5yUZ71E4CN2HtQceO5DsEYpe5M7D5i64kS2A7e2NYWVdA5Z01DqUpQGRBc+uMzOwyif6StBiMiLrZH3n2r5q5aVaXU4Vy5EE4VShv3Mp91sgXJj/v155fv0wShgl681v8yf2u2ZMb7NKnQRA4zM2Ng2EUAyy6PQ+Jbn+rALSm1YgiJdVuSlTLhvgwbiHGO2XgBi7bTHhlqSrJFK3Gs4zwIsop/XqQRBAgMBAAGjUDBOMB0GA1UdDgQWBBQCJmcoa/F7aM3jIFN7Bd4uzWRgzjAfBgNVHSMEGDAWgBQCJmcoa/F7aM3jIFN7Bd4uzWRgzjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBd80GpWKjp1J+Dgp0blVAox1s/WPWQlex9xrx1GEYbc5elp3svS+S82s7dFm2llHrrNOBt1HZVC+TdW4f+MR1xq8O5lOYjDRsosxZc/u9jVsYWYc3M9bQAx8VyJ8VGpcAK+fLqRNabYlqTnj/t9bzX8fS90sp8JsALV4g84Aj0G8RpYJokw+pJUmOpuxsZN5U84MmLPnVfmrnuCVh/HkiLNV2c8Pk8LSomg6q1M1dQUTsz/HVxcOhHLj/owwh3IzXf/KXV/E8vSYW8o4WWCAnruYOWdJMI4Z8NG1Mfv7zvb7U3FL1C/KLV04DqzALXGj+LVmxtDvuxqC042apoIDQV\",\n \"acs\": [\n \"https://ra-dev.stepup.coin.surf.net/app_dev.php/vetting-procedure/gssf/tiqr/verify\"\n ], \n \"loa\": {\n \"__default__\": \"https://gw-dev.stepup.coin.surf.net/authentication/loa1\"\n },\n \"assertion_encryption_enabled\": false,\n \"blacklisted_encryption_algorithms\": [],\n \"second_factor_only\": false,\n \"second_factor_only_nameid_patterns\": []\n },\n {\n \"entity_id\": \"https://ra-dev.stepup.coin.surf.net/app_dev.php/authentication/metadata\",\n \"public_key\": \"MIIEJTCCAw2gAwIBAgIJANug+o++1X5IMA0GCSqGSIb3DQEBCwUAMIGoMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MRwwGgYDVQQDDBNTVVJGbmV0IERldmVsb3BtZW50MSswKQYJKoZIhvcNAQkBFhxzdXJmY29uZXh0LWJlaGVlckBzdXJmbmV0Lm5sMB4XDTE0MTAyMDEyMzkxMVoXDTE0MTExOTEyMzkxMVowgagxCzAJBgNVBAYTAk5MMRAwDgYDVQQIDAdVdHJlY2h0MRAwDgYDVQQHDAdVdHJlY2h0MRUwEwYDVQQKDAxTVVJGbmV0IEIuVi4xEzARBgNVBAsMClNVUkZjb25leHQxHDAaBgNVBAMME1NVUkZuZXQgRGV2ZWxvcG1lbnQxKzApBgkqhkiG9w0BCQEWHHN1cmZjb25leHQtYmVoZWVyQHN1cmZuZXQubmwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDXuSSBeNJY3d4p060oNRSuAER5nLWT6AIVbv3XrXhcgSwc9m2b8u3ksp14pi8FbaNHAYW3MjlKgnLlopYIylzKD/6Ut/clEx67aO9Hpqsc0HmIP0It6q2bf5yUZ71E4CN2HtQceO5DsEYpe5M7D5i64kS2A7e2NYWVdA5Z01DqUpQGRBc+uMzOwyif6StBiMiLrZH3n2r5q5aVaXU4Vy5EE4VShv3Mp91sgXJj/v155fv0wShgl681v8yf2u2ZMb7NKnQRA4zM2Ng2EUAyy6PQ+Jbn+rALSm1YgiJdVuSlTLhvgwbiHGO2XgBi7bTHhlqSrJFK3Gs4zwIsop/XqQRBAgMBAAGjUDBOMB0GA1UdDgQWBBQCJmcoa/F7aM3jIFN7Bd4uzWRgzjAfBgNVHSMEGDAWgBQCJmcoa/F7aM3jIFN7Bd4uzWRgzjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBd80GpWKjp1J+Dgp0blVAox1s/WPWQlex9xrx1GEYbc5elp3svS+S82s7dFm2llHrrNOBt1HZVC+TdW4f+MR1xq8O5lOYjDRsosxZc/u9jVsYWYc3M9bQAx8VyJ8VGpcAK+fLqRNabYlqTnj/t9bzX8fS90sp8JsALV4g84Aj0G8RpYJokw+pJUmOpuxsZN5U84MmLPnVfmrnuCVh/HkiLNV2c8Pk8LSomg6q1M1dQUTsz/HVxcOhHLj/owwh3IzXf/KXV/E8vSYW8o4WWCAnruYOWdJMI4Z8NG1Mfv7zvb7U3FL1C/KLV04DqzALXGj+LVmxtDvuxqC042apoIDQV\",\n \"acs\": [\n \"https://ra-dev.stepup.coin.surf.net/app_dev.php/authentication/consume-assertion\"\n ], \n \"loa\": {\n \"__default__\": \"https://gw-dev.stepup.coin.surf.net/authentication/loa3\"\n },\n \"assertion_encryption_enabled\": false,\n \"blacklisted_encryption_algorithms\": [],\n \"second_factor_only\": false,\n \"second_factor_only_nameid_patterns\": []\n }\n ]\n }\n}" - }, - "url": "http://middleware.stepup.example.com/management/configuration", - "description": "POST the configuration\n" - }, - "response": [] - }, - { - "name": "/management/whitelist", - "request": { - "method": "GET", - "header": [ - { - "key": "Accept", - "value": "application/json" - }, - { - "key": "Content-Type", - "value": "application/json" - } - ], - "url": "http://middleware.stepup.example.com/management/whitelist", - "description": "Get whitelist\n" - }, - "response": [] - }, - { - "name": "/management/whitelist/add", - "request": { - "method": "POST", - "header": [ - { - "key": "Accept", - "value": "application/json" - }, - { - "key": "Content-Type", - "value": "application/json" - } - ], - "body": { - "mode": "raw", - "raw": "{\n \"institutions\": [\n \"institution-a.example.com\",\n \"institution-b.example.com\",\n \"institution-c.example.com\",\n \"institution-d.example.com\",\n \"institution-e.example.com\",\n \"institution-f.example.com\",\n \"institution-g.example.com\",\n \"institution-h.example.com\",\n \"institution-i.example.com\",\n \"institution-j.example.com\"\n ]\n}" - }, - "url": "http://middleware.stepup.example.com/management/whitelist/add", - "description": "Add institutions to the whitelist" - }, - "response": [] - }, - { - "name": "/management/whitelist/remove", - "request": { - "method": "POST", - "header": [ - { - "key": "Accept", - "value": "application/json" - }, - { - "key": "Content-Type", - "value": "application/json" - } - ], - "body": { - "mode": "raw", - "raw": "{\n \"institutions\": [\n \"miko.organisation.example.commm\"\n ]\n}" - }, - "url": "http://middleware.stepup.example.com/management/whitelist/remove", - "description": "Remove an institution from the whitelist" - }, - "response": [] - }, - { - "name": "/management/whitelist/replace", - "request": { - "method": "POST", - "header": [ - { - "key": "Accept", - "value": "application/json" - }, - { - "key": "Content-Type", - "value": "application/json" - } - ], - "body": { - "mode": "raw", - "raw": "{\n \"institutions\": [\n \"dev.organisation.example\",\n \"institution-a.example.com\",\n \"institution-b.example.com\",\n \"institution-c.example.com\",\n \"institution-d.example.com\",\n \"institution-e.example.com\",\n \"institution-f.example.com\",\n \"institution-g.example.com\",\n \"institution-h.example.com\",\n \"institution-i.example.com\",\n \"institution-j.example.com\"\n ]\n}" - }, - "url": "http://middleware.stepup.example.com/management/whitelist/replace", - "description": "Replace the Institution Whitelist\n" - }, - "response": [] - }, - { - "name": "/management/forget-identity", - "request": { - "method": "POST", - "header": [ - { - "key": "Accept", - "value": "application/json" - }, - { - "key": "Content-Type", - "value": "application/json" - } - ], - "body": { - "mode": "raw", - "raw": "{\n \"name_id\": \"2592ab2afb52eea9a61f5db90febd631966d49f5\",\n \"institution\": \"Ibuildings\"\n}" - }, - "url": "http://middleware.stepup.example.com/management/forget-identity", - "description": "- POST body must contain `name_id` and `institution`" - }, - "response": [] - }, - { - "name": "/management/institution-configuration", - "request": { - "method": "GET", - "header": [ - { - "key": "Accept", - "value": "application/json" - }, - { - "key": "Content-Type", - "value": "application/json" - } - ], - "url": { - "raw": "http://middleware.stepup.example.com/management/institution-configuration?XDEBUG_SESSION_START=PHPSTORM", - "protocol": "http", - "host": [ - "middleware", - "stepup", - "example", - "com" - ], - "path": [ - "management", - "institution-configuration" - ], - "query": [ - { - "key": "XDEBUG_SESSION_START", - "value": "PHPSTORM" - } - ] - }, - "description": "GET the institution configuration options" - }, - "response": [] - }, - { - "name": "/management/institution-configuration", - "request": { - "method": "POST", - "header": [ - { - "key": "Accept", - "value": "application/json" - }, - { - "key": "Content-Type", - "value": "application/json" - } - ], - "body": { - "mode": "raw", - "raw": "{\n \"institution-a.example.com\": {\n \"use_ra_locations\": true,\n \"show_raa_contact_information\": true,\n \"verify_email\": false,\n \"self_vet\": true,\n \"number_of_tokens_per_identity\": 2,\n \"allowed_second_factors\": []\n }\n}" - }, - "url": { - "raw": "http://middleware.stepup.example.com/management/institution-configuration?XDEBUG_SESSION_START=PHPSTORM", - "protocol": "http", - "host": [ - "middleware", - "stepup", - "example", - "com" - ], - "path": [ - "management", - "institution-configuration" - ], - "query": [ - { - "key": "XDEBUG_SESSION_START", - "value": "PHPSTORM" - } - ] - }, - "description": "POST the institution configuration options to reconfigure\n" - }, - "response": [] - } - ], - "event": [ - { - "listen": "prerequest", - "script": { - "type": "text/javascript", - "exec": [ - "" - ] - } - }, - { - "listen": "test", - "script": { - "type": "text/javascript", - "exec": [ - "" - ] - } - } - ] -} diff --git a/src/Kernel.php b/src/Kernel.php index 517b77a41..94c750689 100644 --- a/src/Kernel.php +++ b/src/Kernel.php @@ -7,8 +7,7 @@ use Symfony\Component\Config\Resource\FileResource; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Kernel as BaseKernel; -use Symfony\Component\Routing\RouteCollectionBuilder; -use function dirname; +use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator; use const PHP_VERSION_ID; class Kernel extends BaseKernel @@ -45,12 +44,12 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa $loader->load($confDir . '/{services}_' . $this->environment . self::CONFIG_EXTS, 'glob'); } - protected function configureRoutes(RouteCollectionBuilder $routes): void + protected function configureRoutes(RoutingConfigurator $routes): void { - $confDir = $this->getProjectDir() . '/config'; + $extensions = '{php,yml,yaml}'; - $routes->import($confDir . '/{routes}/' . $this->environment . '/*' . self::CONFIG_EXTS, '/', 'glob'); - $routes->import($confDir . '/{routes}/*' . self::CONFIG_EXTS, '/', 'glob'); - $routes->import($confDir . '/{routes}' . self::CONFIG_EXTS, '/', 'glob'); + $routes->import('../config/{routes}/' . $this->environment . "/*.$extensions"); + $routes->import("../config/{routes}/*.$extensions"); + $routes->import("../config/{routes}.$extensions"); } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php index eb4d2bb4b..3111855a2 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php @@ -49,11 +49,13 @@ class ConfiguredInstitutionControllerTest extends WebTestCase public function setUp(): void { + self::ensureKernelShutdown(); + $this->client = static::createClient(); + $this->databaseTool = static::getContainer()->get(DatabaseToolCollection::class)->get(); // Initialises schema. $this->databaseTool->loadFixtures([]); - $this->client = static::createClient(); $passwordSs = $this->client->getKernel()->getContainer()->getParameter('selfservice_api_password'); $passwordRa = $this->client->getKernel()->getContainer()->getParameter('registration_authority_api_password'); From 4d5c91e45387189a0946e6f73c69920fbf9f3ebb Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Thu, 29 Feb 2024 15:17:53 +0100 Subject: [PATCH 30/89] Remove .env from Middleware --- .env | 40 -- .env.test | 4 - .gitignore | 2 +- bin/console | 43 +- ci/qa/phpunit | 2 +- composer.json | 11 +- composer.lock | 499 +++--------------- config/bootstrap.php | 44 +- .../parameters.yaml.dist | 3 + config/{legacy => packages}/bundles.yaml | 0 config/packages/smoketest/framework.yaml | 2 +- config/services.yaml | 4 +- public/apple-touch-icon.png | Bin 4054 -> 0 bytes public/index.php | 27 +- symfony.lock | 18 - 15 files changed, 131 insertions(+), 568 deletions(-) delete mode 100644 .env delete mode 100644 .env.test rename config/{legacy => openconext}/parameters.yaml.dist (98%) rename config/{legacy => packages}/bundles.yaml (100%) delete mode 100644 public/apple-touch-icon.png diff --git a/.env b/.env deleted file mode 100644 index c5d153763..000000000 --- a/.env +++ /dev/null @@ -1,40 +0,0 @@ -# In all environments, the following files are loaded if they exist, -# the latter taking precedence over the former: -# -# * .env contains default values for the environment variables needed by the app -# * .env.local uncommitted file with local overrides -# * .env.$APP_ENV committed environment-specific defaults -# * .env.$APP_ENV.local uncommitted environment-specific overrides -# -# Real environment variables win over .env files. -# -# DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES. -# -# Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2). -# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration - -###> symfony/framework-bundle ### -#APP_ENV=dev -#APP_SECRET=8a978a0a9df7d35ad963ac184f0b1608 -#TRUSTED_PROXIES=127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16 -#TRUSTED_HOSTS='^(localhost|example\.com)$' -###< symfony/framework-bundle ### - -###> doctrine/doctrine-bundle ### -# Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url -# For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data.db" -# For a PostgreSQL database, use: "postgresql://db_user:db_password@127.0.0.1:5432/db_name?serverVersion=11&charset=utf8" -# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml -#DATABASE_URL=mysql://db_user:db_password@127.0.0.1:3306/db_name?serverVersion=5.7 -###< doctrine/doctrine-bundle ### - -###> symfony/mailer ### -# MAILER_DSN=smtp://localhost -###< symfony/mailer ### - -###> symfony/swiftmailer-bundle ### -# For Gmail as a transport, use: "gmail://username:password@localhost" -# For a generic SMTP server, use: "smtp://localhost:25?encryption=&auth_mode=" -# Delivery is disabled by default via "null://localhost" -MAILER_URL=null://localhost -###< symfony/swiftmailer-bundle ### diff --git a/.env.test b/.env.test deleted file mode 100644 index 24a43c03b..000000000 --- a/.env.test +++ /dev/null @@ -1,4 +0,0 @@ -# define your env variables for the test env here -KERNEL_CLASS='App\Kernel' -APP_SECRET='$ecretf0rt3st' -SYMFONY_DEPRECATIONS_HELPER=999999 diff --git a/.gitignore b/.gitignore index 75d84e335..4a872431a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ /web/app_dev.php /web/app_test.php /web/app_dev.php.dist -/config/legacy/parameters.yaml +/config/openconext/parameters.yaml /var/cache/* /var/logs/* !var/cache/.gitkeep diff --git a/bin/console b/bin/console index 5de0e1c5b..22a216a4c 100755 --- a/bin/console +++ b/bin/console @@ -1,42 +1,17 @@ #!/usr/bin/env php getParameterOption(['--env', '-e'], null, true)) { - putenv('APP_ENV='.$_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = $env); -} +require_once dirname(__DIR__).'/vendor/autoload_runtime.php'; +require_once dirname(__DIR__).'/config/bootstrap.php'; -if ($input->hasParameterOption('--no-debug', true)) { - putenv('APP_DEBUG='.$_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = '0'); -} - -require dirname(__DIR__).'/config/bootstrap.php'; - -if ($_SERVER['APP_DEBUG']) { - umask(0000); - - if (class_exists(Debug::class)) { - Debug::enable(); - } -} +return function (array $context) { + $kernel = new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']); -$kernel = new Kernel($_SERVER['APP_ENV'], (bool) $_SERVER['APP_DEBUG']); -$application = new Application($kernel); -$application->run($input); + return new Application($kernel); +}; diff --git a/ci/qa/phpunit b/ci/qa/phpunit index 1ba4249d9..60d577c1c 100755 --- a/ci/qa/phpunit +++ b/ci/qa/phpunit @@ -9,5 +9,5 @@ cd $(dirname $0)/../../ # PHPUnit Bridge should always be used in Symfony applications. (https://symfony.com/doc/current/components/phpunit_bridge.html) # This will create a phpunit executable in /bin/ instead of /vendor/bin/ -XDEBUG_MODE=coverage ./vendor/bin/phpunit --configuration=ci/qa/phpunit.xml --coverage-text --testsuite=unit --stop-on-error $1 +./vendor/bin/phpunit --configuration=ci/qa/phpunit.xml --coverage-text --stop-on-error $1 ./vendor/bin/phpunit --configuration=ci/qa/phpunit.xml --testsuite=database diff --git a/composer.json b/composer.json index b03e970c7..29716da48 100644 --- a/composer.json +++ b/composer.json @@ -49,6 +49,7 @@ "symfony/mailer": "6.4.*", "symfony/monolog-bundle": "^v3.9", "symfony/password-hasher": "6.4.*", + "symfony/runtime": "6.4.*", "symfony/security-bundle": "6.4.*", "symfony/translation": "6.4.*", "symfony/twig-bundle": "6.4.*", @@ -69,7 +70,6 @@ "sebastian/phpcpd": "^6.0", "squizlabs/php_codesniffer": "^3.7", "symfony/browser-kit": "6.4.*", - "symfony/dotenv": "6.4.*", "symfony/phpunit-bridge": "^6.4", "symfony/stopwatch": "6.4.*", "symfony/web-profiler-bundle": "6.4.*" @@ -131,17 +131,16 @@ "sort-packages": true }, "extra": { - "symfony-app-dir": "app", - "symfony-var-dir": "var", - "symfony-bin-dir": "bin", - "symfony-web-dir": "web", "incenteev-parameters": { - "file": "config/legacy/parameters.yaml" + "file": "config/openconext/parameters.yaml" }, "symfony": { "allow-contrib": false, "require": "6.4.*" }, + "runtime": { + "disable_dotenv": true + }, "src-dir": "src/Surfnet" } } diff --git a/composer.lock b/composer.lock index f14db44d4..60189991a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ce9db433d4af3c8eab0b1f37bdf28282", + "content-hash": "43dd339e8ef5224c6f39f806eacea1d4", "packages": [ { "name": "beberlei/assert", @@ -7108,6 +7108,85 @@ ], "time": "2024-01-30T13:55:02+00:00" }, + { + "name": "symfony/runtime", + "version": "v6.4.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/runtime.git", + "reference": "5682281d26366cd3bf0648cec69de0e62cca7fa0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/runtime/zipball/5682281d26366cd3bf0648cec69de0e62cca7fa0", + "reference": "5682281d26366cd3bf0648cec69de0e62cca7fa0", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0|^2.0", + "php": ">=8.1" + }, + "conflict": { + "symfony/dotenv": "<5.4" + }, + "require-dev": { + "composer/composer": "^1.0.2|^2.0", + "symfony/console": "^5.4.9|^6.0.9|^7.0", + "symfony/dotenv": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^5.4|^6.0|^7.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0" + }, + "type": "composer-plugin", + "extra": { + "class": "Symfony\\Component\\Runtime\\Internal\\ComposerPlugin" + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Runtime\\": "", + "Symfony\\Runtime\\Symfony\\Component\\": "Internal/" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Enables decoupling PHP applications from global state", + "homepage": "https://symfony.com", + "keywords": [ + "runtime" + ], + "support": { + "source": "https://github.com/symfony/runtime/tree/v6.4.3" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-23T14:51:35+00:00" + }, { "name": "symfony/security-bundle", "version": "v6.4.4", @@ -9123,61 +9202,6 @@ }, "time": "2023-12-10T02:24:34+00:00" }, - { - "name": "moontoast/math", - "version": "1.2.1", - "source": { - "type": "git", - "url": "https://github.com/ramsey/moontoast-math.git", - "reference": "5f47d34c87767dbcc08b30377a9827df71de91fa" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ramsey/moontoast-math/zipball/5f47d34c87767dbcc08b30377a9827df71de91fa", - "reference": "5f47d34c87767dbcc08b30377a9827df71de91fa", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "phpseclib/bcmath_compat": ">=1.0.3" - }, - "require-dev": { - "jakub-onderka/php-parallel-lint": "^0.9.0", - "phpunit/phpunit": "^4.8 || ^5.5 || ^6.5 || ^7.0", - "satooshi/php-coveralls": "^0.6.1", - "squizlabs/php_codesniffer": "^2.3" - }, - "type": "library", - "autoload": { - "psr-4": { - "Moontoast\\Math\\": "src/Moontoast/Math", - "Moontoast\\Math\\Exception\\": "src/Moontoast/Math/Exception" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "Ben Ramsey", - "email": "ben@benramsey.com", - "homepage": "https://benramsey.com" - } - ], - "description": "A mathematics library, providing functionality for large numbers", - "homepage": "https://github.com/ramsey/moontoast-math", - "keywords": [ - "bcmath", - "math" - ], - "support": { - "issues": "https://github.com/ramsey/moontoast-math/issues", - "source": "https://github.com/ramsey/moontoast-math" - }, - "abandoned": "brick/math", - "time": "2020-01-05T04:49:34+00:00" - }, { "name": "myclabs/deep-copy", "version": "1.11.1", @@ -9327,123 +9351,6 @@ ], "time": "2024-02-06T10:43:30+00:00" }, - { - "name": "paragonie/constant_time_encoding", - "version": "v2.6.3", - "source": { - "type": "git", - "url": "https://github.com/paragonie/constant_time_encoding.git", - "reference": "58c3f47f650c94ec05a151692652a868995d2938" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/58c3f47f650c94ec05a151692652a868995d2938", - "reference": "58c3f47f650c94ec05a151692652a868995d2938", - "shasum": "" - }, - "require": { - "php": "^7|^8" - }, - "require-dev": { - "phpunit/phpunit": "^6|^7|^8|^9", - "vimeo/psalm": "^1|^2|^3|^4" - }, - "type": "library", - "autoload": { - "psr-4": { - "ParagonIE\\ConstantTime\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Paragon Initiative Enterprises", - "email": "security@paragonie.com", - "homepage": "https://paragonie.com", - "role": "Maintainer" - }, - { - "name": "Steve 'Sc00bz' Thomas", - "email": "steve@tobtu.com", - "homepage": "https://www.tobtu.com", - "role": "Original Developer" - } - ], - "description": "Constant-time Implementations of RFC 4648 Encoding (Base-64, Base-32, Base-16)", - "keywords": [ - "base16", - "base32", - "base32_decode", - "base32_encode", - "base64", - "base64_decode", - "base64_encode", - "bin2hex", - "encoding", - "hex", - "hex2bin", - "rfc4648" - ], - "support": { - "email": "info@paragonie.com", - "issues": "https://github.com/paragonie/constant_time_encoding/issues", - "source": "https://github.com/paragonie/constant_time_encoding" - }, - "time": "2022-06-14T06:56:20+00:00" - }, - { - "name": "paragonie/random_compat", - "version": "v9.99.100", - "source": { - "type": "git", - "url": "https://github.com/paragonie/random_compat.git", - "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a", - "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a", - "shasum": "" - }, - "require": { - "php": ">= 7" - }, - "require-dev": { - "phpunit/phpunit": "4.*|5.*", - "vimeo/psalm": "^1" - }, - "suggest": { - "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." - }, - "type": "library", - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Paragon Initiative Enterprises", - "email": "security@paragonie.com", - "homepage": "https://paragonie.com" - } - ], - "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", - "keywords": [ - "csprng", - "polyfill", - "pseudorandom", - "random" - ], - "support": { - "email": "info@paragonie.com", - "issues": "https://github.com/paragonie/random_compat/issues", - "source": "https://github.com/paragonie/random_compat" - }, - "time": "2020-10-15T08:29:30+00:00" - }, { "name": "pdepend/pdepend", "version": "2.16.2", @@ -9701,178 +9608,6 @@ ], "time": "2023-12-11T08:22:20+00:00" }, - { - "name": "phpseclib/bcmath_compat", - "version": "2.0.1", - "source": { - "type": "git", - "url": "https://github.com/phpseclib/bcmath_compat.git", - "reference": "2ffea8bfe1702b4535a7b3c2649c4301968e9a3c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpseclib/bcmath_compat/zipball/2ffea8bfe1702b4535a7b3c2649c4301968e9a3c", - "reference": "2ffea8bfe1702b4535a7b3c2649c4301968e9a3c", - "shasum": "" - }, - "require": { - "phpseclib/phpseclib": "^3.0" - }, - "provide": { - "ext-bcmath": "8.1.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35|^5.7|^6.0|^9.4", - "squizlabs/php_codesniffer": "^3.0" - }, - "suggest": { - "ext-gmp": "Will enable faster math operations" - }, - "type": "library", - "autoload": { - "files": [ - "lib/bcmath.php" - ], - "psr-4": { - "bcmath_compat\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jim Wigginton", - "email": "terrafrost@php.net", - "homepage": "http://phpseclib.sourceforge.net" - } - ], - "description": "PHP 5.x-8.x polyfill for bcmath extension", - "keywords": [ - "BigInteger", - "bcmath", - "bigdecimal", - "math", - "polyfill" - ], - "support": { - "email": "terrafrost@php.net", - "issues": "https://github.com/phpseclib/bcmath_compat/issues", - "source": "https://github.com/phpseclib/bcmath_compat" - }, - "time": "2021-12-16T02:35:52+00:00" - }, - { - "name": "phpseclib/phpseclib", - "version": "3.0.36", - "source": { - "type": "git", - "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "c2fb5136162d4be18fdd4da9980696f3aee96d7b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c2fb5136162d4be18fdd4da9980696f3aee96d7b", - "reference": "c2fb5136162d4be18fdd4da9980696f3aee96d7b", - "shasum": "" - }, - "require": { - "paragonie/constant_time_encoding": "^1|^2", - "paragonie/random_compat": "^1.4|^2.0|^9.99.99", - "php": ">=5.6.1" - }, - "require-dev": { - "phpunit/phpunit": "*" - }, - "suggest": { - "ext-dom": "Install the DOM extension to load XML formatted public keys.", - "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.", - "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.", - "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.", - "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations." - }, - "type": "library", - "autoload": { - "files": [ - "phpseclib/bootstrap.php" - ], - "psr-4": { - "phpseclib3\\": "phpseclib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jim Wigginton", - "email": "terrafrost@php.net", - "role": "Lead Developer" - }, - { - "name": "Patrick Monnerat", - "email": "pm@datasphere.ch", - "role": "Developer" - }, - { - "name": "Andreas Fischer", - "email": "bantu@phpbb.com", - "role": "Developer" - }, - { - "name": "Hans-Jürgen Petrich", - "email": "petrich@tronic-media.com", - "role": "Developer" - }, - { - "name": "Graham Campbell", - "email": "graham@alt-three.com", - "role": "Developer" - } - ], - "description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.", - "homepage": "http://phpseclib.sourceforge.net", - "keywords": [ - "BigInteger", - "aes", - "asn.1", - "asn1", - "blowfish", - "crypto", - "cryptography", - "encryption", - "rsa", - "security", - "sftp", - "signature", - "signing", - "ssh", - "twofish", - "x.509", - "x509" - ], - "support": { - "issues": "https://github.com/phpseclib/phpseclib/issues", - "source": "https://github.com/phpseclib/phpseclib/tree/3.0.36" - }, - "funding": [ - { - "url": "https://github.com/terrafrost", - "type": "github" - }, - { - "url": "https://www.patreon.com/phpseclib", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/phpseclib/phpseclib", - "type": "tidelift" - } - ], - "time": "2024-02-26T05:13:14+00:00" - }, { "name": "phpunit/php-code-coverage", "version": "9.2.30", @@ -11536,80 +11271,6 @@ ], "time": "2024-02-07T09:17:57+00:00" }, - { - "name": "symfony/dotenv", - "version": "v6.4.4", - "source": { - "type": "git", - "url": "https://github.com/symfony/dotenv.git", - "reference": "f6f0a3dd102915b4c5bfdf4f4e3139a8cbf477a0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/dotenv/zipball/f6f0a3dd102915b4c5bfdf4f4e3139a8cbf477a0", - "reference": "f6f0a3dd102915b4c5bfdf4f4e3139a8cbf477a0", - "shasum": "" - }, - "require": { - "php": ">=8.1" - }, - "conflict": { - "symfony/console": "<5.4", - "symfony/process": "<5.4" - }, - "require-dev": { - "symfony/console": "^5.4|^6.0|^7.0", - "symfony/process": "^5.4|^6.0|^7.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Dotenv\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Registers environment variables from a .env file", - "homepage": "https://symfony.com", - "keywords": [ - "dotenv", - "env", - "environment" - ], - "support": { - "source": "https://github.com/symfony/dotenv/tree/v6.4.4" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-02-08T17:53:17+00:00" - }, { "name": "symfony/phpunit-bridge", "version": "v6.4.4", diff --git a/config/bootstrap.php b/config/bootstrap.php index e53d600da..9c7d3a6c0 100644 --- a/config/bootstrap.php +++ b/config/bootstrap.php @@ -1,25 +1,29 @@ =1.2) -//if (is_array($env = @include dirname(__DIR__).'/.env.local.php') && (!isset($env['APP_ENV']) || ($_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? $env['APP_ENV']) === $env['APP_ENV'])) { -// (new Dotenv(false))->populate($env); -//} else { -// // load all the .env files -// (new Dotenv(false))->loadEnv(dirname(__DIR__).'/.env'); -//} -// -$_SERVER += $_ENV; -$_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = ($_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? null) ?: 'dev'; -$_SERVER['APP_DEBUG'] = $_SERVER['APP_DEBUG'] ?? $_ENV['APP_DEBUG'] ?? 'prod' !== $_SERVER['APP_ENV']; -$_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = (int) $_SERVER['APP_DEBUG'] || filter_var($_SERVER['APP_DEBUG'], FILTER_VALIDATE_BOOLEAN) ? '1' : '0'; +// Test if required parameters are set +if (0 !== count(array_diff($requiredParameters, array_keys($parameters)))) { + throw new RuntimeException(sprintf( + 'Required parameters are not configured, required params are: %s, configure them in %s', + implode(', ', $requiredParameters), + $parametersPath + )); +} + +$_SERVER['APP_ENV'] = $parameters['app_env']; +$_SERVER['APP_DEBUG'] = $parameters['app_debug']; +$_SERVER['APP_SECRET'] = $parameters['app_secret']; + +// Allow the application environment (dev/test/prod) to change via the APP_ENV environment variable. +if (array_key_exists('APP_ENV', $_ENV)) { + $_SERVER['APP_ENV'] = $_ENV['APP_ENV']; +} + +filter_var($_SERVER['APP_DEBUG'], FILTER_VALIDATE_BOOLEAN) ? '1' : '0'; diff --git a/config/legacy/parameters.yaml.dist b/config/openconext/parameters.yaml.dist similarity index 98% rename from config/legacy/parameters.yaml.dist rename to config/openconext/parameters.yaml.dist index a97c85a72..a54d3723a 100644 --- a/config/legacy/parameters.yaml.dist +++ b/config/openconext/parameters.yaml.dist @@ -1,4 +1,7 @@ parameters: + app_env: prod + app_debug: false + app_secret: SeTW1ThY0uR0WnS3cR37 application_name: OpenConext Middleware # IP addresses of any HTTP proxies that are sitting in front of the application # See: http://symfony.com/doc/current/request/load_balancer_reverse_proxy.html diff --git a/config/legacy/bundles.yaml b/config/packages/bundles.yaml similarity index 100% rename from config/legacy/bundles.yaml rename to config/packages/bundles.yaml diff --git a/config/packages/smoketest/framework.yaml b/config/packages/smoketest/framework.yaml index 3689f8bad..00dcd315f 100644 --- a/config/packages/smoketest/framework.yaml +++ b/config/packages/smoketest/framework.yaml @@ -1,5 +1,5 @@ framework: - test: ~ + test: true profiler: collect: false php_errors: diff --git a/config/services.yaml b/config/services.yaml index cd536baa6..9aa8ff92f 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -1,7 +1,7 @@ # import legacy parameters.yaml so this could later on be refactored to utilize dotenv support imports: - - { resource: 'legacy/bundles.yaml' } - - { resource: 'legacy/parameters.yaml' } + - { resource: 'packages/bundles.yaml' } + - { resource: 'openconext/parameters.yaml' } services: _defaults: diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png deleted file mode 100644 index 8c0753a4600cb05a0a9fa8484d69d5a3ca933fb4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4054 zcmcIn`9GB18`f)Ak_v^Q5y~3ImVGB#vc?#~2r-T9vJ)w5g(8M5*$u`nrZ-C?%h-1# zBh(mMjENcM`}F<~-*Z0qIp=dfKiucJ&UIh+IWH{DjW{{@IT#oiI8BW8tr!?i$^SJr z7QhqM=hO>KEN-So`V92Hy|A?4N?x*x=e z$?Qpe2U;dIh5fOTKzR*G=;!064~?W+Gd7i}8Q4paIlGcHwwsS7a_XNrdHWbS*06sZ zjFBZ(b;xcdSlNBg3&3ft<8yH0VOG{C3NmcCZHXE_95x&PZ1Vrt3h#+2{)|)ux#{Q+ z)*kPXl2jle<8IDLNux=Z%A0hc@+a}W!TM4)%rju zQ~Ty>{g`m=B%Q^F3H@l!kfN&W(;&ipJFEXFH@8q)k`VDF0SJ39zlnr5#!fHXQY^0f zuqt+qg|q(V-GLi0uUQ^$dL^Xr+8l^Lsch)ul4k9$j`S+2FR#6*P$bE((C8%5Q@A{w zMoeMgw|T{>-%}REe$gr`=vkXbn>`GjaOt9Bmh>d&A#09#g4^M+;sY<$^VwyIMbJy; zN9%U4g4pD47`&Ci%3=e>*yMFs*cu*Qa{Q+^;EuTXo1)uqODnc&^6;9X?V75RYlCg- z!&I;EyPe`NSgeZ@-^n?f)?4siXdS6c{z+Hfp`|58OmXks z_UvhzcINX$h5?{|qTrWj>Q~xAgDJAasO^Nk^`0MS^d?cy-JSEeL!f?Wh!%2XWo+m3 zYbS8;?e+2bG8;RxRK=&;tyQmkXZ~f(+MI9x&vO@1U`08Qf`D7(gLgi&Mol5}kJ}>p zcHw({isCe?QZ*#!mj>T(f%R+`+*H&8b#|+ApInQpK_$PqJP_;iQnwC4Ru^pDKw@s}Nl;p6S{Xk7p<7YMh9UmaBMks27cAkRLL{+R;O^4(ouE4ylSl|NG1nL2Bc zW*(yRIsuQrY5@7x13gL+stc495(!+QZZBe^H06@7ynRDwMpCRC!el}W6ih5 z22gisbITtVcgfL^pfN@t=k=7<-!COsh(4(FjmNDkC9J>fPgXY$4%inWsfyyq6wmxH zy9iQI@=8&TP`c!8lm*#6aD09Hk#R=;qxa+IAJm}gOovR??s#-EMg16#0XRY%ZA=5E z5@daTpjt9A>RyG-ooL*zO=~M0`OY{!b!JTr0R@%!#!3D9RIkoh^eR@3J6=lut`oGQ z9g@M`kSMVaiyphyZ@>rj#ev(h=zmsKz(m>xm-Di^$?4G=ipR>Rcs zal>k;JJwj?=Dvg(exT8JskyWvI4Goc!?^8Hj_+cfp;YOQN>MYHR|X{=b6Gt>$_w0- z=+*h%VyITSh8oqn#$QJXph=IOfRbp`u^J{)jqb8^N7Qzn-skr>Mp(WANt?&Pr`n*I zp1M3yRZ)q3je@-o9;yRR{#Jo9+Zjwf@XXx(utfbApVS*YTBq1A)4KCI^e3huMSxeG zf042vfLWlcg&$o%AdxKg+f7eM7b+;zrm~t@1M$|s{`bIBJh?J%H!~(Su=c$ zScYWvD1p`o7TLm5Gn><2*3na4d2#|^hhczL5Gtz>X&nfR*e-0g@!>Er<>VwPyqyWB zaqMM{Pl0Qw>r9J5S&HEn|3@kq@IG#Z+W? z5YtMuS6HR%I*_ex8cTkp@3B34gC*AbfYkJF<{(o;{}?;;oxO^srC>pT^bCwx8Q3k< z?Fn_Y%V`Fz7Y&Hg`ELQF`Xsv9`qfEe}-zWct$^lRoQ9f;= z-+COC765etDKwK6di!&Vw~&cqo3eL7US+%LcJbzu4Z`XR{022WQsKnE|1E!)khobc z*tsh{K*UY^Vg=S}@pE2a+}c{IkCj>7UA13IAS>vrA%9I798qitZbG*4kdSu-VW(=h zYDu%R(T#9?>&J#lPm_Dv_cI zd6s-Ia8QOBqQL)~>^3055`Xpb#K5K5>v5&Fu^N};z@~L%=Y~b7jL$MnH46Z{q-!qs z;aR6*UDv17Oq==qCW#9$Fj=($I2Ez3_DkHm8!nx^C@zd3AaO4!cr`)lLFZNON!B-c z%4AwAsj{|by)G?u>zC1rf-*km4;jehRHH8H%3$=~&d8QZMEO&5$zMF<7xKHm{r1Iv z!YP-|K6k)nsTvtt+rzw{Tcu`rgl1E8GYs(G^Fo5G^=&_biYwx)eH|FDZN6l>-tCI{}>pH0SEyb(ym?`9jOru!Maa(fv5ww@rMz9nis zaO-Z*YP0hMfZfQwD0q2WXUOsRZ<)Jh|Kd$G(^!&F`T2Q9P`N?8R2oEGE}g>@NITts zNPjp2Hi=sk7Cg6u-zy`W#z)|qvs{MR>zA*qBJLv;BN|p*sm;fF zmNmBpCV6J#@4kz@CBUa6HmLnhv2*Js0?oOGJp4LG)~X-aH@ zXV`=@6esdQsbgv(=4@~H2c<{+6-}pf>@aCNSV>1c2+cLOn>6>t=d4Fm;-g7|FvIXb9wZQ$obap3alXkqZmgu2n=3eh)V&*@mG7$=9jCa`3HDA8o zy3og%NPQAtR2^blGhU-+o5=!~N~)IdVHl`3=ZzXn8HdP&3hd zoYk_mhFk8VfWHF7fTcHFt1>-Mp<;aGydyHqLzOw_&9NnN6nO0@PvBJLZ{T8N&cQ~A z3(g`~ZG%MN_=Z$sT!hLj*J|a@e|Rp(2s1MM9nQgGgvXixTQJ0(IR^sQ|?mt7vi%a8y>%|>Q!8FlPXyI9lMOP439|!E!H~;_u diff --git a/public/index.php b/public/index.php index 5a1dd66d4..a20b1e57a 100644 --- a/public/index.php +++ b/public/index.php @@ -1,26 +1,9 @@ handle($request); -$response->send(); -$kernel->terminate($request, $response); +return function (array $context) { + return new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']); +}; diff --git a/symfony.lock b/symfony.lock index e33a02b27..bb44e90e4 100644 --- a/symfony.lock +++ b/symfony.lock @@ -165,9 +165,6 @@ "monolog/monolog": { "version": "1.25.4" }, - "moontoast/math": { - "version": "1.2.1" - }, "myclabs/deep-copy": { "version": "1.9.5" }, @@ -201,12 +198,6 @@ "pagerfanta/pagerfanta": { "version": "v1.1.0" }, - "paragonie/constant_time_encoding": { - "version": "v2.5.0" - }, - "paragonie/random_compat": { - "version": "v2.0.18" - }, "pdepend/pdepend": { "version": "2.7.1" }, @@ -219,12 +210,6 @@ "phpmd/phpmd": { "version": "2.8.2" }, - "phpseclib/bcmath_compat": { - "version": "1.0.5" - }, - "phpseclib/phpseclib": { - "version": "2.0.27" - }, "phpunit/php-code-coverage": { "version": "7.0.10" }, @@ -393,9 +378,6 @@ "symfony/dom-crawler": { "version": "v4.4.10" }, - "symfony/dotenv": { - "version": "v4.4.9" - }, "symfony/error-handler": { "version": "v4.4.10" }, From 86cea19a1afef9bfe6e2dde77cbc677ff2f8eb7b Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Thu, 14 Mar 2024 09:21:17 +0100 Subject: [PATCH 31/89] Rename namespace of Kernel It is no longer in App, but resides in Surf/Middleware --- bin/console | 2 +- ci/qa/phpunit.xml | 2 +- composer.json | 5 +-- public/index.php | 2 +- src/Kernel.php | 55 ------------------------- src/Surfnet/StepupMiddleware/Kernel.php | 21 ++++++++++ 6 files changed, 25 insertions(+), 62 deletions(-) delete mode 100644 src/Kernel.php create mode 100644 src/Surfnet/StepupMiddleware/Kernel.php diff --git a/bin/console b/bin/console index 22a216a4c..044c2d8f5 100755 --- a/bin/console +++ b/bin/console @@ -1,6 +1,6 @@ #!/usr/bin/env php - + diff --git a/composer.json b/composer.json index 29716da48..aee55b98d 100644 --- a/composer.json +++ b/composer.json @@ -6,10 +6,7 @@ "psr-4": { "Surfnet\\Stepup\\": "src\\Surfnet\\Stepup", "Surfnet\\StepupMiddleware\\": "src\\Surfnet\\StepupMiddleware" - }, - "classmap": [ - "src/Kernel.php" - ] + } }, "autoload-dev": { "psr-4": { diff --git a/public/index.php b/public/index.php index a20b1e57a..0d0178f6d 100644 --- a/public/index.php +++ b/public/index.php @@ -1,5 +1,5 @@ getProjectDir() . '/config/bundles.php'; - foreach ($contents as $class => $envs) { - if ($envs[$this->environment] ?? $envs['all'] ?? false) { - yield new $class(); - } - } - } - - public function getProjectDir(): string - { - return dirname(__DIR__); - } - - protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void - { - $container->addResource(new FileResource($this->getProjectDir() . '/config/bundles.php')); - $container->setParameter('container.dumper.inline_class_loader', PHP_VERSION_ID < 70400 || $this->debug); - $container->setParameter('container.dumper.inline_factories', true); - $confDir = $this->getProjectDir() . '/config'; - - $loader->load($confDir . '/{packages}/*' . self::CONFIG_EXTS, 'glob'); - $loader->load($confDir . '/{packages}/' . $this->environment . '/*' . self::CONFIG_EXTS, 'glob'); - $loader->load($confDir . '/{services}' . self::CONFIG_EXTS, 'glob'); - $loader->load($confDir . '/{services}_' . $this->environment . self::CONFIG_EXTS, 'glob'); - } - - protected function configureRoutes(RoutingConfigurator $routes): void - { - $extensions = '{php,yml,yaml}'; - - $routes->import('../config/{routes}/' . $this->environment . "/*.$extensions"); - $routes->import("../config/{routes}/*.$extensions"); - $routes->import("../config/{routes}.$extensions"); - } -} diff --git a/src/Surfnet/StepupMiddleware/Kernel.php b/src/Surfnet/StepupMiddleware/Kernel.php new file mode 100644 index 000000000..51f692d8b --- /dev/null +++ b/src/Surfnet/StepupMiddleware/Kernel.php @@ -0,0 +1,21 @@ + Date: Thu, 14 Mar 2024 09:27:51 +0100 Subject: [PATCH 32/89] Install PHPStan with SF support Set on level 1 for starters --- .gitignore | 4 + ci/qa/phpstan | 5 + ci/qa/phpstan-baseline.neon | 2 + ci/qa/phpstan-update-baseline | 5 + composer.json | 4 + composer.lock | 480 +++++++++++++++++++++++++++++++++- symfony.lock | 12 + 7 files changed, 511 insertions(+), 1 deletion(-) create mode 100755 ci/qa/phpstan create mode 100644 ci/qa/phpstan-baseline.neon create mode 100755 ci/qa/phpstan-update-baseline diff --git a/.gitignore b/.gitignore index 4a872431a..2bea33b45 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,7 @@ config/services.yml ###> symfony/phpunit-bridge ### .phpunit ###< symfony/phpunit-bridge ### + +###> phpstan/phpstan ### +phpstan.neon +###< phpstan/phpstan ### diff --git a/ci/qa/phpstan b/ci/qa/phpstan new file mode 100755 index 000000000..f60f80592 --- /dev/null +++ b/ci/qa/phpstan @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +cd $(dirname $0)/../../ + +vendor/bin/phpstan analyse --memory-limit=-1 --no-ansi -c ./ci/qa/phpstan.neon diff --git a/ci/qa/phpstan-baseline.neon b/ci/qa/phpstan-baseline.neon new file mode 100644 index 000000000..364905f71 --- /dev/null +++ b/ci/qa/phpstan-baseline.neon @@ -0,0 +1,2 @@ +parameters: + ignoreErrors: diff --git a/ci/qa/phpstan-update-baseline b/ci/qa/phpstan-update-baseline new file mode 100755 index 000000000..50441d856 --- /dev/null +++ b/ci/qa/phpstan-update-baseline @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +cd $(dirname $0)/../../ + +vendor/bin/phpstan analyse --memory-limit=-1 --no-ansi -c ./ci/qa/phpstan.neon --generate-baseline ./ci/qa/phpstan-baseline.neon diff --git a/composer.json b/composer.json index aee55b98d..99016b9b6 100644 --- a/composer.json +++ b/composer.json @@ -63,6 +63,8 @@ "moontoast/math": "^1.2", "overtrue/phplint": "*", "phpmd/phpmd": "^2.15", + "phpstan/phpstan": "^1.10", + "phpstan/phpstan-symfony": "^1.3", "phpunit/phpunit": "^9.5", "sebastian/phpcpd": "^6.0", "squizlabs/php_codesniffer": "^3.7", @@ -80,11 +82,13 @@ "@phplint", "@phpmd", "@phpcs", + "@phpstan", "@phpcpd", "@phpunit" ], "phplint": "./ci/qa/phplint", "phpmd": "./ci/qa/phpmd", + "phpstan": "./ci/qa/phpstan", "phpcs": "./ci/qa/phpcs", "phpcpd": "./ci/qa/phpcpd", "phpunit": "./ci/qa/phpunit --", diff --git a/composer.lock b/composer.lock index 60189991a..3c7ceec52 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "43dd339e8ef5224c6f39f806eacea1d4", + "content-hash": "6df21d3155df0de1eb00a85abe71a17f", "packages": [ { "name": "beberlei/assert", @@ -9202,6 +9202,61 @@ }, "time": "2023-12-10T02:24:34+00:00" }, + { + "name": "moontoast/math", + "version": "1.2.1", + "source": { + "type": "git", + "url": "https://github.com/ramsey/moontoast-math.git", + "reference": "5f47d34c87767dbcc08b30377a9827df71de91fa" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ramsey/moontoast-math/zipball/5f47d34c87767dbcc08b30377a9827df71de91fa", + "reference": "5f47d34c87767dbcc08b30377a9827df71de91fa", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "phpseclib/bcmath_compat": ">=1.0.3" + }, + "require-dev": { + "jakub-onderka/php-parallel-lint": "^0.9.0", + "phpunit/phpunit": "^4.8 || ^5.5 || ^6.5 || ^7.0", + "satooshi/php-coveralls": "^0.6.1", + "squizlabs/php_codesniffer": "^2.3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Moontoast\\Math\\": "src/Moontoast/Math", + "Moontoast\\Math\\Exception\\": "src/Moontoast/Math/Exception" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Ben Ramsey", + "email": "ben@benramsey.com", + "homepage": "https://benramsey.com" + } + ], + "description": "A mathematics library, providing functionality for large numbers", + "homepage": "https://github.com/ramsey/moontoast-math", + "keywords": [ + "bcmath", + "math" + ], + "support": { + "issues": "https://github.com/ramsey/moontoast-math/issues", + "source": "https://github.com/ramsey/moontoast-math" + }, + "abandoned": "brick/math", + "time": "2020-01-05T04:49:34+00:00" + }, { "name": "myclabs/deep-copy", "version": "1.11.1", @@ -9351,6 +9406,123 @@ ], "time": "2024-02-06T10:43:30+00:00" }, + { + "name": "paragonie/constant_time_encoding", + "version": "v2.6.3", + "source": { + "type": "git", + "url": "https://github.com/paragonie/constant_time_encoding.git", + "reference": "58c3f47f650c94ec05a151692652a868995d2938" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/58c3f47f650c94ec05a151692652a868995d2938", + "reference": "58c3f47f650c94ec05a151692652a868995d2938", + "shasum": "" + }, + "require": { + "php": "^7|^8" + }, + "require-dev": { + "phpunit/phpunit": "^6|^7|^8|^9", + "vimeo/psalm": "^1|^2|^3|^4" + }, + "type": "library", + "autoload": { + "psr-4": { + "ParagonIE\\ConstantTime\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Paragon Initiative Enterprises", + "email": "security@paragonie.com", + "homepage": "https://paragonie.com", + "role": "Maintainer" + }, + { + "name": "Steve 'Sc00bz' Thomas", + "email": "steve@tobtu.com", + "homepage": "https://www.tobtu.com", + "role": "Original Developer" + } + ], + "description": "Constant-time Implementations of RFC 4648 Encoding (Base-64, Base-32, Base-16)", + "keywords": [ + "base16", + "base32", + "base32_decode", + "base32_encode", + "base64", + "base64_decode", + "base64_encode", + "bin2hex", + "encoding", + "hex", + "hex2bin", + "rfc4648" + ], + "support": { + "email": "info@paragonie.com", + "issues": "https://github.com/paragonie/constant_time_encoding/issues", + "source": "https://github.com/paragonie/constant_time_encoding" + }, + "time": "2022-06-14T06:56:20+00:00" + }, + { + "name": "paragonie/random_compat", + "version": "v9.99.100", + "source": { + "type": "git", + "url": "https://github.com/paragonie/random_compat.git", + "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a", + "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a", + "shasum": "" + }, + "require": { + "php": ">= 7" + }, + "require-dev": { + "phpunit/phpunit": "4.*|5.*", + "vimeo/psalm": "^1" + }, + "suggest": { + "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." + }, + "type": "library", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Paragon Initiative Enterprises", + "email": "security@paragonie.com", + "homepage": "https://paragonie.com" + } + ], + "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", + "keywords": [ + "csprng", + "polyfill", + "pseudorandom", + "random" + ], + "support": { + "email": "info@paragonie.com", + "issues": "https://github.com/paragonie/random_compat/issues", + "source": "https://github.com/paragonie/random_compat" + }, + "time": "2020-10-15T08:29:30+00:00" + }, { "name": "pdepend/pdepend", "version": "2.16.2", @@ -9608,6 +9780,312 @@ ], "time": "2023-12-11T08:22:20+00:00" }, + { + "name": "phpseclib/bcmath_compat", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/phpseclib/bcmath_compat.git", + "reference": "29bbf07a7039ff65ce7daa44502ba34baf1512ec" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpseclib/bcmath_compat/zipball/29bbf07a7039ff65ce7daa44502ba34baf1512ec", + "reference": "29bbf07a7039ff65ce7daa44502ba34baf1512ec", + "shasum": "" + }, + "require": { + "phpseclib/phpseclib": "^3.0" + }, + "provide": { + "ext-bcmath": "8.1.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35|^5.7|^6.0|^9.4", + "squizlabs/php_codesniffer": "^3.0" + }, + "suggest": { + "ext-gmp": "Will enable faster math operations" + }, + "type": "library", + "autoload": { + "files": [ + "lib/bcmath.php" + ], + "psr-4": { + "bcmath_compat\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jim Wigginton", + "email": "terrafrost@php.net", + "homepage": "http://phpseclib.sourceforge.net" + } + ], + "description": "PHP 5.x-8.x polyfill for bcmath extension", + "keywords": [ + "BigInteger", + "bcmath", + "bigdecimal", + "math", + "polyfill" + ], + "support": { + "email": "terrafrost@php.net", + "issues": "https://github.com/phpseclib/bcmath_compat/issues", + "source": "https://github.com/phpseclib/bcmath_compat" + }, + "time": "2024-02-21T10:30:36+00:00" + }, + { + "name": "phpseclib/phpseclib", + "version": "3.0.37", + "source": { + "type": "git", + "url": "https://github.com/phpseclib/phpseclib.git", + "reference": "cfa2013d0f68c062055180dd4328cc8b9d1f30b8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/cfa2013d0f68c062055180dd4328cc8b9d1f30b8", + "reference": "cfa2013d0f68c062055180dd4328cc8b9d1f30b8", + "shasum": "" + }, + "require": { + "paragonie/constant_time_encoding": "^1|^2", + "paragonie/random_compat": "^1.4|^2.0|^9.99.99", + "php": ">=5.6.1" + }, + "require-dev": { + "phpunit/phpunit": "*" + }, + "suggest": { + "ext-dom": "Install the DOM extension to load XML formatted public keys.", + "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.", + "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.", + "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.", + "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations." + }, + "type": "library", + "autoload": { + "files": [ + "phpseclib/bootstrap.php" + ], + "psr-4": { + "phpseclib3\\": "phpseclib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jim Wigginton", + "email": "terrafrost@php.net", + "role": "Lead Developer" + }, + { + "name": "Patrick Monnerat", + "email": "pm@datasphere.ch", + "role": "Developer" + }, + { + "name": "Andreas Fischer", + "email": "bantu@phpbb.com", + "role": "Developer" + }, + { + "name": "Hans-Jürgen Petrich", + "email": "petrich@tronic-media.com", + "role": "Developer" + }, + { + "name": "Graham Campbell", + "email": "graham@alt-three.com", + "role": "Developer" + } + ], + "description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.", + "homepage": "http://phpseclib.sourceforge.net", + "keywords": [ + "BigInteger", + "aes", + "asn.1", + "asn1", + "blowfish", + "crypto", + "cryptography", + "encryption", + "rsa", + "security", + "sftp", + "signature", + "signing", + "ssh", + "twofish", + "x.509", + "x509" + ], + "support": { + "issues": "https://github.com/phpseclib/phpseclib/issues", + "source": "https://github.com/phpseclib/phpseclib/tree/3.0.37" + }, + "funding": [ + { + "url": "https://github.com/terrafrost", + "type": "github" + }, + { + "url": "https://www.patreon.com/phpseclib", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpseclib/phpseclib", + "type": "tidelift" + } + ], + "time": "2024-03-03T02:14:58+00:00" + }, + { + "name": "phpstan/phpstan", + "version": "1.10.62", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpstan.git", + "reference": "cd5c8a1660ed3540b211407c77abf4af193a6af9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cd5c8a1660ed3540b211407c77abf4af193a6af9", + "reference": "cd5c8a1660ed3540b211407c77abf4af193a6af9", + "shasum": "" + }, + "require": { + "php": "^7.2|^8.0" + }, + "conflict": { + "phpstan/phpstan-shim": "*" + }, + "bin": [ + "phpstan", + "phpstan.phar" + ], + "type": "library", + "autoload": { + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PHPStan - PHP Static Analysis Tool", + "keywords": [ + "dev", + "static analysis" + ], + "support": { + "docs": "https://phpstan.org/user-guide/getting-started", + "forum": "https://github.com/phpstan/phpstan/discussions", + "issues": "https://github.com/phpstan/phpstan/issues", + "security": "https://github.com/phpstan/phpstan/security/policy", + "source": "https://github.com/phpstan/phpstan-src" + }, + "funding": [ + { + "url": "https://github.com/ondrejmirtes", + "type": "github" + }, + { + "url": "https://github.com/phpstan", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan", + "type": "tidelift" + } + ], + "time": "2024-03-13T12:27:20+00:00" + }, + { + "name": "phpstan/phpstan-symfony", + "version": "1.3.8", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpstan-symfony.git", + "reference": "d8a0bc03a68d95288b6471c37d435647fbdaff1a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/d8a0bc03a68d95288b6471c37d435647fbdaff1a", + "reference": "d8a0bc03a68d95288b6471c37d435647fbdaff1a", + "shasum": "" + }, + "require": { + "ext-simplexml": "*", + "php": "^7.2 || ^8.0", + "phpstan/phpstan": "^1.10.36" + }, + "conflict": { + "symfony/framework-bundle": "<3.0" + }, + "require-dev": { + "nikic/php-parser": "^4.13.0", + "php-parallel-lint/php-parallel-lint": "^1.2", + "phpstan/phpstan-phpunit": "^1.3.11", + "phpstan/phpstan-strict-rules": "^1.5.1", + "phpunit/phpunit": "^8.5.29 || ^9.5", + "psr/container": "1.0 || 1.1.1", + "symfony/config": "^5.4 || ^6.1", + "symfony/console": "^5.4 || ^6.1", + "symfony/dependency-injection": "^5.4 || ^6.1", + "symfony/form": "^5.4 || ^6.1", + "symfony/framework-bundle": "^5.4 || ^6.1", + "symfony/http-foundation": "^5.4 || ^6.1", + "symfony/messenger": "^5.4", + "symfony/polyfill-php80": "^1.24", + "symfony/serializer": "^5.4", + "symfony/service-contracts": "^2.2.0" + }, + "type": "phpstan-extension", + "extra": { + "phpstan": { + "includes": [ + "extension.neon", + "rules.neon" + ] + } + }, + "autoload": { + "psr-4": { + "PHPStan\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Lukáš Unger", + "email": "looky.msc@gmail.com", + "homepage": "https://lookyman.net" + } + ], + "description": "Symfony Framework extensions and rules for PHPStan", + "support": { + "issues": "https://github.com/phpstan/phpstan-symfony/issues", + "source": "https://github.com/phpstan/phpstan-symfony/tree/1.3.8" + }, + "time": "2024-03-05T16:33:08+00:00" + }, { "name": "phpunit/php-code-coverage", "version": "9.2.30", diff --git a/symfony.lock b/symfony.lock index bb44e90e4..8ba174f6b 100644 --- a/symfony.lock +++ b/symfony.lock @@ -210,6 +210,18 @@ "phpmd/phpmd": { "version": "2.8.2" }, + "phpstan/phpstan": { + "version": "1.10", + "recipe": { + "repo": "github.com/symfony/recipes-contrib", + "branch": "main", + "version": "1.0", + "ref": "5e490cc197fb6bb1ae22e5abbc531ddc633b6767" + }, + "files": [ + "phpstan.dist.neon" + ] + }, "phpunit/php-code-coverage": { "version": "7.0.10" }, From a438e3b2c1ed1a0bac142ee5090262316846bf6e Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Thu, 14 Mar 2024 09:40:00 +0100 Subject: [PATCH 33/89] Update EventDisplatcher interface contracts --- .../MiddlewareBundle/Service/EventDispatcher.php | 16 ++++------------ .../Service/ReplayingEventDispatcher.php | 14 +++++--------- .../Service/TransactionAwareEventDispatcher.php | 8 ++++---- .../VerifiedSecondFactorReminderMailService.php | 13 ++++++------- 4 files changed, 19 insertions(+), 32 deletions(-) diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventDispatcher.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventDispatcher.php index bb67d1f3c..5c5694417 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventDispatcher.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventDispatcher.php @@ -18,20 +18,12 @@ namespace Surfnet\StepupMiddleware\MiddlewareBundle\Service; -use Broadway\Domain\DomainEventStreamInterface; -use Broadway\ReadModel\ProjectorInterface; +use Broadway\Domain\DomainEventStream; +use Broadway\EventHandling\EventListener; interface EventDispatcher { - /** - * @param ProjectorInterface $projector - * @return void - */ - public function registerProjector(ProjectorInterface $projector); + public function registerProjector(EventListener $projector): void; - /** - * @param DomainEventStreamInterface $event - * @return void - */ - public function dispatch(DomainEventStreamInterface $event); + public function dispatch(DomainEventStream $event): void; } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/ReplayingEventDispatcher.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/ReplayingEventDispatcher.php index 6c0b97676..d3a3355ad 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/ReplayingEventDispatcher.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/ReplayingEventDispatcher.php @@ -18,26 +18,22 @@ namespace Surfnet\StepupMiddleware\MiddlewareBundle\Service; -use Broadway\Domain\DomainEventStreamInterface; -use Broadway\ReadModel\ProjectorInterface; +use Broadway\Domain\DomainEventStream; +use Broadway\EventHandling\EventListener; final class ReplayingEventDispatcher implements EventDispatcher { /** - * @var ProjectorInterface[] + * @var EventListener[] */ private ?array $projectors = null; - /** - * @param ProjectorInterface $projector - */ - public function registerProjector(ProjectorInterface $projector): void + public function registerProjector(EventListener $projector): void { $this->projectors[] = $projector; } - public function dispatch(DomainEventStreamInterface $events): void - { + public function dispatch(DomainEventStream $events): void { foreach ($events as $event) { foreach ($this->projectors as $projector) { $projector->handle($event); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/TransactionAwareEventDispatcher.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/TransactionAwareEventDispatcher.php index a058b36bb..b8697a53f 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/TransactionAwareEventDispatcher.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/TransactionAwareEventDispatcher.php @@ -18,8 +18,8 @@ namespace Surfnet\StepupMiddleware\MiddlewareBundle\Service; -use Broadway\Domain\DomainEventStreamInterface; -use Broadway\ReadModel\ProjectorInterface; +use Broadway\Domain\DomainEventStream; +use Broadway\EventHandling\EventListener; use Exception; final readonly class TransactionAwareEventDispatcher implements EventDispatcher @@ -30,12 +30,12 @@ public function __construct( ) { } - public function registerProjector(ProjectorInterface $projector): void + public function registerProjector(EventListener $projector): void { $this->eventDispatcher->registerProjector($projector); } - public function dispatch(DomainEventStreamInterface $events): void + public function dispatch(DomainEventStream $events): void { $this->connectionHelper->beginTransaction(); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php index b6da3132e..e61bda613 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php @@ -61,16 +61,13 @@ public function __construct( $this->fallbackLocale = $fallbackLocale; } - /** - * @return int - */ - public function sendReminder(VerifiedTokenInformation $tokenInformation) + public function sendReminder(VerifiedTokenInformation $tokenInformation): void { $institution = new Institution((string)$tokenInformation->getInstitution()); $institutionConfigurationOptions = $this->institutionConfigurationOptionsService ->findInstitutionConfigurationOptionsFor($institution); if ($institutionConfigurationOptions->useRaLocationsOption->isEnabled()) { - return $this->sendReminderWithInstitution( + $this->sendReminderWithInstitution( $tokenInformation->getPreferredLocale(), $tokenInformation->getCommonName(), $tokenInformation->getEmail(), @@ -78,12 +75,13 @@ public function sendReminder(VerifiedTokenInformation $tokenInformation) $tokenInformation->getRegistrationCode(), $this->raLocationService->listRaLocationsFor($institution), ); + return; } $ras = $this->raListingService->listRegistrationAuthoritiesFor($tokenInformation->getInstitution()); if ($institutionConfigurationOptions->showRaaContactInformationOption->isEnabled()) { - return $this->sendReminderWithRas( + $this->sendReminderWithRas( $tokenInformation->getPreferredLocale(), $tokenInformation->getCommonName(), $tokenInformation->getEmail(), @@ -91,11 +89,12 @@ public function sendReminder(VerifiedTokenInformation $tokenInformation) $tokenInformation->getRegistrationCode(), $ras, ); + return; } $rasWithoutRaas = array_filter($ras, fn(RegistrationAuthorityCredentials $ra): bool => !$ra->isRaa()); - return $this->sendReminderWithRas( + $this->sendReminderWithRas( $tokenInformation->getPreferredLocale(), $tokenInformation->getCommonName(), $tokenInformation->getEmail(), From 39f4cd97cdd119d2eb18eaf8bf2f991305f08c34 Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Thu, 14 Mar 2024 09:53:38 +0100 Subject: [PATCH 34/89] Annotate event replay might throw an exception This then shows PHPStan that the exception catch block might have access to the local variable: `$replayProgress` --- .../EventHandling/BufferedEventBus.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php index 426819c6e..aff80d558 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php @@ -23,7 +23,8 @@ use Broadway\EventHandling\EventBus as EventBusInterface; use Broadway\EventHandling\EventListener as EventListenerInterface; use Doctrine\ORM\EntityManagerInterface; -use Exception; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Exception\Exception; + class BufferedEventBus implements EventBusInterface { @@ -52,6 +53,9 @@ public function subscribe(EventListenerInterface $eventListener): void $this->eventListeners[] = $eventListener; } + /** + * @throws Exception + */ public function publish(DomainEventStreamInterface $domainMessages): void { foreach ($domainMessages as $domainMessage) { From 6b9b0e74fa8c0a71fbd63bf13436c4edb0a6663a Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Thu, 14 Mar 2024 10:27:29 +0100 Subject: [PATCH 35/89] Stop using AnonymousToken TODO; we probably need to authenticate another null token-ish construction --- composer.json | 2 +- composer.lock | 17 ++++++++++------- .../BootstrapGsspSecondFactorCommand.php | 4 ---- .../Command/BootstrapIdentityCommand.php | 5 ----- ...apIdentityWithYubikeySecondFactorCommand.php | 5 ----- .../Command/BootstrapSmsSecondFactorCommand.php | 4 ---- .../BootstrapYubikeySecondFactorCommand.php | 4 ---- .../Command/MigrateSecondFactorCommand.php | 6 ------ 8 files changed, 11 insertions(+), 36 deletions(-) diff --git a/composer.json b/composer.json index 99016b9b6..1aec54a31 100644 --- a/composer.json +++ b/composer.json @@ -63,7 +63,7 @@ "moontoast/math": "^1.2", "overtrue/phplint": "*", "phpmd/phpmd": "^2.15", - "phpstan/phpstan": "^1.10", + "phpstan/phpstan": "^1.11.x-dev", "phpstan/phpstan-symfony": "^1.3", "phpunit/phpunit": "^9.5", "sebastian/phpcpd": "^6.0", diff --git a/composer.lock b/composer.lock index 3c7ceec52..a5568a8fa 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "6df21d3155df0de1eb00a85abe71a17f", + "content-hash": "156291ab918516a27e699fc01ab05e0c", "packages": [ { "name": "beberlei/assert", @@ -9954,16 +9954,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.62", + "version": "1.11.x-dev", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "cd5c8a1660ed3540b211407c77abf4af193a6af9" + "reference": "5b77cb3070b7ca25fcdb964583cef15cddcfc926" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cd5c8a1660ed3540b211407c77abf4af193a6af9", - "reference": "cd5c8a1660ed3540b211407c77abf4af193a6af9", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/5b77cb3070b7ca25fcdb964583cef15cddcfc926", + "reference": "5b77cb3070b7ca25fcdb964583cef15cddcfc926", "shasum": "" }, "require": { @@ -9972,6 +9972,7 @@ "conflict": { "phpstan/phpstan-shim": "*" }, + "default-branch": true, "bin": [ "phpstan", "phpstan.phar" @@ -10012,7 +10013,7 @@ "type": "tidelift" } ], - "time": "2024-03-13T12:27:20+00:00" + "time": "2024-03-13T14:17:45+00:00" }, { "name": "phpstan/phpstan-symfony", @@ -12026,7 +12027,9 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": { + "phpstan/phpstan": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": { diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php index 9013d4943..cb7e5614b 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php @@ -28,7 +28,6 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken; final class BootstrapGsspSecondFactorCommand extends Command { @@ -68,9 +67,6 @@ protected function execute(InputInterface $input, OutputInterface $output): void $registrationStatus = $input->getArgument('registration-status'); $this->bootstrapService->validRegistrationStatus($registrationStatus); - $this->bootstrapService->setToken( - new AnonymousToken('cli.bootstrap-gssp-token', 'cli', ['ROLE_SS', 'ROLE_RA']), - ); $nameId = new NameId($input->getArgument('name-id')); $institutionText = $input->getArgument('institution'); $institution = new Institution($institutionText); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityCommand.php index 49ab55dd8..1db27ff4b 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityCommand.php @@ -27,7 +27,6 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken; final class BootstrapIdentityCommand extends Command { @@ -52,10 +51,6 @@ protected function configure(): void protected function execute(InputInterface $input, OutputInterface $output): void { - $this->bootstrapService->setToken( - new AnonymousToken('cli.bootstrap-identity-with-sms-token', 'cli', ['ROLE_SS']), - ); - $nameId = new NameId($input->getArgument('name-id')); $institutionText = $input->getArgument('institution'); $institution = new Institution($institutionText); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php index 07e2938b4..22bb8eb81 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php @@ -30,7 +30,6 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) @@ -65,10 +64,6 @@ public function __construct( protected function execute(InputInterface $input, OutputInterface $output): int { - $this->bootstrapService->setToken( - new AnonymousToken('cli.bootstrap-yubikey-token', 'cli', ['ROLE_SS', 'ROLE_RA', 'ROLE_MANAGEMENT']), - ); - $nameId = new NameId($input->getArgument('name-id')); $institution = new Institution($input->getArgument('institution')); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapSmsSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapSmsSecondFactorCommand.php index cab70fe89..0e84b0ca1 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapSmsSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapSmsSecondFactorCommand.php @@ -28,7 +28,6 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken; final class BootstrapSmsSecondFactorCommand extends Command { @@ -63,9 +62,6 @@ protected function execute(InputInterface $input, OutputInterface $output): void $registrationStatus = $input->getArgument('registration-status'); $this->bootstrapService->validRegistrationStatus($registrationStatus); - $this->bootstrapService->setToken( - new AnonymousToken('cli.bootstrap-sms-token', 'cli', ['ROLE_SS', 'ROLE_RA']), - ); $nameId = new NameId($input->getArgument('name-id')); $institutionText = $input->getArgument('institution'); $institution = new Institution($institutionText); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapYubikeySecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapYubikeySecondFactorCommand.php index e054725c7..c906949a9 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapYubikeySecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapYubikeySecondFactorCommand.php @@ -28,7 +28,6 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken; final class BootstrapYubikeySecondFactorCommand extends Command { @@ -63,9 +62,6 @@ protected function execute(InputInterface $input, OutputInterface $output): void $registrationStatus = $input->getArgument('registration-status'); $this->bootstrapService->validRegistrationStatus($registrationStatus); - $this->bootstrapService->setToken( - new AnonymousToken('cli.bootstrap-yubikey-token', 'cli', ['ROLE_SS', 'ROLE_RA']), - ); $nameId = new NameId($input->getArgument('name-id')); $institutionText = $input->getArgument('institution'); $institution = new Institution($institutionText); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php index fba5ed82b..8ef0bee8d 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php @@ -30,8 +30,6 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken; -use function sprintf; final class MigrateSecondFactorCommand extends Command { @@ -65,10 +63,6 @@ protected function execute(InputInterface $input, OutputInterface $output): void $sourceNameId = new NameId($input->getArgument('old-name-id')); $targetNameId = new NameId($input->getArgument('new-name-id')); - $this->bootstrapService->setToken( - new AnonymousToken('cli.bootstrap-yubikey-token', 'cli', ['ROLE_SS', 'ROLE_RA']), - ); - $output->writeln(sprintf('Starting token migration for %s', $sourceNameId)); $sourceIdentity = $this->bootstrapService->getIdentityByNameId($sourceNameId); $targetIdentity = $this->bootstrapService->getIdentityByNameId($targetNameId); From 60b2d0d53bb233842de27e1b01a55a5f3ee65961 Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Thu, 14 Mar 2024 11:39:43 +0100 Subject: [PATCH 36/89] Address PHPStan level 1 issues --- composer.json | 1 + composer.lock | 2 +- .../Configuration/InstitutionConfiguration.php | 1 + .../Identity/Event/RecoveryTokenRevokedEvent.php | 2 +- .../Identity/Value/RegistrationAuthorityRole.php | 11 ++--------- .../Tests/Identity/Event/ForgettableEventsTest.php | 2 +- .../Controller/VettingTypeHintController.php | 2 ++ .../Repository/AuthorizationRepository.php | 14 +++++++++++--- .../Identity/Repository/IdentityRepository.php | 2 +- .../Identity/Repository/RaListingRepository.php | 6 +++--- .../Repository/RaSecondFactorRepository.php | 4 ++-- .../Repository/RecoveryTokenRepository.php | 2 +- .../Identity/Repository/SraaRepository.php | 1 + .../UnverifiedSecondFactorRepository.php | 2 +- .../Repository/VerifiedSecondFactorRepository.php | 2 +- .../Repository/VettedSecondFactorRepository.php | 2 +- .../Identity/Service/AbstractSearchService.php | 4 ++-- .../Tests/Endpoint/SraaControllerTest.php | 1 - .../RightToBeForgottenCommandHandlerTest.php | 1 - .../Tests/Mockery/HasInstitutionMatcher.php | 2 +- .../Repository/SecondFactorRepository.php | 2 +- .../Controller/ConfigurationControllerTest.php | 5 ----- .../ReconfigureInstitutionRequestValidator.php | 8 ++++---- ...strapIdentityWithYubikeySecondFactorCommand.php | 1 + .../EmailVerifiedSecondFactorRemindersCommand.php | 1 + 25 files changed, 41 insertions(+), 40 deletions(-) diff --git a/composer.json b/composer.json index 1aec54a31..c7fb61999 100644 --- a/composer.json +++ b/composer.json @@ -33,6 +33,7 @@ "liip/test-fixtures-bundle": "^2.7", "nelmio/security-bundle": "^3.1", "openconext/monitor-bundle": "^4.1", + "pagerfanta/doctrine-orm-adapter": "*", "pagerfanta/pagerfanta": "^4.3", "ramsey/uuid": "^4.7", "sensio/framework-extra-bundle": "*", diff --git a/composer.lock b/composer.lock index a5568a8fa..b0250f427 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "156291ab918516a27e699fc01ab05e0c", + "content-hash": "83a193d6a8d10f551e177773546928f4", "packages": [ { "name": "beberlei/assert", diff --git a/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php b/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php index 06c74bb00..0b709e84b 100644 --- a/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php +++ b/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php @@ -218,6 +218,7 @@ public function rebuild(): static ShowRaaContactInformationOption::getDefault(), VerifyEmailOption::getDefault(), NumberOfTokensPerIdentityOption::getDefault(), + SsoOn2faOption::getDefault(), SelfVetOption::getDefault(), SelfAssertedTokensOption::getDefault(), ), diff --git a/src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php b/src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php index 0061160df..3f7cb3c8d 100644 --- a/src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php @@ -21,7 +21,7 @@ use Surfnet\Stepup\Identity\AuditLog\Metadata; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\Institution; -use Surfnet\Stepup\Identity\Value\recoveryTokenId; +use Surfnet\Stepup\Identity\Value\RecoveryTokenId; use Surfnet\Stepup\Identity\Value\RecoveryTokenType; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\RightToObtainDataInterface; diff --git a/src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php b/src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php index 10981cd6b..576474a19 100644 --- a/src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php +++ b/src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php @@ -28,20 +28,13 @@ final class RegistrationAuthorityRole implements SerializableInterface, Stringab public const ROLE_RAA = 2; public const ROLE_SRAA = 3; - private readonly int $role; - - /** - * @param string $role may not be an empty string - */ - public function __construct($role) + public function __construct(private readonly int $role) { - if (!is_int($role) || !in_array($role, [self::ROLE_RA, self::ROLE_RAA, self::ROLE_SRAA])) { + if (!in_array($role, [self::ROLE_RA, self::ROLE_RAA, self::ROLE_SRAA])) { throw new InvalidArgumentException( 'Invalid role given, role must be one of RegistrationAuthorityRole::[ROLE_RA|ROLE_RAA|ROLE_SRAA]', ); } - - $this->role = $role; } /** diff --git a/src/Surfnet/Stepup/Tests/Identity/Event/ForgettableEventsTest.php b/src/Surfnet/Stepup/Tests/Identity/Event/ForgettableEventsTest.php index 007ad0b07..ec2b3c0bd 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Event/ForgettableEventsTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Event/ForgettableEventsTest.php @@ -106,7 +106,7 @@ public function certain_events_are_forgettable_events_and_others_are_not(): void foreach ($otherIdentityEventFqcns as $fqcn) { $this->assertFalse( is_a($fqcn, $forgettableFqcn, true), - sprintf('%s is a Forgettable event, is this correct? Then add it to the list', $fqcn, $forgettableFqcn), + sprintf('%s is a Forgettable event, is this correct? Then add it to the list', $fqcn), ); } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettingTypeHintController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettingTypeHintController.php index 806d609fb..4f8649bb1 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettingTypeHintController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettingTypeHintController.php @@ -22,6 +22,7 @@ use Surfnet\Stepup\Configuration\Value\InstitutionRole; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\Institution; +use Surfnet\StepupMiddleware\ApiBundle\Authorization\Service\AuthorizationContextService; use Surfnet\StepupMiddleware\ApiBundle\Exception\NotFoundException; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\RecoveryTokenQuery; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonCollectionResponse; @@ -36,6 +37,7 @@ class VettingTypeHintController extends AbstractController public function __construct( private readonly VettingTypeHintService $service, private readonly LoggerInterface $logger, + private readonly AuthorizationContextService $authorizationService, ) { } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php index 6bfed0260..857df7e74 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php @@ -29,6 +29,7 @@ use Surfnet\Stepup\Identity\Value\RegistrationAuthorityRole; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity\ConfiguredInstitution; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity\InstitutionAuthorization; +use Surfnet\StepupMiddleware\ApiBundle\Exception\RuntimeException; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\AuditLogEntry; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Identity; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\RaListing; @@ -55,7 +56,7 @@ public function __construct( public function getInstitutionsForRole(RegistrationAuthorityRole $role, IdentityId $actorId): InstitutionCollection { $result = new InstitutionCollection(); - $qb = $this->_em->createQueryBuilder() + $qb = $this->getEntityManager()->createQueryBuilder() ->select("a.institution") ->from(ConfiguredInstitution::class, 'i') ->innerJoin(RaListing::class, 'r', Join::WITH, "i.institution = r.raInstitution") @@ -90,7 +91,7 @@ public function getInstitutionsForRole(RegistrationAuthorityRole $role, Identity // Also get the institutions that are linked to the user via the 'institution_relation' field. // Effectively getting the use_raa relation. // See https://www.pivotaltracker.com/story/show/181537313 - $qb = $this->_em->createQueryBuilder() + $qb = $this->getEntityManager()->createQueryBuilder() ->select('ia.institution') ->from(InstitutionAuthorization::class, 'ia') // Filter the RA listing on the authorizations that apply for the RA(A) listed there @@ -134,7 +135,7 @@ public function getInstitutionsForRole(RegistrationAuthorityRole $role, Identity */ public function getInstitutionsForSelectRaaRole(IdentityId $actorId): InstitutionCollection { - $qb = $this->_em->createQueryBuilder() + $qb = $this->getEntityManager()->createQueryBuilder() ->select("ci.institution") ->from(InstitutionAuthorization::class, 'ia') ->innerJoin(ConfiguredInstitution::class, 'ci', Join::WITH, 'ia.institutionRelation = ci.institution') @@ -202,5 +203,12 @@ private function getInstitutionRoleByRaRole(RegistrationAuthorityRole $role): st if ($role->equals(RegistrationAuthorityRole::raa())) { return AuthorityRole::ROLE_RAA; } + + throw new RuntimeException( + sprintf( + 'The role "%s did not match any of our supported AuthorityRoles (ra, raa)', + $role->jsonSerialize() + ) + ); } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php index 6ac36ff30..f431b6716 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php @@ -143,7 +143,7 @@ public function findOneByNameId(string $nameId): ?Identity public function removeByIdentityId(IdentityId $identityId): void { $this->getEntityManager()->createQueryBuilder() - ->delete($this->_entityName, 'i') + ->delete($this->getEntityName(), 'i') ->where('i.id = :identityId') ->setParameter('identityId', $identityId->getIdentityId()) ->getQuery() diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php index 07c72be65..2a5246851 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php @@ -226,7 +226,7 @@ public function listRasFor(Institution $raInstitution): ArrayCollection public function removeByIdentityId(IdentityId $identityId, Institution $institution): void { $this->getEntityManager()->createQueryBuilder() - ->delete($this->_entityName, 'ral') + ->delete($this->getEntityName(), 'ral') ->where('ral.identityId = :identityId') ->andWhere('ral.raInstitution = :institution') ->setParameter('identityId', $identityId->getIdentityId()) @@ -241,7 +241,7 @@ public function removeByIdentityId(IdentityId $identityId, Institution $institut public function removeByIdentityIdAndRaInstitution(IdentityId $identityId, Institution $raInstitution): void { $this->getEntityManager()->createQueryBuilder() - ->delete($this->_entityName, 'ral') + ->delete($this->getEntityName(), 'ral') ->where('ral.identityId = :identityId') ->andWhere('ral.raInstitution = :institution') ->setParameter('identityId', $identityId->getIdentityId()) @@ -256,7 +256,7 @@ public function removeByIdentityIdAndRaInstitution(IdentityId $identityId, Insti public function removeByIdentityIdAndInstitution(IdentityId $identityId, Institution $institution): void { $this->getEntityManager()->createQueryBuilder() - ->delete($this->_entityName, 'ral') + ->delete($this->getEntityName(), 'ral') ->where('ral.identityId = :identityId') ->andWhere('ral.institution = :institution') ->setParameter('identityId', $identityId->getIdentityId()) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php index 109ce4604..dd9f10930 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php @@ -174,7 +174,7 @@ public function createOptionsQuery(RaSecondFactorQuery $query): Query public function removeByIdentityId(IdentityId $identityId): void { $this->getEntityManager()->createQueryBuilder() - ->delete($this->_entityName, 'rasf') + ->delete($this->getEntityName(), 'rasf') ->where('rasf.identityId = :identityId') ->setParameter('identityId', $identityId->getIdentityId()) ->getQuery() @@ -204,7 +204,7 @@ public function saveAll(array $secondFactors): void public function updateStatusByIdentityIdToForgotten(IdentityId $identityId): void { $this->getEntityManager()->createQueryBuilder() - ->update($this->_entityName, 'rasf') + ->update($this->getEntityName(), 'rasf') ->set('rasf.status', ":forgotten") ->where('rasf.identityId = :identityId') ->setParameter('identityId', $identityId->getIdentityId()) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RecoveryTokenRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RecoveryTokenRepository.php index 6271b7165..050c63281 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RecoveryTokenRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RecoveryTokenRepository.php @@ -152,7 +152,7 @@ public function createOptionsQuery(RecoveryTokenQuery $query): Query public function removeByIdentity(IdentityId $identityId): void { $this->getEntityManager()->createQueryBuilder() - ->delete($this->_entityName, 'rt') + ->delete($this->getEntityName(), 'rt') ->where('rt.identityId = :identityId') ->setParameter('identityId', $identityId->getIdentityId()) ->getQuery() diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php index 2cb9d74a4..9ceaf764c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php @@ -62,6 +62,7 @@ public function saveAll(array $sraaList): void $invalidIndications[] = sprintf( '"%s" at index "%d"', get_debug_type($value), + $index ); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/UnverifiedSecondFactorRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/UnverifiedSecondFactorRepository.php index c77606bb0..1c39b1df8 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/UnverifiedSecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/UnverifiedSecondFactorRepository.php @@ -64,7 +64,7 @@ public function createSearchQuery(UnverifiedSecondFactorQuery $query): Query public function removeByIdentityId(IdentityId $identityId): void { $this->getEntityManager()->createQueryBuilder() - ->delete($this->_entityName, 'sf') + ->delete($this->getEntityName(), 'sf') ->where('sf.identityId = :identityId') ->setParameter('identityId', $identityId->getIdentityId()) ->getQuery() diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VerifiedSecondFactorRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VerifiedSecondFactorRepository.php index 79cc5e6dd..3555ef02d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VerifiedSecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VerifiedSecondFactorRepository.php @@ -119,7 +119,7 @@ public function createSearchForIdentityQuery(VerifiedSecondFactorOfIdentityQuery public function removeByIdentityId(IdentityId $identityId): void { $this->getEntityManager()->createQueryBuilder() - ->delete($this->_entityName, 'sf') + ->delete($this->getEntityName(), 'sf') ->where('sf.identityId = :identityId') ->setParameter('identityId', $identityId->getIdentityId()) ->getQuery() diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettedSecondFactorRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettedSecondFactorRepository.php index b603df508..cc5ea423f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettedSecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettedSecondFactorRepository.php @@ -56,7 +56,7 @@ public function createSearchQuery(VettedSecondFactorQuery $query): Query public function removeByIdentityId(IdentityId $identityId): void { $this->getEntityManager()->createQueryBuilder() - ->delete($this->_entityName, 'sf') + ->delete($this->getEntityName(), 'sf') ->where('sf.identityId = :identityId') ->setParameter('identityId', $identityId->getIdentityId()) ->getQuery() diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AbstractSearchService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AbstractSearchService.php index 8b1919379..1820a7e86 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AbstractSearchService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AbstractSearchService.php @@ -20,7 +20,7 @@ use Doctrine\ORM\Query; use Doctrine\ORM\QueryBuilder; -use Pagerfanta\Adapter\DoctrineORMAdapter; +use Pagerfanta\Doctrine\ORM\QueryAdapter; use Pagerfanta\Pagerfanta; use Surfnet\StepupMiddleware\ApiBundle\Exception\InvalidArgumentException; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\AbstractQuery; @@ -45,7 +45,7 @@ protected function createPaginatorFrom( ); } - $adapter = new DoctrineORMAdapter($doctrineQuery, $fetchCollection); + $adapter = new QueryAdapter($doctrineQuery, $fetchCollection); $paginator = new Pagerfanta($adapter); $paginator->setMaxPerPage($query->itemsPerPage); $paginator->setCurrentPage($query->pageNumber); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php index 7daf08765..bf0a68458 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php @@ -54,7 +54,6 @@ public function setUp(): void // Initialises schema. $this->databaseTool->loadFixtures([]); // Initialises schema. - $this->loadFixtures([]); $this->client = static::createClient(); $passwordSs = $this->client->getKernel()->getContainer()->getParameter('selfservice_api_password'); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RightToBeForgottenCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RightToBeForgottenCommandHandlerTest.php index b2be366f3..e7698124d 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RightToBeForgottenCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RightToBeForgottenCommandHandlerTest.php @@ -276,7 +276,6 @@ public function an_ra_cannot_be_forgotten(): void new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RA), new Location('0x0392ff832'), new ContactInformation('/dev/null'), - $institution, ), ]) ->when($command); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcher.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcher.php index 4d597aad0..72f7ae228 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcher.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcher.php @@ -50,6 +50,6 @@ public function match(&$actual): bool public function __toString(): string { - return sprintf('', $this->expected); + return sprintf('', $this->expected); } } diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/SecondFactorRepository.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/SecondFactorRepository.php index a8157e05c..a49c47817 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/SecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/SecondFactorRepository.php @@ -52,7 +52,7 @@ public function findByIdentityId(IdentityId $identityId): array public function removeByIdentityId(IdentityId $identityId): void { $this->getEntityManager()->createQueryBuilder() - ->delete($this->_entityName, 'sf') + ->delete($this->getEntityName(), 'sf') ->where('sf.identityId = :identityId') ->setParameter('identityId', $identityId->getIdentityId()) ->getQuery() diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php index 4bdaa88b1..d2afde83e 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php @@ -20,7 +20,6 @@ use Liip\TestFixturesBundle\Services\DatabaseToolCollection; use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; -use Symfony\Bundle\FrameworkBundle\Client; use Symfony\Bundle\FrameworkBundle\KernelBrowser; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; use Symfony\Component\HttpFoundation\Response; @@ -29,9 +28,6 @@ class ConfigurationControllerTest extends WebTestCase { use MockeryPHPUnitIntegration; - /** - * @var Client - */ private KernelBrowser $client; /** @@ -52,7 +48,6 @@ public function setUp(): void // Initialises schema. $this->databaseTool->loadFixtures([]); // Initialises schema. - $this->loadFixtures([]); $this->client = static::createClient(); $this->password = $this->client->getKernel()->getContainer()->getParameter('management_password'); $this->passwordRo = $this->client->getKernel()->getContainer()->getParameter('readonly_api_password'); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php index cbaa2bbde..53f54ecaa 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php @@ -280,7 +280,7 @@ private function validateAuthorizationSettings( if (in_array($optionName, $acceptedOptions)) { // 1. Value must be array Assertion::isArray( - $authorizationSettings[$optionName], + $setting, sprintf( 'Option "%s" for "%s" must be an array of strings. ("%s") was passed.', $optionName, @@ -292,9 +292,9 @@ private function validateAuthorizationSettings( // 2. The contents of the array must be empty or string Assertion::allString( - $authorizationSettings[$optionName], + $setting, sprintf( - 'All values of option "%s" should be of type string. ("%s") was passed.', + 'All values of option "%s" for "%s" should be of type string. ("%s") was passed.', $optionName, $institution, var_export($setting, true), @@ -307,7 +307,7 @@ private function validateAuthorizationSettings( $authorizationSettings[$optionName], $whitelistedInstitutions, sprintf( - 'All values of option "%s" should be known institutions. ("%s") was passed.', + 'All values of option "%s" for "%s" should be known institutions. ("%s") was passed.', $optionName, $institution, var_export($setting, true), diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php index 22bb8eb81..f70a9e666 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php @@ -114,5 +114,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int $command->secondFactorId, ), ); + return 0; } } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/EmailVerifiedSecondFactorRemindersCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/EmailVerifiedSecondFactorRemindersCommand.php index d40b276bc..65bb0e8fd 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/EmailVerifiedSecondFactorRemindersCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/EmailVerifiedSecondFactorRemindersCommand.php @@ -110,6 +110,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int $this->connection->rollBack(); throw $e; } + return 0; } private function validateInput(InputInterface $input): void From f4fb72c543a40843f4f716e83fbfdaa177fcf56e Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Mon, 18 Mar 2024 08:50:34 +0100 Subject: [PATCH 37/89] Improve PHPStan Mockery integration 1. Installed the mockery plugin 2. Fixed type hints for Mock instances to be MockInterface 3. Addressed some other level 2 fixing in this commit. :blush: --- composer.json | 6 +- composer.lock | 69 ++++++++++++++++--- .../Event/NewConfigurationCreatedEvent.php | 6 -- .../Identity/Entity/InstitutionCollection.php | 19 +---- .../AuthorizationContextServiceTest.php | 9 +-- .../CommandAuthorizationServiceTest.php | 2 - .../InstitutionAuthorizationServiceTest.php | 1 + .../Request/CommandParamConverterTest.php | 1 + .../Request/InstitutionParamConverterTest.php | 2 +- .../Tests/Service/DeprovisionServiceTest.php | 3 +- .../ConfigurationCommandHandler.php | 10 +-- ...InstitutionConfigurationCommandHandler.php | 7 +- .../EventHandling/BufferedEventBus.php | 3 +- .../Identity/Command/AppointRoleCommand.php | 6 -- .../CommandHandler/IdentityCommandHandler.php | 2 +- .../RegistrationAuthorityCommandHandler.php | 1 + .../EventSourcing/SensitiveDataMessage.php | 6 +- .../SensitiveDataMessageRepository.php | 4 +- .../SensitiveData/SensitiveData.php | 31 ++------- .../InstitutionConfigurationProcessorTest.php | 6 +- .../EventHandling/BufferedEventBusTest.php | 3 +- .../IdentityCommandHandlerMoveTokenTest.php | 6 +- ...tyCommandHandlerSelfAssertedTokensTest.php | 29 ++++---- .../IdentityCommandHandlerTest.php | 57 +++++++-------- ...egistrationAuthorityCommandHandlerTest.php | 5 +- .../SecondFactorRevocationTest.php | 18 ++--- .../Tests/Pipeline/AuthorizingStageTest.php | 2 +- .../Tests/Pipeline/ValidationStageTest.php | 3 +- .../Tests/Value/InstitutionTest.php | 2 - ...InstitutionConfigurationControllerTest.php | 4 -- ...nfigureInstitutionRequestValidatorTest.php | 6 +- ...IdentityWithYubikeySecondFactorCommand.php | 6 +- .../Console/Command/ReplayEventsCommand.php | 14 ++-- .../EventSourcing/DBALEventHydrator.php | 27 +++----- .../MappedInstitutionConfiguration.php | 14 ---- .../Resources/config/console_commands.yml | 2 +- .../Service/EventStreamReplayer.php | 1 - .../Service/TransactionHelper.php | 4 +- .../VerifiedSecondFactorReminderService.php | 14 ++-- ...erifiedSecondFactorReminderServiceTest.php | 13 ++-- 40 files changed, 199 insertions(+), 225 deletions(-) diff --git a/composer.json b/composer.json index c7fb61999..85a565d71 100644 --- a/composer.json +++ b/composer.json @@ -54,17 +54,19 @@ "symfony/validator": "6.4.*", "twig/extra-bundle": "^3.0", "twig/intl-extra": "^3", - "twig/twig": "^3" + "twig/twig": "^3", + "ext-pdo": "*" }, "require-dev": { "doctrine/data-fixtures": "~1.7", "doctrine/doctrine-fixtures-bundle": "^3.5.1", "liip/test-fixtures-bundle": "^2.7", - "mockery/mockery": "^1.6", + "mockery/mockery": "1.7.x-dev", "moontoast/math": "^1.2", "overtrue/phplint": "*", "phpmd/phpmd": "^2.15", "phpstan/phpstan": "^1.11.x-dev", + "phpstan/phpstan-mockery": "^1.1", "phpstan/phpstan-symfony": "^1.3", "phpunit/phpunit": "^9.5", "sebastian/phpcpd": "^6.0", diff --git a/composer.lock b/composer.lock index b0250f427..5214ee37d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "83a193d6a8d10f551e177773546928f4", + "content-hash": "668bf259b1e063066c54e7be27f14c3c", "packages": [ { "name": "beberlei/assert", @@ -9121,16 +9121,16 @@ }, { "name": "mockery/mockery", - "version": "1.6.7", + "version": "1.7.x-dev", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06" + "reference": "3f8d3ff1ffe4c552d45c5690c6d825e9310769bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06", - "reference": "0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06", + "url": "https://api.github.com/repos/mockery/mockery/zipball/3f8d3ff1ffe4c552d45c5690c6d825e9310769bf", + "reference": "3f8d3ff1ffe4c552d45c5690c6d825e9310769bf", "shasum": "" }, "require": { @@ -9142,8 +9142,7 @@ "phpunit/phpunit": "<8.0" }, "require-dev": { - "phpunit/phpunit": "^8.5 || ^9.6.10", - "symplify/easy-coding-standard": "^12.0.8" + "phpunit/phpunit": ">=9.6.11 <10.4" }, "type": "library", "autoload": { @@ -9200,7 +9199,7 @@ "security": "https://github.com/mockery/mockery/security/advisories", "source": "https://github.com/mockery/mockery" }, - "time": "2023-12-10T02:24:34+00:00" + "time": "2023-10-01T17:31:30+00:00" }, { "name": "moontoast/math", @@ -10015,6 +10014,56 @@ ], "time": "2024-03-13T14:17:45+00:00" }, + { + "name": "phpstan/phpstan-mockery", + "version": "1.1.2", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpstan-mockery.git", + "reference": "88ae85931768efd3aaf3cce4cb9cb54c4d157d03" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpstan-mockery/zipball/88ae85931768efd3aaf3cce4cb9cb54c4d157d03", + "reference": "88ae85931768efd3aaf3cce4cb9cb54c4d157d03", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0", + "phpstan/phpstan": "^1.10" + }, + "require-dev": { + "mockery/mockery": "^1.2.4", + "nikic/php-parser": "^4.13.0", + "php-parallel-lint/php-parallel-lint": "^1.2", + "phpstan/phpstan-phpunit": "^1.0", + "phpstan/phpstan-strict-rules": "^1.0", + "phpunit/phpunit": "^9.5" + }, + "type": "phpstan-extension", + "extra": { + "phpstan": { + "includes": [ + "extension.neon" + ] + } + }, + "autoload": { + "psr-4": { + "PHPStan\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PHPStan Mockery extension", + "support": { + "issues": "https://github.com/phpstan/phpstan-mockery/issues", + "source": "https://github.com/phpstan/phpstan-mockery/tree/1.1.2" + }, + "time": "2024-01-10T13:50:05+00:00" + }, { "name": "phpstan/phpstan-symfony", "version": "1.3.8", @@ -12028,6 +12077,7 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { + "mockery/mockery": 20, "phpstan/phpstan": 20 }, "prefer-stable": false, @@ -12035,7 +12085,8 @@ "platform": { "php": "^8.2", "ext-gmp": "*", - "ext-json": "*" + "ext-json": "*", + "ext-pdo": "*" }, "platform-dev": [], "platform-overrides": { diff --git a/src/Surfnet/Stepup/Configuration/Event/NewConfigurationCreatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/NewConfigurationCreatedEvent.php index 052b12e5d..889565b47 100644 --- a/src/Surfnet/Stepup/Configuration/Event/NewConfigurationCreatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/NewConfigurationCreatedEvent.php @@ -20,17 +20,11 @@ class NewConfigurationCreatedEvent extends ConfigurationEvent { - /** - * @return mixed The object instance - */ public static function deserialize(array $data): self { return new self($data['id']); } - /** - * @return array - */ public function serialize(): array { return ['id' => $this->id]; diff --git a/src/Surfnet/Stepup/Identity/Entity/InstitutionCollection.php b/src/Surfnet/Stepup/Identity/Entity/InstitutionCollection.php index a525a60a0..5b472c4d4 100644 --- a/src/Surfnet/Stepup/Identity/Entity/InstitutionCollection.php +++ b/src/Surfnet/Stepup/Identity/Entity/InstitutionCollection.php @@ -18,15 +18,11 @@ namespace Surfnet\Stepup\Identity\Entity; -use Surfnet\Stepup\Configuration\Value\InstitutionRole; use Surfnet\Stepup\Identity\Collection\InstitutionCollection as Institutions; use Surfnet\Stepup\Identity\Value\Institution; final class InstitutionCollection { - /** - * @var InstitutionRole[] - */ private $institutions = []; public function set(Institution $institution): void @@ -41,17 +37,11 @@ public function update(Institutions $institutions): void } } - /** - * @return Institution - */ - public function get(Institution $institution) + public function get(Institution $institution): Institution { return $this->institutions[(string)$institution]; } - /** - * @return Institution - */ public function exists(Institution $institution): bool { return array_key_exists((string)$institution, $this->institutions); @@ -62,18 +52,15 @@ public function remove(Institution $institution): void unset($this->institutions[(string)$institution]); } - /** - * @return int - */ public function count(): int { return count($this->institutions); } /** - * @return InstitutionRole[] + * @return Institution[] */ - public function institutions() + public function institutions(): array { return $this->institutions; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationContextServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationContextServiceTest.php index d18f8cf17..09ab832cb 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationContextServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationContextServiceTest.php @@ -20,6 +20,7 @@ use Mockery as m; use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; +use Mockery\MockInterface; use PHPUnit\Framework\TestCase; use Surfnet\Stepup\Identity\Collection\InstitutionCollection; use Surfnet\Stepup\Identity\Value\CommonName; @@ -46,21 +47,21 @@ class AuthorizationContextServiceTest extends TestCase private AuthorizationContextService $service; /** - * @var IdentityService|m\Mock + * @var IdentityService|MockInterface */ private $identityService; /** - * @var SraaService|m\Mock + * @var SraaService|MockInterface */ private $sraaService; /** - * @var AuthorizationRepository|m\Mock + * @var AuthorizationRepository|MockInterface */ private $authorizationRepository; /** - * @var m\Mock&ConfiguredInstitutionRepository + * @var MockInterface|ConfiguredInstitutionRepository */ private $institutionRepo; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php index a7aecb99d..d29609355 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php @@ -151,8 +151,6 @@ public function test_shared_ra_and_ss_commands_are_correctly_authorized(): void /** * @test * @dataProvider availableCommands - * - * @param mixed $value */ public function a_sraa_should_be_able_to_execute_all_commands($file, Command $command): void { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationServiceTest.php index d00dc4392..f49a56fe3 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationServiceTest.php @@ -20,6 +20,7 @@ use Mockery as m; use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; +use Mockery\Mock; use PHPUnit\Framework\TestCase as TestCase; use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\Stepup\Configuration\Value\InstitutionRole; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php index b422d2008..127486a42 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php @@ -62,6 +62,7 @@ public function it_can_convert_command_name_notation($expectedCommandClass, stri { $command = ['command' => ['name' => $commandName, 'uuid' => 'abcdef', 'payload' => new stdClass]]; + /** @var Request&m\Mock $request */ $request = m::mock(Request::class) ->shouldReceive('getContent')->with()->andReturn(json_encode($command)) ->getMock(); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php index 66cdaeb27..19597b425 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php @@ -33,7 +33,7 @@ class InstitutionParamConverterTest extends UnitTest use MockeryPHPUnitIntegration; /** - * @var MockInterface + * @var MockInterface&Request */ private $request; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Service/DeprovisionServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Service/DeprovisionServiceTest.php index fd2ec28a7..7d37d865a 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Service/DeprovisionServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Service/DeprovisionServiceTest.php @@ -113,8 +113,7 @@ public function test_deprovision_does_not_deprovision_when_user_is_not_found(): ->andReturnNull(); $this->pipeline ->shouldNotHaveReceived('process'); - $data = $this->deprovisionService->deprovision('urn:collab:person:example.com:maynard_keenan'); - $this->assertNull($data); + $this->deprovisionService->deprovision('urn:collab:person:example.com:maynard_keenan'); } public function test_deprovision_method_performs_the_right_to_be_forgotten_command(): void diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/ConfigurationCommandHandler.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/ConfigurationCommandHandler.php index e4e3a091c..49004bdbc 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/ConfigurationCommandHandler.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/ConfigurationCommandHandler.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\CommandHandler; use Broadway\CommandHandling\SimpleCommandHandler; +use Broadway\Domain\AggregateRoot; use Broadway\Repository\AggregateNotFoundException; use Surfnet\Stepup\Configuration\Configuration; use Surfnet\Stepup\Configuration\EventSourcing\ConfigurationRepository; @@ -43,13 +44,12 @@ public function handleUpdateConfigurationCommand(UpdateConfigurationCommand $com $this->repository->save($configuration); } - /** - * @return null|\Surfnet\Stepup\Configuration\Api\Configuration - */ - private function getConfiguration() + private function getConfiguration(): ?Configuration { try { - return $this->repository->load(Configuration::CONFIGURATION_ID); + /** @var Configuration $configuration */ + $configuration = $this->repository->load(Configuration::CONFIGURATION_ID); + return $configuration; } catch (AggregateNotFoundException) { return null; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/InstitutionConfigurationCommandHandler.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/InstitutionConfigurationCommandHandler.php index 1bcd65ef7..49f83ce95 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/InstitutionConfigurationCommandHandler.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/InstitutionConfigurationCommandHandler.php @@ -183,7 +183,8 @@ public function handleRemoveInstitutionConfigurationByUnnormalizedIdCommand( ): void { $institution = new Institution($command->institution); - $institutionConfigurationId = InstitutionConfigurationId::from($institution); + $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); + /** @var InstitutionConfiguration $institutionConfiguration */ $institutionConfiguration = $this->repository->load( $institutionConfigurationId->getInstitutionConfigurationId(), ); @@ -197,15 +198,17 @@ public function handleRemoveInstitutionConfigurationByUnnormalizedIdCommand( * @deprecated Should be used until existing institution configurations have been migrated to using normalized ids * */ - private function loadInstitutionConfigurationFor(Institution $institution) + private function loadInstitutionConfigurationFor(Institution $institution): InstitutionConfiguration { try { $institutionConfigurationId = InstitutionConfigurationId::normalizedFrom($institution); + /** @var InstitutionConfiguration $institutionConfiguration */ $institutionConfiguration = $this->repository->load( $institutionConfigurationId->getInstitutionConfigurationId(), ); } catch (AggregateNotFoundException) { $institutionConfigurationId = InstitutionConfigurationId::from($institution); + /** @var InstitutionConfiguration $institutionConfiguration */ $institutionConfiguration = $this->repository->load( $institutionConfigurationId->getInstitutionConfigurationId(), ); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php index aff80d558..30b148fe0 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php @@ -24,6 +24,7 @@ use Broadway\EventHandling\EventListener as EventListenerInterface; use Doctrine\ORM\EntityManagerInterface; use Surfnet\StepupMiddleware\CommandHandlingBundle\Exception\Exception; +use Throwable; class BufferedEventBus implements EventBusInterface @@ -54,7 +55,7 @@ public function subscribe(EventListenerInterface $eventListener): void } /** - * @throws Exception + * @throws Throwable */ public function publish(DomainEventStreamInterface $domainMessages): void { diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AppointRoleCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AppointRoleCommand.php index 09f92be0e..d9a503bc4 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AppointRoleCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AppointRoleCommand.php @@ -25,7 +25,6 @@ class AppointRoleCommand extends AbstractCommand implements RaExecutable { /** - * * @var string */ #[Assert\NotBlank] @@ -33,7 +32,6 @@ class AppointRoleCommand extends AbstractCommand implements RaExecutable public $identityId; /** - * * @var */ #[Assert\NotBlank] @@ -41,16 +39,12 @@ class AppointRoleCommand extends AbstractCommand implements RaExecutable public $role; /** - * * @var string */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] public $raInstitution; - /** - * @inheritDoc - */ public function getRaInstitution() { return $this->raInstitution; diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/IdentityCommandHandler.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/IdentityCommandHandler.php index a2a77123b..972dbb66b 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/IdentityCommandHandler.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/IdentityCommandHandler.php @@ -399,8 +399,8 @@ public function handleSelfVetSecondFactorCommand(SelfVetSecondFactorCommand $com public function handleMigrateVettedSecondFactorCommand(MigrateVettedSecondFactorCommand $command): void { /** @var IdentityApi $sourceIdentity */ - /** @var IdentityApi $targetIdentity */ $sourceIdentity = $this->eventSourcedRepository->load(new IdentityId($command->sourceIdentityId)); + /** @var IdentityApi $targetIdentity */ $targetIdentity = $this->eventSourcedRepository->load(new IdentityId($command->targetIdentityId)); // Check if second factor type is allowed by destination institution diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/RegistrationAuthorityCommandHandler.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/RegistrationAuthorityCommandHandler.php index 136952a54..0fbb1575c 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/RegistrationAuthorityCommandHandler.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/RegistrationAuthorityCommandHandler.php @@ -115,6 +115,7 @@ public function handleRetractRegistrationAuthorityCommand(RetractRegistrationAut public function handleSaveVettingTypeHintCommand(SaveVettingTypeHintCommand $command): void { + /** @var Identity $identity */ $identity = $this->repository->load(new IdentityId($command->identityId)); $collection = $this->vettingTypeHintService->collectionFrom($command->hints); $identity->saveVettingTypeHints( diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessage.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessage.php index d5b256908..e71080f57 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessage.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessage.php @@ -28,11 +28,7 @@ class SensitiveDataMessage private readonly int $playhead; - /** - * @param IdentityId $identityId - * @param int $playhead The associated broadway domain message's playhead. - */ - public function __construct(string $identityId, $playhead, private SensitiveData $sensitiveData) + public function __construct(IdentityId $identityId, int $playhead, private SensitiveData $sensitiveData) { if (!is_int($playhead)) { throw InvalidArgumentException::invalidType('int', 'playhead', $playhead); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/Repository/SensitiveDataMessageRepository.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/Repository/SensitiveDataMessageRepository.php index fc2124445..84e5c1ee5 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/Repository/SensitiveDataMessageRepository.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/Repository/SensitiveDataMessageRepository.php @@ -35,8 +35,6 @@ public function __construct(private readonly Connection $connection) /** * Finds all sensitive data records for a given Identity, ordered by playhead. - * - * @return SensitiveDataMessageStream */ public function findByIdentityId(IdentityId $identityId): SensitiveDataMessageStream { @@ -45,7 +43,7 @@ public function findByIdentityId(IdentityId $identityId): SensitiveDataMessageSt WHERE identity_id = :identity_id ORDER BY playhead ASC'; - $rows = $this->connection->fetchAll($sql, ['identity_id' => (string)$identityId]); + $rows = $this->connection->fetchAllAssociative($sql, ['identity_id' => (string)$identityId]); $messages = array_map(fn(array $row): SensitiveDataMessage => new SensitiveDataMessage( $identityId, (int)$row['playhead'], diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/SensitiveData.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/SensitiveData.php index 2c7d9bb39..638e04bcb 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/SensitiveData.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/SensitiveData.php @@ -50,9 +50,6 @@ class SensitiveData implements SerializableInterface private ?RecoveryTokenIdentifier $recoveryTokenIdentifier = null; - /** - * @return SensitiveData - */ public function withCommonName(CommonName $commonName): static { $clone = clone $this; @@ -61,9 +58,6 @@ public function withCommonName(CommonName $commonName): static return $clone; } - /** - * @return SensitiveData - */ public function withEmail(Email $email): static { $clone = clone $this; @@ -72,9 +66,6 @@ public function withEmail(Email $email): static return $clone; } - /** - * @return SensitiveData - */ public function withSecondFactorIdentifier( SecondFactorIdentifier $secondFactorIdentifier, SecondFactorType $secondFactorType, @@ -107,8 +98,6 @@ public function withVettingType(VettingType $vettingType): self /** * Returns an instance in which all sensitive data is forgotten. - * - * @return SensitiveData */ public function forget(): self { @@ -118,26 +107,17 @@ public function forget(): self return $forgotten; } - /** - * @return CommonName - */ - public function getCommonName() + public function getCommonName(): CommonName { return $this->commonName ?: CommonName::unknown(); } - /** - * @return Email - */ - public function getEmail() + public function getEmail(): Email { return $this->email ?: Email::unknown(); } - /** - * @return SecondFactorIdentifier - */ - public function getSecondFactorIdentifier() + public function getSecondFactorIdentifier(): SecondFactorIdentifier { return $this->secondFactorIdentifier ?: SecondFactorIdentifierFactory::unknownForType($this->secondFactorType); } @@ -153,10 +133,7 @@ public function getRecoveryTokenIdentifier(): ?RecoveryTokenIdentifier return null; } - /** - * @return VettingType - */ - public function getVettingType() + public function getVettingType(): VettingType { return $this->vettingType ?: new UnknownVettingType(); } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/Processor/InstitutionConfigurationProcessorTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/Processor/InstitutionConfigurationProcessorTest.php index aaa325c20..2618eabc7 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/Processor/InstitutionConfigurationProcessorTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/Processor/InstitutionConfigurationProcessorTest.php @@ -44,9 +44,6 @@ class InstitutionConfigurationProcessorTest extends TestCase private $pipelineMock; - /** - * @return Mockery\MockInterface - */ public function setUp(): void { $this->pipelineMock = Mockery::mock(Pipeline::class); @@ -110,8 +107,7 @@ public function no_create_institution_configuration_command_is_processed_when_an ->andReturn(true); $this->pipelineMock - ->shouldReceive('process') - ->never(); + ->shouldNotHaveReceived('process'); $institutionConfigurationProcessor = new InstitutionConfigurationProcessor( $repositoryMock, diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/BufferedEventBusTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/BufferedEventBusTest.php index d39475f9e..9ad95924e 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/BufferedEventBusTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/BufferedEventBusTest.php @@ -41,7 +41,7 @@ public function it_buffers_events(): void { $event = $this->createDummyDomainMessage(null); $listener = m::mock(EventListener::class) - ->shouldReceive('handle')->never() + ->shouldNotHaveReceived('handle') ->getMock(); $bus = new BufferedEventBus($this->getDummyEntityManager()); @@ -124,7 +124,6 @@ public function an_event_caused_by_an_event_in_the_current_buffer_being_flushed_ } /** - * @param mixed $payload * @return DomainMessage */ private function createDummyDomainMessage(?string $payload): DomainMessage diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerMoveTokenTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerMoveTokenTest.php index 66c2d4855..3a2e44c48 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerMoveTokenTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerMoveTokenTest.php @@ -448,7 +448,7 @@ public function test_can_not_be_moved_if_already_present_as_vetted_token(): void $targetYubikeySecFacId, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', @@ -556,7 +556,7 @@ public function test_can_not_be_moved_if_already_present_as_verified_token(): vo $targetYubikeySecFacId, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', @@ -652,7 +652,7 @@ public function test_can_not_be_moved_if_already_present_as_unverified_token(): $targetYubikeySecFacId, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerSelfAssertedTokensTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerSelfAssertedTokensTest.php index d66923cd9..6ad9b6680 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerSelfAssertedTokensTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerSelfAssertedTokensTest.php @@ -23,6 +23,7 @@ use Broadway\EventSourcing\AggregateFactory\PublicConstructorAggregateFactory; use Broadway\EventStore\EventStore as EventStoreInterface; use Mockery as m; +use Mockery\MockInterface; use Psr\Log\LoggerInterface; use Surfnet\Stepup\Configuration\Value\AllowedSecondFactorList; use Surfnet\Stepup\Configuration\Value\SelfAssertedTokensOption; @@ -93,32 +94,32 @@ class IdentityCommandHandlerSelfAssertedTokensTest extends CommandHandlerTest private static int $window = 3600; /** - * @var AllowedSecondFactorListService|m\MockInterface + * @var AllowedSecondFactorListService|MockInterface */ private $allowedSecondFactorListServiceMock; /** - * @var m\MockInterface|IdentityProjectionRepository + * @var MockInterface|IdentityProjectionRepository */ private $identityProjectionRepository; /** - * @var SecondFactorTypeService|m\MockInterface + * @var SecondFactorTypeService|MockInterface */ private $secondFactorTypeService; /** - * @var SecondFactorProvePossessionHelper|m\MockInterface + * @var SecondFactorProvePossessionHelper|MockInterface */ private $secondFactorProvePossessionHelper; /** - * @var InstitutionConfigurationOptionsService $configService + * @var InstitutionConfigurationOptionsService|MockInterface */ private $configService; /** - * @var LoaResolutionService + * @var LoaResolutionService|MockInterface */ private $loaResolutionService; @@ -147,7 +148,7 @@ class IdentityCommandHandlerSelfAssertedTokensTest extends CommandHandlerTest */ private Locale $preferredLocale; /** - * @var RecoveryTokenSecretHelper|m\MockInterface + * @var RecoveryTokenSecretHelper|MockInterface */ private $recoveryTokenSecretHelper; @@ -548,7 +549,7 @@ public function test_a_token_can_be_registered_self_asserted(): void $yubikeyPublicId, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', @@ -630,7 +631,7 @@ public function test_self_asserted_token_registration_requires_possession_of_rec $yubikeyPublicId, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', @@ -739,7 +740,7 @@ public function test_a_sat_token_can_be_used_to_self_vet_a_token(): void $yubikeyPublicId, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', @@ -788,7 +789,7 @@ public function test_a_sat_token_can_be_used_to_self_vet_a_token(): void $phoneIdentifier, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', @@ -892,7 +893,7 @@ public function test_sat_not_allowed_when_one_vetted_token_is_identity_vetted(): $yubikeyPublicId, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', @@ -941,7 +942,7 @@ public function test_sat_not_allowed_when_one_vetted_token_is_identity_vetted(): $phoneIdentifier, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', @@ -982,7 +983,7 @@ public function test_sat_not_allowed_when_one_vetted_token_is_identity_vetted(): $gsspIdentifier, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php index 863592620..f98b8717b 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php @@ -26,6 +26,7 @@ use Hamcrest\Matchers; use Mockery as m; use Mockery\Mock; +use Mockery\MockInterface; use Psr\Log\LoggerInterface; use Surfnet\Stepup\Configuration\Value\AllowedSecondFactorList; use Surfnet\Stepup\DateTime\DateTime; @@ -100,40 +101,40 @@ class IdentityCommandHandlerTest extends CommandHandlerTest private static int $window = 3600; /** - * @var AllowedSecondFactorListService|m\MockInterface + * @var AllowedSecondFactorListService|MockInterface */ private $allowedSecondFactorListServiceMock; /** - * @var m\MockInterface|IdentityProjectionRepository + * @var MockInterface|IdentityProjectionRepository */ private $identityProjectionRepository; /** - * @var SecondFactorTypeService|m\MockInterface + * @var SecondFactorTypeService|MockInterface */ private $secondFactorTypeService; /** - * @var SecondFactorProvePossessionHelper|m\MockInterface + * @var SecondFactorProvePossessionHelper|MockInterface */ private $secondFactorProvePossessionHelper; /** - * @var InstitutionConfigurationOptionsService $configService + * @var InstitutionConfigurationOptionsService|MockInterface $configService */ private $configService; /** - * @var LoaResolutionService + * @var LoaResolutionService|MockInterface */ private $loaResolutionService; + /** - * @var RegistrationMailService|Mock + * @var RegistrationMailService|MockInterface */ private $registrationMailService; - public function setUp(): void { $this->allowedSecondFactorListServiceMock = m::mock(AllowedSecondFactorListService::class); @@ -310,7 +311,7 @@ public function a_yubikey_possession_can_be_proven(): void $pubId, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', @@ -420,7 +421,7 @@ public function yubikey_possession_cannot_be_proven_twice(): void $pubId1, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', @@ -487,7 +488,7 @@ public function a_phone_possession_can_be_proven(): void $phoneNumber, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', @@ -617,7 +618,7 @@ public function a_gssf_possession_can_be_proven(): void $gssfId, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), $nonce, @@ -739,7 +740,7 @@ public function a_u2f_device_possession_can_be_proven(): void $keyHandle, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', @@ -848,7 +849,7 @@ public function phone_possession_cannot_be_proven_twice(): void $phoneNumber1, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', @@ -908,7 +909,7 @@ public function cannot_prove_possession_of_arbitrary_second_factor_type_twice(): $publicId, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', @@ -963,7 +964,7 @@ public function an_unverified_second_factors_email_can_be_verified(): void $secondFactorIdentifier, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', @@ -1031,7 +1032,7 @@ public function a_verified_second_factors_email_cannot_be_verified(): void $secondFactorIdentifier, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', @@ -1095,7 +1096,7 @@ public function cannot_verify_an_email_after_the_verification_window_has_closed( $publicId, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), new DateTime(new CoreDateTime('-2 days')), ), 'nonce', @@ -1294,7 +1295,7 @@ public function a_second_factor_can_be_vetted(): void $registrantSecFacIdentifier, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', @@ -1387,7 +1388,7 @@ public function a_second_factor_cannot_be_vetted_without_a_secure_enough_vetted_ $authorityPhoneNo, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', @@ -1437,7 +1438,7 @@ public function a_second_factor_cannot_be_vetted_without_a_secure_enough_vetted_ $registrantPubId, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', @@ -1553,7 +1554,7 @@ public function a_second_factor_can_be_vetted_without_a_physical_proven_possessi $registrantSecFacIdentifier, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', @@ -1654,7 +1655,7 @@ public function a_second_factor_cannot_be_vetted_without_physical_prove_of_posse $authorityPhoneNo, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', @@ -1704,7 +1705,7 @@ public function a_second_factor_cannot_be_vetted_without_physical_prove_of_posse $registrantPubId, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', @@ -1922,7 +1923,7 @@ public function a_second_factor_can_be_self_vetted(): void $registrantSecPubId, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', @@ -1962,7 +1963,7 @@ public function a_second_factor_can_be_self_vetted(): void $authorityPhoneNo, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', @@ -2051,7 +2052,7 @@ public function a_second_factor_can_be_self_vetted_using_old_authoringSecondFact $registrantSecPubId, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', @@ -2091,7 +2092,7 @@ public function a_second_factor_can_be_self_vetted_using_old_authoringSecondFact $authorityPhoneNo, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RegistrationAuthorityCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RegistrationAuthorityCommandHandlerTest.php index 033c18ec9..c6f7908cc 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RegistrationAuthorityCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RegistrationAuthorityCommandHandlerTest.php @@ -24,6 +24,7 @@ use Broadway\EventSourcing\AggregateFactory\PublicConstructorAggregateFactory; use Broadway\EventStore\EventStore as EventStoreInterface; use Mockery as m; +use Mockery\MockInterface; use Psr\Log\LoggerInterface; use Surfnet\Stepup\Configuration\EventSourcing\InstitutionConfigurationRepository; use Surfnet\Stepup\Configuration\InstitutionConfiguration; @@ -63,12 +64,12 @@ class RegistrationAuthorityCommandHandlerTest extends CommandHandlerTest { /** - * @var InstitutionConfigurationRepository + * @var InstitutionConfigurationRepository|MockInterface */ private $institutionConfigurationRepositoryMock; /** - * @var InstitutionConfiguration + * @var InstitutionConfiguration|MockInterface */ private $institutionConfiguration; diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/SecondFactorRevocationTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/SecondFactorRevocationTest.php index 5a28dce09..80253a852 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/SecondFactorRevocationTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/SecondFactorRevocationTest.php @@ -139,7 +139,7 @@ public function an_identity_can_revoke_its_own_unverified_second_factor(): void $secondFactorIdentifier, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', @@ -195,7 +195,7 @@ public function an_identity_can_revoke_its_own_verified_second_factor(): void $secondFactorIdentifier, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', @@ -265,7 +265,7 @@ public function an_identity_can_revoke_its_own_vetted_second_factor(): void $secondFactorIdentifier, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', @@ -378,7 +378,7 @@ public function a_registration_authority_can_revoke_an_unverified_second_factor( $registrantSecondFactorIdentifier, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', @@ -465,7 +465,7 @@ public function a_registration_authority_can_revoke_a_verified_second_factor(): $registrantSecondFactorIdentifier, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', @@ -564,7 +564,7 @@ public function a_registration_authority_can_revoke_a_vetted_second_factor(): vo $registrantSecondFactorIdentifier, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', @@ -680,7 +680,7 @@ public function a_registration_authority_can_revoke_a_possession_proved_skipped_ $registrantSecondFactorIdentifier, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', @@ -802,7 +802,7 @@ public function a_registration_authority_can_revoke_one_of_multiple_vetted_secon $registrantSecondFactorIdentifier, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', @@ -842,7 +842,7 @@ public function a_registration_authority_can_revoke_one_of_multiple_vetted_secon $registrantSecondFactorIdentifier2, true, EmailVerificationWindow::createFromTimeFrameStartingAt( - TimeFrame::ofSeconds(static::$window), + TimeFrame::ofSeconds(self::$window), DateTime::now(), ), 'nonce', diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/AuthorizingStageTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/AuthorizingStageTest.php index 7602abdf2..b464443d9 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/AuthorizingStageTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/AuthorizingStageTest.php @@ -60,7 +60,7 @@ public function setUp(): void public function when_a_command_has_no_marker_interface_authorization_is_granted_by_default(): void { $command = m::mock(Command::class); - $this->authorizationChecker->shouldReceive('isGranted')->never(); + $this->authorizationChecker->shouldNotHaveReceived('isGranted'); $authorizingStage = new AuthorizingStage($this->logger, $this->authorizationChecker); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/ValidationStageTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/ValidationStageTest.php index 8a8a68415..3cce1632e 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/ValidationStageTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/ValidationStageTest.php @@ -62,7 +62,8 @@ public function it_throws_an_exception_when_validation_fails(): void $command = m::mock(Command::class); $violations = m::mock(ConstraintViolationListInterface::class) - ->shouldReceive('count')->with()->andReturn(1) + ->shouldReceive('count')->with()->andReturn(1); + $violations ->shouldReceive('getIterator')->with()->andReturn(new ArrayIterator()) ->getMock(); $validator = m::mock(ValidatorInterface::class) diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Value/InstitutionTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Value/InstitutionTest.php index d0ce81bc6..9d5f0966b 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Value/InstitutionTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Value/InstitutionTest.php @@ -31,8 +31,6 @@ class InstitutionTest extends UnitTest /** * @test * @dataProvider nonStringOrNonEmptyStringProvider - * - * @param mixed $invalidValue */ public function an_institution_cannot_be_created_with_anything_but_a_nonempty_string( string|int|float|StdClass|array $invalidValue, diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php index 6893a1cf6..bc41ec202 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php @@ -20,7 +20,6 @@ use Liip\TestFixturesBundle\Services\DatabaseToolCollection; use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; -use Symfony\Bundle\FrameworkBundle\Client; use Symfony\Bundle\FrameworkBundle\KernelBrowser; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; use Symfony\Component\HttpFoundation\Response; @@ -29,9 +28,6 @@ class InstitutionConfigurationControllerTest extends WebTestCase { use MockeryPHPUnitIntegration; - /** - * @var Client - */ private KernelBrowser $client; /** diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ReconfigureInstitutionRequestValidatorTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ReconfigureInstitutionRequestValidatorTest.php index 4a6161588..7dfae19b4 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ReconfigureInstitutionRequestValidatorTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ReconfigureInstitutionRequestValidatorTest.php @@ -183,10 +183,10 @@ public function validation_for_existing_institutions_is_done_case_insensitively( ]; $builder = Mockery::mock(ConstraintViolationBuilderInterface::class); - $builder->shouldReceive('addViolation')->never(); + $builder->shouldNotHaveReceived('addViolation'); $context = Mockery::mock(ExecutionContextInterface::class); - $context->shouldReceive('buildViolation')->never(); + $context->shouldNotHaveReceived('buildViolation'); $configuredInstitutionServiceMock = Mockery::mock(ConfiguredInstitutionService::class); $configuredInstitutionServiceMock @@ -238,7 +238,7 @@ public function valid_reconfigure_institution_requests_do_not_cause_any_violatio ->andReturn([$existingInstitution]); $context = Mockery::mock(ExecutionContextInterface::class); - $context->shouldReceive('buildViolation')->never(); + $context->shouldNotHaveReceived('buildViolation'); $secondFactorTypeServiceMock = Mockery::mock(SecondFactorTypeService::class); $secondFactorTypeServiceMock->shouldReceive('getAvailableSecondFactorTypes')->andReturn(['yubikey', 'sms']); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php index f70a9e666..a43404c5b 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php @@ -18,13 +18,12 @@ namespace Surfnet\StepupMiddleware\MiddlewareBundle\Console\Command; -use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Exception; use Ramsey\Uuid\Uuid; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\Stepup\Identity\Value\NameId; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\IdentityRepository; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\BootstrapIdentityWithYubikeySecondFactorCommand as BootstrapIdentityWithYubikeySecondFactorIdentityCommand; -use Surfnet\StepupMiddleware\MiddlewareBundle\Service\BootstrapCommandService; use Surfnet\StepupMiddleware\MiddlewareBundle\Service\TransactionHelper; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; @@ -55,8 +54,7 @@ protected function configure(): void } public function __construct( - private readonly BootstrapCommandService $bootstrapService, - private readonly ServiceEntityRepository $projectionRepository, + private readonly IdentityRepository $projectionRepository, private readonly TransactionHelper $transactionHelper, ) { parent::__construct(); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplayEventsCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplayEventsCommand.php index e0940c55a..66ade8006 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplayEventsCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplayEventsCommand.php @@ -27,7 +27,6 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Question\ConfirmationQuestion; -use Symfony\Component\HttpKernel\KernelInterface; #[AsCommand( name: 'middleware:event:replay', @@ -36,8 +35,10 @@ )] class ReplayEventsCommand extends Command { - public function __construct(private readonly EventStreamReplayer $replayer) - { + public function __construct( + private readonly EventStreamReplayer $replayer, + private readonly string $environment, + ) { parent::__construct(); } @@ -55,16 +56,13 @@ protected function configure(): void protected function execute(InputInterface $input, OutputInterface $output): int { - /** @var KernelInterface $kernel */ - $kernel = $this->getApplication()->getKernel(); - $environment = $kernel->getEnvironment(); /** @var FormatterHelper $formatter */ $formatter = $this->getHelper('formatter'); // Be careful, when using the no-interaction option you will not get the confirmation question $noInteraction = $input->getOption('no-interaction'); - if (!in_array($environment, ['dev_event_replay', 'prod_event_replay', 'smoketest_event_replay'])) { + if (!in_array($this->environment, ['dev_event_replay', 'prod_event_replay', 'smoketest_event_replay'])) { $output->writeln( $formatter->formatBlock( [ @@ -82,7 +80,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int /** @var QuestionHelper $interrogator */ $interrogator = $this->getHelper('question'); - if ($environment === 'prod_event_replay') { + if ($this->environment === 'prod_event_replay') { $wantToRunOnProd = new ConfirmationQuestion( 'You have selected to run this on production. Have you disabled all access to the production ' . 'environment? (y/N)', diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php index 3cf4a3dda..f4e59a9b7 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php @@ -23,7 +23,6 @@ use Broadway\Domain\DomainMessage; use Broadway\Serializer\SimpleInterfaceSerializer; use Doctrine\DBAL\Connection; -use Doctrine\DBAL\DBALException; use Doctrine\DBAL\Driver\Statement; use PDO; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Forgettable; @@ -49,35 +48,27 @@ public function __construct( ) { } - /** - * @return string - * @throws DBALException - */ - public function getCount() + public function getCount(): string { $statement = $this->connection->prepare('SELECT COUNT(1) AS cnt FROM ' . $this->eventStreamTableName); - $statement->execute(); + $result = $statement->executeQuery(); - $row = $statement->fetch(); + $row = $result->fetchAssociative(); return $row['cnt']; } - /** - * @param int $limit - * @param int $offset - * @return DomainEventStream - */ - public function getFromTill($limit, $offset): DomainEventStream + public function getFromTill(int $limit, int $offset): DomainEventStream { $statement = $this->prepareLoadStatement(); $statement->bindValue('limit', $limit, PDO::PARAM_INT); $statement->bindValue('offset', $offset, PDO::PARAM_INT); - $statement->execute(); + $result = $statement->executeQuery(); $events = []; - while ($row = $statement->fetch()) { + + while ($row = $result->fetchAssociative()) { $events[] = $this->deserializeEvent($row); } @@ -101,10 +92,10 @@ public function fetchByEventTypes($eventTypes): DomainEventStream ); $statement = $this->connection->prepare($query); - $statement->execute($eventTypes); + $results = $statement->executeQuery($eventTypes); $events = []; - while ($row = $statement->fetch()) { + foreach ($results->fetchAssociative() as $row) { $events[] = $this->deserializeEvent($row); } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/MappedInstitutionConfiguration.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/MappedInstitutionConfiguration.php index 38b1009be..b30a48c62 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/MappedInstitutionConfiguration.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/MappedInstitutionConfiguration.php @@ -25,7 +25,6 @@ use Surfnet\Stepup\Configuration\Value\ShowRaaContactInformationOption; use Surfnet\Stepup\Configuration\Value\UseRaLocationsOption; use Surfnet\Stepup\Configuration\Value\VerifyEmailOption; -use Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity\RaLocation; use Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\Command\AddRaLocationCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\Command\CreateInstitutionConfigurationCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\Command\ReconfigureInstitutionConfigurationOptionsCommand; @@ -33,10 +32,6 @@ final readonly class MappedInstitutionConfiguration { - /** - * @param SelfVetOption $setVetOption - * @param RaLocation[] $raLocations - */ public function __construct( private Institution $institution, private UseRaLocationsOption $useRaLocationsOption, @@ -48,9 +43,6 @@ public function __construct( ) { } - /** - * @return RemoveInstitutionConfigurationByUnnormalizedIdCommand - */ public function inferRemoveInstitutionConfigurationByIdCommand(): RemoveInstitutionConfigurationByUnnormalizedIdCommand { $command = new RemoveInstitutionConfigurationByUnnormalizedIdCommand(); @@ -60,9 +52,6 @@ public function inferRemoveInstitutionConfigurationByIdCommand(): RemoveInstitut return $command; } - /** - * @return CreateInstitutionConfigurationCommand - */ public function inferCreateInstitutionConfigurationCommand(): CreateInstitutionConfigurationCommand { $command = new CreateInstitutionConfigurationCommand(); @@ -72,9 +61,6 @@ public function inferCreateInstitutionConfigurationCommand(): CreateInstitutionC return $command; } - /** - * @return ReconfigureInstitutionConfigurationOptionsCommand - */ public function inferReconfigureInstitutionConfigurationCommand(): ReconfigureInstitutionConfigurationOptionsCommand { $command = new ReconfigureInstitutionConfigurationOptionsCommand(); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Resources/config/console_commands.yml b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Resources/config/console_commands.yml index 874251073..64629028d 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Resources/config/console_commands.yml +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Resources/config/console_commands.yml @@ -30,12 +30,12 @@ services: - { name: 'console.command', command: 'middleware:event:replay' } arguments: - "@middleware.event_replay.event_stream_replayer" + - "%app_env%" Surfnet\StepupMiddleware\MiddlewareBundle\Console\Command\BootstrapIdentityWithYubikeySecondFactorCommand: tags: - { name: 'console.command', command: 'middleware:bootstrap:identity-with-yubikey' } arguments: - - '@Surfnet\StepupMiddleware\MiddlewareBundle\Service\BootstrapCommandService' - "@surfnet_stepup_middleware_api.repository.identity" - '@Surfnet\StepupMiddleware\MiddlewareBundle\Service\TransactionHelper' diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php index 624f8d05a..0ae8991e6 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php @@ -109,7 +109,6 @@ public function replayEvents(OutputInterface $output, $increments): void $replayProgress->setMessage($defaultMessage); for ($count = 0; $count < $totalEvents; $count += $increments) { - /** @var DomainEventStream $eventStream */ $eventStream = $this->eventHydrator->getFromTill($increments, $count); if ($output->getVerbosity() >= OutputInterface::VERBOSITY_DEBUG) { diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/TransactionHelper.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/TransactionHelper.php index f0ab19800..4e7f73854 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/TransactionHelper.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/TransactionHelper.php @@ -18,15 +18,15 @@ namespace Surfnet\StepupMiddleware\MiddlewareBundle\Service; -use Broadway\EventHandling\EventBus as EventBusInterface; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command as MiddlewareCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\EventHandling\BufferedEventBus; use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\Pipeline; final readonly class TransactionHelper { public function __construct( private Pipeline $pipeline, - private EventBusInterface $eventBus, + private BufferedEventBus $eventBus, private DBALConnectionHelper $connection, ) { } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderService.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderService.php index b20ac4713..0954262fe 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderService.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderService.php @@ -19,6 +19,7 @@ use Assert\Assertion; use DateTime; +use Exception; use InvalidArgumentException; use Psr\Log\LoggerInterface; use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\IdentityRepository; @@ -39,10 +40,7 @@ public function __construct( ) { } - /** - * @param bool $dryRun - */ - public function sendReminders(DateTime $date, $dryRun): void + public function sendReminders(DateTime $date, bool $dryRun): void { $this->logger->info( sprintf( @@ -60,7 +58,13 @@ public function sendReminders(DateTime $date, $dryRun): void $this->logger->info(sprintf('%d token reminder(s) will be sent', count($tokenInformationCollection))); foreach ($tokenInformationCollection as $tokenInformation) { - $numberSent = $dryRun ? 1 : $this->mailService->sendReminder($tokenInformation); + try { + $this->mailService->sendReminder($tokenInformation); + $wasSent = 1; + } catch (Exception) { + $wasSent = 0; + } + $numberSent = $dryRun ? 1 : $wasSent; $this->logger->info( sprintf( diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Service/VerifiedSecondFactorReminderServiceTest.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Service/VerifiedSecondFactorReminderServiceTest.php index 6fc86eb36..d61a2441a 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Service/VerifiedSecondFactorReminderServiceTest.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Service/VerifiedSecondFactorReminderServiceTest.php @@ -20,7 +20,7 @@ use DateTime; use Mockery as m; use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; -use Mockery\Mock; +use Mockery\MockInterface; use PHPUnit\Framework\TestCase; use Psr\Log\LoggerInterface; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Identity; @@ -40,21 +40,22 @@ class VerifiedSecondFactorReminderServiceTest extends TestCase private VerifiedSecondFactorReminderService $service; /** - * @var VerifiedSecondFactorReminderMailService|Mock + * @var VerifiedSecondFactorReminderMailService|MockInterface + */ private $mailService; /** - * @var LoggerInterface|Mock + * @var LoggerInterface|MockInterface */ private $logger; /** - * @var VerifiedSecondFactorRepository|Mock + * @var VerifiedSecondFactorRepository|MockInterface */ private $verifiedSecondFactorRepository; /** - * @var IdentityRepository|Mock + * @var IdentityRepository|MockInterface */ private $identityRepository; @@ -104,7 +105,7 @@ public function test_one_token_reminders_sent(): void $this->logger ->shouldReceive('info') - ->once() + ->times() ->with('Sending reminders for date: 2018-01-01. dry run mode is disabled'); $tokens = $this->buildVerifiedSecondFactors(1, $date); From 04b156a1bd147f815fc195e5772cbf62eecd9b05 Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Mon, 18 Mar 2024 16:09:38 +0100 Subject: [PATCH 38/89] Remove dead method from VettingTypeHintController The collection method was not callable via the router, the indication of broken code sealed the deal. Removing it --- .../Controller/VettingTypeHintController.php | 43 ------------------- 1 file changed, 43 deletions(-) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettingTypeHintController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettingTypeHintController.php index 4f8649bb1..4eae40def 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettingTypeHintController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettingTypeHintController.php @@ -19,17 +19,11 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Controller; use Psr\Log\LoggerInterface; -use Surfnet\Stepup\Configuration\Value\InstitutionRole; -use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\Institution; -use Surfnet\StepupMiddleware\ApiBundle\Authorization\Service\AuthorizationContextService; use Surfnet\StepupMiddleware\ApiBundle\Exception\NotFoundException; -use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\RecoveryTokenQuery; -use Surfnet\StepupMiddleware\ApiBundle\Response\JsonCollectionResponse; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Service\VettingTypeHintService; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; -use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; class VettingTypeHintController extends AbstractController @@ -37,7 +31,6 @@ class VettingTypeHintController extends AbstractController public function __construct( private readonly VettingTypeHintService $service, private readonly LoggerInterface $logger, - private readonly AuthorizationContextService $authorizationService, ) { } @@ -56,40 +49,4 @@ public function get($institution): JsonResponse } return new JsonResponse($recoveryToken); } - - public function collection(Request $request) - { - $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); - $this->logger->info( - sprintf('Received search request for recovery tokens with params: %s', $request->getQueryString()), - ); - $query = new RecoveryTokenQuery(); - $query->identityId = $request->get('identityId'); - $query->type = $request->get('type'); - $query->status = $request->get('status'); - $query->institution = $request->get('institution'); - $query->email = $request->get('email'); - $query->name = $request->get('name'); - $query->pageNumber = (int)$request->get('p', 1); - $query->orderBy = $request->get('orderBy'); - $query->orderDirection = $request->get('orderDirection'); - - $roles = $this->getUser()->getRoles(); - // Only apply the authorization context on non self service requests - if (!in_array('ROLE_SS', $roles)) { - $actorId = $request->get('actorId', $request->get('identityId')); - $this->logger->info(sprintf('Executing query on behalf of %s', $actorId)); - $actorId = new IdentityId($actorId); - $query->authorizationContext = $this->authorizationService->buildInstitutionAuthorizationContext( - $actorId, - new InstitutionRole(InstitutionRole::ROLE_USE_RA), - ); - } - $paginator = $this->service->search($query); - $this->logger->info(sprintf('Found %d results', $paginator->count())); - - $filters = $this->service->getFilterOptions($query); - - return JsonCollectionResponse::fromPaginator($paginator, $filters); - } } From 6305abcaff97b03e1934e9565614ddfae054b3c8 Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Tue, 19 Mar 2024 11:40:39 +0100 Subject: [PATCH 39/89] Address remaining PHPStan level 2 issues --- .../Event/ServiceProvidersUpdatedEvent.php | 3 - .../InstitutionConfiguration.php | 5 +- .../Value/InstitutionAuthorizationOption.php | 43 ++------ .../Configuration/Value/InstitutionSet.php | 12 +-- .../Exception/InvalidArgumentException.php | 9 +- src/Surfnet/Stepup/Identity/Api/Identity.php | 6 -- .../Collection/VettingTypeHintCollection.php | 15 --- .../Identity/Entity/InstitutionCollection.php | 2 +- .../RegistrationAuthorityCollection.php | 11 +-- .../Identity/Event/AppointedAsRaEvent.php | 11 +-- .../AppointedAsRaForInstitutionEvent.php | 3 - .../Identity/Event/AppointedAsRaaEvent.php | 11 +-- .../AppointedAsRaaForInstitutionEvent.php | 13 +-- .../Event/LocalePreferenceExpressedEvent.php | 4 - ...etRecoveryTokenPossessionPromisedEvent.php | 26 +---- src/Surfnet/Stepup/Identity/Identity.php | 6 +- .../Stepup/Identity/Value/VettingTypeHint.php | 8 ++ .../Value/ContactInformationTest.php | 2 - .../Configuration/Value/InstitutionTest.php | 2 - .../Configuration/Value/LocationTest.php | 2 - .../Configuration/Value/RaLocationIdTest.php | 2 - .../Value/RaLocationNameTest.php | 2 - .../ShowRaaContactInformationOptionTest.php | 2 - .../Value/UseRaLocationsOptionTest.php | 2 - ...entSerializationAndDeserializationTest.php | 3 +- .../Tests/Identity/Value/CommonNameTest.php | 2 - .../Identity/Value/ContactInformationTest.php | 2 - .../Identity/Value/DocumentNumberTest.php | 2 - .../Stepup/Tests/Identity/Value/EmailTest.php | 2 - .../Tests/Identity/Value/GssfIdTest.php | 2 - .../Tests/Identity/Value/InstitutionTest.php | 2 - .../Tests/Identity/Value/LocationTest.php | 2 - .../Tests/Identity/Value/PhoneNumberTest.php | 2 - .../Value/RegistrationAuthorityRoleTest.php | 2 - .../Identity/Value/StepupProviderTest.php | 2 - .../Identity/Value/YubikeyPublicIdTest.php | 2 - .../InstitutionAuthorizationRepository.php | 13 ++- .../InstitutionAuthorizationOptionMap.php | 11 +-- .../Controller/CommandController.php | 17 ++-- .../ApiBundle/Doctrine/Type/DateTimeType.php | 14 +-- .../Doctrine/Type/DocumentNumberType.php | 18 +--- .../Doctrine/Type/RecoveryTokenStatusType.php | 6 +- .../Doctrine/Type/SecondFactorStatusType.php | 10 +- .../EventListener/ExceptionListener.php | 5 - .../Exception/InvalidArgumentException.php | 9 +- .../Repository/AuditLogRepository.php | 6 +- .../Repository/AuthorizationRepository.php | 2 +- .../Repository/RaListingRepository.php | 37 +------ .../Repository/RaSecondFactorRepository.php | 4 - .../Identity/Service/IdentityService.php | 29 +++--- .../RegistrationAuthorityCredentials.php | 97 ++++--------------- ...utionAuthorizationRepositoryFilterTest.php | 14 +-- .../CommandAuthorizationServiceTest.php | 49 +++------- ...itutionConfigurationOptionsServiceTest.php | 9 +- .../Doctrine/Type/CommonNameTypeTest.php | 3 - ...onfigurationContactInformationTypeTest.php | 3 - .../Type/ConfigurationInstitutionTypeTest.php | 3 - .../Type/ConfigurationLocationTypeTest.php | 3 - .../Type/ContactInformationTypeTest.php | 4 +- .../Tests/Doctrine/Type/DateTimeTypeTest.php | 4 +- .../Doctrine/Type/DocumentNumberTypeTest.php | 3 - .../Tests/Doctrine/Type/EmailTypeTest.php | 3 - .../Doctrine/Type/InstitutionRoleTypeTest.php | 3 - .../Doctrine/Type/InstitutionTypeTest.php | 3 - .../Tests/Doctrine/Type/LocaleTypeTest.php | 3 - .../Tests/Doctrine/Type/LocationTypeTest.php | 4 +- .../Tests/Doctrine/Type/NameIdTypeTest.php | 4 +- .../NumberOfTokensPerIdentityTypeTest.php | 4 +- .../Type/RecoveryTokenStatusTypeTest.php | 8 -- .../Type/SecondFactorStatusTypeTest.php | 4 +- .../Doctrine/Type/SelfVetOptionTypeTest.php | 4 +- ...howRaaContactInformationOptionTypeTest.php | 4 +- .../Type/UseRaLocationsOptionTypeTest.php | 4 +- .../Type/VerifyEmailOptionTypeTest.php | 3 - .../ConfiguredInstitutionControllerTest.php | 3 - .../Tests/Endpoint/SraaControllerTest.php | 6 -- .../Request/CommandParamConverterTest.php | 12 ++- .../EventHandling/BufferedEventBus.php | 6 +- .../Exception/Exception.php | 4 +- .../Exception/InvalidArgumentException.php | 9 +- .../Identity/Command/AppointRoleCommand.php | 2 +- .../Pipeline/Pipeline.php | 7 +- .../Pipeline/StagedPipeline.php | 3 +- .../Pipeline/TransactionAwarePipeline.php | 4 +- .../Tests/Mockery/HasInstitutionMatcher.php | 15 +-- .../Tests/Pipeline/ValidationStageTest.php | 9 +- .../Exception/InvalidArgumentException.php | 9 +- ...IdentityWithYubikeySecondFactorCommand.php | 5 +- .../Exception/InvalidArgumentException.php | 9 +- .../Service/EventStreamReplayer.php | 6 +- 90 files changed, 171 insertions(+), 589 deletions(-) diff --git a/src/Surfnet/Stepup/Configuration/Event/ServiceProvidersUpdatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/ServiceProvidersUpdatedEvent.php index 5333b3314..30cd4feee 100644 --- a/src/Surfnet/Stepup/Configuration/Event/ServiceProvidersUpdatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/ServiceProvidersUpdatedEvent.php @@ -36,9 +36,6 @@ public function __construct($configurationId, array $serviceProviders) $this->serviceProviders = $serviceProviders; } - /** - * @return mixed The object instance - */ public static function deserialize(array $data): self { return new self($data['id'], $data['service_providers']); diff --git a/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php b/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php index 0b709e84b..2d23025cd 100644 --- a/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php +++ b/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php @@ -200,10 +200,7 @@ public static function create( return $institutionConfiguration; } - /** - * @return InstitutionConfiguration - */ - public function rebuild(): static + public function rebuild(): self { // We can only rebuild a destroyed InstitutionConfiguration, all other cases are not valid if ($this->isMarkedAsDestroyed !== true) { diff --git a/src/Surfnet/Stepup/Configuration/Value/InstitutionAuthorizationOption.php b/src/Surfnet/Stepup/Configuration/Value/InstitutionAuthorizationOption.php index e0594da23..fb7354d93 100644 --- a/src/Surfnet/Stepup/Configuration/Value/InstitutionAuthorizationOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/InstitutionAuthorizationOption.php @@ -39,11 +39,7 @@ private function __construct( $this->isDefault = (bool)$isDefault; } - /** - * @param string[]|null - * @return InstitutionAuthorizationOption - */ - public static function fromInstitutionConfig(InstitutionRole $role, $institutions = null) + public static function fromInstitutionConfig(InstitutionRole $role, $institutions = null): InstitutionAuthorizationOption { if (is_null($institutions)) { return self::getDefault($role); @@ -82,7 +78,6 @@ function ($institution, $key) use ($institutions): void { /** * @param Institution[] $institutions - * @return InstitutionAuthorizationOption */ public static function fromInstitutions(InstitutionRole $role, Institution $institution, array $institutions): self { @@ -92,35 +87,21 @@ public static function fromInstitutions(InstitutionRole $role, Institution $inst return new self($role, InstitutionSet::create($institutions), false); } - /** - * @param string[]|null - * @return InstitutionAuthorizationOption - */ public static function getDefault(InstitutionRole $role): self { return new self($role, InstitutionSet::create([]), true); } - /** - * @param string[]|null - * @return InstitutionAuthorizationOption - */ public static function getEmpty(InstitutionRole $role): self { return new self($role, InstitutionSet::create([]), false); } - /** - * @return null - */ - public static function blank() + public static function blank(): null { return null; } - /** - * @return bool - */ public function equals(InstitutionAuthorizationOption $option): bool { return @@ -129,18 +110,12 @@ public function equals(InstitutionAuthorizationOption $option): bool $this->isDefault === $option->isDefault(); } - /** - * @return InstitutionRole - */ - public function getInstitutionRole() + public function getInstitutionRole(): InstitutionRole { return $this->institutionRole; } - /** - * @return InstitutionSet - */ - public function getInstitutionSet() + public function getInstitutionSet(): InstitutionSet { return $this->institutionSet; } @@ -151,7 +126,7 @@ public function getInstitutionSet() * * @return Institution[] */ - public function getInstitutions(Institution $institution) + public function getInstitutions(Institution $institution): array { if ($this->isDefault) { return [$institution]; @@ -159,9 +134,6 @@ public function getInstitutions(Institution $institution) return $this->institutionSet->getInstitutions(); } - /** - * @return bool - */ public function hasInstitution(Institution $institution, Institution $default): bool { $institutions = $this->getInstitutions($default); @@ -172,10 +144,7 @@ public function hasInstitution(Institution $institution, Institution $default): return in_array($institution->getInstitution(), $list); } - /** - * @return bool - */ - public function isDefault() + public function isDefault(): bool { return $this->isDefault; } diff --git a/src/Surfnet/Stepup/Configuration/Value/InstitutionSet.php b/src/Surfnet/Stepup/Configuration/Value/InstitutionSet.php index 78b542583..1b99edb6a 100644 --- a/src/Surfnet/Stepup/Configuration/Value/InstitutionSet.php +++ b/src/Surfnet/Stepup/Configuration/Value/InstitutionSet.php @@ -25,10 +25,10 @@ final class InstitutionSet /** * @var Institution[] */ - private $institutions; + private array $institutions; /** - * @param Institution[] + * @param Institution[] $institutions */ private function __construct(array $institutions) { @@ -42,8 +42,7 @@ private function __construct(array $institutions) } /** - * @param Institution[] - * @return InstitutionSet + * @param Institution[] $institutions */ public static function create(array $institutions): self { @@ -69,9 +68,6 @@ public function equals(InstitutionSet $other): bool return $this->toScalarArray() === $other->toScalarArray(); } - /** - * @return bool - */ public function isOption(Institution $institution): bool { return in_array($institution->getInstitution(), $this->institutions); @@ -80,7 +76,7 @@ public function isOption(Institution $institution): bool /** * @return Institution[] */ - public function getInstitutions() + public function getInstitutions(): array { return $this->institutions; } diff --git a/src/Surfnet/Stepup/Exception/InvalidArgumentException.php b/src/Surfnet/Stepup/Exception/InvalidArgumentException.php index 798e90c42..dbe864320 100644 --- a/src/Surfnet/Stepup/Exception/InvalidArgumentException.php +++ b/src/Surfnet/Stepup/Exception/InvalidArgumentException.php @@ -20,14 +20,7 @@ class InvalidArgumentException extends \InvalidArgumentException implements Exception { - /** - * @param string $expected description of expected type - * @param string $parameterName - * @param mixed $parameter the parameter that is not of the expected type. - * - * @return self - */ - public static function invalidType($expected, $parameterName, mixed $parameter): self + public static function invalidType(string $expected, string $parameterName, mixed $parameter): self { $message = sprintf( 'Invalid argument type: "%s" expected, "%s" given for "%s"', diff --git a/src/Surfnet/Stepup/Identity/Api/Identity.php b/src/Surfnet/Stepup/Identity/Api/Identity.php index a4447b622..ef806d8bc 100644 --- a/src/Surfnet/Stepup/Identity/Api/Identity.php +++ b/src/Surfnet/Stepup/Identity/Api/Identity.php @@ -327,12 +327,6 @@ public function getVerifiedSecondFactor(SecondFactorId $secondFactorId); */ public function getVettedSecondFactorById(SecondFactorId $secondFactorId): ?VettedSecondFactor; - /** - * @return IdentityId We're deviating from Broadway's official API, as they accept toString-able VOs as IDs, and we - * require the IdentityId VO in our SensitiveDataEventStoreDecorator. - */ - public function getAggregateRootId(): string; - /** * Identity proved possession of a phone number by reproducing a secret sent to it via SMS */ diff --git a/src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php b/src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php index 6f0c08c3a..53f7c1042 100644 --- a/src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php +++ b/src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php @@ -49,21 +49,6 @@ public function add(VettingTypeHint $hint): void $this->elements[] = $hint; } - public function remove(VettingTypeHint $hint): void - { - if (!in_array($hint, $this->elements)) { - throw new RuntimeException( - sprintf( - 'Cannot remove vetting type hint "%s" from the collection as it is not in the collection', - $hint, - ), - ); - } - - $elements = array_filter($this->elements, fn($inst): bool => !$hint->equals($inst)); - $this->elements = $elements; - } - public function jsonSerialize(): array { return $this->elements; diff --git a/src/Surfnet/Stepup/Identity/Entity/InstitutionCollection.php b/src/Surfnet/Stepup/Identity/Entity/InstitutionCollection.php index 5b472c4d4..af33f6018 100644 --- a/src/Surfnet/Stepup/Identity/Entity/InstitutionCollection.php +++ b/src/Surfnet/Stepup/Identity/Entity/InstitutionCollection.php @@ -33,7 +33,7 @@ public function set(Institution $institution): void public function update(Institutions $institutions): void { foreach ($institutions as $institution) { - $this->institutions[(string)$institutions] = $institution; + $this->institutions[(string)$institution] = $institution; } } diff --git a/src/Surfnet/Stepup/Identity/Entity/RegistrationAuthorityCollection.php b/src/Surfnet/Stepup/Identity/Entity/RegistrationAuthorityCollection.php index b3f13ee19..2509471d5 100644 --- a/src/Surfnet/Stepup/Identity/Entity/RegistrationAuthorityCollection.php +++ b/src/Surfnet/Stepup/Identity/Entity/RegistrationAuthorityCollection.php @@ -32,17 +32,11 @@ public function set(Institution $institution, RegistrationAuthority $registratio $this->registrationAuthorities[(string)$institution] = $registrationAuthority; } - /** - * @return RegistrationAuthority - */ - public function get(Institution $institution) + public function get(Institution $institution): RegistrationAuthority { return $this->registrationAuthorities[(string)$institution]; } - /** - * @return RegistrationAuthority - */ public function exists(Institution $institution): bool { return array_key_exists((string)$institution, $this->registrationAuthorities); @@ -53,9 +47,6 @@ public function remove(Institution $institution): void unset($this->registrationAuthorities[(string)$institution]); } - /** - * @return int - */ public function count(): int { return count($this->registrationAuthorities); diff --git a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php index d4637eb4b..54e8895d9 100644 --- a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php @@ -35,10 +35,7 @@ class AppointedAsRaEvent extends IdentityEvent implements RightToObtainDataInter 'name_id', ]; - /** - * @var NameId - */ - public $nameId; + public NameId $nameId; public function __construct( IdentityId $identityId, @@ -59,9 +56,6 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - /** - * @return mixed The object instance - */ public static function deserialize(array $data): self { return new self( @@ -71,9 +65,6 @@ public static function deserialize(array $data): self ); } - /** - * @return array - */ public function serialize(): array { return [ diff --git a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php index bf3877d32..a1ba0e6be 100644 --- a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php @@ -65,9 +65,6 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - /** - * @return mixed The object instance - */ public static function deserialize(array $data): self { return new self( diff --git a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php index 0d3f60f8b..5f8de76c3 100644 --- a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php @@ -35,10 +35,7 @@ class AppointedAsRaaEvent extends IdentityEvent implements RightToObtainDataInte 'name_id', ]; - /** - * @var NameId - */ - public $nameId; + public NameId $nameId; public function __construct( IdentityId $identityId, @@ -59,9 +56,6 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - /** - * @return mixed The object instance - */ public static function deserialize(array $data): self { return new self( @@ -71,9 +65,6 @@ public static function deserialize(array $data): self ); } - /** - * @return array - */ public function serialize(): array { return [ diff --git a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaForInstitutionEvent.php index 6955619de..3694fabb6 100644 --- a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaForInstitutionEvent.php @@ -33,15 +33,9 @@ class AppointedAsRaaForInstitutionEvent extends IdentityEvent implements RightTo 'ra_institution', ]; - /** - * @var NameId - */ - public $nameId; + public NameId $nameId; - /** - * @var Institution - */ - public $raInstitution; + public Institution $raInstitution; public function __construct( IdentityId $identityId, @@ -65,9 +59,6 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - /** - * @return mixed The object instance - */ public static function deserialize(array $data): self { return new self( diff --git a/src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php b/src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php index 7b31faceb..82fa4b3d9 100644 --- a/src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php @@ -58,10 +58,6 @@ public function getAuditLogMetadata(): Metadata return $metadata; } - /** - * @param array $data - * @return IdentityRenamedEvent The object instance - */ public static function deserialize(array $data): self { return new self( diff --git a/src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php b/src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php index acb9d77e2..fd661d78b 100644 --- a/src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php @@ -21,7 +21,6 @@ use Surfnet\Stepup\Identity\AuditLog\Metadata; use Surfnet\Stepup\Identity\Value\CommonName; use Surfnet\Stepup\Identity\Value\Email; -use Surfnet\Stepup\Identity\Value\HashableSecret; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\Stepup\Identity\Value\Locale; @@ -52,30 +51,15 @@ class SafeStoreSecretRecoveryTokenPossessionPromisedEvent extends IdentityEvent 'common_name', ]; - /** - * @var RecoveryTokenId - */ - public $recoveryTokenId; + public RecoveryTokenId $recoveryTokenId; - /** - * @var HashableSecret - */ - public $secret; + public RecoveryTokenIdentifier $secret; - /** - * @var CommonName - */ - public $commonName; + public CommonName $commonName; - /** - * @var Email - */ - public $email; + public Email $email; - /** - * @var Locale Eg. "en_GB" - */ - public $preferredLocale; + public Locale $preferredLocale; public function __construct( IdentityId $identityId, diff --git a/src/Surfnet/Stepup/Identity/Identity.php b/src/Surfnet/Stepup/Identity/Identity.php index ca931b256..83e17ab97 100644 --- a/src/Surfnet/Stepup/Identity/Identity.php +++ b/src/Surfnet/Stepup/Identity/Identity.php @@ -1371,10 +1371,8 @@ protected function applyAppointedAsRaaEvent(AppointedAsRaaEvent $event) /** * This method is kept to be backwards compatible for changes before FGA - * - * @param AppointedAsRaaEvent $event */ - protected function applyIdentityAccreditedAsRaEvent(IdentityAccreditedAsRaEvent $event) + protected function applyIdentityAccreditedAsRaEvent(IdentityAccreditedAsRaEvent $event): void { $this->registrationAuthorities->set( $event->identityInstitution, @@ -1565,7 +1563,7 @@ private function assertSelfAssertedTokenRegistrationAllowed(): void */ private function assertAllVettedTokensAreSelfAsserted(): bool { - /** @var VettedSecondFactor $vettedToken */ + /** @var VettedSecondFactor $vettedSecondFactor */ foreach ($this->vettedSecondFactors as $vettedSecondFactor) { if ($vettedSecondFactor->vettingType()->type() !== VettingType::TYPE_SELF_ASSERTED_REGISTRATION) { throw new DomainException( diff --git a/src/Surfnet/Stepup/Identity/Value/VettingTypeHint.php b/src/Surfnet/Stepup/Identity/Value/VettingTypeHint.php index 54edf09b6..90a84434c 100644 --- a/src/Surfnet/Stepup/Identity/Value/VettingTypeHint.php +++ b/src/Surfnet/Stepup/Identity/Value/VettingTypeHint.php @@ -31,6 +31,14 @@ public function __construct( ) { } + public function __toString(): string + { + if ($this->hint === null) { + return ''; + } + return $this->hint; + } + public function jsonSerialize(): array { return [ diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/ContactInformationTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/ContactInformationTest.php index 2dc023e7a..36d7ffb18 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/ContactInformationTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/ContactInformationTest.php @@ -32,8 +32,6 @@ class ContactInformationTest extends UnitTest * @test * @group domain * @dataProvider invalidValueProvider - * - * @param mixed $invalidValue */ public function it_cannot_be_created_with_anything_but_a_nonempty_string(int|float|StdClass|array $invalidValue,): void { diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionTest.php index d5cf92fcf..94e31cd06 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionTest.php @@ -32,8 +32,6 @@ class InstitutionTest extends UnitTest * @test * @group domain * @dataProvider nonStringOrNonEmptyStringProvider - * - * @param mixed $invalidValue */ public function an_institution_cannot_be_created_with_anything_but_a_nonempty_string( string|int|float|StdClass|array $invalidValue, diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/LocationTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/LocationTest.php index 7596e55dc..5286f29e3 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/LocationTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/LocationTest.php @@ -32,8 +32,6 @@ class LocationTest extends UnitTest * @test * @group domain * @dataProvider nonStringProvider - * - * @param mixed $nonString */ public function it_cannot_be_created_with_anything_but_a_string(bool|int|float|stdClass|array|null $nonString): void { diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php index 2fa26fe8f..3a0198fc3 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php @@ -33,8 +33,6 @@ class RaLocationIdTest extends TestCase * @test * @group domain * @dataProvider nonStringOrEmptyStringProvider - * - * @param mixed $nonStringOrEmptyString */ public function an_ra_location_id_cannot_be_created_with_anything_but_a_nonempty_string( string|int|float|StdClass|array $nonStringOrEmptyString, diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationNameTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationNameTest.php index 51d0c3876..a7805c7ec 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationNameTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationNameTest.php @@ -32,8 +32,6 @@ class RaLocationNameTest extends TestCase * @test * @group domain * @dataProvider nonStringOrEmptyStringProvider - * - * @param mixed $nonStringOrEmptyString */ public function an_ra_location_name_cannot_be_created_with_anything_but_a_nonempty_string( string|int|float|StdClass|array $nonStringOrEmptyString, diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/ShowRaaContactInformationOptionTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/ShowRaaContactInformationOptionTest.php index d96e304ed..5e3b2e6d7 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/ShowRaaContactInformationOptionTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/ShowRaaContactInformationOptionTest.php @@ -33,8 +33,6 @@ class ShowRaaContactInformationOptionTest extends TestCase * @group domain * @group institution-configuration-option * @dataProvider nonBooleanProvider - * - * @param mixed $nonBooleanProvider */ public function show_raa_contact_information_option_can_only_be_boolean( string|int|float|StdClass|array $nonBooleanProvider, diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/UseRaLocationsOptionTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/UseRaLocationsOptionTest.php index 1032557e0..45b825098 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/UseRaLocationsOptionTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/UseRaLocationsOptionTest.php @@ -33,8 +33,6 @@ class UseRaLocationsOptionTest extends TestCase * @group domain * @group institution-configuration-option * @dataProvider nonBooleanProvider - * - * @param mixed $nonBooleanProvider */ public function use_ra_locations_option_can_only_be_boolean(string|int|float|StdClass|array $nonBooleanProvider,): void { diff --git a/src/Surfnet/Stepup/Tests/Identity/Event/EventSerializationAndDeserializationTest.php b/src/Surfnet/Stepup/Tests/Identity/Event/EventSerializationAndDeserializationTest.php index fb71eff0f..3d2b558f3 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Event/EventSerializationAndDeserializationTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Event/EventSerializationAndDeserializationTest.php @@ -83,7 +83,7 @@ class EventSerializationAndDeserializationTest extends UnitTest * @group domain * @dataProvider eventProvider */ - public function an_event_should_be_the_same_after_serialization_and_deserialization(SerializableInterface $event,): void + public function an_event_should_be_the_same_after_serialization_and_deserialization(SerializableInterface $event): void { $isForgettableEvent = $event instanceof Forgettable; $providesSensitiveData = method_exists($event, 'getSensitiveData') || method_exists($event, 'setSensitiveData'); @@ -100,6 +100,7 @@ public function an_event_should_be_the_same_after_serialization_and_deserializat $serializedEvent = $event->serialize(); if ($isForgettableEvent) { + assert($event instanceof Forgettable); $sensitiveData = $event->getSensitiveData(); } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/CommonNameTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/CommonNameTest.php index b9377bfc0..2dfd33973 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/CommonNameTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/CommonNameTest.php @@ -32,8 +32,6 @@ class CommonNameTest extends UnitTest * @test * @group domain * @dataProvider invalidArgumentProvider - * - * @param mixed $invalidValue */ public function the_common_name_address_must_be_a_non_empty_string(string|int|float|StdClass|array $invalidValue,): void { diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/ContactInformationTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/ContactInformationTest.php index dbe80cd29..d00ff196e 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/ContactInformationTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/ContactInformationTest.php @@ -32,8 +32,6 @@ class ContactInformationTest extends UnitTest * @test * @group domain * @dataProvider invalidValueProvider - * - * @param mixed $invalidValue */ public function it_cannot_be_created_with_anything_but_a_nonempty_string(int|float|StdClass|array $invalidValue,): void { diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/DocumentNumberTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/DocumentNumberTest.php index e16687617..d957f1a47 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/DocumentNumberTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/DocumentNumberTest.php @@ -32,8 +32,6 @@ class DocumentNumberTest extends UnitTest * @test * @group domain * @dataProvider invalidArgumentProvider - * - * @param mixed $invalidValue */ public function the_document_number_must_be_a_non_empty_string(string|int|float|StdClass|array $invalidValue): void { diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/EmailTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/EmailTest.php index a95bb3825..daf63f21d 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/EmailTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/EmailTest.php @@ -32,8 +32,6 @@ class EmailTest extends UnitTest * @test * @group domain * @dataProvider invalidArgumentProvider - * - * @param mixed $invalidValue */ public function the_email_address_must_be_a_non_empty_string(string|int|float|StdClass|array $invalidValue): void { diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/GssfIdTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/GssfIdTest.php index 6e05e8033..5e50dff84 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/GssfIdTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/GssfIdTest.php @@ -32,8 +32,6 @@ class GssfIdTest extends UnitTest * @test * @group domain * @dataProvider invalidValueProvider - * - * @param mixed $invalidValue */ public function a_gssf_id_cannot_be_created_with_anything_but_a_nonempty_string( string|int|float|StdClass|array $invalidValue, diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/InstitutionTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/InstitutionTest.php index fdabec5d6..bcfd7a01d 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/InstitutionTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/InstitutionTest.php @@ -32,8 +32,6 @@ class InstitutionTest extends UnitTest * @test * @group domain * @dataProvider invalidValueProvider - * - * @param mixed $invalidValue */ public function an_institution_cannot_be_created_with_anything_but_a_nonempty_string( string|int|float|StdClass|array $invalidValue, diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/LocationTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/LocationTest.php index b1964440e..05837f4d6 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/LocationTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/LocationTest.php @@ -32,8 +32,6 @@ class LocationTest extends UnitTest * @test * @group domain * @dataProvider invalidValueProvider - * - * @param mixed $invalidValue */ public function it_cannot_be_created_with_anything_but_a_nonempty_string(int|float|StdClass|array $invalidValue,): void { diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/PhoneNumberTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/PhoneNumberTest.php index 7aa40b9bb..d5aca4494 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/PhoneNumberTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/PhoneNumberTest.php @@ -32,8 +32,6 @@ class PhoneNumberTest extends UnitTest * @test * @group domain * @dataProvider invalidValueProvider - * - * @param mixed $invalidValue */ public function a_phone_number_cannot_be_created_with_anything_but_a_nonempty_string( string|int|float|StdClass|array $invalidValue, diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/RegistrationAuthorityRoleTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/RegistrationAuthorityRoleTest.php index a3573a5b8..4a4573a97 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/RegistrationAuthorityRoleTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/RegistrationAuthorityRoleTest.php @@ -32,8 +32,6 @@ class RegistrationAuthorityRoleTest extends UnitTest * @test * @group domain * @dataProvider invalidValueProvider - * - * @param mixed $invalidValue */ public function it_cannot_be_created_with_anything_but_a_valid_role(float|StdClass|array $invalidValue): void { diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/StepupProviderTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/StepupProviderTest.php index 07187cf64..fa53c77ac 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/StepupProviderTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/StepupProviderTest.php @@ -32,8 +32,6 @@ class StepupProviderTest extends UnitTest * @test * @group domain * @dataProvider invalidValueProvider - * - * @param mixed $invalidValue */ public function a_stepup_provider_cannot_be_created_with_anything_but_a_nonempty_string( string|int|float|StdClass|array $invalidValue, diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/YubikeyPublicIdTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/YubikeyPublicIdTest.php index c89fcc50a..fa085e594 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/YubikeyPublicIdTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/YubikeyPublicIdTest.php @@ -61,8 +61,6 @@ public function invalidFormatProvider(): array * @test * @group domain * @dataProvider invalidFormatProvider - * - * @param mixed $invalidFormat */ public function it_cannot_be_constructed_with_an_invalid_format(string $invalidFormat): void { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionAuthorizationRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionAuthorizationRepository.php index 575c5716e..ac0ebf9f2 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionAuthorizationRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionAuthorizationRepository.php @@ -19,7 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; -use Doctrine\ORM\EntityManager; +use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\OptimisticLockException; use Doctrine\Persistence\ManagerRegistry; use Surfnet\Stepup\Configuration\Value\Institution; @@ -37,7 +37,7 @@ public function __construct(ManagerRegistry $registry) /** * @return InstitutionAuthorization[] */ - public function findAuthorizationOptionsForInstitutionByRole(Institution $institution, InstitutionRole $role) + public function findAuthorizationOptionsForInstitutionByRole(Institution $institution, InstitutionRole $role): array { return $this->createQueryBuilder('ia') ->where('ia.institution = :institution') @@ -51,7 +51,7 @@ public function findAuthorizationOptionsForInstitutionByRole(Institution $instit /** * @return InstitutionAuthorization[] */ - public function findAuthorizationOptionsForInstitution(Institution $institution) + public function findAuthorizationOptionsForInstitution(Institution $institution): array { return $this->createQueryBuilder('ia') ->where('ia.institution = :institution') @@ -63,7 +63,7 @@ public function findAuthorizationOptionsForInstitution(Institution $institution) /** * @return InstitutionAuthorization[] */ - public function findSelectRaasForInstitution(Institution $institution) + public function findSelectRaasForInstitution(Institution $institution): array { return $this->createQueryBuilder('ia') ->where('ia.institutionRelation = :institution') @@ -95,7 +95,6 @@ public function saveInstitutionOption( } /** - * @param InstitutionAuthorizationOption $institutionOption * @throws OptimisticLockException */ public function clearInstitutionOption(Institution $institution): void @@ -147,7 +146,7 @@ private function save(Institution $institution, InstitutionRole $role, array $in } private function clearOldAuthorizations( - EntityManager $entityManager, + EntityManagerInterface $entityManager, Institution $institution, InstitutionRole $role, ): void { @@ -164,7 +163,7 @@ private function clearOldAuthorizations( * @param InstitutionAuthorization[] $institutionAuthorizations */ private function addNewAuthorizations( - EntityManager $entityManager, + EntityManagerInterface $entityManager, InstitutionRole $role, array $institutionAuthorizations, ): void { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionAuthorizationOptionMap.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionAuthorizationOptionMap.php index 9ac663dbf..b6244bf09 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionAuthorizationOptionMap.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionAuthorizationOptionMap.php @@ -30,7 +30,6 @@ final class InstitutionAuthorizationOptionMap private array $institutionOptions = []; /** - * InstitutionAuthorizationOptionMap constructor. * @param InstitutionAuthorization[] $institutionAuthorizations */ private function __construct(Institution $institution, array $institutionAuthorizations) @@ -60,10 +59,6 @@ private function __construct(Institution $institution, array $institutionAuthori } } - /** - * @param InstitutionAuthorization[]|null - * @return InstitutionAuthorizationOptionMap - */ public static function fromInstitutionAuthorizations( Institution $institution, array $institutionAuthorizations, @@ -71,11 +66,7 @@ public static function fromInstitutionAuthorizations( return new self($institution, $institutionAuthorizations); } - /** - * InstitutionAuthorizationOption - * @return InstitutionAuthorizationOption - */ - public function getAuthorizationOptionsByRole(InstitutionRole $role) + public function getAuthorizationOptionsByRole(InstitutionRole $role): InstitutionAuthorizationOption { if (!isset($this->institutionOptions[$role->getType()])) { return InstitutionAuthorizationOption::getEmpty($role); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php index 10bbcad1c..26fc80e3f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php @@ -22,8 +22,10 @@ use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Authorization\Service\CommandAuthorizationService; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\AbstractCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Metadata; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\SelfServiceExecutable; use Surfnet\StepupMiddleware\CommandHandlingBundle\EventSourcing\MetadataEnricher; use Surfnet\StepupMiddleware\CommandHandlingBundle\Exception\ForbiddenException; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\CreateIdentityCommand; @@ -34,6 +36,7 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface; +use function sprintf; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) @@ -49,7 +52,7 @@ public function __construct( ) { } - public function handle(Command $command, Metadata $metadata, Request $request): JsonResponse + public function handle(AbstractCommand $command, Metadata $metadata, Request $request): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS']); $this->logger->notice(sprintf('Received request to process Command "%s"', $command)); @@ -101,7 +104,7 @@ private function resolveInstitution(Command $command, Metadata $metadata): Insti ); } - private function handleAuthorization(Command $command, Metadata $metadata): void + private function handleAuthorization(AbstractCommand $command, Metadata $metadata): void { // Get the actorId and actorInstitution from the metadata // Be aware that these values could be null when executing commands where we shouldn't log in for @@ -135,13 +138,15 @@ private function handleAuthorization(Command $command, Metadata $metadata): void $command, $actorId, )) { - throw new AccessDeniedHttpException( - sprintf( + $message = 'Processing of SelfService command denied, see log entries for details'; + if ($command instanceof SelfServiceExecutable) { + $message = sprintf( 'The actor "%s" is not allowed to act on behalf of identity "%s" processing of SelfService command denied', new IdentityId($metadata->actorId), $command->getIdentityId(), - ), - ); + ); + } + throw new AccessDeniedHttpException($message); } // Validate that if a command is an RAExecutable we may execute the command diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DateTimeType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DateTimeType.php index f9809b1a8..dfd3be74b 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DateTimeType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DateTimeType.php @@ -20,7 +20,6 @@ use DateTime as CoreDateTime; use DateTimeZone; -use Doctrine\DBAL\DBALException; use Doctrine\DBAL\Platforms\AbstractPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; @@ -37,19 +36,13 @@ class DateTimeType extends Type * @param array $column * @param AbstractPlatform $platform * @return string - * @throws DBALException */ public function getSQLDeclaration(array $column, AbstractPlatform $platform): string { return $platform->getDateTimeTypeDeclarationSQL($column); } - /** - * @param mixed $value - * @param AbstractPlatform $platform - * @return null|string - */ - public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string + public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): ?string { if ($value === null) { return null; @@ -62,12 +55,9 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str } /** - * @param mixed $value - * @param AbstractPlatform $platform - * @return null|DateTime * @throws ConversionException */ - public function convertToPHPValue($value, AbstractPlatform $platform): ?DateTime + public function convertToPHPValue(mixed $value, AbstractPlatform $platform): ?DateTime { if (is_null($value)) { return $value; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DocumentNumberType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DocumentNumberType.php index 46ce0a7ba..ddfea6a16 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DocumentNumberType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DocumentNumberType.php @@ -18,10 +18,10 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type; -use Doctrine\DBAL\DBALException; use Doctrine\DBAL\Platforms\AbstractPlatform; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; +use Surfnet\Stepup\Exception\InvalidArgumentException; use Surfnet\Stepup\Identity\Value\DocumentNumber; /** @@ -31,21 +31,12 @@ class DocumentNumberType extends Type { public const NAME = 'stepup_document_number'; - /** - * @param array $column - * @param AbstractPlatform $platform - * @return string - * @throws DBALException - */ public function getSQLDeclaration(array $column, AbstractPlatform $platform): string { return $platform->getVarcharTypeDeclarationSQL($column); } /** - * @param mixed $value - * @param AbstractPlatform $platform - * @return null|string * @throws ConversionException */ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string @@ -68,12 +59,9 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str } /** - * @param mixed $value - * @param AbstractPlatform $platform - * @return null|DocumentNumber - * @throws ConversionException + * @throws InvalidArgumentException */ - public function convertToPHPValue($value, AbstractPlatform $platform): ?DocumentNumber + public function convertToPHPValue(mixed $value, AbstractPlatform $platform): ?DocumentNumber { if (is_null($value)) { return null; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RecoveryTokenStatusType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RecoveryTokenStatusType.php index 26c97a724..0cfd34c42 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RecoveryTokenStatusType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RecoveryTokenStatusType.php @@ -36,10 +36,9 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st } /** - * @param mixed $value * @throws ConversionException */ - public function convertToDatabaseValue($value, AbstractPlatform $platform): int + public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): int { if (!$value instanceof RecoveryTokenStatus) { throw new ConversionException( @@ -63,10 +62,9 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): int } /** - * @param mixed $value * @throws ConversionException */ - public function convertToPHPValue($value, AbstractPlatform $platform): RecoveryTokenStatus + public function convertToPHPValue(mixed $value, AbstractPlatform $platform): RecoveryTokenStatus { if ($value === '0') { return RecoveryTokenStatus::active(); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorStatusType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorStatusType.php index d0bd3199c..f179fde92 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorStatusType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorStatusType.php @@ -42,12 +42,9 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st } /** - * @param mixed $value - * @param AbstractPlatform $platform - * @return int * @throws ConversionException */ - public function convertToDatabaseValue($value, AbstractPlatform $platform): int + public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): int { if (!$value instanceof SecondFactorStatus) { throw new ConversionException( @@ -75,12 +72,9 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): int } /** - * @param mixed $value - * @param AbstractPlatform $platform - * @return SecondFactorStatus * @throws ConversionException */ - public function convertToPHPValue($value, AbstractPlatform $platform): SecondFactorStatus + public function convertToPHPValue(mixed $value, AbstractPlatform $platform): SecondFactorStatus { if ($value === '0') { return SecondFactorStatus::unverified(); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/EventListener/ExceptionListener.php b/src/Surfnet/StepupMiddleware/ApiBundle/EventListener/ExceptionListener.php index c4c3f12f8..df2fb4e40 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/EventListener/ExceptionListener.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/EventListener/ExceptionListener.php @@ -74,11 +74,6 @@ private function logException(Throwable $throwable): void } } - /** - * @param Throwable $exception - * @param array $headers OPTIONAL - * @return JsonResponse - */ private function createJsonErrorResponse(Throwable $throwable, int $statusCode, array $headers = []): JsonResponse { if ($throwable instanceof BadApiRequestException diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Exception/InvalidArgumentException.php b/src/Surfnet/StepupMiddleware/ApiBundle/Exception/InvalidArgumentException.php index 1a0a78c36..d76474f23 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Exception/InvalidArgumentException.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Exception/InvalidArgumentException.php @@ -22,14 +22,7 @@ class InvalidArgumentException extends CoreInvalidArgumentException implements Exception { - /** - * @param string $expected description of expected type - * @param string $parameterName - * @param mixed $parameter the parameter that is not of the expected type. - * - * @return self - */ - public static function invalidType($expected, $parameterName, mixed $parameter): self + public static function invalidType(string $expected, string $parameterName, mixed $parameter): self { $message = sprintf( 'Invalid argument type: "%s" expected, "%s" given for "%s"', diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuditLogRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuditLogRepository.php index 5044a54e5..53ce97c6c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuditLogRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuditLogRepository.php @@ -106,7 +106,6 @@ public function __construct(ManagerRegistry $registry) /** * @SuppressWarnings(PHPMD.CyclomaticComplexity) - The filtering switch triggers the CyclomaticComplexity, it does * not actually make the class complex or hard to maintain. - * @return Query */ public function createSecondFactorSearchQuery(SecondFactorAuditLogQuery $query): Query { @@ -133,7 +132,7 @@ public function createSecondFactorSearchQuery(SecondFactorAuditLogQuery $query): /** * @return AuditLogEntry[] */ - public function findEntriesWhereIdentityIsActorOnly(IdentityId $actorId) + public function findEntriesWhereIdentityIsActorOnly(IdentityId $actorId): array { return $this->createQueryBuilder('al') ->where('al.actorId = :actorId') @@ -144,10 +143,9 @@ public function findEntriesWhereIdentityIsActorOnly(IdentityId $actorId) } /** - * @param IdentityId $actorId * @return AuditLogEntry[] */ - public function findByIdentityId(IdentityId $identityId) + public function findByIdentityId(IdentityId $identityId): array { return $this->createQueryBuilder('al') ->where('al.identityId = :identityId') diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php index 857df7e74..f61331e7b 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php @@ -119,7 +119,7 @@ public function getInstitutionsForRole(RegistrationAuthorityRole $role, Identity $this->logger->notice( sprintf( 'Adding %s to authorized institutions from %s', - $role->getType(), + $role, $institution['institution'], ), ); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php index 2a5246851..80740d199 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php @@ -42,20 +42,12 @@ public function __construct( parent::__construct($registry, RaListing::class); } - /** - * @param IdentityId $identityId The RA's identity id. - * @return null|RaListing[] - */ - public function findByIdentityId(IdentityId $identityId): array + public function findByIdentityId(IdentityId $identityId): ?array { return parent::findBy(['identityId' => (string)$identityId]); } - /** - * @param IdentityId $identityId The RA's identity id. - * @return null|RaListing - */ - public function findByIdentityIdAndRaInstitution(IdentityId $identityId, Institution $raInstitution): ?object + public function findByIdentityIdAndRaInstitution(IdentityId $identityId, Institution $raInstitution): ?RaListing { return parent::findOneBy([ 'identityId' => (string)$identityId, @@ -63,16 +55,11 @@ public function findByIdentityIdAndRaInstitution(IdentityId $identityId, Institu ]); } - - /** - * @param IdentityId $identityId The RA's identity id. - * @return null|RaListing - */ public function findByIdentityIdAndRaInstitutionWithContext( IdentityId $identityId, Institution $raInstitution, InstitutionAuthorizationContextInterface $authorizationContext, - ) { + ): ?RaListing { $queryBuilder = $this->createQueryBuilder('r') ->where('r.identityId = :identityId') ->andWhere('r.raInstitution = :raInstitution') @@ -95,7 +82,6 @@ public function findByIdentityIdAndRaInstitutionWithContext( } /** - * @param IdentityId $identityId The RA's identity id. * @return RaListing[] */ public function findByIdentityIdAndInstitution(IdentityId $identityId, Institution $institution): array @@ -115,8 +101,6 @@ public function save(RaListing $raListingEntry): void /** * @SuppressWarnings(PHPMD.CyclomaticComplexity) The amount of if statements do not necessarily make the method * @SuppressWarnings(PHPMD.NPathComplexity) below complex or hard to maintain. - * - * @return Query */ public function createSearchQuery(RaListingQuery $query): Query { @@ -183,9 +167,6 @@ public function createSearchQuery(RaListingQuery $query): Query return $queryBuilder->getQuery(); } - /** - * @return Query - */ public function createOptionsQuery(RaListingQuery $query): Query { $queryBuilder = $this->createQueryBuilder('r') @@ -206,9 +187,6 @@ public function createOptionsQuery(RaListingQuery $query): Query return $queryBuilder->getQuery(); } - /** - * @return ArrayCollection - */ public function listRasFor(Institution $raInstitution): ArrayCollection { $listings = $this->createQueryBuilder('rl') @@ -220,9 +198,6 @@ public function listRasFor(Institution $raInstitution): ArrayCollection return new ArrayCollection($listings); } - /** - * @return void - */ public function removeByIdentityId(IdentityId $identityId, Institution $institution): void { $this->getEntityManager()->createQueryBuilder() @@ -235,9 +210,6 @@ public function removeByIdentityId(IdentityId $identityId, Institution $institut ->execute(); } - /** - * @return void - */ public function removeByIdentityIdAndRaInstitution(IdentityId $identityId, Institution $raInstitution): void { $this->getEntityManager()->createQueryBuilder() @@ -250,9 +222,6 @@ public function removeByIdentityIdAndRaInstitution(IdentityId $identityId, Insti ->execute(); } - /** - * @return void - */ public function removeByIdentityIdAndInstitution(IdentityId $identityId, Institution $institution): void { $this->getEntityManager()->createQueryBuilder() diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php index dd9f10930..bf68aa1c2 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php @@ -19,7 +19,6 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Repository; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; -use Doctrine\DBAL\DBALException; use Doctrine\DBAL\Types\Type; use Doctrine\ORM\Query; use Doctrine\Persistence\ManagerRegistry; @@ -71,9 +70,6 @@ public function findByInstitution($institution): array * @SuppressWarnings(PHPMD.CyclomaticComplexity) The amount of if statements do not necessarily make the method * below complex or hard to maintain. * @SuppressWarnings(PHPMD.NPathComplexity) - * - * @return Query - * @throws DBALException */ public function createSearchQuery(RaSecondFactorQuery $query): Query { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/IdentityService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/IdentityService.php index 01ea58a32..0036ee754 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/IdentityService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/IdentityService.php @@ -18,6 +18,8 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Service; +use Iterator; +use IteratorAggregate; use Pagerfanta\Pagerfanta; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\Institution; @@ -32,6 +34,7 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RaListingRepository; use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\SraaRepository; use Surfnet\StepupMiddleware\ApiBundle\Identity\Value\RegistrationAuthorityCredentials; +use Traversable; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) @@ -55,22 +58,14 @@ public function find(mixed $id): ?Identity return $this->repository->find($id); } - /** - * @param InstitutionRoleSet $institutionRoles - * @return Pagerfanta - */ - public function search(IdentityQuery $query) + public function search(IdentityQuery $query): Pagerfanta { $searchQuery = $this->repository->createSearchQuery($query); return $this->createPaginatorFrom($searchQuery, $query); } - /** - * @param string $identityId - * @return null|RegistrationAuthorityCredentials - */ - public function findRegistrationAuthorityCredentialsOf($identityId) + public function findRegistrationAuthorityCredentialsOf(string $identityId): ?RegistrationAuthorityCredentials { $identity = $this->find($identityId); @@ -81,11 +76,10 @@ public function findRegistrationAuthorityCredentialsOf($identityId) return $this->findRegistrationAuthorityCredentialsByIdentity($identity); } - /** - * @return RegistrationAuthorityCredentials|null - */ - public function findRegistrationAuthorityCredentialsByNameIdAndInstitution(NameId $nameId, Institution $institution) - { + public function findRegistrationAuthorityCredentialsByNameIdAndInstitution( + NameId $nameId, + Institution $institution + ): ?RegistrationAuthorityCredentials { $query = new IdentityQuery(); $query->nameId = $nameId->getNameId(); $query->institution = $institution->getInstitution(); @@ -109,8 +103,11 @@ public function findRegistrationAuthorityCredentialsByNameIdAndInstitution(NameI ); } + /** @var Iterator $collection */ + $collection = $identities->getIterator(); + /** @var Identity $identity */ - $identity = $identities->getIterator()->current(); + $identity = $collection->current(); return $this->findRegistrationAuthorityCredentialsByIdentity($identity); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RegistrationAuthorityCredentials.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RegistrationAuthorityCredentials.php index 3723b8a53..620c02113 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RegistrationAuthorityCredentials.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RegistrationAuthorityCredentials.php @@ -30,42 +30,25 @@ class RegistrationAuthorityCredentials implements JsonSerializable { - /** - * @var Institution - */ - private $institution; + private Institution $institution; - /** - * @var CommonName - */ - private $commonName; + private CommonName $commonName; - /** - * @var Location|null - */ - private $location; + private ?Location $location; - /** - * @var ContactInformation|null - */ - private $contactInformation; + private ?ContactInformation $contactInformation; - /** - * @param string $identityId - * @param bool $isRa - * @param bool $isRaa - * @param bool $isSraa - */ - private function __construct(private $identityId, private $isRa, private $isRaa, private $isSraa) - { + private function __construct( + private readonly string $identityId, + private readonly bool $isRa, + private readonly bool $isRaa, + private bool $isSraa + ) { } - /** - * @return RegistrationAuthorityCredentials - */ public static function fromSraa(Sraa $sraa, Identity $identity): self { - static::assertEquals($sraa->nameId, $identity->nameId); + self::assertEquals($sraa->nameId, $identity->nameId); $credentials = new self($identity->id, true, true, true); $credentials->commonName = $identity->commonName; @@ -75,7 +58,6 @@ public static function fromSraa(Sraa $sraa, Identity $identity): self /** * @param RaListing[] $raListings - * @return RegistrationAuthorityCredentials */ public static function fromRaListings(array $raListings): self { @@ -108,10 +90,6 @@ public static function fromRaListings(array $raListings): self return $credentials; } - - /** - * @return RegistrationAuthorityCredentials - */ public static function fromRaListing(RaListing $raListing): self { $credentials = new self( @@ -129,19 +107,11 @@ public static function fromRaListing(RaListing $raListing): self return $credentials; } - /** - * @param string $nameId - * @param string $identityNameId - * @return void - */ - private static function assertEquals($nameId, $identityNameId): void + private static function assertEquals(string $nameId, string $identityNameId): void { Assertion::eq($nameId, $identityNameId); } - /** - * @return RegistrationAuthorityCredentials - */ public function grantSraa(): static { $copy = clone $this; @@ -150,9 +120,6 @@ public function grantSraa(): static return $copy; } - /** - * @return bool - */ public function equals(RegistrationAuthorityCredentials $other): bool { return $other->jsonSerialize() === $this->jsonSerialize(); @@ -174,66 +141,42 @@ public function jsonSerialize(): array ]; } - /** - * @return string - */ - public function getIdentityId() + public function getIdentityId(): string { return $this->identityId; } - /** - * @return Institution - */ - public function getInstitution() + public function getInstitution(): Institution { return $this->institution; } - /** - * @return CommonName - */ - public function getCommonName() + public function getCommonName(): CommonName { return $this->commonName; } - /** - * @return string - */ - public function getLocation() + public function getLocation(): string { return $this->location; } - /** - * @return string - */ - public function getContactInformation() + public function getContactInformation(): string { return $this->contactInformation; } - /** - * @return boolean - */ - public function isRa() + public function isRa(): bool { return $this->isRa; } - /** - * @return boolean - */ - public function isRaa() + public function isRaa(): bool { return $this->isRaa; } - /** - * @return boolean - */ - public function isSraa() + public function isSraa(): bool { return $this->isSraa; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Filter/InstitutionAuthorizationRepositoryFilterTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Filter/InstitutionAuthorizationRepositoryFilterTest.php index 312ddad43..72a6810f4 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Filter/InstitutionAuthorizationRepositoryFilterTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Filter/InstitutionAuthorizationRepositoryFilterTest.php @@ -23,7 +23,6 @@ use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; -use PHPUnit_Framework_MockObject_MockObject; use Surfnet\Stepup\Identity\Collection\InstitutionCollection; use Surfnet\Stepup\Identity\Value\Institution as InstitutionValue; use Surfnet\StepupMiddleware\ApiBundle\Authorization\Filter\InstitutionAuthorizationRepositoryFilter; @@ -33,20 +32,11 @@ class InstitutionAuthorizationRepositoryFilterTest extends TestCase { use MockeryPHPUnitIntegration; - /** - * @var QueryBuilder - */ private QueryBuilder $queryBuilder; - /** - * @var EntityManager - */ - private MockObject $entityManager; + private EntityManager&MockObject $entityManager; - /** - * @var InstitutionAuthorizationContextInterface|PHPUnit_Framework_MockObject_MockObject - */ - private MockObject $mockedAuthorizationContext; + private InstitutionAuthorizationContextInterface&MockObject $mockedAuthorizationContext; public function setUp(): void { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php index d29609355..2e160c5d6 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php @@ -20,6 +20,7 @@ use Mockery as m; use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; +use Mockery\MockInterface; use PHPUnit\Framework\TestCase; use Psr\Log\LoggerInterface; use Ramsey\Uuid\Uuid; @@ -81,26 +82,14 @@ class CommandAuthorizationServiceTest extends TestCase { use MockeryPHPUnitIntegration; - /** - * @var WhitelistService|m\MockInterface - */ - private $whitelistService; - /** - * @var IdentityService|m\MockInterface - */ - private $identityService; - /** - * @var LoggerInterface|m\MockInterface - */ - private $logger; - /** - * @var AuthorizationContextService|m\MockInterface - */ - private $authorizationContextService; + private WhitelistService&MockInterface $whitelistService; + + private IdentityService&MockInterface $identityService; + + private LoggerInterface&MockInterface $logger; + + private AuthorizationContextService&MockInterface $authorizationContextService; - /** - * @var CommandAuthorizationService - */ private CommandAuthorizationService $service; public function setUp(): void @@ -177,10 +166,8 @@ public function a_sraa_should_be_able_to_execute_all_commands($file, Command $co /** * @test * @dataProvider availableCommands - * - * @param mixed $value */ - public function an_identity_should_be_able_to_execute_own_selfservice_commands($file, $command): void + public function an_identity_should_be_able_to_execute_own_selfservice_commands(string $file, mixed $command): void { $this->assertInstanceOf(Command::class, $command); @@ -211,10 +198,8 @@ public function an_identity_should_be_able_to_execute_own_selfservice_commands($ /** * @test * @dataProvider availableCommands - * - * @param mixed $value */ - public function an_identity_should_be_able_to_execute_configured_ra_commands($file, $command): void + public function an_identity_should_be_able_to_execute_configured_ra_commands(string $file, mixed $command): void { $this->assertInstanceOf(Command::class, $command); @@ -273,10 +258,8 @@ public function an_identity_should_be_able_to_execute_configured_ra_commands($fi /** * @test * @dataProvider availableCommands - * - * @param mixed $value */ - public function an_identity_should_be_able_to_execute_configured_ra_and_selfservice_commands($file, $command): void + public function an_identity_should_be_able_to_execute_configured_ra_and_selfservice_commands(string $file, mixed $command): void { $this->assertInstanceOf(Command::class, $command); @@ -331,10 +314,8 @@ public function an_identity_should_be_able_to_execute_configured_ra_and_selfserv /** * @test * @dataProvider availableCommands - * - * @param mixed $value */ - public function an_identity_should_not_be_able_to_execute_someone_elses_selfservice_commands($file, $command): void + public function an_identity_should_not_be_able_to_execute_someone_elses_selfservice_commands(string $file, mixed $command): void { $this->assertInstanceOf(Command::class, $command); @@ -373,10 +354,8 @@ public function an_identity_should_not_be_able_to_execute_someone_elses_selfserv /** * @test * @dataProvider availableCommands - * - * @param mixed $value */ - public function an_identity_should_be_able_to_execute_unconfigured_ra_commands($file, $command): void + public function an_identity_should_be_able_to_execute_unconfigured_ra_commands(string $file, mixed $command): void { $this->assertInstanceOf(Command::class, $command); @@ -433,8 +412,6 @@ public function an_identity_should_be_able_to_execute_unconfigured_ra_commands($ /** * @test - * - * @param mixed $value */ public function all_available_commands_should_be_tested(): void { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionConfigurationOptionsServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionConfigurationOptionsServiceTest.php index db929c8e1..b52f02e8c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionConfigurationOptionsServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionConfigurationOptionsServiceTest.php @@ -20,6 +20,7 @@ use Mockery as m; use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; +use Mockery\MockInterface; use PHPUnit\Framework\TestCase as TestCase; use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\Stepup\Configuration\Value\NumberOfTokensPerIdentityOption; @@ -31,15 +32,9 @@ class InstitutionConfigurationOptionsServiceTest extends TestCase { use MockeryPHPUnitIntegration; - /** - * @var InstitutionConfigurationOptionsService - */ private InstitutionConfigurationOptionsService $service; - /** - * @var InstitutionConfigurationOptionsRepository|Mock - */ - private $repository; + private InstitutionConfigurationOptionsRepository&MockInterface $repository; /** * A representation of the globally configured application setting for the numberOfTokensPerIdentity, this value diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/CommonNameTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/CommonNameTypeTest.php index 035aee960..f1bd6b66b 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/CommonNameTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/CommonNameTypeTest.php @@ -30,9 +30,6 @@ class CommonNameTypeTest extends UnitTest { use MockeryPHPUnitIntegration; - /** - * @var MySqlPlatform - */ private MariaDBPlatform $platform; /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationContactInformationTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationContactInformationTypeTest.php index 00d1bbce4..b546b676d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationContactInformationTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationContactInformationTypeTest.php @@ -30,9 +30,6 @@ class ConfigurationContactInformationTypeTest extends UnitTest { use MockeryPHPUnitIntegration; - /** - * @var MySqlPlatform - */ private MariaDBPlatform $platform; /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationInstitutionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationInstitutionTypeTest.php index a54c82ddb..0ff23bd14 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationInstitutionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationInstitutionTypeTest.php @@ -30,9 +30,6 @@ class ConfigurationInstitutionTypeTest extends UnitTest { use MockeryPHPUnitIntegration; - /** - * @var MySqlPlatform - */ private MariaDBPlatform $platform; /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationLocationTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationLocationTypeTest.php index c4d1021e7..c7896cd1c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationLocationTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationLocationTypeTest.php @@ -30,9 +30,6 @@ class ConfigurationLocationTypeTest extends UnitTest { use MockeryPHPUnitIntegration; - /** - * @var MySqlPlatform - */ private MariaDBPlatform $platform; /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ContactInformationTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ContactInformationTypeTest.php index 10d7921cc..c7906d28d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ContactInformationTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ContactInformationTypeTest.php @@ -30,9 +30,7 @@ class ContactInformationTypeTest extends UnitTest { use MockeryPHPUnitIntegration; - /** - * @var MySqlPlatform - */ + private MariaDBPlatform $platform; /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DateTimeTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DateTimeTypeTest.php index e4b157880..d0dd1ddaf 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DateTimeTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DateTimeTypeTest.php @@ -32,9 +32,7 @@ class DateTimeTypeTest extends UnitTest { use MockeryPHPUnitIntegration; - /** - * @var MySqlPlatform - */ + private MariaDBPlatform $platform; /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DocumentNumberTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DocumentNumberTypeTest.php index cdfd1e9ab..a6c0ab968 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DocumentNumberTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DocumentNumberTypeTest.php @@ -31,9 +31,6 @@ class DocumentNumberTypeTest extends UnitTest { use MockeryPHPUnitIntegration; - /** - * @var MySqlPlatform - */ private MariaDBPlatform $platform; /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/EmailTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/EmailTypeTest.php index 1128b6a72..6c4ed6837 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/EmailTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/EmailTypeTest.php @@ -30,9 +30,6 @@ class EmailTypeTest extends UnitTest { use MockeryPHPUnitIntegration; - /** - * @var MySqlPlatform - */ private MariaDBPlatform $platform; /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionRoleTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionRoleTypeTest.php index 4a811bd4f..c7cb82c67 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionRoleTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionRoleTypeTest.php @@ -30,9 +30,6 @@ class InstitutionRoleTypeTest extends UnitTest { use MockeryPHPUnitIntegration; - /** - * @var MySqlPlatform - */ private MariaDBPlatform $platform; /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionTypeTest.php index 6a7772f4e..edb107a84 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/InstitutionTypeTest.php @@ -30,9 +30,6 @@ class InstitutionTypeTest extends UnitTest { use MockeryPHPUnitIntegration; - /** - * @var MySqlPlatform - */ private MariaDBPlatform $platform; /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocaleTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocaleTypeTest.php index 110b56f47..384bdaafa 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocaleTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocaleTypeTest.php @@ -30,9 +30,6 @@ class LocaleTypeTest extends UnitTest { use MockeryPHPUnitIntegration; - /** - * @var MySqlPlatform - */ private MariaDBPlatform $platform; /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocationTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocationTypeTest.php index 4d0549a18..e1eec910c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocationTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocationTypeTest.php @@ -30,9 +30,7 @@ class LocationTypeTest extends UnitTest { use MockeryPHPUnitIntegration; - /** - * @var MySqlPlatform - */ + private MariaDBPlatform $platform; /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NameIdTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NameIdTypeTest.php index 93d418f0a..6c40a2c0d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NameIdTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NameIdTypeTest.php @@ -30,9 +30,7 @@ class NameIdTypeTest extends UnitTest { use MockeryPHPUnitIntegration; - /** - * @var MySqlPlatform - */ + private MariaDBPlatform $platform; /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NumberOfTokensPerIdentityTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NumberOfTokensPerIdentityTypeTest.php index 2f4aacd7f..8199614fc 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NumberOfTokensPerIdentityTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NumberOfTokensPerIdentityTypeTest.php @@ -30,9 +30,7 @@ class NumberOfTokensPerIdentityTypeTest extends UnitTest { use MockeryPHPUnitIntegration; - /** - * @var MySqlPlatform - */ + private MariaDBPlatform $platform; /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RecoveryTokenStatusTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RecoveryTokenStatusTypeTest.php index 3e79ddc17..6267e421d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RecoveryTokenStatusTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RecoveryTokenStatusTypeTest.php @@ -31,9 +31,6 @@ class RecoveryTokenStatusTypeTest extends UnitTest { use MockeryPHPUnitIntegration; - /** - * @var MySqlPlatform - */ private MariaDBPlatform $platform; /** @@ -88,9 +85,6 @@ public function validPhpValues(): array * @test * @dataProvider validPhpValues * @group doctrine - * - * @param mixed $phpValue - * @param mixed $databaseValue */ public function a_valid_php_value_is_converted_to_a_sql_value( RecoveryTokenStatus $phpValue, @@ -139,8 +133,6 @@ public function validDatabaseValues(): array * @test * @dataProvider validDatabaseValues * @group doctrine - * - * @param mixed $phpValue */ public function a_valid_database_value_is_converted_to_a_sql_value( string $databaseValue, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SecondFactorStatusTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SecondFactorStatusTypeTest.php index d5ca85f14..6fa40236d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SecondFactorStatusTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SecondFactorStatusTypeTest.php @@ -31,9 +31,7 @@ class SecondFactorStatusTypeTest extends UnitTest { use MockeryPHPUnitIntegration; - /** - * @var MySqlPlatform - */ + private MariaDBPlatform $platform; /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SelfVetOptionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SelfVetOptionTypeTest.php index a333103dd..0e3fa9571 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SelfVetOptionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SelfVetOptionTypeTest.php @@ -30,9 +30,7 @@ class SelfVetOptionTypeTest extends UnitTest { use MockeryPHPUnitIntegration; - /** - * @var MySqlPlatform - */ + private MariaDBPlatform $platform; /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ShowRaaContactInformationOptionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ShowRaaContactInformationOptionTypeTest.php index b562c5cd0..2e494ff83 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ShowRaaContactInformationOptionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ShowRaaContactInformationOptionTypeTest.php @@ -31,9 +31,7 @@ class ShowRaaContactInformationOptionTypeTest extends UnitTest { use MockeryPHPUnitIntegration; - /** - * @var MySqlPlatform - */ + private MariaDBPlatform $platform; /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/UseRaLocationsOptionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/UseRaLocationsOptionTypeTest.php index 9cefbb413..aa35e5b0e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/UseRaLocationsOptionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/UseRaLocationsOptionTypeTest.php @@ -30,9 +30,7 @@ class UseRaLocationsOptionTypeTest extends UnitTest { use MockeryPHPUnitIntegration; - /** - * @var MySqlPlatform - */ + private MariaDBPlatform $platform; /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/VerifyEmailOptionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/VerifyEmailOptionTypeTest.php index feb1705b5..987336b6d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/VerifyEmailOptionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/VerifyEmailOptionTypeTest.php @@ -30,9 +30,6 @@ class VerifyEmailOptionTypeTest extends UnitTest { use MockeryPHPUnitIntegration; - /** - * @var MySqlPlatform - */ private MariaDBPlatform $platform; /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php index 3111855a2..af79059b7 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php @@ -30,9 +30,6 @@ class ConfiguredInstitutionControllerTest extends WebTestCase { use MockeryPHPUnitIntegration; - /** - * @var Client - */ private KernelBrowser $client; /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php index bf0a68458..ee7e9acbe 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php @@ -31,9 +31,6 @@ class SraaControllerTest extends WebTestCase { use MockeryPHPUnitIntegration; - /** - * @var Client - */ private KernelBrowser $client; /** @@ -41,9 +38,6 @@ class SraaControllerTest extends WebTestCase */ private array $accounts; - /** - * @var string - */ private string $endpoint; private DatabaseToolCollection $databaseTool; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php index 127486a42..9ef5b6cd6 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php @@ -21,7 +21,9 @@ use Mockery as m; use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use Mockery\Matcher\MatcherAbstract; +use Mockery\MockInterface; use PHPUnit\Framework\TestCase; +use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; use stdClass; use Surfnet\StepupMiddleware\ApiBundle\Exception\BadCommandRequestException; use Surfnet\StepupMiddleware\ApiBundle\Request\CommandParamConverter; @@ -62,14 +64,14 @@ public function it_can_convert_command_name_notation($expectedCommandClass, stri { $command = ['command' => ['name' => $commandName, 'uuid' => 'abcdef', 'payload' => new stdClass]]; - /** @var Request&m\Mock $request */ + /** @var Request&MockInterface $request */ $request = m::mock(Request::class) ->shouldReceive('getContent')->with()->andReturn(json_encode($command)) ->getMock(); $request->attributes = m::mock() ->shouldReceive('set')->with('command', m::type($expectedCommandClass)) ->getMock(); - $configuration = m::mock('Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter'); + $configuration = m::mock(ParamConverter::class); $converter = new CommandParamConverter(); $converter->apply($request, $configuration); @@ -85,13 +87,14 @@ public function it_sets_uuid(): void { $command = ['command' => ['name' => 'Root:FooBar', 'uuid' => 'abcdef', 'payload' => new stdClass]]; + /** @var Request&MockInterface $request */ $request = m::mock(Request::class) ->shouldReceive('getContent')->with()->andReturn(json_encode($command)) ->getMock(); $request->attributes = m::mock() ->shouldReceive('set')->with('command', $this->spy($spiedCommand)) ->getMock(); - $configuration = m::mock('Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter'); + $configuration = m::mock(ParamConverter::class); $converter = new CommandParamConverter(); $converter->apply($request, $configuration); @@ -107,13 +110,14 @@ public function it_sets_payload(): void { $command = ['command' => ['name' => 'Root:FooBar', 'uuid' => 'abcdef', 'payload' => ['snake_case' => true]]]; + /** @var Request&MockInterface $request */ $request = m::mock(Request::class) ->shouldReceive('getContent')->with()->andReturn(json_encode($command)) ->getMock(); $request->attributes = m::mock() ->shouldReceive('set')->with('command', $this->spy($spiedCommand)) ->getMock(); - $configuration = m::mock('Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter'); + $configuration = m::mock(ParamConverter::class); $converter = new CommandParamConverter(); $converter->apply($request, $configuration); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php index 30b148fe0..490b21aa6 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php @@ -54,9 +54,6 @@ public function subscribe(EventListenerInterface $eventListener): void $this->eventListeners[] = $eventListener; } - /** - * @throws Throwable - */ public function publish(DomainEventStreamInterface $domainMessages): void { foreach ($domainMessages as $domainMessage) { @@ -66,6 +63,7 @@ public function publish(DomainEventStreamInterface $domainMessages): void /** * Flushes the buffered domain messages to all event listeners. + * @throws Exception */ public function flush(): void { @@ -93,7 +91,7 @@ public function flush(): void // This comes with a caveat: event listeners cannot hold references to certain entities between events $this->entityManager->clear(); } - } catch (Exception $e) { + } catch (Throwable $e) { $this->isFlushing = false; array_splice($this->buffer, 0, 0, $buffer); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Exception/Exception.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Exception/Exception.php index d311543e3..ce4fe5a24 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Exception/Exception.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Exception/Exception.php @@ -18,6 +18,8 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Exception; -interface Exception +use Throwable; + +interface Exception extends Throwable { } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Exception/InvalidArgumentException.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Exception/InvalidArgumentException.php index 9aceca79b..725a658ec 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Exception/InvalidArgumentException.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Exception/InvalidArgumentException.php @@ -20,14 +20,7 @@ class InvalidArgumentException extends \InvalidArgumentException implements Exception { - /** - * @param string $expected description of expected type - * @param string $parameterName - * @param mixed $parameter the parameter that is not of the expected type. - * - * @return self - */ - public static function invalidType($expected, $parameterName, mixed $parameter): self + public static function invalidType(string $expected, string $parameterName, mixed $parameter): self { $message = sprintf( 'Invalid argument type: "%s" expected, "%s" given for "%s"', diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AppointRoleCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AppointRoleCommand.php index d9a503bc4..ad2b99fc2 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AppointRoleCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AppointRoleCommand.php @@ -32,7 +32,7 @@ class AppointRoleCommand extends AbstractCommand implements RaExecutable public $identityId; /** - * @var + * @var string */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Pipeline.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Pipeline.php index fbdb8d1ac..9c81b2ca0 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Pipeline.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Pipeline.php @@ -18,7 +18,7 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline; -use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\AbstractCommand; /** * Describes a linear structure in which commands are processed. For example, authorisation may be checked and @@ -26,8 +26,5 @@ */ interface Pipeline { - /** - * @return Command - */ - public function process(Command $command); + public function process(AbstractCommand $command): AbstractCommand; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/StagedPipeline.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/StagedPipeline.php index d5aaa6b0f..d993c48ec 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/StagedPipeline.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/StagedPipeline.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline; use Psr\Log\LoggerInterface; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\AbstractCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; class StagedPipeline implements Pipeline @@ -32,7 +33,7 @@ public function __construct(private readonly LoggerInterface $logger) { } - public function process(Command $command) + public function process(AbstractCommand $command): AbstractCommand { $this->logger->debug(sprintf('Processing "%s"', $command)); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/TransactionAwarePipeline.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/TransactionAwarePipeline.php index 2023e488d..b74b2d761 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/TransactionAwarePipeline.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/TransactionAwarePipeline.php @@ -21,7 +21,7 @@ use Doctrine\DBAL\Connection; use Exception; use Psr\Log\LoggerInterface; -use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\AbstractCommand; class TransactionAwarePipeline implements Pipeline { @@ -33,7 +33,7 @@ public function __construct( ) { } - public function process(Command $command) + public function process(AbstractCommand $command): AbstractCommand { $this->logger->debug( sprintf( diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcher.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcher.php index 72f7ae228..7c12ca630 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcher.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcher.php @@ -19,17 +19,18 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\Mockery; use Mockery\Exception\RuntimeException; -use Mockery\Matcher\MatcherInterface; +use Mockery\Matcher\MatcherAbstract; -final class HasInstitutionMatcher implements MatcherInterface +final class HasInstitutionMatcher extends MatcherAbstract { - public function __construct(private $expected) + public function __construct($expected) { - if (!is_string($this->expected)) { + if (!is_string($expected)) { throw new RuntimeException( sprintf('In order to use the %s, a string should be given.', self::class), ); } + parent::__construct($expected); } public function match(&$actual): bool @@ -39,10 +40,10 @@ public function match(&$actual): bool } if (method_exists($actual, 'getInstitution')) { - return $this->expected === $actual->getInstitution(); + return $this->_expected === $actual->getInstitution(); } if (property_exists($actual, 'institution')) { - return $this->expected === $actual->institution; + return $this->_expected === $actual->institution; } return false; @@ -50,6 +51,6 @@ public function match(&$actual): bool public function __toString(): string { - return sprintf('', $this->expected); + return sprintf('', $this->_expected); } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/ValidationStageTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/ValidationStageTest.php index 3cce1632e..c0fd0f831 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/ValidationStageTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/ValidationStageTest.php @@ -61,11 +61,10 @@ public function it_throws_an_exception_when_validation_fails(): void $this->expectException(InvalidCommandException::class); $command = m::mock(Command::class); - $violations = m::mock(ConstraintViolationListInterface::class) - ->shouldReceive('count')->with()->andReturn(1); - $violations - ->shouldReceive('getIterator')->with()->andReturn(new ArrayIterator()) - ->getMock(); + $violations = m::mock(ConstraintViolationListInterface::class); + $violations->allows()->count()->andReturn(1); + $violations->allows()->getIterator()->andReturn(new ArrayIterator())->getMock(); + $validator = m::mock(ValidatorInterface::class) ->shouldReceive('validate')->once()->with($command)->andReturn($violations) ->getMock(); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Exception/InvalidArgumentException.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Exception/InvalidArgumentException.php index 4e4fa23d9..2f8d2533c 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Exception/InvalidArgumentException.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Exception/InvalidArgumentException.php @@ -20,14 +20,7 @@ class InvalidArgumentException extends \InvalidArgumentException implements Exception { - /** - * @param string $expected description of expected type - * @param string $parameterName - * @param mixed $parameter the parameter that is not of the expected type. - * - * @return self - */ - public static function invalidType($expected, $parameterName, mixed $parameter): self + public static function invalidType(string $expected, string $parameterName, mixed $parameter): self { $message = sprintf( 'Invalid argument type: "%s" expected, "%s" given for "%s"', diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php index a43404c5b..8e81795a9 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php @@ -85,7 +85,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int $command->commonName = $input->getArgument('common-name'); $command->email = $input->getArgument('email'); $command->preferredLocale = $input->getArgument('preferred-locale'); - $command->secondFactorId = (string)Uuid::uuid4(); + $secondFactorId = (string)Uuid::uuid4(); + $command->secondFactorId = $secondFactorId; $command->yubikeyPublicId = $input->getArgument('yubikey'); $this->transactionHelper->beginTransaction(); @@ -109,7 +110,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int $output->writeln( sprintf( 'Successfully registered a Yubikey token with UUID %s', - $command->secondFactorId, + $secondFactorId, ), ); return 0; diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Exception/InvalidArgumentException.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Exception/InvalidArgumentException.php index 41d4c67f8..bf6bf3528 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Exception/InvalidArgumentException.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Exception/InvalidArgumentException.php @@ -22,14 +22,7 @@ class InvalidArgumentException extends CoreInvalidArgumentException { - /** - * @param string $expected description of expected type - * @param string $parameterName - * @param mixed $parameter the parameter that is not of the expected type. - * - * @return self - */ - public static function invalidType($expected, $parameterName, mixed $parameter): self + public static function invalidType(string $expected, string $parameterName, mixed $parameter): self { $message = sprintf( 'Invalid argument type: "%s" expected, "%s" given for "%s"', diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php index 0ae8991e6..49ba7e401 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php @@ -20,6 +20,7 @@ use Broadway\Domain\DomainEventStream; use Broadway\Domain\DomainMessage; +use Doctrine\DBAL\Exception\InvalidArgumentException; use Exception; use Surfnet\StepupMiddleware\CommandHandlingBundle\EventHandling\BufferedEventBus; use Surfnet\StepupMiddleware\MiddlewareBundle\EventSourcing\DBALEventHydrator; @@ -85,7 +86,7 @@ public function replayEvents(OutputInterface $output, $increments): void $preparationProgress->advance(); $preparationProgress->setMessage('Determining amount of events to replay...'); - $totalEvents = $this->eventHydrator->getCount(); + $totalEvents = (int) $this->eventHydrator->getCount(); $preparationProgress->advance(); @@ -148,6 +149,9 @@ public function replayEvents(OutputInterface $output, $increments): void } } + /** + * @throws InvalidArgumentException|\Doctrine\DBAL\Exception + */ private function wipeReadTables(OutputInterface $output): void { if ($output->getVerbosity() === OutputInterface::VERBOSITY_DEBUG) { From 3dc4490cf39c77cad40d5f207edcccf24deeffdd Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Wed, 20 Mar 2024 09:38:28 +0100 Subject: [PATCH 40/89] Address level 3 PHPStan issues --- .../Migrations/Version20210610131957.php | 9 +- .../Configuration/Api/Configuration.php | 4 +- .../Api/InstitutionConfiguration.php | 32 +-- .../Stepup/Configuration/Configuration.php | 6 +- .../Configuration/Entity/RaLocation.php | 16 +- .../Event/ConfigurationEvent.php | 2 +- .../Event/ConfigurationUpdatedEvent.php | 4 +- .../Event/EmailTemplatesUpdatedEvent.php | 2 +- .../Event/IdentityProvidersUpdatedEvent.php | 2 +- .../InstitutionConfigurationRemovedEvent.php | 4 +- ...ewInstitutionConfigurationCreatedEvent.php | 18 +- .../Event/RaLocationAddedEvent.php | 12 +- ...LocationContactInformationChangedEvent.php | 6 +- .../Event/RaLocationRelocatedEvent.php | 6 +- .../Event/RaLocationRemovedEvent.php | 6 +- .../Event/RaLocationRenamedEvent.php | 6 +- .../Event/ServiceProvidersUpdatedEvent.php | 2 +- .../Configuration/Event/SraaUpdatedEvent.php | 2 +- .../InstitutionConfiguration.php | 71 +++---- .../Value/ContactInformation.php | 6 +- .../Configuration/Value/Institution.php | 9 +- .../Value/InstitutionAuthorizationOption.php | 5 +- .../Value/InstitutionConfigurationId.php | 9 +- .../Configuration/Value/InstitutionRole.php | 7 +- .../Stepup/Configuration/Value/Location.php | 9 +- .../Value/NumberOfTokensPerIdentityOption.php | 13 +- .../Configuration/Value/RaLocationId.php | 9 +- .../Configuration/Value/RaLocationList.php | 10 +- .../Configuration/Value/RaLocationName.php | 12 +- .../Value/ShowRaaContactInformationOption.php | 5 +- .../Value/UseRaLocationsOption.php | 5 +- .../Configuration/Value/VerifyEmailOption.php | 5 +- src/Surfnet/Stepup/DateTime/DateTime.php | 30 +-- .../SecondFactorProvePossessionHelper.php | 3 - src/Surfnet/Stepup/Identity/Api/Id.php | 5 +- src/Surfnet/Stepup/Identity/Api/Identity.php | 179 ++++++----------- src/Surfnet/Stepup/Identity/Api/Whitelist.php | 16 +- .../Stepup/Identity/AuditLog/Metadata.php | 18 +- .../Identity/Entity/ConfigurableSettings.php | 8 +- .../Identity/Entity/InstitutionCollection.php | 2 +- .../Identity/Entity/RegistrationAuthority.php | 16 +- .../Entity/SecondFactorCollection.php | 5 +- .../Entity/UnverifiedSecondFactor.php | 34 ++-- .../Identity/Entity/VerifiedSecondFactor.php | 40 ++-- .../Identity/Entity/VettedSecondFactor.php | 12 +- .../AppointedAsRaForInstitutionEvent.php | 4 +- .../Stepup/Identity/Event/AuditableEvent.php | 2 +- ...ompliedWithRecoveryCodeRevocationEvent.php | 6 +- .../Event/CompliedWithRevocationEvent.php | 10 +- .../Identity/Event/EmailVerifiedEvent.php | 32 +-- .../GssfPossessionProvenAndVerifiedEvent.php | 36 ++-- .../Event/GssfPossessionProvenEvent.php | 56 +++--- .../Event/IdentityAccreditedAsRaEvent.php | 8 +- ...ntityAccreditedAsRaForInstitutionEvent.php | 10 +- .../Event/IdentityAccreditedAsRaaEvent.php | 8 +- ...tityAccreditedAsRaaForInstitutionEvent.php | 10 +- .../Identity/Event/IdentityCreatedEvent.php | 10 +- .../Event/IdentityEmailChangedEvent.php | 4 +- .../Stepup/Identity/Event/IdentityEvent.php | 4 +- .../Identity/Event/IdentityRenamedEvent.php | 4 +- .../InstitutionsAddedToWhitelistEvent.php | 2 +- .../InstitutionsRemovedFromWhitelistEvent.php | 2 +- .../Event/LocalePreferenceExpressedEvent.php | 2 +- .../PhonePossessionProvenAndVerifiedEvent.php | 34 ++-- .../Event/PhonePossessionProvenEvent.php | 40 ++-- ...honeRecoveryTokenPossessionProvenEvent.php | 18 +- .../Event/RecoveryTokenRevokedEvent.php | 4 +- ...rationAuthorityInformationAmendedEvent.php | 6 +- ...yInformationAmendedForInstitutionEvent.php | 8 +- .../RegistrationAuthorityRetractedEvent.php | 8 +- ...nAuthorityRetractedForInstitutionEvent.php | 10 +- ...etRecoveryTokenPossessionPromisedEvent.php | 4 +- .../Event/SecondFactorMigratedEvent.php | 20 +- .../Event/SecondFactorMigratedToEvent.php | 12 +- .../Event/SecondFactorRevokedEvent.php | 8 +- .../Event/SecondFactorVettedEvent.php | 16 +- ...torVettedWithoutTokenProofOfPossession.php | 18 +- ...DevicePossessionProvenAndVerifiedEvent.php | 34 ++-- .../Event/U2fDevicePossessionProvenEvent.php | 40 ++-- .../Event/VettingTypeHintsSavedEvent.php | 4 +- .../Identity/Event/WhitelistCreatedEvent.php | 2 +- .../Identity/Event/WhitelistReplacedEvent.php | 2 +- ...ubikeyPossessionProvenAndVerifiedEvent.php | 35 ++-- .../Event/YubikeyPossessionProvenEvent.php | 44 ++--- .../YubikeySecondFactorBootstrappedEvent.php | 8 +- src/Surfnet/Stepup/Identity/Identity.php | 184 +++++++++--------- .../Stepup/Identity/Value/CommonName.php | 6 +- .../Identity/Value/ContactInformation.php | 13 +- .../Stepup/Identity/Value/DocumentNumber.php | 11 +- src/Surfnet/Stepup/Identity/Value/Email.php | 6 +- .../Value/EmailVerificationWindow.php | 11 +- src/Surfnet/Stepup/Identity/Value/GssfId.php | 6 +- .../Stepup/Identity/Value/IdentityId.php | 2 +- .../Stepup/Identity/Value/Institution.php | 9 +- src/Surfnet/Stepup/Identity/Value/Locale.php | 7 +- .../Stepup/Identity/Value/Location.php | 13 +- src/Surfnet/Stepup/Identity/Value/NameId.php | 2 +- .../Identity/Value/OnPremiseVettingType.php | 2 +- .../Stepup/Identity/Value/PhoneNumber.php | 6 +- .../Stepup/Identity/Value/RecoveryTokenId.php | 2 +- .../Identity/Value/RecoveryTokenType.php | 2 +- .../Value/RegistrationAuthorityRole.php | 7 +- .../Stepup/Identity/Value/SecondFactorId.php | 2 +- .../Identity/Value/SecondFactorIdentifier.php | 6 +- .../SelfAssertedRegistrationVettingType.php | 2 +- .../Identity/Value/SelfVetVettingType.php | 2 +- .../Stepup/Identity/Value/StepupProvider.php | 2 +- .../Stepup/Identity/Value/TimeFrame.php | 12 +- .../Stepup/Identity/Value/U2fKeyHandle.php | 6 +- .../Stepup/Identity/Value/UnhashedSecret.php | 2 +- .../Identity/Value/UnknownVettingType.php | 2 +- .../Stepup/Identity/Value/YubikeyPublicId.php | 6 +- src/Surfnet/Stepup/Identity/Whitelist.php | 3 - ...entSerializationAndDeserializationTest.php | 3 - .../Value/AllowedSecondFactorListTest.php | 6 +- .../Value/ContactInformationTest.php | 5 +- .../InstitutionAuthorizationOptionTest.php | 2 +- .../Value/InstitutionConfigurationIdTest.php | 1 - .../Configuration/Value/InstitutionTest.php | 23 ++- .../Configuration/Value/LocationTest.php | 5 +- .../Configuration/Value/RaLocationIdTest.php | 24 ++- .../Value/RaLocationNameTest.php | 24 ++- .../Stepup/Tests/Helper/JsonHelperTest.php | 1 - .../Tests/Helper/UserDataFilterTest.php | 3 +- .../Collection/InstitutionCollectionTest.php | 2 +- .../Entity/SecondFactorCollectionTest.php | 5 +- .../Identity/Event/ForgettableEventsTest.php | 3 + ...entSerializationAndDeserializationTest.php | 2 +- .../Tests/Identity/Value/CommonNameTest.php | 26 ++- .../Identity/Value/ContactInformationTest.php | 5 +- .../Identity/Value/DocumentNumberTest.php | 25 ++- .../Stepup/Tests/Identity/Value/EmailTest.php | 26 ++- .../Value/EmailVerificationWindowTest.php | 6 +- .../Tests/Identity/Value/InstitutionTest.php | 28 ++- .../Tests/Identity/Value/LocationTest.php | 6 +- .../Value/RegistrationAuthorityRoleTest.php | 5 +- .../Tests/Identity/Value/TimeFrameTest.php | 37 +++- .../Doctrine/Type/CommonNameType.php | 3 +- .../ConfigurationContactInformationType.php | 5 +- .../Type/ConfigurationLocationType.php | 5 +- .../Doctrine/Type/ContactInformationType.php | 5 +- .../Doctrine/Type/DocumentNumberType.php | 2 + .../ApiBundle/Doctrine/Type/LocaleType.php | 5 +- .../ApiBundle/Doctrine/Type/LocationType.php | 5 +- .../Identity/Entity/AuditLogEntry.php | 73 ++----- .../ApiBundle/Identity/Entity/Identity.php | 31 +-- .../IdentitySelfAssertedTokenOptions.php | 6 +- .../Identity/Entity/InstitutionListing.php | 2 +- .../ApiBundle/Identity/Entity/RaCandidate.php | 12 +- .../ApiBundle/Identity/Entity/RaListing.php | 18 +- .../Identity/Entity/RaSecondFactor.php | 24 +-- .../Identity/Entity/RecoveryToken.php | 16 +- .../Entity/SecondFactorRevocation.php | 10 +- .../Entity/UnverifiedSecondFactor.php | 10 +- .../Identity/Entity/VerifiedSecondFactor.php | 40 +--- .../Identity/Entity/VettedSecondFactor.php | 10 +- .../Identity/Projector/AuditLogProjector.php | 4 +- .../Identity/Projector/RaListingProjector.php | 2 +- .../Projector/RaSecondFactorProjector.php | 33 ++-- .../Projector/RecoveryTokenProjector.php | 2 +- .../Projector/SecondFactorProjector.php | 17 +- .../SecondFactorRevocationProjector.php | 6 +- .../Identity/Projector/WhitelistProjector.php | 8 +- .../Identity/Query/AbstractQuery.php | 4 +- .../Identity/Query/IdentityQuery.php | 8 +- .../Identity/Query/RaCandidateQuery.php | 12 +- .../Identity/Query/RaListingQuery.php | 18 +- .../Identity/Query/RaSecondFactorQuery.php | 18 +- .../ApiBundle/Identity/Query/RaaQuery.php | 4 +- .../Identity/Query/RecoveryTokenQuery.php | 18 +- .../Query/SecondFactorAuditLogQuery.php | 8 +- .../Query/UnverifiedSecondFactorQuery.php | 4 +- .../VerifiedSecondFactorOfIdentityQuery.php | 2 +- .../Query/VerifiedSecondFactorQuery.php | 8 +- .../Query/VettedSecondFactorQuery.php | 2 +- .../Repository/IdentityRepository.php | 8 +- ...titySelfAssertedTokenOptionsRepository.php | 2 - .../Repository/RaCandidateRepository.php | 4 +- .../Repository/RaSecondFactorRepository.php | 4 +- .../VerifiedSecondFactorRepository.php | 7 +- .../Repository/WhitelistEntryRepository.php | 2 +- .../Service/AbstractSearchService.php | 2 +- .../Identity/Service/AuditLogService.php | 2 +- .../Identity/Service/IdentityService.php | 5 +- .../Identity/Service/ProfileService.php | 4 +- .../Identity/Service/RaCandidateService.php | 6 +- .../Identity/Service/RaListingService.php | 9 +- .../Service/RaSecondFactorService.php | 6 +- .../Identity/Service/RecoveryTokenService.php | 2 +- .../Identity/Service/SecondFactorService.php | 8 +- .../Identity/Service/SraaService.php | 4 +- .../Identity/Service/WhitelistService.php | 4 +- .../Specification/SpecificationInterface.php | 2 +- .../Identity/Value/AuthorityRole.php | 8 +- .../Value/AuthorizedInstitutionCollection.php | 16 +- .../ApiBundle/Identity/Value/Profile.php | 4 +- .../Identity/Value/SecondFactorStatus.php | 4 +- .../Request/CommandParamConverter.php | 3 +- ...ConfigurationInstitutionParamConverter.php | 3 +- .../Request/InstitutionParamConverter.php | 4 +- .../Request/MetadataParamConverter.php | 3 +- .../CommandAuthorizationServiceTest.php | 7 + ...onfigurationContactInformationTypeTest.php | 2 + .../Type/ConfigurationLocationTypeTest.php | 2 + .../Type/ContactInformationTypeTest.php | 2 + .../Doctrine/Type/DocumentNumberTypeTest.php | 5 +- .../Tests/Doctrine/Type/LocaleTypeTest.php | 2 + .../Tests/Doctrine/Type/LocationTypeTest.php | 2 + .../ConfiguredInstitutionControllerTest.php | 8 +- .../Tests/Endpoint/SraaControllerTest.php | 5 +- .../Projector/AuditLogProjectorTest.php | 22 +-- .../Identity/Projector/Event/EventStub.php | 2 +- .../Request/CommandParamConverterTest.php | 24 ++- .../Command/AbstractCommand.php | 2 +- .../Command/Metadata.php | 4 +- .../Command/RaExecutable.php | 4 +- .../Command/SelfServiceExecutable.php | 2 +- .../Command/AddRaLocationCommand.php | 15 +- .../Command/ChangeRaLocationCommand.php | 12 +- .../CreateInstitutionConfigurationCommand.php | 2 +- ...InstitutionConfigurationOptionsCommand.php | 22 +-- ...onConfigurationByUnnormalizedIdCommand.php | 2 +- .../Command/RemoveRaLocationCommand.php | 6 +- .../Command/UpdateConfigurationCommand.php | 2 +- .../ConfigurationCommandHandler.php | 1 - .../Configuration/Dto/EmailTemplate.php | 6 +- .../Service/EmailTemplateService.php | 6 +- .../Dto/VettingLocation.php | 2 +- .../EventHandling/BufferedEventBus.php | 2 +- .../EventSourcing/MetadataEnricher.php | 2 +- .../SecondFactorNotAllowedException.php | 4 +- .../Command/AccreditIdentityCommand.php | 41 +--- ...egistrationAuthorityInformationCommand.php | 10 +- .../Identity/Command/AppointRoleCommand.php | 8 +- ...IdentityWithYubikeySecondFactorCommand.php | 16 +- .../Command/CreateIdentityCommand.php | 14 +- .../ExpressLocalePreferenceCommand.php | 11 +- .../Command/ForgetIdentityCommand.php | 4 +- .../MigrateVettedSecondFactorCommand.php | 8 +- ...eSafeStoreSecretTokenPossessionCommand.php | 13 +- .../Command/ProveGssfPossessionCommand.php | 10 +- .../Command/ProvePhonePossessionCommand.php | 8 +- ...ovePhoneRecoveryTokenPossessionCommand.php | 19 +- .../ProveU2fDevicePossessionCommand.php | 8 +- .../Command/ProveYubikeyPossessionCommand.php | 8 +- ...egisterSelfAssertedSecondFactorCommand.php | 14 +- .../RetractRegistrationAuthorityCommand.php | 6 +- .../Command/RevokeOwnRecoveryTokenCommand.php | 6 +- .../Command/RevokeOwnSecondFactorCommand.php | 6 +- .../RevokeRegistrantsRecoveryTokenCommand.php | 11 +- .../RevokeRegistrantsSecondFactorCommand.php | 8 +- .../Command/SaveVettingTypeHintCommand.php | 6 +- .../Command/SelfVetSecondFactorCommand.php | 35 +--- ...ndSecondFactorRegistrationEmailCommand.php | 6 +- ...ndVerifiedSecondFactorRemindersCommand.php | 4 +- .../Command/UpdateIdentityCommand.php | 8 +- .../Identity/Command/VerifyEmailCommand.php | 6 +- .../Command/VetSecondFactorCommand.php | 20 +- .../CommandHandler/IdentityCommandHandler.php | 2 +- .../RegistrationAuthorityCommandHandler.php | 8 +- .../WhitelistCommandHandler.php | 10 +- .../Service/RecoveryTokenMailService.php | 2 +- .../Service/RegistrationMailService.php | 6 +- .../SecondFactorRevocationMailService.php | 2 +- .../Service/SecondFactorVettedMailService.php | 2 +- .../Pipeline/AuthorizingStage.php | 4 +- .../Pipeline/DispatchStage.php | 4 +- .../Pipeline/EventDispatchingStage.php | 4 +- .../Exception/InvalidCommandException.php | 2 +- .../Exception/ProcessingAbortedException.php | 2 +- .../CommandHandlingBundle/Pipeline/Stage.php | 7 +- .../Pipeline/StagedPipeline.php | 1 - .../Pipeline/ValidationStage.php | 4 +- .../EventSourcing/SensitiveDataMessage.php | 6 +- .../SensitiveData/Forgettable.php | 4 +- .../SensitiveData/SensitiveData.php | 5 +- .../Tests/Command/FixedUuidStubCommand.php | 2 +- ...itutionConfigurationCommandHandlerTest.php | 1 - .../InstitutionConfigurationProcessorTest.php | 5 +- .../EventHandling/BufferedEventBusTest.php | 3 +- ...ndPublishToBusOnFirstCallEventListener.php | 2 +- .../IdentityCommandHandlerMoveTokenTest.php | 21 +- ...tyCommandHandlerSelfAssertedTokensTest.php | 32 +-- .../IdentityCommandHandlerTest.php | 36 +--- ...IdentityIdEnforcingEventStoreDecorator.php | 2 +- ...egistrationAuthorityCommandHandlerTest.php | 10 +- .../RightToBeForgottenCommandHandlerTest.php | 6 +- .../Tests/Pipeline/AuthorizingStageTest.php | 8 +- .../RecoveryTokenEmailProcessorTest.php | 17 +- .../EventSourcing/ForgettableEventStub.php | 4 +- .../Value/Institution.php | 4 +- .../Service/EmailTemplateService.php | 2 +- .../ConfigurationControllerTest.php | 6 +- ...InstitutionConfigurationControllerTest.php | 6 +- .../BootstrapGsspSecondFactorCommand.php | 7 +- .../Command/BootstrapIdentityCommand.php | 8 +- .../BootstrapSmsSecondFactorCommand.php | 7 +- .../BootstrapYubikeySecondFactorCommand.php | 7 +- .../Command/MigrateSecondFactorCommand.php | 5 +- .../EventSourcing/DBALEventHydrator.php | 7 +- ...erifiedSecondFactorReminderServiceTest.php | 20 +- 301 files changed, 1522 insertions(+), 1734 deletions(-) diff --git a/src/Surfnet/Migrations/Version20210610131957.php b/src/Surfnet/Migrations/Version20210610131957.php index 0846335d3..35f662f55 100644 --- a/src/Surfnet/Migrations/Version20210610131957.php +++ b/src/Surfnet/Migrations/Version20210610131957.php @@ -5,8 +5,6 @@ use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; -use function json_decode; -use function json_encode; /** * This migration removes sensitive data (vetting type) from the event stream @@ -36,11 +34,12 @@ public function up(Schema $schema): void // Do not show warning on migrations. $this->addSql('# Updating entities.'); - $affectedEventStreamRows = $this->connection->executeQuery(self::$select); + $result = $this->connection->executeQuery(self::$select); - $this->write("Affected records: {$affectedEventStreamRows->rowCount()}"); + $affectedEventStreamRows = $result->fetchAllAssociative(); + $this->write("Affected records: {$result->rowCount()}"); - if ($affectedEventStreamRows->rowCount() === 0) { + if ($result->rowCount() === 0) { return; } diff --git a/src/Surfnet/Stepup/Configuration/Api/Configuration.php b/src/Surfnet/Stepup/Configuration/Api/Configuration.php index 5d77d8281..2857d3e6b 100644 --- a/src/Surfnet/Stepup/Configuration/Api/Configuration.php +++ b/src/Surfnet/Stepup/Configuration/Api/Configuration.php @@ -25,11 +25,11 @@ interface Configuration extends AggregateRoot /** * @return Configuration */ - public static function create(); + public static function create(): Configuration; /** * @param string $newConfiguration * @return void */ - public function update($newConfiguration); + public function update(string $newConfiguration): void; } diff --git a/src/Surfnet/Stepup/Configuration/Api/InstitutionConfiguration.php b/src/Surfnet/Stepup/Configuration/Api/InstitutionConfiguration.php index a0dd6a12a..5c8a1b7d3 100644 --- a/src/Surfnet/Stepup/Configuration/Api/InstitutionConfiguration.php +++ b/src/Surfnet/Stepup/Configuration/Api/InstitutionConfiguration.php @@ -30,50 +30,32 @@ interface InstitutionConfiguration extends AggregateRoot { - /** - * @return InstitutionConfiguration - */ - public static function create(InstitutionConfigurationId $institutionConfigurationId, Institution $institution); + public static function create(InstitutionConfigurationId $institutionConfigurationId, Institution $institution): InstitutionConfiguration; - /** - * @return void - */ - public function configureUseRaLocationsOption(UseRaLocationsOption $useRaLocationsOption); + public function configureUseRaLocationsOption(UseRaLocationsOption $useRaLocationsOption): void; - /** - * @return void - */ public function configureShowRaaContactInformationOption( ShowRaaContactInformationOption $showRaaContactInformationOption, - ); + ): void; - /** - * @return void - */ public function addRaLocation( RaLocationId $raLocationId, RaLocationName $raLocationName, Location $location, ContactInformation $contactInformation, - ); + ): void; - /** - * @return void - */ public function changeRaLocation( RaLocationId $raLocationId, RaLocationName $raLocationName, Location $location, ContactInformation $contactInformation, - ); + ): void; - /** - * @return void - */ - public function removeRaLocation(RaLocationId $raLocationId); + public function removeRaLocation(RaLocationId $raLocationId): void; /** * @return void */ - public function destroy(); + public function destroy(): void; } diff --git a/src/Surfnet/Stepup/Configuration/Configuration.php b/src/Surfnet/Stepup/Configuration/Configuration.php index 98fb67b94..aa1490cdc 100644 --- a/src/Surfnet/Stepup/Configuration/Configuration.php +++ b/src/Surfnet/Stepup/Configuration/Configuration.php @@ -38,7 +38,7 @@ class Configuration extends EventSourcedAggregateRoot implements ConfigurationIn /** * @var array */ - private $configuration; + private array $configuration; public static function create(): self { @@ -48,9 +48,9 @@ public static function create(): self return $configuration; } - public function update($configurationAsJson): void + public function update(string $newConfiguration): void { - $decodedConfiguration = JsonHelper::decode($configurationAsJson); + $decodedConfiguration = JsonHelper::decode($newConfiguration); $this->apply( new ConfigurationUpdatedEvent( diff --git a/src/Surfnet/Stepup/Configuration/Entity/RaLocation.php b/src/Surfnet/Stepup/Configuration/Entity/RaLocation.php index e1714b094..73b4bb69d 100644 --- a/src/Surfnet/Stepup/Configuration/Entity/RaLocation.php +++ b/src/Surfnet/Stepup/Configuration/Entity/RaLocation.php @@ -25,9 +25,6 @@ class RaLocation { - /** - * @return RaLocation - */ public static function create( RaLocationId $id, RaLocationName $name, @@ -60,10 +57,7 @@ public function changeContactInformation(ContactInformation $contactInformation) $this->contactInformation = $contactInformation; } - /** - * @return bool - */ - public function hasId(RaLocationId $otherId) + public function hasId(RaLocationId $otherId): bool { return $this->id->equals($otherId); } @@ -71,7 +65,7 @@ public function hasId(RaLocationId $otherId) /** * @return RaLocationId */ - public function getId() + public function getId(): RaLocationId { return $this->id; } @@ -79,7 +73,7 @@ public function getId() /** * @return RaLocationName */ - public function getName() + public function getName(): RaLocationName { return $this->name; } @@ -87,7 +81,7 @@ public function getName() /** * @return Location */ - public function getLocation() + public function getLocation(): Location { return $this->location; } @@ -95,7 +89,7 @@ public function getLocation() /** * @return ContactInformation */ - public function getContactInformation() + public function getContactInformation(): ContactInformation { return $this->contactInformation; } diff --git a/src/Surfnet/Stepup/Configuration/Event/ConfigurationEvent.php b/src/Surfnet/Stepup/Configuration/Event/ConfigurationEvent.php index 3080aaf9d..c62e3cdcf 100644 --- a/src/Surfnet/Stepup/Configuration/Event/ConfigurationEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/ConfigurationEvent.php @@ -27,7 +27,7 @@ abstract class ConfigurationEvent implements SerializableInterface /** * @var string */ - public $id; + public string $id; public function __construct($id) { diff --git a/src/Surfnet/Stepup/Configuration/Event/ConfigurationUpdatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/ConfigurationUpdatedEvent.php index 276fcc822..f5352c46f 100644 --- a/src/Surfnet/Stepup/Configuration/Event/ConfigurationUpdatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/ConfigurationUpdatedEvent.php @@ -23,12 +23,12 @@ class ConfigurationUpdatedEvent extends ConfigurationEvent /** * @var array */ - public $newConfiguration; + public array $newConfiguration; /** * @var array|null */ - public $oldConfiguration; + public ?array $oldConfiguration; /** * @param string $id diff --git a/src/Surfnet/Stepup/Configuration/Event/EmailTemplatesUpdatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/EmailTemplatesUpdatedEvent.php index 42cf84533..907050773 100644 --- a/src/Surfnet/Stepup/Configuration/Event/EmailTemplatesUpdatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/EmailTemplatesUpdatedEvent.php @@ -23,7 +23,7 @@ class EmailTemplatesUpdatedEvent extends ConfigurationEvent /** * @var array */ - public $emailTemplates; + public array $emailTemplates; /** * @param string $configurationId diff --git a/src/Surfnet/Stepup/Configuration/Event/IdentityProvidersUpdatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/IdentityProvidersUpdatedEvent.php index aee223294..08514bf77 100644 --- a/src/Surfnet/Stepup/Configuration/Event/IdentityProvidersUpdatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/IdentityProvidersUpdatedEvent.php @@ -23,7 +23,7 @@ class IdentityProvidersUpdatedEvent extends ConfigurationEvent /** * @var array */ - public $identityProviders; + public array $identityProviders; /** * @param string $configurationId diff --git a/src/Surfnet/Stepup/Configuration/Event/InstitutionConfigurationRemovedEvent.php b/src/Surfnet/Stepup/Configuration/Event/InstitutionConfigurationRemovedEvent.php index 264543d36..aba2495e0 100644 --- a/src/Surfnet/Stepup/Configuration/Event/InstitutionConfigurationRemovedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/InstitutionConfigurationRemovedEvent.php @@ -27,12 +27,12 @@ class InstitutionConfigurationRemovedEvent implements SerializableInterface /** * @var Institution */ - public $institution; + public Institution $institution; /** * @var InstitutionConfigurationId */ - public $institutionConfigurationId; + public InstitutionConfigurationId $institutionConfigurationId; public function __construct(InstitutionConfigurationId $institutionConfigurationId, Institution $institution) { diff --git a/src/Surfnet/Stepup/Configuration/Event/NewInstitutionConfigurationCreatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/NewInstitutionConfigurationCreatedEvent.php index 4afe25f42..e85fe71ea 100644 --- a/src/Surfnet/Stepup/Configuration/Event/NewInstitutionConfigurationCreatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/NewInstitutionConfigurationCreatedEvent.php @@ -38,46 +38,46 @@ class NewInstitutionConfigurationCreatedEvent implements SerializableInterface /** * @var InstitutionConfigurationId */ - public $institutionConfigurationId; + public InstitutionConfigurationId $institutionConfigurationId; /** * @var Institution */ - public $institution; + public Institution $institution; /** * @var UseRaLocationsOption */ - public $useRaLocationsOption; + public UseRaLocationsOption $useRaLocationsOption; /** * @var ShowRaaContactInformationOption */ - public $showRaaContactInformationOption; + public ShowRaaContactInformationOption $showRaaContactInformationOption; /** * @var VerifyEmailOption */ - public $verifyEmailOption; + public VerifyEmailOption $verifyEmailOption; /** * @var NumberOfTokensPerIdentityOption */ - public $numberOfTokensPerIdentityOption; + public NumberOfTokensPerIdentityOption $numberOfTokensPerIdentityOption; /** * @var SelfVetOption */ - public $selfVetOption; + public SelfVetOption $selfVetOption; /** * @var SelfAssertedTokensOption */ - public $selfAssertedTokensOption; + public SelfAssertedTokensOption $selfAssertedTokensOption; /** * @var SsoOn2faOption */ - public $ssoOn2faOption; + public SsoOn2faOption $ssoOn2faOption; public function __construct( InstitutionConfigurationId $institutionConfigurationId, diff --git a/src/Surfnet/Stepup/Configuration/Event/RaLocationAddedEvent.php b/src/Surfnet/Stepup/Configuration/Event/RaLocationAddedEvent.php index 960e54cf7..7459b50ac 100644 --- a/src/Surfnet/Stepup/Configuration/Event/RaLocationAddedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/RaLocationAddedEvent.php @@ -31,31 +31,31 @@ class RaLocationAddedEvent implements SerializableInterface /** * @var InstitutionConfigurationId */ - public $institutionConfigurationId; + public InstitutionConfigurationId $institutionConfigurationId; /** * @var Institution */ - public $institution; + public Institution $institution; /** * @var RaLocationId */ - public $raLocationId; + public RaLocationId $raLocationId; /** * @var RaLocationName */ - public $raLocationName; + public RaLocationName $raLocationName; /** * @var Location */ - public $location; + public Location $location; /** * @var ContactInformation */ - public $contactInformation; + public ContactInformation $contactInformation; public function __construct( InstitutionConfigurationId $institutionConfigurationId, diff --git a/src/Surfnet/Stepup/Configuration/Event/RaLocationContactInformationChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/RaLocationContactInformationChangedEvent.php index 2326664cb..c3bcc3ff7 100644 --- a/src/Surfnet/Stepup/Configuration/Event/RaLocationContactInformationChangedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/RaLocationContactInformationChangedEvent.php @@ -28,17 +28,17 @@ class RaLocationContactInformationChangedEvent implements SerializableInterface /** * @var InstitutionConfigurationId */ - public $institutionConfigurationId; + public InstitutionConfigurationId $institutionConfigurationId; /** * @var RaLocationId */ - public $raLocationId; + public RaLocationId $raLocationId; /** * @var ContactInformation */ - public $contactInformation; + public ContactInformation $contactInformation; public function __construct( InstitutionConfigurationId $institutionConfigurationId, diff --git a/src/Surfnet/Stepup/Configuration/Event/RaLocationRelocatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/RaLocationRelocatedEvent.php index 0eb8c2e6f..8a37c040d 100644 --- a/src/Surfnet/Stepup/Configuration/Event/RaLocationRelocatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/RaLocationRelocatedEvent.php @@ -28,17 +28,17 @@ class RaLocationRelocatedEvent implements SerializableInterface /** * @var InstitutionConfigurationId */ - public $institutionConfigurationId; + public InstitutionConfigurationId $institutionConfigurationId; /** * @var RaLocationId */ - public $raLocationId; + public RaLocationId $raLocationId; /** * @var Location */ - public $location; + public Location $location; public function __construct( InstitutionConfigurationId $institutionConfigurationId, diff --git a/src/Surfnet/Stepup/Configuration/Event/RaLocationRemovedEvent.php b/src/Surfnet/Stepup/Configuration/Event/RaLocationRemovedEvent.php index f03d7308d..2a2bf8eed 100644 --- a/src/Surfnet/Stepup/Configuration/Event/RaLocationRemovedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/RaLocationRemovedEvent.php @@ -28,17 +28,17 @@ class RaLocationRemovedEvent implements SerializableInterface /** * @var InstitutionConfigurationId */ - public $institutionConfigurationId; + public InstitutionConfigurationId $institutionConfigurationId; /** * @var Institution */ - public $institution; + public Institution $institution; /** * @var RaLocationId */ - public $raLocationId; + public RaLocationId $raLocationId; public function __construct( InstitutionConfigurationId $institutionConfigurationId, diff --git a/src/Surfnet/Stepup/Configuration/Event/RaLocationRenamedEvent.php b/src/Surfnet/Stepup/Configuration/Event/RaLocationRenamedEvent.php index 3452532cf..4d775a2bf 100644 --- a/src/Surfnet/Stepup/Configuration/Event/RaLocationRenamedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/RaLocationRenamedEvent.php @@ -28,17 +28,17 @@ class RaLocationRenamedEvent implements SerializableInterface /** * @var InstitutionConfigurationId */ - public $institutionConfigurationId; + public InstitutionConfigurationId $institutionConfigurationId; /** * @var RaLocationId */ - public $raLocationId; + public RaLocationId $raLocationId; /** * @var RaLocationName */ - public $raLocationName; + public RaLocationName $raLocationName; public function __construct( InstitutionConfigurationId $institutionConfigurationId, diff --git a/src/Surfnet/Stepup/Configuration/Event/ServiceProvidersUpdatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/ServiceProvidersUpdatedEvent.php index 30cd4feee..cbbf318da 100644 --- a/src/Surfnet/Stepup/Configuration/Event/ServiceProvidersUpdatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/ServiceProvidersUpdatedEvent.php @@ -23,7 +23,7 @@ class ServiceProvidersUpdatedEvent extends ConfigurationEvent /** * @var array */ - public $serviceProviders; + public array $serviceProviders; /** * @param string $configurationId diff --git a/src/Surfnet/Stepup/Configuration/Event/SraaUpdatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/SraaUpdatedEvent.php index a2c78f3cf..5d6c7ec2c 100644 --- a/src/Surfnet/Stepup/Configuration/Event/SraaUpdatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/SraaUpdatedEvent.php @@ -23,7 +23,7 @@ class SraaUpdatedEvent extends ConfigurationEvent /** * @var array */ - public $sraaList; + public array $sraaList; /** * @param string $configurationId diff --git a/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php b/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php index 2d23025cd..f7fdae537 100644 --- a/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php +++ b/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php @@ -78,70 +78,70 @@ class InstitutionConfiguration extends EventSourcedAggregateRoot implements Inst /** * @var InstitutionConfigurationId */ - private $institutionConfigurationId; + private InstitutionConfigurationId $institutionConfigurationId; /** * @var Institution */ - private $institution; + private Institution $institution; private ?RaLocationList $raLocations = null; /** * @var UseRaLocationsOption */ - private $useRaLocationsOption; + private UseRaLocationsOption $useRaLocationsOption; /** * @var ShowRaaContactInformationOption */ - private $showRaaContactInformationOption; + private ShowRaaContactInformationOption $showRaaContactInformationOption; /** * @var VerifyEmailOption */ - private $verifyEmailOption; + private VerifyEmailOption $verifyEmailOption; /** * @var NumberOfTokensPerIdentityOption */ - private $numberOfTokensPerIdentityOption; + private NumberOfTokensPerIdentityOption $numberOfTokensPerIdentityOption; /** * @var SelfVetOption */ - private $selfVetOption; + private SelfVetOption $selfVetOption; /** * @var SsoOn2faOption */ - private $ssoOn2faOption; + private SsoOn2faOption $ssoOn2faOption; /** * @var SelfAssertedTokensOption */ - private $selfAssertedTokensOption; + private SelfAssertedTokensOption $selfAssertedTokensOption; /** * @var InstitutionAuthorizationOption */ - private $useRaOption; + private InstitutionAuthorizationOption $useRaOption; /** * @var InstitutionAuthorizationOption */ - private $useRaaOption; + private InstitutionAuthorizationOption $useRaaOption; /** * @var InstitutionAuthorizationOption */ - private $selectRaaOption; + private InstitutionAuthorizationOption $selectRaaOption; /** * @var AllowedSecondFactorList */ - private $allowedSecondFactorList; + private AllowedSecondFactorList $allowedSecondFactorList; private ?bool $isMarkedAsDestroyed = null; @@ -550,9 +550,8 @@ public function getAggregateRootId(): string /** * Check if role from institution is allowed to accredit roles * - * @return bool */ - public function isInstitutionAllowedToAccreditRoles(Institution $institution) + public function isInstitutionAllowedToAccreditRoles(Institution $institution): bool { // This method is needed to support the situation pre FGA. In that situation the SelectRaaOptionChanged wasn't // fired and that would result in a situation were $this->selectRaaOption is null. If that occurs we should check @@ -563,7 +562,7 @@ public function isInstitutionAllowedToAccreditRoles(Institution $institution) return $this->selectRaaOption->hasInstitution($institution, $this->institution); } - protected function applyNewInstitutionConfigurationCreatedEvent(NewInstitutionConfigurationCreatedEvent $event) + protected function applyNewInstitutionConfigurationCreatedEvent(NewInstitutionConfigurationCreatedEvent $event): void { $this->institutionConfigurationId = $event->institutionConfigurationId; $this->institution = $event->institution; @@ -588,68 +587,74 @@ protected function applyNewInstitutionConfigurationCreatedEvent(NewInstitutionCo * * This also applies for applyUseRaaOptionChangedEvent & applySelectRaaOptionChangedEvent */ - protected function applyUseRaOptionChangedEvent(UseRaOptionChangedEvent $event) + protected function applyUseRaOptionChangedEvent(UseRaOptionChangedEvent $event): void { $this->useRaOption = $event->useRaOption; } - protected function applyUseRaaOptionChangedEvent(UseRaaOptionChangedEvent $event) + protected function applyUseRaaOptionChangedEvent(UseRaaOptionChangedEvent $event): void { $this->useRaaOption = $event->useRaaOption; } - protected function applySelectRaaOptionChangedEvent(SelectRaaOptionChangedEvent $event) + protected function applySelectRaaOptionChangedEvent(SelectRaaOptionChangedEvent $event): void { $this->selectRaaOption = $event->selectRaaOption; } - protected function applyUseRaLocationsOptionChangedEvent(UseRaLocationsOptionChangedEvent $event) + protected function applyUseRaLocationsOptionChangedEvent(UseRaLocationsOptionChangedEvent $event): void { $this->useRaLocationsOption = $event->useRaLocationsOption; } protected function applyShowRaaContactInformationOptionChangedEvent( ShowRaaContactInformationOptionChangedEvent $event, - ) { + ): void + { $this->showRaaContactInformationOption = $event->showRaaContactInformationOption; } protected function applyVerifyEmailOptionChangedEvent( VerifyEmailOptionChangedEvent $event, - ) { + ): void + { $this->verifyEmailOption = $event->verifyEmailOption; } protected function applySelfVetOptionChangedEvent( SelfVetOptionChangedEvent $event, - ) { + ): void + { $this->selfVetOption = $event->selfVetOption; } protected function applySelfAssertedTokensOptionChangedEvent( SelfAssertedTokensOptionChangedEvent $event, - ) { + ): void + { $this->selfAssertedTokensOption = $event->selfAssertedTokensOption; } protected function applySsoOn2faOptionChangedEvent( SsoOn2faOptionChangedEvent $event, - ) { + ): void + { $this->ssoOn2faOption = $event->ssoOn2faOption; } protected function applyNumberOfTokensPerIdentityOptionChangedEvent( NumberOfTokensPerIdentityOptionChangedEvent $event, - ) { + ): void + { $this->numberOfTokensPerIdentityOption = $event->numberOfTokensPerIdentityOption; } - protected function applyAllowedSecondFactorListUpdatedEvent(AllowedSecondFactorListUpdatedEvent $event) + protected function applyAllowedSecondFactorListUpdatedEvent(AllowedSecondFactorListUpdatedEvent $event): void { $this->allowedSecondFactorList = $event->allowedSecondFactorList; } - protected function applyRaLocationAddedEvent(RaLocationAddedEvent $event) + protected function applyRaLocationAddedEvent(RaLocationAddedEvent $event): void { $this->raLocations->add( RaLocation::create( @@ -661,25 +666,25 @@ protected function applyRaLocationAddedEvent(RaLocationAddedEvent $event) ); } - protected function applyRaLocationRenamedEvent(RaLocationRenamedEvent $event) + protected function applyRaLocationRenamedEvent(RaLocationRenamedEvent $event): void { $raLocation = $this->raLocations->getById($event->raLocationId); $raLocation->rename($event->raLocationName); } - protected function applyRaLocationRelocatedEvent(RaLocationRelocatedEvent $event) + protected function applyRaLocationRelocatedEvent(RaLocationRelocatedEvent $event): void { $raLocation = $this->raLocations->getById($event->raLocationId); $raLocation->relocate($event->location); } - protected function applyRaLocationContactInformationChangedEvent(RaLocationContactInformationChangedEvent $event) + protected function applyRaLocationContactInformationChangedEvent(RaLocationContactInformationChangedEvent $event): void { $raLocation = $this->raLocations->getById($event->raLocationId); $raLocation->changeContactInformation($event->contactInformation); } - protected function applyRaLocationRemovedEvent(RaLocationRemovedEvent $event) + protected function applyRaLocationRemovedEvent(RaLocationRemovedEvent $event): void { $this->raLocations->removeWithId($event->raLocationId); } @@ -687,7 +692,7 @@ protected function applyRaLocationRemovedEvent(RaLocationRemovedEvent $event) /** * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - protected function applyInstitutionConfigurationRemovedEvent(InstitutionConfigurationRemovedEvent $event) + protected function applyInstitutionConfigurationRemovedEvent(InstitutionConfigurationRemovedEvent $event): void { // reset all configuration to defaults. This way, should it be rebuild, it seems like it is new again $this->raLocations = new RaLocationList([]); diff --git a/src/Surfnet/Stepup/Configuration/Value/ContactInformation.php b/src/Surfnet/Stepup/Configuration/Value/ContactInformation.php index 20b96978f..ff7c1fa8d 100644 --- a/src/Surfnet/Stepup/Configuration/Value/ContactInformation.php +++ b/src/Surfnet/Stepup/Configuration/Value/ContactInformation.php @@ -1,5 +1,7 @@ contactInformation; } diff --git a/src/Surfnet/Stepup/Configuration/Value/Institution.php b/src/Surfnet/Stepup/Configuration/Value/Institution.php index c4cbf3029..9920d80e8 100644 --- a/src/Surfnet/Stepup/Configuration/Value/Institution.php +++ b/src/Surfnet/Stepup/Configuration/Value/Institution.php @@ -1,5 +1,7 @@ institution; } - /** - * @return bool - */ public function equals(Institution $otherInstitution): bool { return $this->institution === $otherInstitution->institution; diff --git a/src/Surfnet/Stepup/Configuration/Value/InstitutionAuthorizationOption.php b/src/Surfnet/Stepup/Configuration/Value/InstitutionAuthorizationOption.php index fb7354d93..a7acf308d 100644 --- a/src/Surfnet/Stepup/Configuration/Value/InstitutionAuthorizationOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/InstitutionAuthorizationOption.php @@ -29,12 +29,11 @@ final class InstitutionAuthorizationOption implements JsonSerializable * will take the current institution into account when returning institutions. * * AbstractRoleOption constructor. - * @param bool $isDefault */ private function __construct( private readonly InstitutionRole $institutionRole, - private readonly InstitutionSet $institutionSet, - $isDefault, + private readonly InstitutionSet $institutionSet, + bool $isDefault, ) { $this->isDefault = (bool)$isDefault; } diff --git a/src/Surfnet/Stepup/Configuration/Value/InstitutionConfigurationId.php b/src/Surfnet/Stepup/Configuration/Value/InstitutionConfigurationId.php index 145f1785e..27cf86c22 100644 --- a/src/Surfnet/Stepup/Configuration/Value/InstitutionConfigurationId.php +++ b/src/Surfnet/Stepup/Configuration/Value/InstitutionConfigurationId.php @@ -30,7 +30,6 @@ final class InstitutionConfigurationId implements JsonSerializable, Stringable private readonly string $institutionConfigurationId; /** - * @return InstitutionConfigurationId * @deprecated To be removed in next release; use normalizedFrom method to account for case-(in)sensitivity issues * */ @@ -39,9 +38,6 @@ public static function from(Institution $institution): self return new self((string)Uuid::uuid5(self::UUID_NAMESPACE, $institution->getInstitution())); } - /** - * @return InstitutionConfigurationId - */ public static function normalizedFrom(Institution $institution): self { return new self((string)Uuid::uuid5(self::UUID_NAMESPACE, strtolower($institution->getInstitution()))); @@ -68,9 +64,6 @@ public function __construct($institutionConfigurationId) $this->institutionConfigurationId = $institutionConfigurationId; } - /** - * @return bool - */ public function equals(InstitutionConfigurationId $otherInstitutionConfigurationId): bool { return $this->institutionConfigurationId === $otherInstitutionConfigurationId->institutionConfigurationId; @@ -79,7 +72,7 @@ public function equals(InstitutionConfigurationId $otherInstitutionConfiguration /** * @return string */ - public function getInstitutionConfigurationId() + public function getInstitutionConfigurationId(): string { return $this->institutionConfigurationId; } diff --git a/src/Surfnet/Stepup/Configuration/Value/InstitutionRole.php b/src/Surfnet/Stepup/Configuration/Value/InstitutionRole.php index 8e702ed6b..e528ca3b3 100644 --- a/src/Surfnet/Stepup/Configuration/Value/InstitutionRole.php +++ b/src/Surfnet/Stepup/Configuration/Value/InstitutionRole.php @@ -36,7 +36,7 @@ final class InstitutionRole implements JsonSerializable, Stringable /** * @var string */ - private $type; + private string $type; /** * InstitutionRole constructor. @@ -75,9 +75,6 @@ public static function selectRaa(): self return new self(self::ROLE_SELECT_RAA); } - /** - * @return bool - */ public function equals(InstitutionRole $role): bool { return $this->type == $role->getType(); @@ -86,7 +83,7 @@ public function equals(InstitutionRole $role): bool /** * @return string */ - public function getType() + public function getType(): string { return $this->type; } diff --git a/src/Surfnet/Stepup/Configuration/Value/Location.php b/src/Surfnet/Stepup/Configuration/Value/Location.php index c06997195..55f35b5c8 100644 --- a/src/Surfnet/Stepup/Configuration/Value/Location.php +++ b/src/Surfnet/Stepup/Configuration/Value/Location.php @@ -1,5 +1,7 @@ location = trim($location); } - /** - * @return bool - */ public function equals(Location $otherLocation): bool { return $this->location === $otherLocation->location; @@ -49,7 +48,7 @@ public function equals(Location $otherLocation): bool /** * @return string */ - public function getLocation() + public function getLocation(): string { return $this->location; } diff --git a/src/Surfnet/Stepup/Configuration/Value/NumberOfTokensPerIdentityOption.php b/src/Surfnet/Stepup/Configuration/Value/NumberOfTokensPerIdentityOption.php index 6f367f205..d19b18632 100644 --- a/src/Surfnet/Stepup/Configuration/Value/NumberOfTokensPerIdentityOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/NumberOfTokensPerIdentityOption.php @@ -25,10 +25,7 @@ class NumberOfTokensPerIdentityOption implements JsonSerializable { public const DISABLED = 0; - /** - * @var int - */ - private $numberOfTokensPerIdentity; + private int $numberOfTokensPerIdentity; public static function getDefault(): self { @@ -48,9 +45,6 @@ public function __construct($numberOfTokensPerIdentity) $this->numberOfTokensPerIdentity = $numberOfTokensPerIdentity; } - /** - * @return bool - */ public function equals(NumberOfTokensPerIdentityOption $other): bool { return $this->numberOfTokensPerIdentity === $other->numberOfTokensPerIdentity; @@ -64,10 +58,7 @@ public function isEnabled(): bool return $this->numberOfTokensPerIdentity > self::DISABLED; } - /** - * @return int - */ - public function getNumberOfTokensPerIdentity() + public function getNumberOfTokensPerIdentity(): int { return $this->numberOfTokensPerIdentity; } diff --git a/src/Surfnet/Stepup/Configuration/Value/RaLocationId.php b/src/Surfnet/Stepup/Configuration/Value/RaLocationId.php index ffaa36baa..798873c5a 100644 --- a/src/Surfnet/Stepup/Configuration/Value/RaLocationId.php +++ b/src/Surfnet/Stepup/Configuration/Value/RaLocationId.php @@ -1,5 +1,7 @@ raLocationId = $raLocationId; } - /** - * @return bool - */ public function equals(RaLocationId $otherRaLocationId): bool { return $this->raLocationId === $otherRaLocationId->raLocationId; @@ -62,7 +61,7 @@ public function equals(RaLocationId $otherRaLocationId): bool /** * @return string */ - public function getRaLocationId() + public function getRaLocationId(): string { return $this->raLocationId; } diff --git a/src/Surfnet/Stepup/Configuration/Value/RaLocationList.php b/src/Surfnet/Stepup/Configuration/Value/RaLocationList.php index b1444a644..0a092ec52 100644 --- a/src/Surfnet/Stepup/Configuration/Value/RaLocationList.php +++ b/src/Surfnet/Stepup/Configuration/Value/RaLocationList.php @@ -29,7 +29,7 @@ final class RaLocationList implements IteratorAggregate /** * @var RaLocation[] */ - private $raLocations = []; + private array $raLocations = []; public function __construct(array $raLocations) { @@ -38,9 +38,6 @@ public function __construct(array $raLocations) } } - /** - * @return bool - */ public function containsWithId(RaLocationId $raLocationId): bool { foreach ($this->raLocations as $raLocation) { @@ -85,10 +82,7 @@ public function removeWithId(RaLocationId $raLocationId): void ); } - /** - * @return RaLocation - */ - public function getById(RaLocationId $raLocationId) + public function getById(RaLocationId $raLocationId): RaLocation { foreach ($this->raLocations as $raLocation) { if ($raLocation->hasId($raLocationId)) { diff --git a/src/Surfnet/Stepup/Configuration/Value/RaLocationName.php b/src/Surfnet/Stepup/Configuration/Value/RaLocationName.php index 58a292a0e..c44f371e5 100644 --- a/src/Surfnet/Stepup/Configuration/Value/RaLocationName.php +++ b/src/Surfnet/Stepup/Configuration/Value/RaLocationName.php @@ -1,5 +1,7 @@ raLocationName = $raLocationName; } - /** - * @return bool - */ public function equals(RaLocationName $otherRaLocationName): bool { return $this->raLocationName === $otherRaLocationName->raLocationName; @@ -49,7 +45,7 @@ public function equals(RaLocationName $otherRaLocationName): bool /** * @return string */ - public function getRaLocationName() + public function getRaLocationName(): string { return $this->raLocationName; } diff --git a/src/Surfnet/Stepup/Configuration/Value/ShowRaaContactInformationOption.php b/src/Surfnet/Stepup/Configuration/Value/ShowRaaContactInformationOption.php index cf1658081..15ced7e13 100644 --- a/src/Surfnet/Stepup/Configuration/Value/ShowRaaContactInformationOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/ShowRaaContactInformationOption.php @@ -43,9 +43,6 @@ public function __construct($showRaaContactInformationOption) $this->showRaaContactInformationOption = $showRaaContactInformationOption; } - /** - * @return bool - */ public function equals(ShowRaaContactInformationOption $other): bool { return $this->showRaaContactInformationOption === $other->showRaaContactInformationOption; @@ -54,7 +51,7 @@ public function equals(ShowRaaContactInformationOption $other): bool /** * @return boolean */ - public function isEnabled() + public function isEnabled(): bool { return $this->showRaaContactInformationOption; } diff --git a/src/Surfnet/Stepup/Configuration/Value/UseRaLocationsOption.php b/src/Surfnet/Stepup/Configuration/Value/UseRaLocationsOption.php index 264e24fad..e785c06a7 100644 --- a/src/Surfnet/Stepup/Configuration/Value/UseRaLocationsOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/UseRaLocationsOption.php @@ -46,9 +46,6 @@ public function __construct($useRaLocationsOption) $this->useRaLocationsOption = $useRaLocationsOption; } - /** - * @return bool - */ public function equals(UseRaLocationsOption $other): bool { return $this->useRaLocationsOption === $other->useRaLocationsOption; @@ -57,7 +54,7 @@ public function equals(UseRaLocationsOption $other): bool /** * @return boolean */ - public function isEnabled() + public function isEnabled(): bool { return $this->useRaLocationsOption; } diff --git a/src/Surfnet/Stepup/Configuration/Value/VerifyEmailOption.php b/src/Surfnet/Stepup/Configuration/Value/VerifyEmailOption.php index fa55f97b8..f42f613dd 100644 --- a/src/Surfnet/Stepup/Configuration/Value/VerifyEmailOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/VerifyEmailOption.php @@ -43,9 +43,6 @@ public function __construct($verifyEmailOption) $this->verifyEmailOption = $verifyEmailOption; } - /** - * @return bool - */ public function equals(VerifyEmailOption $other): bool { return $this->verifyEmailOption === $other->verifyEmailOption; @@ -54,7 +51,7 @@ public function equals(VerifyEmailOption $other): bool /** * @return boolean */ - public function isEnabled() + public function isEnabled(): bool { return $this->verifyEmailOption; } diff --git a/src/Surfnet/Stepup/DateTime/DateTime.php b/src/Surfnet/Stepup/DateTime/DateTime.php index 6a049f7e1..77556611d 100644 --- a/src/Surfnet/Stepup/DateTime/DateTime.php +++ b/src/Surfnet/Stepup/DateTime/DateTime.php @@ -40,14 +40,14 @@ class DateTime implements Stringable * * @var self|null */ - private static $now; + private static ?DateTime $now; private readonly CoreDateTime $dateTime; /** * @return self */ - public static function now() + public static function now(): DateTime { return self::$now ?: new self(new CoreDateTime); } @@ -56,7 +56,7 @@ public static function now() * @param string $string A date-time string formatted using `self::FORMAT` (eg. '2014-11-26T15:20:43+01:00'). * @return self */ - public static function fromString($string): self + public static function fromString(string $string): self { if (!is_string($string)) { InvalidArgumentException::invalidType('string', 'dateTime', $string); @@ -79,9 +79,6 @@ public function __construct(CoreDateTime $dateTime = null) $this->dateTime = $dateTime ?: new CoreDateTime(); } - /** - * @return DateTime - */ public function add(DateInterval $interval): self { $dateTime = clone $this->dateTime; @@ -90,9 +87,6 @@ public function add(DateInterval $interval): self return new self($dateTime); } - /** - * @return DateTime - */ public function sub(DateInterval $interval): self { $dateTime = clone $this->dateTime; @@ -112,33 +106,23 @@ public function endOfDay(): self return new self($dateTime); } - /** - * @return boolean - */ public function comesBefore(DateTime $dateTime): bool { return $this->dateTime < $dateTime->dateTime; } - /** - * @return boolean - */ public function comesBeforeOrIsEqual(DateTime $dateTime): bool { return $this->dateTime <= $dateTime->dateTime; } - /** - * @return boolean - */ public function comesAfter(DateTime $dateTime): bool { - return $this->dateTime > $dateTime->dateTime; + $end = $this->dateTime->getTimestamp(); + $start = $dateTime->dateTime->getTimestamp(); + return $end > $start; } - /** - * @return boolean - */ public function comesAfterOrIsEqual(DateTime $dateTime): bool { return $this->dateTime >= $dateTime->dateTime; @@ -148,7 +132,7 @@ public function comesAfterOrIsEqual(DateTime $dateTime): bool * @param $format * @return string */ - public function format($format) + public function format($format): string { $formatted = $this->dateTime->format($format); diff --git a/src/Surfnet/Stepup/Helper/SecondFactorProvePossessionHelper.php b/src/Surfnet/Stepup/Helper/SecondFactorProvePossessionHelper.php index 88dc162ea..8d89048fd 100644 --- a/src/Surfnet/Stepup/Helper/SecondFactorProvePossessionHelper.php +++ b/src/Surfnet/Stepup/Helper/SecondFactorProvePossessionHelper.php @@ -38,9 +38,6 @@ public function __construct( $this->skipProvePossessionSecondFactorTypes = $skipProvePossessionSecondFactorTypes; } - /** - * @return bool - */ public function canSkipProvePossession(SecondFactorType $secondFactorType): bool { return in_array($secondFactorType->getSecondFactorType(), $this->skipProvePossessionSecondFactorTypes); diff --git a/src/Surfnet/Stepup/Identity/Api/Id.php b/src/Surfnet/Stepup/Identity/Api/Id.php index a499f933a..09aad9efc 100644 --- a/src/Surfnet/Stepup/Identity/Api/Id.php +++ b/src/Surfnet/Stepup/Identity/Api/Id.php @@ -32,8 +32,5 @@ public function __construct(mixed $value); */ public function __toString(); - /** - * @return bool - */ - public function equals(Id $other); + public function equals(Id $other): bool; } diff --git a/src/Surfnet/Stepup/Identity/Api/Identity.php b/src/Surfnet/Stepup/Identity/Api/Identity.php index ef806d8bc..e79547d1e 100644 --- a/src/Surfnet/Stepup/Identity/Api/Identity.php +++ b/src/Surfnet/Stepup/Identity/Api/Identity.php @@ -51,9 +51,6 @@ interface Identity extends AggregateRoot { - /** - * @return Identity - */ public static function create( IdentityId $id, Institution $institution, @@ -61,115 +58,87 @@ public static function create( CommonName $commonName, Email $email, Locale $preferredLocale, - ); + ): Identity; /** * Construct a new aggregate root. Aggregate roots can only be affected by events, so no parameters are allowed. */ public function __construct(); - /** - * @return void - */ - public function rename(CommonName $commonName); + public function rename(CommonName $commonName): void; - /** - * @return void - */ - public function changeEmail(Email $email); + public function changeEmail(Email $email): void; - /** - * @param int $maxNumberOfTokens - * @return void - */ public function bootstrapYubikeySecondFactor( - SecondFactorId $secondFactorId, + SecondFactorId $secondFactorId, YubikeyPublicId $yubikeyPublicId, - $maxNumberOfTokens, - ); + int $maxNumberOfTokens, + ): void; - /** - * @param bool $emailVerificationRequired - * @param int $maxNumberOfTokens - * @return void - */ public function provePossessionOfYubikey( - SecondFactorId $secondFactorId, - YubikeyPublicId $yubikeyPublicId, - $emailVerificationRequired, + SecondFactorId $secondFactorId, + YubikeyPublicId $yubikeyPublicId, + bool $emailVerificationRequired, EmailVerificationWindow $emailVerificationWindow, - $maxNumberOfTokens, - ); + int $maxNumberOfTokens, + ): void; - /** - * @param bool $emailVerificationRequired - * @param int $maxNumberOfTokens - * @return void - */ public function provePossessionOfPhone( - SecondFactorId $secondFactorId, - PhoneNumber $phoneNumber, - $emailVerificationRequired, + SecondFactorId $secondFactorId, + PhoneNumber $phoneNumber, + bool $emailVerificationRequired, EmailVerificationWindow $emailVerificationWindow, - $maxNumberOfTokens, - ); + int $maxNumberOfTokens, + ): void; /** - * @param bool $emailVerificationRequired * @parame int $maxNumberOfTokens - * @return void */ public function provePossessionOfGssf( - SecondFactorId $secondFactorId, - StepupProvider $provider, - GssfId $gssfId, - $emailVerificationRequired, + SecondFactorId $secondFactorId, + StepupProvider $provider, + GssfId $gssfId, + bool $emailVerificationRequired, EmailVerificationWindow $emailVerificationWindow, - $maxNumberOfTokens, - ); + $maxNumberOfTokens, + ): void; /** - * @param bool $emailVerificationRequired * @parame int $maxNumberOfTokens - * @return void * @deprecated Built in U2F support is dropped from StepUp, this was not removed to support event replay */ public function provePossessionOfU2fDevice( - SecondFactorId $secondFactorId, - U2fKeyHandle $keyHandle, - $emailVerificationRequired, + SecondFactorId $secondFactorId, + U2fKeyHandle $keyHandle, + bool $emailVerificationRequired, EmailVerificationWindow $emailVerificationWindow, - $maxNumberOfTokens, - ); + $maxNumberOfTokens, + ): void; /** * @param string $verificationNonce * @return void */ - public function verifyEmail($verificationNonce); + public function verifyEmail(string $verificationNonce): void; /** * Attempts to vet another identity's verified second factor. * - * @param string $registrationCode - * @param bool $identityVerified - * @param bool $provePossessionSkipped - * @return void * * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function vetSecondFactor( - Identity $registrant, - SecondFactorId $registrantsSecondFactorId, - SecondFactorType $registrantsSecondFactorType, - SecondFactorIdentifier $registrantsSecondFactorIdentifier, - $registrationCode, - DocumentNumber $documentNumber, - $identityVerified, - SecondFactorTypeService $secondFactorTypeService, + Identity $registrant, + SecondFactorId $registrantsSecondFactorId, + SecondFactorType $registrantsSecondFactorType, + SecondFactorIdentifier $registrantsSecondFactorIdentifier, + string $registrationCode, + DocumentNumber $documentNumber, + bool $identityVerified, + SecondFactorTypeService $secondFactorTypeService, SecondFactorProvePossessionHelper $secondFactorProvePossessionHelper, - $provePossessionSkipped, - ); + bool $provePossessionSkipped, + ): void; /** * Self vetting, is when the user uses its own token to vet another. @@ -208,29 +177,20 @@ public function migrateVettedSecondFactor( /** * Makes the identity comply with an authority's vetting of a verified second factor. * - * @param string $registrationCode - * @param bool $provePossessionSkipped - * @return void * @throws DomainException */ public function complyWithVettingOfSecondFactor( - SecondFactorId $secondFactorId, - SecondFactorType $secondFactorType, + SecondFactorId $secondFactorId, + SecondFactorType $secondFactorType, SecondFactorIdentifier $secondFactorIdentifier, - $registrationCode, - DocumentNumber $documentNumber, - $provePossessionSkipped, - ); + string $registrationCode, + DocumentNumber $documentNumber, + bool $provePossessionSkipped, + ): void; - /** - * @return void - */ - public function revokeSecondFactor(SecondFactorId $secondFactorId); + public function revokeSecondFactor(SecondFactorId $secondFactorId): void; - /** - * @return void - */ - public function complyWithSecondFactorRevocation(SecondFactorId $secondFactorId, IdentityId $authorityId); + public function complyWithSecondFactorRevocation(SecondFactorId $secondFactorId, IdentityId $authorityId): void; /** * From SelfService, an Identity is allowed to revoke a recovery token @@ -243,88 +203,67 @@ public function revokeRecoveryToken(RecoveryTokenId $recoveryTokenId): void; */ public function complyWithRecoveryTokenRevocation(RecoveryTokenId $recoveryTokenId, IdentityId $authorityId): void; - /** - * @return void - */ public function accreditWith( RegistrationAuthorityRole $role, Institution $institution, Location $location, ContactInformation $contactInformation, InstitutionConfiguration $institutionConfiguration, - ); + ): void; - /** - * @return void - */ public function appointAs( Institution $institution, RegistrationAuthorityRole $role, InstitutionConfiguration $institutionConfiguration, - ); + ): void; - /** - * @return void - */ public function amendRegistrationAuthorityInformation( Institution $institution, Location $location, ContactInformation $contactInformation, - ); + ): void; - /** - * @return void - */ - public function retractRegistrationAuthority(Institution $institution); + public function retractRegistrationAuthority(Institution $institution): void; - /** - * @return void - */ - public function expressPreferredLocale(Locale $preferredLocale); + public function expressPreferredLocale(Locale $preferredLocale): void; /** * @return void */ - public function forget(); + public function forget(): void; /** * @return IdentityId */ - public function getId(); + public function getId(): IdentityId; /** * @return NameId */ - public function getNameId(); + public function getNameId(): NameId; /** * @return Institution */ - public function getInstitution(); + public function getInstitution(): Institution; /** * @return CommonName */ - public function getCommonName(); + public function getCommonName(): CommonName; /** * @return Email */ - public function getEmail(); + public function getEmail(): Email; /** * @return Locale */ - public function getPreferredLocale(); + public function getPreferredLocale(): Locale; - /** - * @return VerifiedSecondFactor|null - */ - public function getVerifiedSecondFactor(SecondFactorId $secondFactorId); + public function getVerifiedSecondFactor(SecondFactorId $secondFactorId): ?VerifiedSecondFactor; - /** - * @return VettedSecondFactor|null - */ public function getVettedSecondFactorById(SecondFactorId $secondFactorId): ?VettedSecondFactor; /** diff --git a/src/Surfnet/Stepup/Identity/Api/Whitelist.php b/src/Surfnet/Stepup/Identity/Api/Whitelist.php index a1098ac92..40a9097c0 100644 --- a/src/Surfnet/Stepup/Identity/Api/Whitelist.php +++ b/src/Surfnet/Stepup/Identity/Api/Whitelist.php @@ -29,29 +29,21 @@ public function __construct(); /** * Create a new Whitelist instance with the institutions that are on the initial whitelist - * - * @return Whitelist */ - public static function create(InstitutionCollection $institutionCollection); + public static function create(InstitutionCollection $institutionCollection): Whitelist; /** * Replace all institutions on the whitelist with the institutions in the given collection - * - * @return void */ - public function replaceAll(InstitutionCollection $institutionCollection); + public function replaceAll(InstitutionCollection $institutionCollection): void; /** * Add the institutions in the given collection to the whitelist - * - * @return void */ - public function add(InstitutionCollection $institutionCollection); + public function add(InstitutionCollection $institutionCollection): void; /** * Remove the institutions in the given collection from the whitelist - * - * @return mixed */ - public function remove(InstitutionCollection $institutionCollection); + public function remove(InstitutionCollection $institutionCollection): void; } diff --git a/src/Surfnet/Stepup/Identity/AuditLog/Metadata.php b/src/Surfnet/Stepup/Identity/AuditLog/Metadata.php index 2d574164e..1435235ad 100644 --- a/src/Surfnet/Stepup/Identity/AuditLog/Metadata.php +++ b/src/Surfnet/Stepup/Identity/AuditLog/Metadata.php @@ -32,43 +32,43 @@ final class Metadata /** * @var IdentityId */ - public $identityId; + public IdentityId $identityId; /** * @var Institution */ - public $identityInstitution; + public Institution $identityInstitution; /** * @var Institution */ - public $raInstitution; + public Institution $raInstitution; /** * @var SecondFactorId|null */ - public $secondFactorId; + public ?SecondFactorId $secondFactorId; /** * @var SecondFactorType|null */ - public $secondFactorType; + public ?SecondFactorType $secondFactorType; /** * @var SecondFactorIdentifier|null */ - public $secondFactorIdentifier; + public ?SecondFactorIdentifier $secondFactorIdentifier; /** @var VettingType */ - public $vettingType; + public VettingType $vettingType; /** * @var RecoveryTokenId */ - public $recoveryTokenId; + public RecoveryTokenId $recoveryTokenId; /** * @var RecoveryTokenType */ - public $recoveryTokenType; + public RecoveryTokenType $recoveryTokenType; } diff --git a/src/Surfnet/Stepup/Identity/Entity/ConfigurableSettings.php b/src/Surfnet/Stepup/Identity/Entity/ConfigurableSettings.php index 629e8a809..3ebab62d6 100644 --- a/src/Surfnet/Stepup/Identity/Entity/ConfigurableSettings.php +++ b/src/Surfnet/Stepup/Identity/Entity/ConfigurableSettings.php @@ -18,6 +18,7 @@ namespace Surfnet\Stepup\Identity\Entity; +use Exception; use Surfnet\Stepup\DateTime\DateTime; use Surfnet\Stepup\Exception\InvalidArgumentException; use Surfnet\Stepup\Identity\Value\EmailVerificationWindow; @@ -57,6 +58,8 @@ private function __construct( * @param int $emailVerificationTimeFrame positive integer * @param string[] $locales * @return ConfigurableSettings + * @throws Exception + * @throws Exception */ public static function create($emailVerificationTimeFrame, array $locales): self { @@ -72,7 +75,7 @@ public static function create($emailVerificationTimeFrame, array $locales): self /** * @return EmailVerificationWindow */ - public function createNewEmailVerificationWindow() + public function createNewEmailVerificationWindow(): EmailVerificationWindow { return EmailVerificationWindow::createFromTimeFrameStartingAt( $this->emailVerificationTimeFrame, @@ -80,9 +83,6 @@ public function createNewEmailVerificationWindow() ); } - /** - * @return bool - */ public function isSupportedLocale(Locale $locale): bool { return array_reduce( diff --git a/src/Surfnet/Stepup/Identity/Entity/InstitutionCollection.php b/src/Surfnet/Stepup/Identity/Entity/InstitutionCollection.php index af33f6018..3b319bb15 100644 --- a/src/Surfnet/Stepup/Identity/Entity/InstitutionCollection.php +++ b/src/Surfnet/Stepup/Identity/Entity/InstitutionCollection.php @@ -23,7 +23,7 @@ final class InstitutionCollection { - private $institutions = []; + private array $institutions = []; public function set(Institution $institution): void { diff --git a/src/Surfnet/Stepup/Identity/Entity/RegistrationAuthority.php b/src/Surfnet/Stepup/Identity/Entity/RegistrationAuthority.php index c5d1903d7..87dbc7c11 100644 --- a/src/Surfnet/Stepup/Identity/Entity/RegistrationAuthority.php +++ b/src/Surfnet/Stepup/Identity/Entity/RegistrationAuthority.php @@ -37,9 +37,6 @@ final class RegistrationAuthority extends SimpleEventSourcedEntity private ?Institution $institution = null; - /** - * @return RegistrationAuthority - */ public static function accreditWith( RegistrationAuthorityRole $role, Location $location, @@ -61,26 +58,17 @@ public function amendInformation(Location $location, ContactInformation $contact $this->contactInformation = $contactInformation; } - /** - * @return void - */ public function appointAs(RegistrationAuthorityRole $role): void { $this->role = $role; } - /** - * @return bool - */ - public function isAppointedAs(RegistrationAuthorityRole $role) + public function isAppointedAs(RegistrationAuthorityRole $role): bool { return $this->role->equals($role); } - /** - * @return RegistrationAuthorityRole - */ - public function getRole() + public function getRole(): ?RegistrationAuthorityRole { return $this->role; } diff --git a/src/Surfnet/Stepup/Identity/Entity/SecondFactorCollection.php b/src/Surfnet/Stepup/Identity/Entity/SecondFactorCollection.php index 47f6d8306..750cd99b4 100644 --- a/src/Surfnet/Stepup/Identity/Entity/SecondFactorCollection.php +++ b/src/Surfnet/Stepup/Identity/Entity/SecondFactorCollection.php @@ -26,10 +26,7 @@ final class SecondFactorCollection extends ArrayCollection { - /** - * @return null|SecondFactor - */ - public function getSecondFactorWithHighestLoa(SecondFactorTypeService $service) + public function getSecondFactorWithHighestLoa(SecondFactorTypeService $service): ?SecondFactor { // We can only get the highest loa'ed second factor when we have a collection of // VettedSecondFactors. The because that is the only SF type that has a vetting diff --git a/src/Surfnet/Stepup/Identity/Entity/UnverifiedSecondFactor.php b/src/Surfnet/Stepup/Identity/Entity/UnverifiedSecondFactor.php index 401c438fe..51c35f40c 100644 --- a/src/Surfnet/Stepup/Identity/Entity/UnverifiedSecondFactor.php +++ b/src/Surfnet/Stepup/Identity/Entity/UnverifiedSecondFactor.php @@ -49,24 +49,19 @@ class UnverifiedSecondFactor extends AbstractSecondFactor /** * @var SecondFactorIdentifier */ - private $secondFactorIdentifier; + private SecondFactorIdentifier $secondFactorIdentifier; private ?EmailVerificationWindow $verificationWindow = null; private ?string $verificationNonce = null; - /** - * @param SecondFactorIdentifier $secondFactorIdentifier - * @param string $verificationNonce - * @return UnverifiedSecondFactor - */ public static function create( - SecondFactorId $id, - Identity $identity, - SecondFactorType $type, - $secondFactorIdentifier, + SecondFactorId $id, + Identity $identity, + SecondFactorType $type, + SecondFactorIdentifier $secondFactorIdentifier, EmailVerificationWindow $emailVerificationWindow, - $verificationNonce, + string $verificationNonce, ): self { if (!is_string($verificationNonce)) { throw InvalidArgumentException::invalidType('string', 'verificationNonce', $verificationNonce); @@ -91,10 +86,7 @@ final public function __construct() { } - /** - * @return SecondFactorId - */ - public function getId() + public function getId(): ?SecondFactorId { return $this->id; } @@ -103,7 +95,7 @@ public function getId() * @param string $verificationNonce * @return bool */ - public function hasNonce($verificationNonce): bool + public function hasNonce(string $verificationNonce): bool { return $this->verificationNonce === $verificationNonce; } @@ -111,7 +103,7 @@ public function hasNonce($verificationNonce): bool /** * @return bool */ - public function canBeVerifiedNow() + public function canBeVerifiedNow(): bool { return $this->verificationWindow->isOpen(); } @@ -161,11 +153,7 @@ public function complyWithRevocation(IdentityId $authorityId): void ); } - /** - * @param string $registrationCode - * @return VerifiedSecondFactor - */ - public function asVerified(DateTime $registrationRequestedAt, $registrationCode) + public function asVerified(DateTime $registrationRequestedAt, string $registrationCode): VerifiedSecondFactor { return VerifiedSecondFactor::create( $this->id, @@ -177,7 +165,7 @@ public function asVerified(DateTime $registrationRequestedAt, $registrationCode) ); } - protected function applyIdentityForgottenEvent(IdentityForgottenEvent $event) + protected function applyIdentityForgottenEvent(IdentityForgottenEvent $event): void { $secondFactorIdentifierClass = $this->secondFactorIdentifier::class; diff --git a/src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php b/src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php index 2efd55641..2e7043d1c 100644 --- a/src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php +++ b/src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php @@ -53,23 +53,19 @@ class VerifiedSecondFactor extends AbstractSecondFactor /** * @var SecondFactorIdentifier */ - private $secondFactorIdentifier; + private SecondFactorIdentifier $secondFactorIdentifier; private ?DateTime $registrationRequestedAt = null; private ?string $registrationCode = null; - /** - * @param string $registrationCode - * @return self - */ public static function create( - SecondFactorId $id, - Identity $identity, - SecondFactorType $type, + SecondFactorId $id, + Identity $identity, + SecondFactorType $type, SecondFactorIdentifier $secondFactorIdentifier, - DateTime $registrationRequestedAt, - $registrationCode, + DateTime $registrationRequestedAt, + string $registrationCode, ): self { if (!is_string($registrationCode)) { throw InvalidArgumentException::invalidType('string', 'registrationCode', $registrationCode); @@ -90,20 +86,13 @@ final private function __construct() { } - /** - * @return SecondFactorId - */ - public function getId() + public function getId(): ?SecondFactorId { return $this->id; } - /** - * @param string $registrationCode - * @return bool - */ public function hasRegistrationCodeAndIdentifier( - $registrationCode, + string $registrationCode, SecondFactorIdentifier $secondFactorIdentifier, ): bool { return strcasecmp($registrationCode, (string)$this->registrationCode) === 0 @@ -185,10 +174,7 @@ public function complyWithRevocation(IdentityId $authorityId): void ); } - /** - * @return VettedSecondFactor - */ - public function asVetted(VettingType $vettingType) + public function asVetted(VettingType $vettingType): VettedSecondFactor { return VettedSecondFactor::create( $this->id, @@ -199,16 +185,18 @@ public function asVetted(VettingType $vettingType) ); } - public function getLoaLevel(SecondFactorTypeService $secondFactorTypeService): int + public function getLoaLevel(SecondFactorTypeService $secondFactorTypeService): float { return $secondFactorTypeService->getLevel($this->type, new StepupVettingType(VettingType::TYPE_UNKNOWN)); } - protected function applyIdentityForgottenEvent(IdentityForgottenEvent $event) + protected function applyIdentityForgottenEvent(IdentityForgottenEvent $event): void { $secondFactorIdentifierClass = $this->secondFactorIdentifier::class; - $this->secondFactorIdentifier = $secondFactorIdentifierClass::unknown(); + $identifier = $secondFactorIdentifierClass::unknown(); + assert($identifier instanceof SecondFactorIdentifier); + $this->secondFactorIdentifier = $identifier; } public function getType(): SecondFactorType diff --git a/src/Surfnet/Stepup/Identity/Entity/VettedSecondFactor.php b/src/Surfnet/Stepup/Identity/Entity/VettedSecondFactor.php index 6c88ce893..107a84adc 100644 --- a/src/Surfnet/Stepup/Identity/Entity/VettedSecondFactor.php +++ b/src/Surfnet/Stepup/Identity/Entity/VettedSecondFactor.php @@ -44,13 +44,10 @@ class VettedSecondFactor extends AbstractSecondFactor /** * @var SecondFactorIdentifier */ - private $secondFactorIdentifier; + private SecondFactorIdentifier $secondFactorIdentifier; private ?VettingType $vettingType = null; - /** - * @return VettedSecondFactor - */ public static function create( SecondFactorId $id, Identity $identity, @@ -72,10 +69,7 @@ final public function __construct() { } - /** - * @return SecondFactorId - */ - public function getId() + public function getId(): ?SecondFactorId { return $this->id; } @@ -112,7 +106,7 @@ public function vettingType(): VettingType return $this->vettingType; } - protected function applyIdentityForgottenEvent(IdentityForgottenEvent $event) + protected function applyIdentityForgottenEvent(IdentityForgottenEvent $event): void { $secondFactorIdentifierClass = $this->secondFactorIdentifier::class; diff --git a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php index a1ba0e6be..a1f9b27f8 100644 --- a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php @@ -36,12 +36,12 @@ class AppointedAsRaForInstitutionEvent extends IdentityEvent implements RightToO /** * @var NameId */ - public $nameId; + public NameId $nameId; /** * @var Institution */ - public $raInstitution; + public Institution $raInstitution; public function __construct( IdentityId $identityId, diff --git a/src/Surfnet/Stepup/Identity/Event/AuditableEvent.php b/src/Surfnet/Stepup/Identity/Event/AuditableEvent.php index 5c6937309..e62f58111 100644 --- a/src/Surfnet/Stepup/Identity/Event/AuditableEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/AuditableEvent.php @@ -25,5 +25,5 @@ interface AuditableEvent /** * @return Metadata */ - public function getAuditLogMetadata(); + public function getAuditLogMetadata(): Metadata; } diff --git a/src/Surfnet/Stepup/Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php b/src/Surfnet/Stepup/Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php index d63016883..631d76ce4 100644 --- a/src/Surfnet/Stepup/Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php @@ -30,15 +30,15 @@ class CompliedWithRecoveryCodeRevocationEvent extends IdentityEvent implements R /** * @var IdentityId */ - public $authorityId; + public IdentityId $authorityId; /** * @var RecoveryTokenId */ - public $recoveryTokenId; + public RecoveryTokenId $recoveryTokenId; /** * @var RecoveryTokenType */ - public $recoveryTokenType; + public RecoveryTokenType $recoveryTokenType; private array $allowlist = [ 'identity_id', 'identity_institution', diff --git a/src/Surfnet/Stepup/Identity/Event/CompliedWithRevocationEvent.php b/src/Surfnet/Stepup/Identity/Event/CompliedWithRevocationEvent.php index 16388457d..e79aa3fa2 100644 --- a/src/Surfnet/Stepup/Identity/Event/CompliedWithRevocationEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/CompliedWithRevocationEvent.php @@ -42,22 +42,22 @@ abstract class CompliedWithRevocationEvent extends IdentityEvent implements Forg /** * @var IdentityId */ - public $authorityId; + public IdentityId $authorityId; /** * @var SecondFactorId */ - public $secondFactorId; + public SecondFactorId $secondFactorId; /** * @var SecondFactorType */ - public $secondFactorType; + public SecondFactorType $secondFactorType; /** * @var SecondFactorIdentifier */ - public $secondFactorIdentifier; + public SecondFactorIdentifier $secondFactorIdentifier; final public function __construct( IdentityId $identityId, @@ -115,7 +115,7 @@ final public function serialize(): array ]; } - public function getSensitiveData() + public function getSensitiveData(): SensitiveData { return (new SensitiveData) ->withSecondFactorIdentifier($this->secondFactorIdentifier, $this->secondFactorType); diff --git a/src/Surfnet/Stepup/Identity/Event/EmailVerifiedEvent.php b/src/Surfnet/Stepup/Identity/Event/EmailVerifiedEvent.php index 9245cfdc9..618fef8b3 100644 --- a/src/Surfnet/Stepup/Identity/Event/EmailVerifiedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/EmailVerifiedEvent.php @@ -53,32 +53,32 @@ class EmailVerifiedEvent extends IdentityEvent implements /** * @var SecondFactorId */ - public $secondFactorId; + public SecondFactorId $secondFactorId; /** * @var SecondFactorType */ - public $secondFactorType; + public SecondFactorType $secondFactorType; /** * @var DateTime */ - public $registrationRequestedAt; + public DateTime $registrationRequestedAt; /** * @var CommonName */ - public $commonName; + public CommonName $commonName; /** * @var Email */ - public $email; + public Email $email; /** * @var Locale Eg. "en_GB" */ - public $preferredLocale; + public Locale $preferredLocale; /** * @param IdentityId $identityId @@ -95,16 +95,16 @@ class EmailVerifiedEvent extends IdentityEvent implements * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function __construct( - IdentityId $identityId, - Institution $identityInstitution, - SecondFactorId $secondFactorId, - SecondFactorType $secondFactorType, + IdentityId $identityId, + Institution $identityInstitution, + SecondFactorId $secondFactorId, + SecondFactorType $secondFactorType, private SecondFactorIdentifier $secondFactorIdentifier, - DateTime $registrationRequestedAt, - public $registrationCode, - CommonName $commonName, - Email $email, - Locale $preferredLocale, + DateTime $registrationRequestedAt, + public string $registrationCode, + CommonName $commonName, + Email $email, + Locale $preferredLocale, ) { parent::__construct($identityId, $identityInstitution); @@ -162,7 +162,7 @@ public function serialize(): array ]; } - public function getSensitiveData() + public function getSensitiveData(): SensitiveData { return (new SensitiveData) ->withCommonName($this->commonName) diff --git a/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenAndVerifiedEvent.php b/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenAndVerifiedEvent.php index b76a4c9f0..da6455bc0 100644 --- a/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenAndVerifiedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenAndVerifiedEvent.php @@ -53,37 +53,37 @@ class GssfPossessionProvenAndVerifiedEvent extends IdentityEvent implements /** * @var SecondFactorId */ - public $secondFactorId; + public SecondFactorId $secondFactorId; /** * @var StepupProvider */ - public $stepupProvider; + public StepupProvider $stepupProvider; /** * @var GssfId */ - public $gssfId; + public GssfId $gssfId; /** * @var CommonName */ - public $commonName; + public CommonName $commonName; /** * @var Email */ - public $email; + public Email $email; /** * @var Locale Eg. "en_GB" */ - public $preferredLocale; + public Locale $preferredLocale; /** * @var DateTime */ - public $registrationRequestedAt; + public DateTime $registrationRequestedAt; /** * @param IdentityId $identityId @@ -100,16 +100,16 @@ class GssfPossessionProvenAndVerifiedEvent extends IdentityEvent implements * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function __construct( - IdentityId $identityId, - Institution $identityInstitution, + IdentityId $identityId, + Institution $identityInstitution, SecondFactorId $secondFactorId, StepupProvider $stepupProvider, - GssfId $gssfId, - CommonName $commonName, - Email $email, - Locale $locale, - DateTime $registrationRequestedAt, - public $registrationCode, + GssfId $gssfId, + CommonName $commonName, + Email $email, + Locale $locale, + DateTime $registrationRequestedAt, + public string $registrationCode, ) { parent::__construct($identityId, $identityInstitution); @@ -171,7 +171,7 @@ public function serialize(): array ]; } - public function getSensitiveData() + public function getSensitiveData(): SensitiveData { return (new SensitiveData) ->withCommonName($this->commonName) @@ -181,7 +181,9 @@ public function getSensitiveData() public function setSensitiveData(SensitiveData $sensitiveData): void { - $this->gssfId = $sensitiveData->getSecondFactorIdentifier(); + $gssfId = $sensitiveData->getSecondFactorIdentifier(); + assert($gssfId instanceof GssfId); + $this->gssfId = $gssfId; $this->email = $sensitiveData->getEmail(); $this->commonName = $sensitiveData->getCommonName(); } diff --git a/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenEvent.php b/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenEvent.php index ba3a0f742..c8244c0f2 100644 --- a/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenEvent.php @@ -49,65 +49,53 @@ class GssfPossessionProvenEvent extends IdentityEvent implements Forgettable, Ri /** * @var SecondFactorId */ - public $secondFactorId; + public SecondFactorId $secondFactorId; /** * @var StepupProvider */ - public $stepupProvider; + public StepupProvider $stepupProvider; /** * @var GssfId */ - public $gssfId; + public GssfId $gssfId; /** * @var EmailVerificationWindow */ - public $emailVerificationWindow; + public EmailVerificationWindow $emailVerificationWindow; /** * @var CommonName */ - public $commonName; + public CommonName $commonName; /** * @var Email */ - public $email; + public Email $email; /** * @var Locale Eg. "en_GB" */ - public $preferredLocale; + public Locale $preferredLocale; /** * @SuppressWarnings(PHPMD.ExcessiveParameterList) - * - * @param IdentityId $identityId - * @param Institution $identityInstitution - * @param SecondFactorId $secondFactorId - * @param StepupProvider $stepupProvider - * @param GssfId $gssfId - * @param bool $emailVerificationRequired - * @param EmailVerificationWindow $emailVerificationWindow - * @param string $emailVerificationNonce - * @param CommonName $commonName - * @param Email $email - * @param Locale $preferredLocale */ public function __construct( - IdentityId $identityId, - Institution $identityInstitution, - SecondFactorId $secondFactorId, - StepupProvider $stepupProvider, - GssfId $gssfId, - public $emailVerificationRequired, + IdentityId $identityId, + Institution $identityInstitution, + SecondFactorId $secondFactorId, + StepupProvider $stepupProvider, + GssfId $gssfId, + public bool $emailVerificationRequired, EmailVerificationWindow $emailVerificationWindow, - public $emailVerificationNonce, - CommonName $commonName, - Email $email, - Locale $preferredLocale, + public string $emailVerificationNonce, + CommonName $commonName, + Email $email, + Locale $preferredLocale, ) { parent::__construct($identityId, $identityInstitution); @@ -163,14 +151,14 @@ public function serialize(): array 'identity_institution' => (string)$this->identityInstitution, 'second_factor_id' => (string)$this->secondFactorId, 'stepup_provider' => (string)$this->stepupProvider, - 'email_verification_required' => (bool)$this->emailVerificationRequired, + 'email_verification_required' => $this->emailVerificationRequired, 'email_verification_window' => $this->emailVerificationWindow->serialize(), - 'email_verification_nonce' => (string)$this->emailVerificationNonce, + 'email_verification_nonce' => $this->emailVerificationNonce, 'preferred_locale' => (string)$this->preferredLocale, ]; } - public function getSensitiveData() + public function getSensitiveData(): SensitiveData { return (new SensitiveData) ->withCommonName($this->commonName) @@ -182,7 +170,9 @@ public function setSensitiveData(SensitiveData $sensitiveData): void { $this->email = $sensitiveData->getEmail(); $this->commonName = $sensitiveData->getCommonName(); - $this->gssfId = $sensitiveData->getSecondFactorIdentifier(); + $gssfId = $sensitiveData->getSecondFactorIdentifier(); + assert($gssfId instanceof GssfId); + $this->gssfId = $gssfId; } public function obtainUserData(): array diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php index 14f399325..f236f3c60 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php @@ -44,22 +44,22 @@ class IdentityAccreditedAsRaEvent extends IdentityEvent implements RightToObtain /** * @var NameId */ - public $nameId; + public NameId $nameId; /** * @var RegistrationAuthorityRole */ - public $registrationAuthorityRole; + public RegistrationAuthorityRole $registrationAuthorityRole; /** * @var Location */ - public $location; + public Location $location; /** * @var ContactInformation */ - public $contactInformation; + public ContactInformation $contactInformation; /** * @param IdentityId $identityId diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaForInstitutionEvent.php index a2da435c5..36235b5fe 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaForInstitutionEvent.php @@ -42,27 +42,27 @@ class IdentityAccreditedAsRaForInstitutionEvent extends IdentityEvent implements /** * @var NameId */ - public $nameId; + public NameId $nameId; /** * @var RegistrationAuthorityRole */ - public $registrationAuthorityRole; + public RegistrationAuthorityRole $registrationAuthorityRole; /** * @var Location */ - public $location; + public Location $location; /** * @var ContactInformation */ - public $contactInformation; + public ContactInformation $contactInformation; /** * @var Institution */ - public $raInstitution; + public Institution $raInstitution; /** * @param IdentityId $identityId diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php index da99be275..3eee576bc 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php @@ -44,22 +44,22 @@ class IdentityAccreditedAsRaaEvent extends IdentityEvent implements RightToObtai /** * @var NameId */ - public $nameId; + public NameId $nameId; /** * @var RegistrationAuthorityRole */ - public $registrationAuthorityRole; + public RegistrationAuthorityRole $registrationAuthorityRole; /** * @var Location */ - public $location; + public Location $location; /** * @var ContactInformation */ - public $contactInformation; + public ContactInformation $contactInformation; /** * @param IdentityId $identityId diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaForInstitutionEvent.php index 15165bfcf..775bdb563 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaForInstitutionEvent.php @@ -42,26 +42,26 @@ class IdentityAccreditedAsRaaForInstitutionEvent extends IdentityEvent implement /** * @var NameId */ - public $nameId; + public NameId $nameId; /** * @var RegistrationAuthorityRole */ - public $registrationAuthorityRole; + public RegistrationAuthorityRole $registrationAuthorityRole; /** * @var Location */ - public $location; + public Location $location; /** * @var ContactInformation */ - public $contactInformation; + public ContactInformation $contactInformation; /** * @var Institution */ - public $raInstitution; + public Institution $raInstitution; /** * @param IdentityId $identityId diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php index 859dccf48..f80c42663 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php @@ -43,22 +43,22 @@ class IdentityCreatedEvent extends IdentityEvent implements Forgettable, RightTo /** * @var NameId */ - public $nameId; + public NameId $nameId; /** * @var CommonName */ - public $commonName; + public CommonName $commonName; /** * @var Email */ - public $email; + public Email $email; /** * @var Locale */ - public $preferredLocale; + public Locale $preferredLocale; public function __construct( IdentityId $id, @@ -110,7 +110,7 @@ public function serialize(): array ]; } - public function getSensitiveData() + public function getSensitiveData(): SensitiveData { return (new SensitiveData) ->withCommonName($this->commonName) diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityEmailChangedEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityEmailChangedEvent.php index 739d5a27b..154bf73cb 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityEmailChangedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityEmailChangedEvent.php @@ -37,7 +37,7 @@ class IdentityEmailChangedEvent extends IdentityEvent implements Forgettable, Ri /** * @var Email */ - public $email; + public Email $email; public function __construct(IdentityId $identityId, Institution $institution, Email $email) { @@ -79,7 +79,7 @@ public function serialize(): array ]; } - public function getSensitiveData() + public function getSensitiveData(): SensitiveData { return (new SensitiveData) ->withEmail($this->email); diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityEvent.php index 315d92f3c..8856dab21 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityEvent.php @@ -30,12 +30,12 @@ abstract class IdentityEvent implements AuditableEvent, SerializableInterface /** * @var IdentityId */ - public $identityId; + public IdentityId $identityId; /** * @var Institution */ - public $identityInstitution; + public Institution $identityInstitution; public function __construct(IdentityId $identityId, Institution $identityInstitution) { diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityRenamedEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityRenamedEvent.php index 3073aacff..71a017159 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityRenamedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityRenamedEvent.php @@ -37,7 +37,7 @@ class IdentityRenamedEvent extends IdentityEvent implements Forgettable, RightTo /** * @var CommonName */ - public $commonName; + public CommonName $commonName; public function __construct(IdentityId $id, Institution $institution, CommonName $commonName) { @@ -79,7 +79,7 @@ public function serialize(): array ]; } - public function getSensitiveData() + public function getSensitiveData(): SensitiveData { return (new SensitiveData) ->withCommonName($this->commonName); diff --git a/src/Surfnet/Stepup/Identity/Event/InstitutionsAddedToWhitelistEvent.php b/src/Surfnet/Stepup/Identity/Event/InstitutionsAddedToWhitelistEvent.php index 35928a83b..d9d7fc7a5 100644 --- a/src/Surfnet/Stepup/Identity/Event/InstitutionsAddedToWhitelistEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/InstitutionsAddedToWhitelistEvent.php @@ -25,7 +25,7 @@ class InstitutionsAddedToWhitelistEvent implements WhitelistEvent /** * @var InstitutionCollection */ - public $addedInstitutions; + public InstitutionCollection $addedInstitutions; public function __construct(InstitutionCollection $addedInstitutions) { diff --git a/src/Surfnet/Stepup/Identity/Event/InstitutionsRemovedFromWhitelistEvent.php b/src/Surfnet/Stepup/Identity/Event/InstitutionsRemovedFromWhitelistEvent.php index 031faa6af..f69fc1957 100644 --- a/src/Surfnet/Stepup/Identity/Event/InstitutionsRemovedFromWhitelistEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/InstitutionsRemovedFromWhitelistEvent.php @@ -25,7 +25,7 @@ class InstitutionsRemovedFromWhitelistEvent implements WhitelistEvent /** * @var InstitutionCollection */ - public $removedInstitutions; + public InstitutionCollection $removedInstitutions; public function __construct(InstitutionCollection $removedInstitutions) { diff --git a/src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php b/src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php index 82fa4b3d9..e17d2ddc6 100644 --- a/src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php @@ -35,7 +35,7 @@ class LocalePreferenceExpressedEvent extends IdentityEvent implements RightToObt /** * @var Locale */ - public $preferredLocale; + public Locale $preferredLocale; /** * @param IdentityId $id diff --git a/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenAndVerifiedEvent.php b/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenAndVerifiedEvent.php index 68ccba346..4ac4ea094 100644 --- a/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenAndVerifiedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenAndVerifiedEvent.php @@ -52,32 +52,32 @@ class PhonePossessionProvenAndVerifiedEvent extends IdentityEvent implements /** * @var SecondFactorId */ - public $secondFactorId; + public SecondFactorId $secondFactorId; /** * @var PhoneNumber */ - public $phoneNumber; + public PhoneNumber $phoneNumber; /** * @var CommonName */ - public $commonName; + public CommonName $commonName; /** * @var Email */ - public $email; + public Email $email; /** * @var Locale Eg. "en_GB" */ - public $preferredLocale; + public Locale $preferredLocale; /** * @var DateTime */ - public $registrationRequestedAt; + public DateTime $registrationRequestedAt; /** * @param IdentityId $identityId @@ -91,15 +91,15 @@ class PhonePossessionProvenAndVerifiedEvent extends IdentityEvent implements * @param string $registrationCode */ public function __construct( - IdentityId $identityId, - Institution $identityInstitution, + IdentityId $identityId, + Institution $identityInstitution, SecondFactorId $secondFactorId, - PhoneNumber $phoneNumber, - CommonName $commonName, - Email $email, - Locale $locale, - DateTime $registrationRequestedAt, - public $registrationCode, + PhoneNumber $phoneNumber, + CommonName $commonName, + Email $email, + Locale $locale, + DateTime $registrationRequestedAt, + public string $registrationCode, ) { parent::__construct($identityId, $identityInstitution); @@ -158,7 +158,7 @@ public function serialize(): array ]; } - public function getSensitiveData() + public function getSensitiveData(): SensitiveData { return (new SensitiveData) ->withCommonName($this->commonName) @@ -168,7 +168,9 @@ public function getSensitiveData() public function setSensitiveData(SensitiveData $sensitiveData): void { - $this->phoneNumber = $sensitiveData->getSecondFactorIdentifier(); + $phoneNumber = $sensitiveData->getSecondFactorIdentifier(); + assert($phoneNumber instanceof PhoneNumber); + $this->phoneNumber = $phoneNumber; $this->email = $sensitiveData->getEmail(); $this->commonName = $sensitiveData->getCommonName(); } diff --git a/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenEvent.php b/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenEvent.php index 9aed2bdec..904709ed6 100644 --- a/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenEvent.php @@ -48,32 +48,32 @@ class PhonePossessionProvenEvent extends IdentityEvent implements Forgettable, R /** * @var SecondFactorId */ - public $secondFactorId; + public SecondFactorId $secondFactorId; /** * @var PhoneNumber */ - public $phoneNumber; + public PhoneNumber $phoneNumber; /** * @var EmailVerificationWindow */ - public $emailVerificationWindow; + public EmailVerificationWindow $emailVerificationWindow; /** * @var CommonName */ - public $commonName; + public CommonName $commonName; /** * @var Email */ - public $email; + public Email $email; /** * @var Locale Eg. "en_GB" */ - public $preferredLocale; + public Locale $preferredLocale; /** * @param IdentityId $identityId @@ -90,16 +90,16 @@ class PhonePossessionProvenEvent extends IdentityEvent implements Forgettable, R * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function __construct( - IdentityId $identityId, - Institution $identityInstitution, - SecondFactorId $secondFactorId, - PhoneNumber $phoneNumber, - public $emailVerificationRequired, + IdentityId $identityId, + Institution $identityInstitution, + SecondFactorId $secondFactorId, + PhoneNumber $phoneNumber, + public bool $emailVerificationRequired, EmailVerificationWindow $emailVerificationWindow, - public $emailVerificationNonce, - CommonName $commonName, - Email $email, - Locale $preferredLocale, + public string $emailVerificationNonce, + CommonName $commonName, + Email $email, + Locale $preferredLocale, ) { parent::__construct($identityId, $identityInstitution); @@ -152,14 +152,14 @@ public function serialize(): array 'identity_id' => (string)$this->identityId, 'identity_institution' => (string)$this->identityInstitution, 'second_factor_id' => (string)$this->secondFactorId, - 'email_verification_required' => (bool)$this->emailVerificationRequired, + 'email_verification_required' => $this->emailVerificationRequired, 'email_verification_window' => $this->emailVerificationWindow->serialize(), - 'email_verification_nonce' => (string)$this->emailVerificationNonce, + 'email_verification_nonce' => $this->emailVerificationNonce, 'preferred_locale' => (string)$this->preferredLocale, ]; } - public function getSensitiveData() + public function getSensitiveData(): SensitiveData { return (new SensitiveData) ->withCommonName($this->commonName) @@ -171,7 +171,9 @@ public function setSensitiveData(SensitiveData $sensitiveData): void { $this->email = $sensitiveData->getEmail(); $this->commonName = $sensitiveData->getCommonName(); - $this->phoneNumber = $sensitiveData->getSecondFactorIdentifier(); + $phoneNumber = $sensitiveData->getSecondFactorIdentifier(); + assert($phoneNumber instanceof PhoneNumber); + $this->phoneNumber = $phoneNumber; } public function obtainUserData(): array diff --git a/src/Surfnet/Stepup/Identity/Event/PhoneRecoveryTokenPossessionProvenEvent.php b/src/Surfnet/Stepup/Identity/Event/PhoneRecoveryTokenPossessionProvenEvent.php index 62ec91f87..328baaeaa 100644 --- a/src/Surfnet/Stepup/Identity/Event/PhoneRecoveryTokenPossessionProvenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/PhoneRecoveryTokenPossessionProvenEvent.php @@ -51,27 +51,27 @@ class PhoneRecoveryTokenPossessionProvenEvent extends IdentityEvent implements F /** * @var RecoveryTokenId */ - public $recoveryTokenId; + public RecoveryTokenId $recoveryTokenId; /** * @var PhoneNumber */ - public $phoneNumber; + public PhoneNumber $phoneNumber; /** * @var CommonName */ - public $commonName; + public CommonName $commonName; /** * @var Email */ - public $email; + public Email $email; /** * @var Locale Eg. "en_GB" */ - public $preferredLocale; + public Locale $preferredLocale; public function __construct( IdentityId $identityId, @@ -96,8 +96,8 @@ public function getAuditLogMetadata(): Metadata $metadata = new Metadata(); $metadata->identityId = $this->identityId; $metadata->identityInstitution = $this->identityInstitution; - $metadata->recoveryTokenId = (string)$this->phoneNumber; - $metadata->recoveryTokenType = RecoveryTokenType::TYPE_SMS; + $metadata->recoveryTokenId = new RecoveryTokenId((string) $this->phoneNumber); + $metadata->recoveryTokenType = RecoveryTokenType::sms(); return $metadata; } @@ -140,7 +140,9 @@ public function setSensitiveData(SensitiveData $sensitiveData): void { $this->email = $sensitiveData->getEmail(); $this->commonName = $sensitiveData->getCommonName(); - $this->phoneNumber = $sensitiveData->getRecoveryTokenIdentifier(); + $phoneNumber = $sensitiveData->getRecoveryTokenIdentifier(); + assert($phoneNumber instanceof PhoneNumber); + $this->phoneNumber = $phoneNumber; } public function obtainUserData(): array diff --git a/src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php b/src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php index 3f7cb3c8d..e1cf90c80 100644 --- a/src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php @@ -30,11 +30,11 @@ class RecoveryTokenRevokedEvent extends IdentityEvent implements RightToObtainDa /** * @var RecoveryTokenId */ - public $recoveryTokenId; + public RecoveryTokenId $recoveryTokenId; /** * @var RecoveryTokenType */ - public $recoveryTokenType; + public RecoveryTokenType $recoveryTokenType; private array $allowlist = [ 'identity_id', diff --git a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedEvent.php b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedEvent.php index 161ab0977..38fc00ae6 100644 --- a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedEvent.php @@ -42,17 +42,17 @@ class RegistrationAuthorityInformationAmendedEvent extends IdentityEvent impleme /** * @var NameId */ - public $nameId; + public NameId $nameId; /** * @var Location */ - public $location; + public Location $location; /** * @var ContactInformation */ - public $contactInformation; + public ContactInformation $contactInformation; /** * @param IdentityId $identityId diff --git a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedForInstitutionEvent.php index 74d7892d7..e23ab8f21 100644 --- a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedForInstitutionEvent.php @@ -41,22 +41,22 @@ class RegistrationAuthorityInformationAmendedForInstitutionEvent extends Identit /** * @var NameId */ - public $nameId; + public NameId $nameId; /** * @var Location */ - public $location; + public Location $location; /** * @var ContactInformation */ - public $contactInformation; + public ContactInformation $contactInformation; /** * @var Institution */ - public $raInstitution; + public Institution $raInstitution; /** * @param IdentityId $identityId diff --git a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedEvent.php b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedEvent.php index 8dc615ba3..922a751a8 100644 --- a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedEvent.php @@ -44,17 +44,17 @@ class RegistrationAuthorityRetractedEvent extends IdentityEvent implements Forge /** * @var NameId */ - public $nameId; + public NameId $nameId; /** * @var CommonName */ - public $commonName; + public CommonName $commonName; /** * @var Email */ - public $email; + public Email $email; public function __construct( IdentityId $identityId, @@ -99,7 +99,7 @@ public function serialize(): array ]; } - public function getSensitiveData() + public function getSensitiveData(): SensitiveData { return (new SensitiveData) ->withCommonName($this->commonName) diff --git a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedForInstitutionEvent.php index 3fea29a7c..b2613861a 100644 --- a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedForInstitutionEvent.php @@ -44,22 +44,22 @@ class RegistrationAuthorityRetractedForInstitutionEvent extends IdentityEvent im /** * @var NameId */ - public $nameId; + public NameId $nameId; /** * @var CommonName */ - public $commonName; + public CommonName $commonName; /** * @var Email */ - public $email; + public Email $email; /** * @var Institution */ - public $raInstitution; + public Institution $raInstitution; public function __construct( IdentityId $identityId, @@ -111,7 +111,7 @@ public function serialize(): array ]; } - public function getSensitiveData() + public function getSensitiveData(): SensitiveData { return (new SensitiveData) ->withCommonName($this->commonName) diff --git a/src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php b/src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php index fd661d78b..78b77587e 100644 --- a/src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php @@ -85,8 +85,8 @@ public function getAuditLogMetadata(): Metadata $metadata->identityId = $this->identityId; $metadata->identityInstitution = $this->identityInstitution; // In the audit log we do not show the secret (hashed) - $metadata->recoveryTokenId = (string)SafeStore::hidden(); - $metadata->recoveryTokenType = RecoveryTokenType::TYPE_SAFE_STORE; + $metadata->recoveryTokenId = new RecoveryTokenId((string) SafeStore::hidden()); + $metadata->recoveryTokenType = RecoveryTokenType::safeStore(); return $metadata; } diff --git a/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php b/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php index 25e6d6fa2..72652f4d5 100644 --- a/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php @@ -59,45 +59,45 @@ class SecondFactorMigratedEvent extends IdentityEvent implements Forgettable, Ri /** * @var NameId */ - public $targetNameId; + public NameId $targetNameId; /** * @var SecondFactorId */ - public $secondFactorId; + public SecondFactorId $secondFactorId; /** * @var SecondFactorId */ - public $newSecondFactorId; + public SecondFactorId $newSecondFactorId; /** * @var SecondFactorType */ - public $secondFactorType; + public SecondFactorType $secondFactorType; /** * @var SecondFactorIdentifier */ - public $secondFactorIdentifier; + public SecondFactorIdentifier $secondFactorIdentifier; /** * @var CommonName */ - public $commonName; + public CommonName $commonName; /** * @var Email */ - public $email; + public Email $email; /** * @var Locale */ - public $preferredLocale; + public Locale $preferredLocale; /** * @var VettingType */ - public $vettingType; + public VettingType $vettingType; /** * @SuppressWarnings(PHPMD.ExcessiveParameterList) @@ -184,7 +184,7 @@ public function serialize(): array ]; } - public function getSensitiveData() + public function getSensitiveData(): SensitiveData { return (new SensitiveData) ->withCommonName($this->commonName) diff --git a/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedToEvent.php b/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedToEvent.php index 8bc4f1759..c3159993d 100644 --- a/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedToEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedToEvent.php @@ -47,27 +47,27 @@ class SecondFactorMigratedToEvent extends IdentityEvent implements Forgettable, /** * @var Institution */ - public $targetInstitution; + public Institution $targetInstitution; /** * @var SecondFactorId */ - public $secondFactorId; + public SecondFactorId $secondFactorId; /** * @var SecondFactorId */ - public $targetSecondFactorId; + public SecondFactorId $targetSecondFactorId; /** * @var SecondFactorType */ - public $secondFactorType; + public SecondFactorType $secondFactorType; /** * @var SecondFactorIdentifier */ - public $secondFactorIdentifier; + public SecondFactorIdentifier $secondFactorIdentifier; /** * @SuppressWarnings(PHPMD.ExcessiveParameterList) @@ -131,7 +131,7 @@ public function serialize(): array ]; } - public function getSensitiveData() + public function getSensitiveData(): SensitiveData { return (new SensitiveData) ->withSecondFactorIdentifier($this->secondFactorIdentifier, $this->secondFactorType); diff --git a/src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php b/src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php index 35f39979a..add677c7f 100644 --- a/src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php @@ -42,17 +42,17 @@ abstract class SecondFactorRevokedEvent extends IdentityEvent implements Forgett /** * @var SecondFactorId */ - public $secondFactorId; + public SecondFactorId $secondFactorId; /** * @var SecondFactorType */ - public $secondFactorType; + public SecondFactorType $secondFactorType; /** * @var SecondFactorIdentifier */ - public $secondFactorIdentifier; + public SecondFactorIdentifier $secondFactorIdentifier; final public function __construct( IdentityId $identityId, @@ -106,7 +106,7 @@ final public function serialize(): array ]; } - public function getSensitiveData() + public function getSensitiveData(): SensitiveData { return (new SensitiveData) ->withSecondFactorIdentifier($this->secondFactorIdentifier, $this->secondFactorType); diff --git a/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php b/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php index 8f9316498..b1b9aa517 100644 --- a/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php @@ -56,40 +56,40 @@ class SecondFactorVettedEvent extends IdentityEvent implements Forgettable, Righ /** * @var NameId */ - public $nameId; + public NameId $nameId; /** * @var SecondFactorId */ - public $secondFactorId; + public SecondFactorId $secondFactorId; /** * @var SecondFactorType */ - public $secondFactorType; + public SecondFactorType $secondFactorType; /** * @var SecondFactorIdentifier */ - public $secondFactorIdentifier; + public SecondFactorIdentifier $secondFactorIdentifier; /** * @var CommonName */ - public $commonName; + public CommonName $commonName; /** * @var Email */ - public $email; + public Email $email; /** * @var Locale Eg. "en_GB" */ - public $preferredLocale; + public Locale $preferredLocale; /** @var VettingType */ - public $vettingType; + public VettingType $vettingType; /** * @SuppressWarnings(PHPMD.ExcessiveParameterList) diff --git a/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php b/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php index 3057fb84f..81d819c64 100644 --- a/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php +++ b/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php @@ -59,45 +59,45 @@ class SecondFactorVettedWithoutTokenProofOfPossession extends IdentityEvent impl /** * @var NameId */ - public $nameId; + public NameId $nameId; /** * @var SecondFactorId */ - public $secondFactorId; + public SecondFactorId $secondFactorId; /** * @var SecondFactorType */ - public $secondFactorType; + public SecondFactorType $secondFactorType; /** * @var SecondFactorIdentifier */ - public $secondFactorIdentifier; + public SecondFactorIdentifier $secondFactorIdentifier; /** * @var DocumentNumber */ - public $documentNumber; + public DocumentNumber $documentNumber; /** * @var CommonName */ - public $commonName; + public CommonName $commonName; /** * @var Email */ - public $email; + public Email $email; /** * @var Locale Eg. "en_GB" */ - public $preferredLocale; + public Locale $preferredLocale; /** @var VettingType */ - public $vettingType; + public VettingType $vettingType; /** * @SuppressWarnings(PHPMD.ExcessiveParameterList) diff --git a/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenAndVerifiedEvent.php b/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenAndVerifiedEvent.php index 952be5472..4d0c689e9 100644 --- a/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenAndVerifiedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenAndVerifiedEvent.php @@ -55,32 +55,32 @@ class U2fDevicePossessionProvenAndVerifiedEvent extends IdentityEvent implements /** * @var SecondFactorId */ - public $secondFactorId; + public SecondFactorId $secondFactorId; /** * @var U2fKeyHandle */ - public $keyHandle; + public U2fKeyHandle $keyHandle; /** * @var CommonName */ - public $commonName; + public CommonName $commonName; /** * @var Email */ - public $email; + public Email $email; /** * @var Locale Eg. "en_GB" */ - public $preferredLocale; + public Locale $preferredLocale; /** * @var DateTime */ - public $registrationRequestedAt; + public DateTime $registrationRequestedAt; /** * @param IdentityId $identityId @@ -94,15 +94,15 @@ class U2fDevicePossessionProvenAndVerifiedEvent extends IdentityEvent implements * @param string $registrationCode */ public function __construct( - IdentityId $identityId, - Institution $identityInstitution, + IdentityId $identityId, + Institution $identityInstitution, SecondFactorId $secondFactorId, - U2fKeyHandle $keyHandle, - CommonName $commonName, - Email $email, - Locale $locale, - DateTime $registrationRequestedAt, - public $registrationCode, + U2fKeyHandle $keyHandle, + CommonName $commonName, + Email $email, + Locale $locale, + DateTime $registrationRequestedAt, + public string $registrationCode, ) { parent::__construct($identityId, $identityInstitution); @@ -161,7 +161,7 @@ public function serialize(): array ]; } - public function getSensitiveData() + public function getSensitiveData(): SensitiveData { return (new SensitiveData) ->withCommonName($this->commonName) @@ -171,7 +171,9 @@ public function getSensitiveData() public function setSensitiveData(SensitiveData $sensitiveData): void { - $this->keyHandle = $sensitiveData->getSecondFactorIdentifier(); + $keyHandle = $sensitiveData->getSecondFactorIdentifier(); + assert($keyHandle instanceof U2fKeyHandle); + $this->keyHandle = $keyHandle; $this->email = $sensitiveData->getEmail(); $this->commonName = $sensitiveData->getCommonName(); } diff --git a/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php b/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php index c16bb4327..e137c3aeb 100644 --- a/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php @@ -51,32 +51,32 @@ class U2fDevicePossessionProvenEvent extends IdentityEvent implements Forgettabl /** * @var SecondFactorId */ - public $secondFactorId; + public SecondFactorId $secondFactorId; /** * @var U2fKeyHandle */ - public $keyHandle; + public U2fKeyHandle $keyHandle; /** * @var EmailVerificationWindow */ - public $emailVerificationWindow; + public EmailVerificationWindow $emailVerificationWindow; /** * @var CommonName */ - public $commonName; + public CommonName $commonName; /** * @var Email */ - public $email; + public Email $email; /** * @var Locale Eg. "en_GB" */ - public $preferredLocale; + public Locale $preferredLocale; /** * @param IdentityId $identityId @@ -93,16 +93,16 @@ class U2fDevicePossessionProvenEvent extends IdentityEvent implements Forgettabl * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function __construct( - IdentityId $identityId, - Institution $identityInstitution, - SecondFactorId $secondFactorId, - U2fKeyHandle $keyHandle, - public $emailVerificationRequired, + IdentityId $identityId, + Institution $identityInstitution, + SecondFactorId $secondFactorId, + U2fKeyHandle $keyHandle, + public bool $emailVerificationRequired, EmailVerificationWindow $emailVerificationWindow, - public $emailVerificationNonce, - CommonName $commonName, - Email $email, - Locale $preferredLocale, + public string $emailVerificationNonce, + CommonName $commonName, + Email $email, + Locale $preferredLocale, ) { parent::__construct($identityId, $identityInstitution); @@ -155,14 +155,14 @@ public function serialize(): array 'identity_id' => (string)$this->identityId, 'identity_institution' => (string)$this->identityInstitution, 'second_factor_id' => (string)$this->secondFactorId, - 'email_verification_required' => (bool)$this->emailVerificationRequired, + 'email_verification_required' => $this->emailVerificationRequired, 'email_verification_window' => $this->emailVerificationWindow->serialize(), - 'email_verification_nonce' => (string)$this->emailVerificationNonce, + 'email_verification_nonce' => $this->emailVerificationNonce, 'preferred_locale' => (string)$this->preferredLocale, ]; } - public function getSensitiveData() + public function getSensitiveData(): SensitiveData { return (new SensitiveData) ->withCommonName($this->commonName) @@ -174,7 +174,9 @@ public function setSensitiveData(SensitiveData $sensitiveData): void { $this->email = $sensitiveData->getEmail(); $this->commonName = $sensitiveData->getCommonName(); - $this->keyHandle = $sensitiveData->getSecondFactorIdentifier(); + $keyHandle = $sensitiveData->getSecondFactorIdentifier(); + assert($keyHandle instanceof U2fKeyHandle); + $this->keyHandle = $keyHandle; } public function obtainUserData(): array diff --git a/src/Surfnet/Stepup/Identity/Event/VettingTypeHintsSavedEvent.php b/src/Surfnet/Stepup/Identity/Event/VettingTypeHintsSavedEvent.php index 94188c638..6a06de510 100644 --- a/src/Surfnet/Stepup/Identity/Event/VettingTypeHintsSavedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/VettingTypeHintsSavedEvent.php @@ -36,12 +36,12 @@ class VettingTypeHintsSavedEvent extends IdentityEvent implements RightToObtainD /** * @var VettingTypeHintCollection */ - public $hints; + public VettingTypeHintCollection $hints; /** * @var Institution */ - public $institution; + public Institution $institution; public function __construct( IdentityId $identityId, diff --git a/src/Surfnet/Stepup/Identity/Event/WhitelistCreatedEvent.php b/src/Surfnet/Stepup/Identity/Event/WhitelistCreatedEvent.php index 59473df60..16a7a1634 100644 --- a/src/Surfnet/Stepup/Identity/Event/WhitelistCreatedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/WhitelistCreatedEvent.php @@ -25,7 +25,7 @@ class WhitelistCreatedEvent implements WhitelistEvent /** * @var InstitutionCollection */ - public $whitelistedInstitutions; + public InstitutionCollection $whitelistedInstitutions; public function __construct(InstitutionCollection $institutionCollection) { diff --git a/src/Surfnet/Stepup/Identity/Event/WhitelistReplacedEvent.php b/src/Surfnet/Stepup/Identity/Event/WhitelistReplacedEvent.php index a5ae233b8..4f5a2e3f1 100644 --- a/src/Surfnet/Stepup/Identity/Event/WhitelistReplacedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/WhitelistReplacedEvent.php @@ -25,7 +25,7 @@ class WhitelistReplacedEvent implements WhitelistEvent /** * @var InstitutionCollection */ - public $whitelistedInstitutions; + public InstitutionCollection $whitelistedInstitutions; public function __construct(InstitutionCollection $whitelistedInstitutions) { diff --git a/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenAndVerifiedEvent.php b/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenAndVerifiedEvent.php index 497bf6e2f..ddfbed24b 100644 --- a/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenAndVerifiedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenAndVerifiedEvent.php @@ -52,34 +52,34 @@ class YubikeyPossessionProvenAndVerifiedEvent extends IdentityEvent implements /** * @var SecondFactorId */ - public $secondFactorId; + public SecondFactorId $secondFactorId; /** * The Yubikey's public ID. * * @var YubikeyPublicId */ - public $yubikeyPublicId; + public YubikeyPublicId $yubikeyPublicId; /** * @var CommonName */ - public $commonName; + public CommonName $commonName; /** * @var Email */ - public $email; + public Email $email; /** * @var Locale Eg. "en_GB" */ - public $preferredLocale; + public Locale $preferredLocale; /** * @var DateTime */ - public $registrationRequestedAt; + public DateTime $registrationRequestedAt; /** * @param IdentityId $identityId @@ -93,15 +93,15 @@ class YubikeyPossessionProvenAndVerifiedEvent extends IdentityEvent implements * @param string $registrationCode */ public function __construct( - IdentityId $identityId, - Institution $institution, - SecondFactorId $secondFactorId, + IdentityId $identityId, + Institution $institution, + SecondFactorId $secondFactorId, YubikeyPublicId $yubikeyPublicId, - CommonName $commonName, - Email $email, - Locale $locale, - DateTime $registrationRequestedAt, - public $registrationCode, + CommonName $commonName, + Email $email, + Locale $locale, + DateTime $registrationRequestedAt, + public string $registrationCode, ) { parent::__construct($identityId, $institution); @@ -160,7 +160,7 @@ public function serialize(): array ]; } - public function getSensitiveData() + public function getSensitiveData(): SensitiveData { return (new SensitiveData) ->withCommonName($this->commonName) @@ -170,7 +170,10 @@ public function getSensitiveData() public function setSensitiveData(SensitiveData $sensitiveData): void { - $this->yubikeyPublicId = $sensitiveData->getSecondFactorIdentifier(); + $yubikeyPublicId = $sensitiveData->getSecondFactorIdentifier(); + assert($yubikeyPublicId instanceof YubikeyPublicId); + $this->yubikeyPublicId = $yubikeyPublicId; + $this->email = $sensitiveData->getEmail(); $this->commonName = $sensitiveData->getCommonName(); } diff --git a/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenEvent.php b/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenEvent.php index 50dcfd178..e9046f985 100644 --- a/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenEvent.php @@ -49,56 +49,54 @@ class YubikeyPossessionProvenEvent extends IdentityEvent implements Forgettable, /** * @var SecondFactorId */ - public $secondFactorId; + public SecondFactorId $secondFactorId; /** * The Yubikey's public ID. * * @var YubikeyPublicId */ - public $yubikeyPublicId; + public YubikeyPublicId $yubikeyPublicId; /** * @var DateTime */ - public $emailVerificationRequestedAt; + public DateTime $emailVerificationRequestedAt; /** * @var EmailVerificationWindow */ - public $emailVerificationWindow; + public EmailVerificationWindow $emailVerificationWindow; /** * @var CommonName */ - public $commonName; + public CommonName $commonName; /** * @var Email */ - public $email; + public Email $email; /** * @var Locale Eg. "en_GB" */ - public $preferredLocale; + public Locale $preferredLocale; /** - * @param bool $emailVerificationRequired - * @param string $emailVerificationNonce * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function __construct( - IdentityId $identityId, - Institution $institution, - SecondFactorId $secondFactorId, - YubikeyPublicId $yubikeyPublicId, - public $emailVerificationRequired, + IdentityId $identityId, + Institution $institution, + SecondFactorId $secondFactorId, + YubikeyPublicId $yubikeyPublicId, + public bool $emailVerificationRequired, EmailVerificationWindow $emailVerificationWindow, - public $emailVerificationNonce, - CommonName $commonName, - Email $email, - Locale $preferredLocale, + public string $emailVerificationNonce, + CommonName $commonName, + Email $email, + Locale $preferredLocale, ) { parent::__construct($identityId, $institution); @@ -151,14 +149,14 @@ public function serialize(): array 'identity_id' => (string)$this->identityId, 'identity_institution' => (string)$this->identityInstitution, 'second_factor_id' => (string)$this->secondFactorId, - 'email_verification_required' => (bool)$this->emailVerificationRequired, + 'email_verification_required' => $this->emailVerificationRequired, 'email_verification_window' => $this->emailVerificationWindow->serialize(), - 'email_verification_nonce' => (string)$this->emailVerificationNonce, + 'email_verification_nonce' => $this->emailVerificationNonce, 'preferred_locale' => (string)$this->preferredLocale, ]; } - public function getSensitiveData() + public function getSensitiveData(): SensitiveData { return (new SensitiveData) ->withCommonName($this->commonName) @@ -170,7 +168,9 @@ public function setSensitiveData(SensitiveData $sensitiveData): void { $this->email = $sensitiveData->getEmail(); $this->commonName = $sensitiveData->getCommonName(); - $this->yubikeyPublicId = $sensitiveData->getSecondFactorIdentifier(); + $yubikeyPublicId = $sensitiveData->getSecondFactorIdentifier(); + assert($yubikeyPublicId instanceof YubikeyPublicId); + $this->yubikeyPublicId = $yubikeyPublicId; } public function obtainUserData(): array diff --git a/src/Surfnet/Stepup/Identity/Event/YubikeySecondFactorBootstrappedEvent.php b/src/Surfnet/Stepup/Identity/Event/YubikeySecondFactorBootstrappedEvent.php index 2a9334a77..e986550a7 100644 --- a/src/Surfnet/Stepup/Identity/Event/YubikeySecondFactorBootstrappedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/YubikeySecondFactorBootstrappedEvent.php @@ -51,7 +51,7 @@ final class YubikeySecondFactorBootstrappedEvent extends IdentityEvent implement /** * @var Institution */ - public $institution; + public Institution $institution; public function __construct( IdentityId $identityId, @@ -107,7 +107,7 @@ public static function deserialize(array $data): self ); } - public function getSensitiveData() + public function getSensitiveData(): SensitiveData { return (new SensitiveData) ->withCommonName($this->commonName) @@ -119,7 +119,9 @@ public function setSensitiveData(SensitiveData $sensitiveData): void { $this->email = $sensitiveData->getEmail(); $this->commonName = $sensitiveData->getCommonName(); - $this->yubikeyPublicId = $sensitiveData->getSecondFactorIdentifier(); + $yubikeyPublicId = $sensitiveData->getSecondFactorIdentifier(); + assert($yubikeyPublicId instanceof YubikeyPublicId); + $this->yubikeyPublicId = $yubikeyPublicId; } public function obtainUserData(): array diff --git a/src/Surfnet/Stepup/Identity/Identity.php b/src/Surfnet/Stepup/Identity/Identity.php index 83e17ab97..d3da0c230 100644 --- a/src/Surfnet/Stepup/Identity/Identity.php +++ b/src/Surfnet/Stepup/Identity/Identity.php @@ -121,41 +121,32 @@ class Identity extends EventSourcedAggregateRoot implements IdentityApi /** * @var IdentityId */ - private $id; + private IdentityId $id; /** * @var Institution */ - private $institution; + private Institution $institution; /** * @var NameId */ - private $nameId; + private NameId $nameId; /** * @var CommonName */ - private $commonName; + private CommonName $commonName; /** * @var Email */ - private $email; + private Email $email; - /** - * @var SecondFactorCollection|UnverifiedSecondFactor[] - */ private ?SecondFactorCollection $unverifiedSecondFactors = null; - /** - * @var SecondFactorCollection|VerifiedSecondFactor[] - */ private ?SecondFactorCollection $verifiedSecondFactors = null; - /** - * @var SecondFactorCollection|VettedSecondFactor[] - */ private ?SecondFactorCollection $vettedSecondFactors = null; private ?RegistrationAuthorityCollection $registrationAuthorities = null; @@ -163,7 +154,7 @@ class Identity extends EventSourcedAggregateRoot implements IdentityApi /** * @var Locale */ - private $preferredLocale; + private Locale $preferredLocale; private ?bool $forgotten = null; @@ -212,9 +203,9 @@ public function changeEmail(Email $email): void } public function bootstrapYubikeySecondFactor( - SecondFactorId $secondFactorId, + SecondFactorId $secondFactorId, YubikeyPublicId $yubikeyPublicId, - $maxNumberOfTokens, + int $maxNumberOfTokens, ): void { $this->assertNotForgotten(); $this->assertUserMayAddSecondFactor($maxNumberOfTokens); @@ -234,11 +225,11 @@ public function bootstrapYubikeySecondFactor( } public function provePossessionOfYubikey( - SecondFactorId $secondFactorId, - YubikeyPublicId $yubikeyPublicId, - $emailVerificationRequired, + SecondFactorId $secondFactorId, + YubikeyPublicId $yubikeyPublicId, + bool $emailVerificationRequired, EmailVerificationWindow $emailVerificationWindow, - $maxNumberOfTokens, + int $maxNumberOfTokens, ): void { $this->assertNotForgotten(); $this->assertUserMayAddSecondFactor($maxNumberOfTokens); @@ -278,11 +269,11 @@ public function provePossessionOfYubikey( } public function provePossessionOfPhone( - SecondFactorId $secondFactorId, - PhoneNumber $phoneNumber, - $emailVerificationRequired, + SecondFactorId $secondFactorId, + PhoneNumber $phoneNumber, + bool $emailVerificationRequired, EmailVerificationWindow $emailVerificationWindow, - $maxNumberOfTokens, + int $maxNumberOfTokens, ): void { $this->assertNotForgotten(); $this->assertUserMayAddSecondFactor($maxNumberOfTokens); @@ -372,12 +363,12 @@ public function saveVettingTypeHints(Institution $institution, VettingTypeHintCo } public function provePossessionOfGssf( - SecondFactorId $secondFactorId, - StepupProvider $provider, - GssfId $gssfId, - $emailVerificationRequired, + SecondFactorId $secondFactorId, + StepupProvider $provider, + GssfId $gssfId, + bool $emailVerificationRequired, EmailVerificationWindow $emailVerificationWindow, - $maxNumberOfTokens, + $maxNumberOfTokens, ): void { $this->assertNotForgotten(); $this->assertUserMayAddSecondFactor($maxNumberOfTokens); @@ -422,11 +413,11 @@ public function provePossessionOfGssf( * @deprecated Built in U2F support is dropped from StepUp, this was not removed to support event replay */ public function provePossessionOfU2fDevice( - SecondFactorId $secondFactorId, - U2fKeyHandle $keyHandle, - $emailVerificationRequired, + SecondFactorId $secondFactorId, + U2fKeyHandle $keyHandle, + bool $emailVerificationRequired, EmailVerificationWindow $emailVerificationWindow, - $maxNumberOfTokens, + $maxNumberOfTokens, ): void { $this->assertNotForgotten(); $this->assertUserMayAddSecondFactor($maxNumberOfTokens); @@ -465,7 +456,7 @@ public function provePossessionOfU2fDevice( } } - public function verifyEmail($verificationNonce): void + public function verifyEmail(string $verificationNonce): void { $this->assertNotForgotten(); @@ -495,16 +486,16 @@ public function verifyEmail($verificationNonce): void * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function vetSecondFactor( - IdentityApi $registrant, - SecondFactorId $registrantsSecondFactorId, - SecondFactorType $registrantsSecondFactorType, - SecondFactorIdentifier $registrantsSecondFactorIdentifier, - $registrationCode, - DocumentNumber $documentNumber, - $identityVerified, - SecondFactorTypeService $secondFactorTypeService, + IdentityApi $registrant, + SecondFactorId $registrantsSecondFactorId, + SecondFactorType $registrantsSecondFactorType, + SecondFactorIdentifier $registrantsSecondFactorIdentifier, + string $registrationCode, + DocumentNumber $documentNumber, + bool $identityVerified, + SecondFactorTypeService $secondFactorTypeService, SecondFactorProvePossessionHelper $secondFactorProvePossessionHelper, - $provePossessionSkipped, + bool $provePossessionSkipped, ): void { $this->assertNotForgotten(); @@ -728,12 +719,12 @@ public function migrateVettedSecondFactor( } public function complyWithVettingOfSecondFactor( - SecondFactorId $secondFactorId, - SecondFactorType $secondFactorType, + SecondFactorId $secondFactorId, + SecondFactorType $secondFactorType, SecondFactorIdentifier $secondFactorIdentifier, - $registrationCode, - DocumentNumber $documentNumber, - $provePossessionSkipped, + string $registrationCode, + DocumentNumber $documentNumber, + bool $provePossessionSkipped, ): void { $this->assertNotForgotten(); @@ -1029,7 +1020,7 @@ public function allVettedSecondFactorsRemoved(): void ); } - protected function applyIdentityCreatedEvent(IdentityCreatedEvent $event) + protected function applyIdentityCreatedEvent(IdentityCreatedEvent $event): void { $this->id = $event->identityId; $this->institution = $event->identityInstitution; @@ -1056,7 +1047,7 @@ public function applyIdentityEmailChangedEvent(IdentityEmailChangedEvent $event) $this->email = $event->email; } - protected function applyYubikeySecondFactorBootstrappedEvent(YubikeySecondFactorBootstrappedEvent $event) + protected function applyYubikeySecondFactorBootstrappedEvent(YubikeySecondFactorBootstrappedEvent $event): void { $secondFactor = VettedSecondFactor::create( $event->secondFactorId, @@ -1069,7 +1060,7 @@ protected function applyYubikeySecondFactorBootstrappedEvent(YubikeySecondFactor $this->vettedSecondFactors->set((string)$secondFactor->getId(), $secondFactor); } - protected function applyYubikeyPossessionProvenEvent(YubikeyPossessionProvenEvent $event) + protected function applyYubikeyPossessionProvenEvent(YubikeyPossessionProvenEvent $event): void { $secondFactor = UnverifiedSecondFactor::create( $event->secondFactorId, @@ -1083,7 +1074,7 @@ protected function applyYubikeyPossessionProvenEvent(YubikeyPossessionProvenEven $this->unverifiedSecondFactors->set((string)$secondFactor->getId(), $secondFactor); } - protected function applyYubikeyPossessionProvenAndVerifiedEvent(YubikeyPossessionProvenAndVerifiedEvent $event) + protected function applyYubikeyPossessionProvenAndVerifiedEvent(YubikeyPossessionProvenAndVerifiedEvent $event): void { $secondFactor = VerifiedSecondFactor::create( $event->secondFactorId, @@ -1097,7 +1088,7 @@ protected function applyYubikeyPossessionProvenAndVerifiedEvent(YubikeyPossessio $this->verifiedSecondFactors->set((string)$secondFactor->getId(), $secondFactor); } - protected function applyPhonePossessionProvenEvent(PhonePossessionProvenEvent $event) + protected function applyPhonePossessionProvenEvent(PhonePossessionProvenEvent $event): void { $secondFactor = UnverifiedSecondFactor::create( $event->secondFactorId, @@ -1111,7 +1102,7 @@ protected function applyPhonePossessionProvenEvent(PhonePossessionProvenEvent $e $this->unverifiedSecondFactors->set((string)$secondFactor->getId(), $secondFactor); } - protected function applyPhonePossessionProvenAndVerifiedEvent(PhonePossessionProvenAndVerifiedEvent $event) + protected function applyPhonePossessionProvenAndVerifiedEvent(PhonePossessionProvenAndVerifiedEvent $event): void { $secondFactor = VerifiedSecondFactor::create( $event->secondFactorId, @@ -1125,7 +1116,7 @@ protected function applyPhonePossessionProvenAndVerifiedEvent(PhonePossessionPro $this->verifiedSecondFactors->set((string)$secondFactor->getId(), $secondFactor); } - protected function applyGssfPossessionProvenEvent(GssfPossessionProvenEvent $event) + protected function applyGssfPossessionProvenEvent(GssfPossessionProvenEvent $event): void { $secondFactor = UnverifiedSecondFactor::create( $event->secondFactorId, @@ -1139,7 +1130,7 @@ protected function applyGssfPossessionProvenEvent(GssfPossessionProvenEvent $eve $this->unverifiedSecondFactors->set((string)$secondFactor->getId(), $secondFactor); } - protected function applyGssfPossessionProvenAndVerifiedEvent(GssfPossessionProvenAndVerifiedEvent $event) + protected function applyGssfPossessionProvenAndVerifiedEvent(GssfPossessionProvenAndVerifiedEvent $event): void { $secondFactor = VerifiedSecondFactor::create( $event->secondFactorId, @@ -1153,7 +1144,7 @@ protected function applyGssfPossessionProvenAndVerifiedEvent(GssfPossessionProve $this->verifiedSecondFactors->set((string)$secondFactor->getId(), $secondFactor); } - protected function applyU2fDevicePossessionProvenEvent(U2fDevicePossessionProvenEvent $event) + protected function applyU2fDevicePossessionProvenEvent(U2fDevicePossessionProvenEvent $event): void { $secondFactor = UnverifiedSecondFactor::create( $event->secondFactorId, @@ -1167,7 +1158,7 @@ protected function applyU2fDevicePossessionProvenEvent(U2fDevicePossessionProven $this->unverifiedSecondFactors->set((string)$secondFactor->getId(), $secondFactor); } - protected function applyU2fDevicePossessionProvenAndVerifiedEvent(U2fDevicePossessionProvenAndVerifiedEvent $event) + protected function applyU2fDevicePossessionProvenAndVerifiedEvent(U2fDevicePossessionProvenAndVerifiedEvent $event): void { $secondFactor = VerifiedSecondFactor::create( $event->secondFactorId, @@ -1181,7 +1172,7 @@ protected function applyU2fDevicePossessionProvenAndVerifiedEvent(U2fDevicePosse $this->verifiedSecondFactors->set((string)$secondFactor->getId(), $secondFactor); } - protected function applyPhoneRecoveryTokenPossessionProvenEvent(PhoneRecoveryTokenPossessionProvenEvent $event) + protected function applyPhoneRecoveryTokenPossessionProvenEvent(PhoneRecoveryTokenPossessionProvenEvent $event): void { $recoveryToken = RecoveryTokenEntity::create($event->recoveryTokenId, RecoveryTokenType::sms(), $this); @@ -1190,13 +1181,14 @@ protected function applyPhoneRecoveryTokenPossessionProvenEvent(PhoneRecoveryTok protected function applySafeStoreSecretRecoveryTokenPossessionPromisedEvent( SafeStoreSecretRecoveryTokenPossessionPromisedEvent $event, - ) { + ): void + { $recoveryToken = RecoveryTokenEntity::create($event->recoveryTokenId, RecoveryTokenType::safeStore(), $this); $this->recoveryTokens->set($recoveryToken); } - protected function applyEmailVerifiedEvent(EmailVerifiedEvent $event) + protected function applyEmailVerifiedEvent(EmailVerifiedEvent $event): void { $secondFactorId = (string)$event->secondFactorId; @@ -1226,7 +1218,7 @@ public function applySecondFactorMigratedEvent(SecondFactorMigratedEvent $event) $this->vettedSecondFactors->set($secondFactorId, $vetted); } - protected function applySecondFactorVettedEvent(SecondFactorVettedEvent $event) + protected function applySecondFactorVettedEvent(SecondFactorVettedEvent $event): void { $secondFactorId = (string)$event->secondFactorId; $verified = $this->verifiedSecondFactors->get($secondFactorId); @@ -1237,7 +1229,8 @@ protected function applySecondFactorVettedEvent(SecondFactorVettedEvent $event) protected function applySecondFactorVettedWithoutTokenProofOfPossession( SecondFactorVettedWithoutTokenProofOfPossession $event, - ) { + ): void + { $secondFactorId = (string)$event->secondFactorId; /** @var VerifiedSecondFactor $verified */ @@ -1248,50 +1241,53 @@ protected function applySecondFactorVettedWithoutTokenProofOfPossession( $this->vettedSecondFactors->set($secondFactorId, $vetted); } - protected function applyUnverifiedSecondFactorRevokedEvent(UnverifiedSecondFactorRevokedEvent $event) + protected function applyUnverifiedSecondFactorRevokedEvent(UnverifiedSecondFactorRevokedEvent $event): void { $this->unverifiedSecondFactors->remove((string)$event->secondFactorId); } protected function applyCompliedWithUnverifiedSecondFactorRevocationEvent( CompliedWithUnverifiedSecondFactorRevocationEvent $event, - ) { + ): void + { $this->unverifiedSecondFactors->remove((string)$event->secondFactorId); } - protected function applyVerifiedSecondFactorRevokedEvent(VerifiedSecondFactorRevokedEvent $event) + protected function applyVerifiedSecondFactorRevokedEvent(VerifiedSecondFactorRevokedEvent $event): void { $this->verifiedSecondFactors->remove((string)$event->secondFactorId); } protected function applyCompliedWithVerifiedSecondFactorRevocationEvent( CompliedWithVerifiedSecondFactorRevocationEvent $event, - ) { + ): void + { $this->verifiedSecondFactors->remove((string)$event->secondFactorId); } - protected function applyVettedSecondFactorRevokedEvent(VettedSecondFactorRevokedEvent $event) + protected function applyVettedSecondFactorRevokedEvent(VettedSecondFactorRevokedEvent $event): void { $this->vettedSecondFactors->remove((string)$event->secondFactorId); } protected function applyCompliedWithVettedSecondFactorRevocationEvent( CompliedWithVettedSecondFactorRevocationEvent $event, - ) { + ): void + { $this->vettedSecondFactors->remove((string)$event->secondFactorId); } - protected function applyCompliedWithRecoveryCodeRevocationEvent(CompliedWithRecoveryCodeRevocationEvent $event) + protected function applyCompliedWithRecoveryCodeRevocationEvent(CompliedWithRecoveryCodeRevocationEvent $event): void { $this->recoveryTokens->remove($event->recoveryTokenId); } - protected function applyRecoveryTokenRevokedEvent(RecoveryTokenRevokedEvent $event) + protected function applyRecoveryTokenRevokedEvent(RecoveryTokenRevokedEvent $event): void { $this->recoveryTokens->remove($event->recoveryTokenId); } - protected function applyIdentityAccreditedAsRaForInstitutionEvent(IdentityAccreditedAsRaForInstitutionEvent $event) + protected function applyIdentityAccreditedAsRaForInstitutionEvent(IdentityAccreditedAsRaForInstitutionEvent $event): void { $this->registrationAuthorities->set( $event->raInstitution, @@ -1304,7 +1300,7 @@ protected function applyIdentityAccreditedAsRaForInstitutionEvent(IdentityAccred ); } - protected function applyIdentityAccreditedAsRaaForInstitutionEvent(IdentityAccreditedAsRaaForInstitutionEvent $event,) + protected function applyIdentityAccreditedAsRaaForInstitutionEvent(IdentityAccreditedAsRaaForInstitutionEvent $event,): void { $this->registrationAuthorities->set( $event->raInstitution, @@ -1319,14 +1315,15 @@ protected function applyIdentityAccreditedAsRaaForInstitutionEvent(IdentityAccre protected function applyRegistrationAuthorityInformationAmendedForInstitutionEvent( RegistrationAuthorityInformationAmendedForInstitutionEvent $event, - ) { + ): void + { $this->registrationAuthorities->get($event->raInstitution)->amendInformation( $event->location, $event->contactInformation, ); } - protected function applyAppointedAsRaaForInstitutionEvent(AppointedAsRaaForInstitutionEvent $event) + protected function applyAppointedAsRaaForInstitutionEvent(AppointedAsRaaForInstitutionEvent $event): void { $this->registrationAuthorities->get($event->raInstitution)->appointAs( new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RAA), @@ -1335,16 +1332,17 @@ protected function applyAppointedAsRaaForInstitutionEvent(AppointedAsRaaForInsti protected function applyRegistrationAuthorityRetractedForInstitutionEvent( RegistrationAuthorityRetractedForInstitutionEvent $event, - ) { + ): void + { $this->registrationAuthorities->remove($event->raInstitution); } - protected function applyLocalePreferenceExpressedEvent(LocalePreferenceExpressedEvent $event) + protected function applyLocalePreferenceExpressedEvent(LocalePreferenceExpressedEvent $event): void { $this->preferredLocale = $event->preferredLocale; } - protected function applyIdentityForgottenEvent(IdentityForgottenEvent $event) + protected function applyIdentityForgottenEvent(IdentityForgottenEvent $event): void { $this->commonName = CommonName::unknown(); $this->email = Email::unknown(); @@ -1354,7 +1352,7 @@ protected function applyIdentityForgottenEvent(IdentityForgottenEvent $event) /** * This method is kept to be backwards compatible for changes before FGA */ - protected function applyAppointedAsRaEvent(AppointedAsRaEvent $event) + protected function applyAppointedAsRaEvent(AppointedAsRaEvent $event): void { $this->registrationAuthorities->get($event->identityInstitution) ->appointAs(new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RA)); @@ -1363,7 +1361,7 @@ protected function applyAppointedAsRaEvent(AppointedAsRaEvent $event) /** * This method is kept to be backwards compatible for changes before FGA */ - protected function applyAppointedAsRaaEvent(AppointedAsRaaEvent $event) + protected function applyAppointedAsRaaEvent(AppointedAsRaaEvent $event): void { $this->registrationAuthorities->get($event->identityInstitution) ->appointAs(new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RAA)); @@ -1388,7 +1386,7 @@ protected function applyIdentityAccreditedAsRaEvent(IdentityAccreditedAsRaEvent /** * This method is kept to be backwards compatible for changes before FGA */ - protected function applyIdentityAccreditedAsRaaEvent(IdentityAccreditedAsRaaEvent $event) + protected function applyIdentityAccreditedAsRaaEvent(IdentityAccreditedAsRaaEvent $event): void { $this->registrationAuthorities->set( $event->identityInstitution, @@ -1404,7 +1402,7 @@ protected function applyIdentityAccreditedAsRaaEvent(IdentityAccreditedAsRaaEven /** * This method is kept to be backwards compatible for changes before FGA */ - protected function applyAppointedAsRaForInstitutionEvent(AppointedAsRaForInstitutionEvent $event) + protected function applyAppointedAsRaForInstitutionEvent(AppointedAsRaForInstitutionEvent $event): void { $this->registrationAuthorities->get($event->identityInstitution) ->appointAs(new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RA)); @@ -1415,7 +1413,8 @@ protected function applyAppointedAsRaForInstitutionEvent(AppointedAsRaForInstitu */ protected function applyRegistrationAuthorityInformationAmendedEvent( RegistrationAuthorityInformationAmendedEvent $event, - ) { + ): void + { $this->registrationAuthorities->get($event->identityInstitution)->amendInformation( $event->location, $event->contactInformation, @@ -1425,7 +1424,7 @@ protected function applyRegistrationAuthorityInformationAmendedEvent( /** * This method is kept to be backwards compatible for changes before FGA */ - protected function applyRegistrationAuthorityRetractedEvent(RegistrationAuthorityRetractedEvent $event) + protected function applyRegistrationAuthorityRetractedEvent(RegistrationAuthorityRetractedEvent $event): void { $this->registrationAuthorities->remove($event->identityInstitution); } @@ -1481,7 +1480,7 @@ private function assertUserMayAddRecoveryToken(RecoveryTokenType $recoveryTokenT } } - public function getId() + public function getId(): IdentityId { return $this->id; } @@ -1489,7 +1488,7 @@ public function getId() /** * @return NameId */ - public function getNameId() + public function getNameId(): NameId { return $this->nameId; } @@ -1497,22 +1496,22 @@ public function getNameId() /** * @return Institution */ - public function getInstitution() + public function getInstitution(): Institution { return $this->institution; } - public function getCommonName() + public function getCommonName(): CommonName { return $this->commonName; } - public function getEmail() + public function getEmail(): Email { return $this->email; } - public function getPreferredLocale() + public function getPreferredLocale(): Locale { return $this->preferredLocale; } @@ -1561,7 +1560,7 @@ private function assertSelfAssertedTokenRegistrationAllowed(): void /** * Verify that every vetted second factor is self-asserted */ - private function assertAllVettedTokensAreSelfAsserted(): bool + private function assertAllVettedTokensAreSelfAsserted(): void { /** @var VettedSecondFactor $vettedSecondFactor */ foreach ($this->vettedSecondFactors as $vettedSecondFactor) { @@ -1571,6 +1570,5 @@ private function assertAllVettedTokensAreSelfAsserted(): bool ); } } - return true; } } diff --git a/src/Surfnet/Stepup/Identity/Value/CommonName.php b/src/Surfnet/Stepup/Identity/Value/CommonName.php index 5451c47e7..c6aa01297 100644 --- a/src/Surfnet/Stepup/Identity/Value/CommonName.php +++ b/src/Surfnet/Stepup/Identity/Value/CommonName.php @@ -1,5 +1,7 @@ commonName; } diff --git a/src/Surfnet/Stepup/Identity/Value/ContactInformation.php b/src/Surfnet/Stepup/Identity/Value/ContactInformation.php index 6a4be94a9..d8e762e99 100644 --- a/src/Surfnet/Stepup/Identity/Value/ContactInformation.php +++ b/src/Surfnet/Stepup/Identity/Value/ContactInformation.php @@ -1,5 +1,7 @@ contactInformation = trim($contactInformation); } - /** - * @return bool - */ public function equals(ContactInformation $otherContactInformation): bool { return $this->contactInformation === $otherContactInformation->contactInformation; @@ -49,7 +44,7 @@ public function equals(ContactInformation $otherContactInformation): bool /** * @return string */ - public function getContactInformation() + public function getContactInformation(): string { return $this->contactInformation; } diff --git a/src/Surfnet/Stepup/Identity/Value/DocumentNumber.php b/src/Surfnet/Stepup/Identity/Value/DocumentNumber.php index 57b60dbfa..178e2dd11 100644 --- a/src/Surfnet/Stepup/Identity/Value/DocumentNumber.php +++ b/src/Surfnet/Stepup/Identity/Value/DocumentNumber.php @@ -1,5 +1,7 @@ documentNumber; } diff --git a/src/Surfnet/Stepup/Identity/Value/Email.php b/src/Surfnet/Stepup/Identity/Value/Email.php index 4d92edf03..0c96c80a6 100644 --- a/src/Surfnet/Stepup/Identity/Value/Email.php +++ b/src/Surfnet/Stepup/Identity/Value/Email.php @@ -1,5 +1,7 @@ email; } diff --git a/src/Surfnet/Stepup/Identity/Value/EmailVerificationWindow.php b/src/Surfnet/Stepup/Identity/Value/EmailVerificationWindow.php index 9d1153d75..4614b589a 100644 --- a/src/Surfnet/Stepup/Identity/Value/EmailVerificationWindow.php +++ b/src/Surfnet/Stepup/Identity/Value/EmailVerificationWindow.php @@ -31,17 +31,11 @@ private function __construct( ) { } - /** - * @return EmailVerificationWindow - */ public static function createFromTimeFrameStartingAt(TimeFrame $timeFrame, DateTime $start): EmailVerificationWindow { return new EmailVerificationWindow($start, $timeFrame->getEndWhenStartingAt($start)); } - /** - * @return EmailVerificationWindow - */ public static function createWindowFromTill(DateTime $start, DateTime $end): EmailVerificationWindow { if (!$end->comesAfter($start)) { @@ -71,14 +65,11 @@ public function isOpen(): bool /** * @return DateTime */ - public function openUntil() + public function openUntil(): DateTime { return $this->end; } - /** - * @return bool - */ public function equals(EmailVerificationWindow $other): bool { return $this->start == $other->start && $this->end == $other->end; diff --git a/src/Surfnet/Stepup/Identity/Value/GssfId.php b/src/Surfnet/Stepup/Identity/Value/GssfId.php index d4b63944b..00d434a10 100644 --- a/src/Surfnet/Stepup/Identity/Value/GssfId.php +++ b/src/Surfnet/Stepup/Identity/Value/GssfId.php @@ -24,7 +24,7 @@ final class GssfId implements SecondFactorIdentifier { private readonly string $gssfId; - public static function unknown(): self + public static function unknown(): static { return new self('—'); } @@ -38,7 +38,7 @@ public function __construct($gssfId) $this->gssfId = trim($gssfId); } - public function getValue() + public function getValue(): string { return $this->gssfId; } @@ -48,7 +48,7 @@ public function __toString(): string return $this->gssfId; } - public function equals($other): bool + public function equals(SecondFactorIdentifier $other): bool { return $other instanceof self && $this->gssfId === $other->gssfId; } diff --git a/src/Surfnet/Stepup/Identity/Value/IdentityId.php b/src/Surfnet/Stepup/Identity/Value/IdentityId.php index 1ba4b8f50..3da3b04f4 100644 --- a/src/Surfnet/Stepup/Identity/Value/IdentityId.php +++ b/src/Surfnet/Stepup/Identity/Value/IdentityId.php @@ -38,7 +38,7 @@ public function __construct($value) /** * @return string */ - public function getIdentityId() + public function getIdentityId(): string { return $this->value; } diff --git a/src/Surfnet/Stepup/Identity/Value/Institution.php b/src/Surfnet/Stepup/Identity/Value/Institution.php index 848383319..f824cd4fa 100644 --- a/src/Surfnet/Stepup/Identity/Value/Institution.php +++ b/src/Surfnet/Stepup/Identity/Value/Institution.php @@ -1,5 +1,7 @@ institution; } - /** - * @return bool - */ public function equals(Institution $otherInstitution): bool { return $this->institution === $otherInstitution->institution; diff --git a/src/Surfnet/Stepup/Identity/Value/Locale.php b/src/Surfnet/Stepup/Identity/Value/Locale.php index ac30d0efd..7c0f57d12 100644 --- a/src/Surfnet/Stepup/Identity/Value/Locale.php +++ b/src/Surfnet/Stepup/Identity/Value/Locale.php @@ -29,7 +29,7 @@ final class Locale implements JsonSerializable, Stringable /** * @param string $locale */ - public function __construct($locale) + public function __construct(string $locale) { if (!is_string($locale)) { throw InvalidArgumentException::invalidType('string', 'locale', $locale); @@ -38,9 +38,6 @@ public function __construct($locale) $this->locale = $locale; } - /** - * @return bool - */ public function equals(Locale $other): bool { return $this == $other; @@ -49,7 +46,7 @@ public function equals(Locale $other): bool /** * @return string */ - public function getLocale() + public function getLocale(): string { return $this->locale; } diff --git a/src/Surfnet/Stepup/Identity/Value/Location.php b/src/Surfnet/Stepup/Identity/Value/Location.php index 395fdd6e2..bce97e6d7 100644 --- a/src/Surfnet/Stepup/Identity/Value/Location.php +++ b/src/Surfnet/Stepup/Identity/Value/Location.php @@ -1,5 +1,7 @@ location = trim($location); } - /** - * @return bool - */ public function equals(Location $otherLocation): bool { return $this->location === $otherLocation->location; @@ -49,7 +44,7 @@ public function equals(Location $otherLocation): bool /** * @return string */ - public function getLocation() + public function getLocation(): string { return $this->location; } diff --git a/src/Surfnet/Stepup/Identity/Value/NameId.php b/src/Surfnet/Stepup/Identity/Value/NameId.php index 8a29ea6a9..84859431d 100644 --- a/src/Surfnet/Stepup/Identity/Value/NameId.php +++ b/src/Surfnet/Stepup/Identity/Value/NameId.php @@ -55,7 +55,7 @@ public function __construct($value) /** * @return string */ - public function getNameId() + public function getNameId(): string { return $this->value; } diff --git a/src/Surfnet/Stepup/Identity/Value/OnPremiseVettingType.php b/src/Surfnet/Stepup/Identity/Value/OnPremiseVettingType.php index be152f43c..c971fe4d2 100644 --- a/src/Surfnet/Stepup/Identity/Value/OnPremiseVettingType.php +++ b/src/Surfnet/Stepup/Identity/Value/OnPremiseVettingType.php @@ -23,7 +23,7 @@ class OnPremiseVettingType implements VettingType /** * @var string */ - protected $type = VettingType::TYPE_ON_PREMISE; + protected string $type = VettingType::TYPE_ON_PREMISE; public function __construct(private readonly DocumentNumber $documentNumber) { diff --git a/src/Surfnet/Stepup/Identity/Value/PhoneNumber.php b/src/Surfnet/Stepup/Identity/Value/PhoneNumber.php index f81cb6b39..6608ce7d9 100644 --- a/src/Surfnet/Stepup/Identity/Value/PhoneNumber.php +++ b/src/Surfnet/Stepup/Identity/Value/PhoneNumber.php @@ -24,7 +24,7 @@ final class PhoneNumber implements SecondFactorIdentifier, RecoveryTokenIdentifi { private readonly string $phoneNumber; - public static function unknown(): self + public static function unknown(): static { return new self('+0 (0) 000000000'); } @@ -48,12 +48,12 @@ public function __construct($phoneNumber) $this->phoneNumber = $phoneNumber; } - public function getValue() + public function getValue(): string { return $this->phoneNumber; } - public function equals($other): bool + public function equals(mixed $other): bool { return $other instanceof self && $this->phoneNumber === $other->phoneNumber; } diff --git a/src/Surfnet/Stepup/Identity/Value/RecoveryTokenId.php b/src/Surfnet/Stepup/Identity/Value/RecoveryTokenId.php index c171289f7..90ad910fc 100644 --- a/src/Surfnet/Stepup/Identity/Value/RecoveryTokenId.php +++ b/src/Surfnet/Stepup/Identity/Value/RecoveryTokenId.php @@ -37,7 +37,7 @@ public function __construct($value) /** * @return string */ - public function getRecoveryTokenId() + public function getRecoveryTokenId(): string { return $this->value; } diff --git a/src/Surfnet/Stepup/Identity/Value/RecoveryTokenType.php b/src/Surfnet/Stepup/Identity/Value/RecoveryTokenType.php index 55cffa241..dc3437dd9 100644 --- a/src/Surfnet/Stepup/Identity/Value/RecoveryTokenType.php +++ b/src/Surfnet/Stepup/Identity/Value/RecoveryTokenType.php @@ -66,7 +66,7 @@ public function isSafeStore(): bool /** * @return string */ - public function getType() + public function getType(): string { return $this->type; } diff --git a/src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php b/src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php index 576474a19..25d8b2bdf 100644 --- a/src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php +++ b/src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php @@ -1,5 +1,7 @@ role === $role->role; @@ -74,7 +73,7 @@ public function isRaa(): bool return $this->role === self::ROLE_RAA; } - public function jsonSerialize(): string + public function jsonSerialize(): int { return $this->role; } diff --git a/src/Surfnet/Stepup/Identity/Value/SecondFactorId.php b/src/Surfnet/Stepup/Identity/Value/SecondFactorId.php index fb2ab51ec..023158b17 100644 --- a/src/Surfnet/Stepup/Identity/Value/SecondFactorId.php +++ b/src/Surfnet/Stepup/Identity/Value/SecondFactorId.php @@ -37,7 +37,7 @@ public function __construct($value) /** * @return string */ - public function getSecondFactorId() + public function getSecondFactorId(): string { return $this->value; } diff --git a/src/Surfnet/Stepup/Identity/Value/SecondFactorIdentifier.php b/src/Surfnet/Stepup/Identity/Value/SecondFactorIdentifier.php index 10f135cc3..65c8557be 100644 --- a/src/Surfnet/Stepup/Identity/Value/SecondFactorIdentifier.php +++ b/src/Surfnet/Stepup/Identity/Value/SecondFactorIdentifier.php @@ -25,20 +25,20 @@ interface SecondFactorIdentifier extends JsonSerializable /** * @return static */ - public static function unknown(); + public static function unknown(): static; /** * Return a string representation of the value of this value object. * * @return string */ - public function getValue(); + public function getValue(): string; /** * @param self $other * @return bool */ - public function equals($other): bool; + public function equals(SecondFactorIdentifier $other): bool; /** * @return string diff --git a/src/Surfnet/Stepup/Identity/Value/SelfAssertedRegistrationVettingType.php b/src/Surfnet/Stepup/Identity/Value/SelfAssertedRegistrationVettingType.php index 4bc220cf1..fae3a8677 100644 --- a/src/Surfnet/Stepup/Identity/Value/SelfAssertedRegistrationVettingType.php +++ b/src/Surfnet/Stepup/Identity/Value/SelfAssertedRegistrationVettingType.php @@ -23,7 +23,7 @@ class SelfAssertedRegistrationVettingType implements VettingType /** * @var string */ - protected $type = VettingType::TYPE_SELF_ASSERTED_REGISTRATION; + protected string $type = VettingType::TYPE_SELF_ASSERTED_REGISTRATION; public function __construct(protected RecoveryTokenId $authoringRecoveryToken) { diff --git a/src/Surfnet/Stepup/Identity/Value/SelfVetVettingType.php b/src/Surfnet/Stepup/Identity/Value/SelfVetVettingType.php index 96bf87d83..12569eda6 100644 --- a/src/Surfnet/Stepup/Identity/Value/SelfVetVettingType.php +++ b/src/Surfnet/Stepup/Identity/Value/SelfVetVettingType.php @@ -25,7 +25,7 @@ class SelfVetVettingType implements VettingType /** * @var string */ - protected $type = VettingType::TYPE_SELF_VET; + protected string $type = VettingType::TYPE_SELF_VET; public function __construct(private readonly Loa $authoringLoa) { diff --git a/src/Surfnet/Stepup/Identity/Value/StepupProvider.php b/src/Surfnet/Stepup/Identity/Value/StepupProvider.php index 9cdbc809b..6cbab7517 100644 --- a/src/Surfnet/Stepup/Identity/Value/StepupProvider.php +++ b/src/Surfnet/Stepup/Identity/Value/StepupProvider.php @@ -37,7 +37,7 @@ public function __construct($provider) /** * @return string */ - public function getStepupProvider() + public function getStepupProvider(): string { return $this->provider; } diff --git a/src/Surfnet/Stepup/Identity/Value/TimeFrame.php b/src/Surfnet/Stepup/Identity/Value/TimeFrame.php index f91de8f7a..62994a3a3 100644 --- a/src/Surfnet/Stepup/Identity/Value/TimeFrame.php +++ b/src/Surfnet/Stepup/Identity/Value/TimeFrame.php @@ -1,5 +1,6 @@ add($this->timeFrame); } - /** - * @return bool - */ public function equals(TimeFrame $other): bool { return $this->timeFrame->s === $other->timeFrame->s; diff --git a/src/Surfnet/Stepup/Identity/Value/U2fKeyHandle.php b/src/Surfnet/Stepup/Identity/Value/U2fKeyHandle.php index 95e0809e5..a88b8ada9 100644 --- a/src/Surfnet/Stepup/Identity/Value/U2fKeyHandle.php +++ b/src/Surfnet/Stepup/Identity/Value/U2fKeyHandle.php @@ -32,7 +32,7 @@ final class U2fKeyHandle implements SecondFactorIdentifier /** * @return static */ - public static function unknown(): self + public static function unknown(): static { return new self(self::UNKNOWN); } @@ -55,7 +55,7 @@ public function __construct($value) $this->value = $value; } - public function getValue() + public function getValue(): string { return $this->value; } @@ -65,7 +65,7 @@ public function __toString(): string return $this->value; } - public function equals($other): bool + public function equals(SecondFactorIdentifier $other): bool { return $other instanceof self && $this->value === $other->value; } diff --git a/src/Surfnet/Stepup/Identity/Value/UnhashedSecret.php b/src/Surfnet/Stepup/Identity/Value/UnhashedSecret.php index 6e2b876b4..da0fa4422 100644 --- a/src/Surfnet/Stepup/Identity/Value/UnhashedSecret.php +++ b/src/Surfnet/Stepup/Identity/Value/UnhashedSecret.php @@ -41,7 +41,7 @@ class UnhashedSecret implements HashableSecret */ private const ALGORITHM = PASSWORD_BCRYPT; - public function hashSecret(): Secret + public function hashSecret(): HashedSecret { $hashedSecret = password_hash( $this->secret, diff --git a/src/Surfnet/Stepup/Identity/Value/UnknownVettingType.php b/src/Surfnet/Stepup/Identity/Value/UnknownVettingType.php index 91eb89b96..9b3cdc1cf 100644 --- a/src/Surfnet/Stepup/Identity/Value/UnknownVettingType.php +++ b/src/Surfnet/Stepup/Identity/Value/UnknownVettingType.php @@ -23,7 +23,7 @@ class UnknownVettingType implements VettingType /** * @var string */ - protected $type = VettingType::TYPE_UNKNOWN; + protected string $type = VettingType::TYPE_UNKNOWN; public function __construct() { diff --git a/src/Surfnet/Stepup/Identity/Value/YubikeyPublicId.php b/src/Surfnet/Stepup/Identity/Value/YubikeyPublicId.php index f6978cc9b..5d62301f0 100644 --- a/src/Surfnet/Stepup/Identity/Value/YubikeyPublicId.php +++ b/src/Surfnet/Stepup/Identity/Value/YubikeyPublicId.php @@ -26,7 +26,7 @@ final class YubikeyPublicId implements SecondFactorIdentifier private string $value; - public static function unknown(): self + public static function unknown(): static { return new self(self::UNKNOWN); } @@ -62,7 +62,7 @@ public function __construct($value) $this->value = $value; } - public function getValue() + public function getValue(): string { return $this->value; } @@ -72,7 +72,7 @@ public function __toString(): string return $this->value; } - public function equals($other): bool + public function equals(SecondFactorIdentifier $other): bool { return $other instanceof self && $this->value === $other->value; } diff --git a/src/Surfnet/Stepup/Identity/Whitelist.php b/src/Surfnet/Stepup/Identity/Whitelist.php index 87dbcc7d9..08dd4aa27 100644 --- a/src/Surfnet/Stepup/Identity/Whitelist.php +++ b/src/Surfnet/Stepup/Identity/Whitelist.php @@ -34,9 +34,6 @@ final class Whitelist extends EventSourcedAggregateRoot implements WhitelistApi */ public const WHITELIST_AGGREGATE_ID = '125ccee5-d650-437a-a0b0-6bf17c8188fa'; - /** - * @var InstitutionCollection The collection of institutions currently on the whitelist - */ private ?InstitutionCollection $whitelist = null; public function __construct() diff --git a/src/Surfnet/Stepup/Tests/Configuration/Event/EventSerializationAndDeserializationTest.php b/src/Surfnet/Stepup/Tests/Configuration/Event/EventSerializationAndDeserializationTest.php index bcdbae7ce..1aadeaef4 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Event/EventSerializationAndDeserializationTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Event/EventSerializationAndDeserializationTest.php @@ -78,9 +78,6 @@ public function an_event_should_be_the_same_after_serialization_and_deserializat $this->assertEquals($unserializedEvent, $deserializedEvent); } - /** - * @return SerializableInterface[] - */ public function institutionConfigurationEventsProvider(): array { $institution = new Institution('A test institution'); diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/AllowedSecondFactorListTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/AllowedSecondFactorListTest.php index aed427340..115931adf 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/AllowedSecondFactorListTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/AllowedSecondFactorListTest.php @@ -184,7 +184,7 @@ public function allowed_second_factor_lists_with_the_same_elements_are_considere $this->assertTrue($base->equals($other)); } - public function differentAllowedSecondFactorListsProvider() + public function differentAllowedSecondFactorListsProvider(): array { return [ 'Different second factor types' => [ @@ -206,7 +206,7 @@ public function differentAllowedSecondFactorListsProvider() ]; } - public function sameAllowedSecondFactorListsProvider() + public function sameAllowedSecondFactorListsProvider(): array { return [ 'Same second factor types' => [ @@ -228,7 +228,7 @@ public function sameAllowedSecondFactorListsProvider() ]; } - public function availableSecondFactorTypeProvider() + public function availableSecondFactorTypeProvider(): array { $service = new SecondFactorTypeService([ 'biometric' => ['loa' => 3], diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/ContactInformationTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/ContactInformationTest.php index 36d7ffb18..8d538678f 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/ContactInformationTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/ContactInformationTest.php @@ -1,5 +1,7 @@ expectException(InvalidArgumentException::class); + $this->expectException(TypeError::class); new ContactInformation($invalidValue); } diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php index 7da9a0465..1b513f315 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php @@ -139,7 +139,7 @@ public function should_be_set_to_default_if_created_with_own_institution_as_inst ); $this->assertEquals([$this->institution], $option->getInstitutions($this->institution)); - $this->assertEquals(true, $option->isDefault()); + $this->assertTrue($option->isDefault()); $this->assertEquals([], $option->getInstitutionSet()->toScalarArray()); } diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionConfigurationIdTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionConfigurationIdTest.php index d9a8a50ca..c8220e100 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionConfigurationIdTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionConfigurationIdTest.php @@ -46,7 +46,6 @@ public function two_institution_configuration_ids_created_for_the_different_inst * @group domain * * @dataProvider nonStringOrEmptyStringProvider - * @param $nonStringOrEmptyString */ public function an_institution_configuration_id_cannot_be_created_from_something_other_than_a_string( string|int|float|StdClass|array $nonStringOrEmptyString, diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionTest.php index 94e31cd06..185d2fc1d 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionTest.php @@ -1,5 +1,7 @@ expectException(InvalidArgumentException::class); new Institution($invalidValue); } + /** + * @test + * @group domain + * @dataProvider nonStringOrNonEmptyStringProviderTypeError + */ + public function an_institution_cannot_be_created_with_anything_but_a_nonempty_string_type_errors( + int|float|StdClass|array $invalidValue, + ): void { + $this->expectException(TypeError::class); + new Institution($invalidValue); + } + /** * @test * @group domain @@ -61,6 +76,12 @@ public function nonStringOrNonEmptyStringProvider(): array return [ 'empty string' => [''], 'blank string' => [' '], + ]; + } + + public function nonStringOrNonEmptyStringProviderTypeError(): array + { + return [ 'array' => [[]], 'integer' => [1], 'float' => [1.2], diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/LocationTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/LocationTest.php index 5286f29e3..0f23c8686 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/LocationTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/LocationTest.php @@ -1,5 +1,7 @@ expectException(InvalidArgumentException::class); + $this->expectException(TypeError::class); new Location($nonString); } diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php index 3a0198fc3..fa1287ce0 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php @@ -1,5 +1,7 @@ expectException(InvalidArgumentException::class); new RaLocationId($nonStringOrEmptyString); } + /** + * @test + * @group domain + * @dataProvider nonStringOrEmptyStringProviderTypeError + */ + public function an_ra_location_id_cannot_be_created_with_anything_but_a_nonempty_string_type_errors( + int|float|StdClass|array $errorValue, + ): void { + $this->expectException(TypeError::class); + + new RaLocationId($errorValue); + } + /** * @test * @group domain @@ -86,6 +102,12 @@ public function nonStringOrEmptyStringProvider(): array return [ 'empty string' => [''], 'blank string' => [' '], + ]; + } + + public function nonStringOrEmptyStringProviderTypeError(): array + { + return [ 'array' => [[]], 'integer' => [1], 'float' => [1.2], diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationNameTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationNameTest.php index a7805c7ec..5c46c6aa4 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationNameTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationNameTest.php @@ -1,5 +1,7 @@ expectException(InvalidArgumentException::class); new RaLocationName($nonStringOrEmptyString); } + /** + * @test + * @group domain + * @dataProvider nonStringOrEmptyStringProviderTypeError + */ + public function an_ra_location_name_cannot_be_created_with_anything_but_a_nonempty_string_type_errors( + int|float|StdClass|array $error, + ): void { + $this->expectException(TypeError::class); + + new RaLocationName($error); + } + /** * @test * @group domain @@ -70,6 +86,12 @@ public function nonStringOrEmptyStringProvider(): array return [ 'empty string' => [''], 'blank string' => [' '], + ]; + } + + public function nonStringOrEmptyStringProviderTypeError(): array + { + return [ 'array' => [[]], 'integer' => [1], 'float' => [1.2], diff --git a/src/Surfnet/Stepup/Tests/Helper/JsonHelperTest.php b/src/Surfnet/Stepup/Tests/Helper/JsonHelperTest.php index 90e3a1238..f60ae4497 100644 --- a/src/Surfnet/Stepup/Tests/Helper/JsonHelperTest.php +++ b/src/Surfnet/Stepup/Tests/Helper/JsonHelperTest.php @@ -34,7 +34,6 @@ class JsonHelperTest extends TestCase * @group json * * @dataProvider nonStringProvider - * @param $nonString */ public function json_helper_can_only_decode_strings(bool|int|float|StdClass|array $nonString): void { diff --git a/src/Surfnet/Stepup/Tests/Helper/UserDataFilterTest.php b/src/Surfnet/Stepup/Tests/Helper/UserDataFilterTest.php index 141ab0776..0241bcc53 100644 --- a/src/Surfnet/Stepup/Tests/Helper/UserDataFilterTest.php +++ b/src/Surfnet/Stepup/Tests/Helper/UserDataFilterTest.php @@ -18,6 +18,7 @@ namespace Surfnet\Stepup\Tests\Helper; +use DateTime as CoreDateTime; use Generator; use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase; @@ -117,7 +118,7 @@ public function provideEvents(): Generator new SecondFactorId("52"), new PhoneNumber("+0 (0) 000000000"), true, - emailVerificationWindow::createWindowFromTill(new DateTime(), new DateTime()), + EmailVerificationWindow::createWindowFromTill(new DateTime(), new DateTime(new CoreDateTime('+5 minute'))), "30c0fcb136bf324eea652d5b86c1a08c", new CommonName("commonname"), new Email("test@example.com"), diff --git a/src/Surfnet/Stepup/Tests/Identity/Collection/InstitutionCollectionTest.php b/src/Surfnet/Stepup/Tests/Identity/Collection/InstitutionCollectionTest.php index c5d1fbd74..fbd4f5e00 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Collection/InstitutionCollectionTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Collection/InstitutionCollectionTest.php @@ -172,7 +172,7 @@ public function multiple_institutions_can_be_removed(): void /** * @return array */ - private function getInstitutions() + private function getInstitutions(): array { static $institutions; diff --git a/src/Surfnet/Stepup/Tests/Identity/Entity/SecondFactorCollectionTest.php b/src/Surfnet/Stepup/Tests/Identity/Entity/SecondFactorCollectionTest.php index 8576c929e..e74740015 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Entity/SecondFactorCollectionTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Entity/SecondFactorCollectionTest.php @@ -52,10 +52,7 @@ public function collection_can_return_second_factor_with_highest_loa(): void $this->assertTrue($secondFactor->getType()->isYubikey(), 'Expected yubikey since it has a higher LoA than sms'); } - /** - * @return SecondFactor - */ - private function mockVettedSecondFactor(string $type) + private function mockVettedSecondFactor(string $type): SecondFactor { $mock = m::mock(VettedSecondFactor::class); $mock->shouldReceive('getType') diff --git a/src/Surfnet/Stepup/Tests/Identity/Event/ForgettableEventsTest.php b/src/Surfnet/Stepup/Tests/Identity/Event/ForgettableEventsTest.php index ec2b3c0bd..5df9935ee 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Event/ForgettableEventsTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Event/ForgettableEventsTest.php @@ -21,6 +21,7 @@ use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase; use ReflectionClass; +use ReflectionException; use Surfnet\Stepup\Identity\Event\CompliedWithRevocationEvent; use Surfnet\Stepup\Identity\Event\CompliedWithUnverifiedSecondFactorRevocationEvent; use Surfnet\Stepup\Identity\Event\CompliedWithVerifiedSecondFactorRevocationEvent; @@ -113,6 +114,8 @@ public function certain_events_are_forgettable_events_and_others_are_not(): void /** * @return string[] + * @throws ReflectionException + * @throws ReflectionException */ private function getConcreteIdentityEventFqcns(): array { diff --git a/src/Surfnet/Stepup/Tests/Identity/Event/WhitelistEventSerializationAndDeserializationTest.php b/src/Surfnet/Stepup/Tests/Identity/Event/WhitelistEventSerializationAndDeserializationTest.php index 2d33f7ac2..ca587a765 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Event/WhitelistEventSerializationAndDeserializationTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Event/WhitelistEventSerializationAndDeserializationTest.php @@ -65,7 +65,7 @@ public function eventProvider(): array /** * @return InstitutionCollection */ - private function getInstitutionCollection() + private function getInstitutionCollection(): InstitutionCollection { static $institutionCollection; diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/CommonNameTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/CommonNameTest.php index 2dfd33973..b48fe4d70 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/CommonNameTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/CommonNameTest.php @@ -1,5 +1,7 @@ expectException(InvalidArgumentException::class); new CommonName($invalidValue); } + /** + * @test + * @group domain + * @dataProvider invalidArgumentProviderTypeError + */ + public function the_common_name_address_must_be_a_non_empty_string_type_error(int|float|StdClass|array $invalidValue): void + { + $this->expectException(TypeError::class); + + new CommonName($invalidValue); + } + /** * @test * @group domain @@ -56,14 +71,17 @@ public function two_common_names_with_the_same_value_are_equal(): void $this->assertFalse($commonName->equals($unknown)); } - /** - * provider for {@see the_common_name_address_must_be_a_non_empty_string()} - */ public function invalidArgumentProvider(): array { return [ 'empty string' => [''], 'blank string' => [' '], + ]; + } + + public function invalidArgumentProviderTypeError(): array + { + return [ 'array' => [[]], 'integer' => [1], 'float' => [1.2], diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/ContactInformationTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/ContactInformationTest.php index d00ff196e..0af33851f 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/ContactInformationTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/ContactInformationTest.php @@ -1,5 +1,7 @@ expectException(InvalidArgumentException::class); + $this->expectException(TypeError::class); new ContactInformation($invalidValue); } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/DocumentNumberTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/DocumentNumberTest.php index d957f1a47..e9904c7e1 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/DocumentNumberTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/DocumentNumberTest.php @@ -1,5 +1,7 @@ expectException(InvalidArgumentException::class); new DocumentNumber($invalidValue); } + /** + * @test + * @group domain + * @dataProvider invalidArgumentProviderTypeError + */ + public function the_document_number_must_be_a_non_empty_string_type_error(int|float|StdClass|array $invalidValue): void + { + $this->expectException(TypeError::class); + new DocumentNumber($invalidValue); + } + /** * @test * @group domain @@ -55,13 +69,16 @@ public function two_document_numbers_with_the_same_value_are_equal(): void $this->assertFalse($commonName->equals($unknown)); } - /** - * provider for {@see the_document_number_address_must_be_a_non_empty_string()} - */ public function invalidArgumentProvider(): array { return [ 'empty string' => [''], + ]; + } + + public function invalidArgumentProviderTypeError(): array + { + return [ 'array' => [[]], 'integer' => [1], 'float' => [1.2], diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/EmailTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/EmailTest.php index daf63f21d..1bd8dfbbd 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/EmailTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/EmailTest.php @@ -1,5 +1,7 @@ expectException(InvalidArgumentException::class); new Email($invalidValue); } + /** + * @test + * @group domain + * @dataProvider invalidArgumentProviderTypeErrors + */ + public function the_email_address_must_be_a_non_empty_string_invalid_types(int|float|StdClass|array $invalidValue): void + { + $this->expectException(TypeError::class); + new Email($invalidValue); + } + /** * @test * @group domain * @dataProvider invalidEmailProvider - * @param $invalidValue */ public function the_email_address_given_must_be_rfc_822_compliant(string $invalidValue): void { @@ -68,14 +81,17 @@ public function two_emails_with_the_same_value_are_equal(): void $this->assertFalse($email->equals($unknown)); } - /** - * provider for {@see the_email_address_must_be_a_non_empty_string()} - */ public function invalidArgumentProvider(): array { return [ 'empty string' => [''], 'blank string' => [' '], + ]; + } + + public function invalidArgumentProviderTypeErrors(): array + { + return [ 'array' => [[]], 'integer' => [1], 'float' => [1.2], diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/EmailVerificationWindowTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/EmailVerificationWindowTest.php index 861e18d3b..630d0c72f 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/EmailVerificationWindowTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/EmailVerificationWindowTest.php @@ -20,6 +20,7 @@ use DateInterval; use DateTime as CoreDateTime; +use Exception; use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase; use Surfnet\Stepup\DateTime\DateTime; @@ -118,9 +119,10 @@ public function the_window_correctly_calculates_the_end_datetime(): void * Helper method for easy EmailVerificationWindow creation * * @param string|null $startTimeOffset - * @return EmailVerificationWindow + * @throws Exception + * @throws Exception */ - private function newEmailVerificationWindow(int $timeFrameSeconds, $startTimeOffset = null) + private function newEmailVerificationWindow(int $timeFrameSeconds, string $startTimeOffset = null): EmailVerificationWindow { $start = DateTime::now(); if ($startTimeOffset) { diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/InstitutionTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/InstitutionTest.php index bcfd7a01d..e03ba36df 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/InstitutionTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/InstitutionTest.php @@ -1,5 +1,7 @@ expectException(TypeError::class); + new Institution($invalidValue); + } + /** + * @test + * @group domain + * @dataProvider invalidValueProviderInvalidString + */ + public function an_institution_cannot_be_created_with_anything_but_a_nonempty_string_type_errors(string $invalidValue): void { $this->expectException(InvalidArgumentException::class); - new Institution($invalidValue); } @@ -63,12 +74,21 @@ public function two_institutions_with_the_same_value_are_equal(): void public function invalidValueProvider(): array { return [ - 'empty string' => [''], - 'blank string' => [' '], 'array' => [[]], 'integer' => [1], 'float' => [1.2], 'object' => [new StdClass()], ]; } + + /** + * dataprovider + */ + public function invalidValueProviderInvalidString(): array + { + return [ + 'empty string' => [''], + 'blank string' => [' '], + ]; + } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/LocationTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/LocationTest.php index 05837f4d6..55844f2f6 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/LocationTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/LocationTest.php @@ -1,5 +1,7 @@ expectException(InvalidArgumentException::class); - + $this->expectException(TypeError::class); new Location($invalidValue); } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/RegistrationAuthorityRoleTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/RegistrationAuthorityRoleTest.php index 4a4573a97..ea612aa2b 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/RegistrationAuthorityRoleTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/RegistrationAuthorityRoleTest.php @@ -1,5 +1,7 @@ expectException(InvalidArgumentException::class); + $this->expectException(TypeError::class); new RegistrationAuthorityRole($invalidValue); } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/TimeFrameTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/TimeFrameTest.php index 992035120..fc868f883 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/TimeFrameTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/TimeFrameTest.php @@ -1,5 +1,7 @@ expectException(InvalidArgumentException::class); TimeFrame::ofSeconds($invalidValue); } + /** + * @test + * @group domain + * @dataProvider invalidValueProviderOtherTypes + */ + public function it_cannot_be_given_an_non_positive_amount_of_secondsOtherTypes(string|float|StdClass|array $invalidValue): void + { + $this->expectException(TypeError::class); + + TimeFrame::ofSeconds($invalidValue); + } + /** * @test * @group domain @@ -60,15 +76,24 @@ public function to_string_output_matches_amount_of_seconds_as_string(): void /** * dataprovider */ - public function invalidValueProvider(): array + public function invalidValueProviderInt(): array + { + return [ + 'zero' => [0], + 'negative int' => [-1], + ]; + } + + /** + * dataprovider + */ + public function invalidValueProviderOtherTypes(): array { return [ 'empty string' => [''], 'string' => ['abc'], 'array' => [[]], - 'float' => [2.718], - 'zero' => [0], - 'negative int' => [-1], + 'float' => [2.123], 'object' => [new StdClass()], ]; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/CommonNameType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/CommonNameType.php index a8b2ba0a4..46d32d1bd 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/CommonNameType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/CommonNameType.php @@ -23,6 +23,7 @@ use Doctrine\DBAL\Types\Type; use Surfnet\Stepup\Exception\InvalidArgumentException; use Surfnet\Stepup\Identity\Value\CommonName; +use TypeError; /** * Custom Type for the CommonName Value Object @@ -53,7 +54,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform): ?CommonNa try { $commonName = new CommonName($value); - } catch (InvalidArgumentException $e) { + } catch (InvalidArgumentException|TypeError $e) { // get nice standard message, so we can throw it keeping the exception chain $doctrineExceptionMessage = ConversionException::conversionFailed( $value, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationContactInformationType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationContactInformationType.php index 17ed944e8..08fc37f3b 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationContactInformationType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationContactInformationType.php @@ -1,5 +1,7 @@ 'recovery_token_revoked', ]; - /** - * - * @var string - */ #[ORM\Id] #[ORM\Column(length: 36)] - public $id; + public string $id; - /** - * @var string|null - */ #[ORM\Column(length: 36, nullable: true)] - public $actorId; + public ?string $actorId; - /** - * @var CommonName - */ #[ORM\Column(type: 'stepup_common_name', nullable: true)] - public $actorCommonName; + public CommonName $actorCommonName; - /** - * @var Institution|null - */ #[ORM\Column(type: 'institution', nullable: true)] - public $actorInstitution; + public ?Institution $actorInstitution; /** * Only in certain situations will this field be filled, It represents the RA institution the * event log entry is targeted at. For example. John Doe is accredited to become RA by Joe from * institution-a. The actual institution John is appointed RA for is stored in this field. - * - * - * @var string|null */ #[ORM\Column(length: 255, nullable: true)] - public $raInstitution; + public ?string $raInstitution; - /** - * @var string - */ #[ORM\Column(length: 36)] - public $identityId; + public string $identityId; - /** - * @var Institution - */ #[ORM\Column(type: 'institution')] - public $identityInstitution; + public Institution $identityInstitution; - /** - * @var string|null - */ #[ORM\Column(length: 36, nullable: true)] - public $secondFactorId; + public ?string $secondFactorId; - /** - * @var string - */ #[ORM\Column(length: 255, nullable: true)] - public $secondFactorIdentifier; + public string $secondFactorIdentifier; - /** - * @var string|null - */ #[ORM\Column(length: 36, nullable: true)] - public $secondFactorType; + public ?string $secondFactorType; - /** - * @var string - */ #[ORM\Column(length: 255, nullable: true)] - public $recoveryTokenIdentifier; + public string $recoveryTokenIdentifier; - /** - * @var string|null - */ #[ORM\Column(length: 36, nullable: true)] - public $recoveryTokenType; + public ?string $recoveryTokenType; - /** - * @var string - */ #[ORM\Column(length: 255)] - public $event; + public string $event; - /** - * @var DateTime - */ #[ORM\Column(type: 'stepup_datetime')] - public $recordedOn; + public DateTime $recordedOn; public function jsonSerialize(): array { @@ -232,7 +189,7 @@ public function jsonSerialize(): array * @param string $event Event FQCN * @return string Action name */ - private function mapEventToAction($event) + private function mapEventToAction(string $event): string { if (!isset($this->eventActionMap[$event])) { throw new LogicException(sprintf("Action name for event '%s' not registered", $event)); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Identity.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Identity.php index f60a13eb3..57cfbd94b 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Identity.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Identity.php @@ -34,43 +34,24 @@ #[ORM\Entity(repositoryClass: IdentityRepository::class)] class Identity implements JsonSerializable { - /** - * - * @var string - */ #[ORM\Id] #[ORM\Column(length: 36)] - public $id; + public string $id; - /** - * @var NameId - */ #[ORM\Column(type: 'stepup_name_id')] - public $nameId; + public NameId $nameId; - /** - * @var CommonName - */ #[ORM\Column(type: 'stepup_common_name')] - public $commonName; + public CommonName $commonName; - /** - * @var Institution - */ #[ORM\Column(type: 'institution')] - public $institution; + public Institution $institution; - /** - * @var Email - */ #[ORM\Column(type: 'stepup_email')] - public $email; + public Email $email; - /** - * @var Locale - */ #[ORM\Column(type: 'stepup_locale')] - public $preferredLocale; + public Locale $preferredLocale; public ?bool $possessedSelfAssertedToken; public static function create( diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/IdentitySelfAssertedTokenOptions.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/IdentitySelfAssertedTokenOptions.php index 3fe930bc5..7b571d144 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/IdentitySelfAssertedTokenOptions.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/IdentitySelfAssertedTokenOptions.php @@ -32,7 +32,7 @@ class IdentitySelfAssertedTokenOptions implements JsonSerializable */ #[ORM\Id] #[ORM\Column(length: 36)] - public $identityId; + public IdentityId $identityId; /** * In order to determine if the user is allowed to register @@ -42,7 +42,7 @@ class IdentitySelfAssertedTokenOptions implements JsonSerializable * @var bool */ #[ORM\Column(type: 'boolean')] - public $possessedToken = false; + public bool $possessedToken = false; /** * Indicator if Identity is allowed to work with Recovery Tokens @@ -54,7 +54,7 @@ class IdentitySelfAssertedTokenOptions implements JsonSerializable * @var bool */ #[ORM\Column(type: 'boolean')] - public $possessedSelfAssertedToken; + public bool $possessedSelfAssertedToken; public static function create( IdentityId $identityId, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/InstitutionListing.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/InstitutionListing.php index ed8ef6e30..6355ef219 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/InstitutionListing.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/InstitutionListing.php @@ -32,7 +32,7 @@ class InstitutionListing implements JsonSerializable */ #[ORM\Id] #[ORM\Column(type: 'institution')] - public $institution; + public Institution $institution; public static function createFrom(Institution $institution): self { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaCandidate.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaCandidate.php index 764222a52..3c4f9fb54 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaCandidate.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaCandidate.php @@ -39,7 +39,7 @@ class RaCandidate implements JsonSerializable */ #[ORM\Id] #[ORM\Column(length: 36)] - public $identityId; + public string $identityId; /** * @@ -47,31 +47,31 @@ class RaCandidate implements JsonSerializable */ #[ORM\Id] #[ORM\Column(type: 'institution')] - public $raInstitution; + public Institution $raInstitution; /** * @var Institution */ #[ORM\Column(type: 'institution')] - public $institution; + public Institution $institution; /** * @var NameId */ #[ORM\Column(type: 'stepup_name_id')] - public $nameId; + public NameId $nameId; /** * @var CommonName */ #[ORM\Column(type: 'stepup_common_name')] - public $commonName; + public CommonName $commonName; /** * @var Email */ #[ORM\Column(type: 'stepup_email')] - public $email; + public Email $email; private function __construct() { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaListing.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaListing.php index 51aced080..75c5cbabe 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaListing.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaListing.php @@ -43,55 +43,55 @@ class RaListing implements JsonSerializable #[ORM\Id] #[ORM\Column(type: 'integer')] #[ORM\GeneratedValue] - public $id; + public int $id; /** * @var string */ #[ORM\Column(length: 36)] - public $identityId; + public string $identityId; /** * @var Institution */ #[ORM\Column(type: 'institution')] - public $raInstitution; + public Institution $raInstitution; /** * @var Institution */ #[ORM\Column(type: 'institution')] - public $institution; + public Institution $institution; /** * @var CommonName */ #[ORM\Column(type: 'stepup_common_name')] - public $commonName; + public CommonName $commonName; /** * @var Email */ #[ORM\Column(type: 'stepup_email')] - public $email; + public Email $email; /** * @var AuthorityRole */ #[ORM\Column(type: 'authority_role')] - public $role; + public AuthorityRole $role; /** * @var Location */ #[ORM\Column(type: 'stepup_location', nullable: true)] - public $location; + public Location $location; /** * @var ContactInformation */ #[ORM\Column(type: 'stepup_contact_information', nullable: true)] - public $contactInformation; + public ContactInformation $contactInformation; public static function create( $identityId, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaSecondFactor.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaSecondFactor.php index e7d6be771..ac0a833db 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaSecondFactor.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaSecondFactor.php @@ -44,7 +44,7 @@ class RaSecondFactor implements JsonSerializable * @var Institution */ #[ORM\Column(type: 'institution')] - public $institution; + public Institution $institution; /** * The name of the registrant. @@ -53,7 +53,7 @@ class RaSecondFactor implements JsonSerializable * @var CommonName */ #[ORM\Column(type: 'stepup_common_name')] - public $name; + public CommonName $name; /** * The e-mail of the registrant. @@ -62,19 +62,19 @@ class RaSecondFactor implements JsonSerializable * @var Email */ #[ORM\Column(type: 'stepup_email')] - public $email; + public Email $email; /** * @var DocumentNumber */ #[ORM\Column(type: 'stepup_document_number', nullable: true)] - public $documentNumber; + public ?DocumentNumber $documentNumber; /** * @var SecondFactorStatus */ #[ORM\Column(type: 'stepup_second_factor_status')] - public $status; + public SecondFactorStatus $status; /** * @param string $id @@ -86,16 +86,16 @@ class RaSecondFactor implements JsonSerializable public function __construct( #[ORM\Id] #[ORM\Column(length: 36)] - public $id, + public string $id, #[ORM\Column(length: 16)] - public $type, + public string $type, #[ORM\Column(length: 255)] - public $secondFactorId, + public string $secondFactorId, #[ORM\Column(length: 36)] - public $identityId, - Institution $institution, - CommonName $name, - Email $email, + public string $identityId, + Institution $institution, + CommonName $name, + Email $email, DocumentNumber $documentNumber = null, ) { $this->institution = $institution; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RecoveryToken.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RecoveryToken.php index bd8b89802..04ca1f144 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RecoveryToken.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RecoveryToken.php @@ -33,51 +33,51 @@ class RecoveryToken implements JsonSerializable { #[ORM\Id] #[ORM\Column(length: 36)] - public $id; + public string $id; /** * @var string */ #[ORM\Column(length: 36)] - public $identityId; + public string $identityId; /** * @var string */ #[ORM\Column(length: 16)] - public $type; + public string $type; /** * @var RecoveryTokenStatus */ #[ORM\Column(type: 'stepup_recovery_token_status')] - public $status; + public RecoveryTokenStatus $status; /** * @var Institution */ #[ORM\Column(type: 'institution')] - public $institution; + public Institution $institution; /** * The name of the registrant. * @var CommonName */ #[ORM\Column(type: 'stepup_common_name')] - public $name; + public CommonName $name; /** * The e-mail of the registrant. * @var Email */ #[ORM\Column(type: 'stepup_email')] - public $email; + public Email $email; /** * @var string */ #[ORM\Column(length: 255)] - public $recoveryMethodIdentifier; + public string $recoveryMethodIdentifier; public function jsonSerialize(): array { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/SecondFactorRevocation.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/SecondFactorRevocation.php index b4bd1d9ab..ad0a00935 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/SecondFactorRevocation.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/SecondFactorRevocation.php @@ -33,29 +33,29 @@ class SecondFactorRevocation */ #[ORM\Id] #[ORM\Column(length: 36)] - public $id; + public string $id; /** * @var Institution */ #[ORM\Column(type: 'institution')] - public $institution; + public Institution $institution; /** * @var string|null */ #[ORM\Column(length: 36, nullable: true)] - public $secondFactorType; + public ?string $secondFactorType; /** * @var string */ #[ORM\Column] - public $revokedBy; + public string $revokedBy; /** * @var DateTime */ #[ORM\Column(type: 'stepup_datetime')] - public $recordedOn; + public DateTime $recordedOn; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/UnverifiedSecondFactor.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/UnverifiedSecondFactor.php index 898f02176..fa45af37f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/UnverifiedSecondFactor.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/UnverifiedSecondFactor.php @@ -31,32 +31,32 @@ class UnverifiedSecondFactor implements JsonSerializable */ #[ORM\Id] #[ORM\Column(length: 36)] - public $id; + public string $id; /** * @var string */ #[ORM\Column(length: 36)] - public $identityId; + public string $identityId; /** * @var string */ #[ORM\Column(length: 16)] - public $type; + public string $type; /** * The second factor identifier, ie. telephone number, Yubikey public ID, Tiqr ID * @var string */ #[ORM\Column(length: 255)] - public $secondFactorIdentifier; + public string $secondFactorIdentifier; /** * @var string */ #[ORM\Column(length: 32)] - public $verificationNonce; + public string $verificationNonce; public function jsonSerialize(): array { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VerifiedSecondFactor.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VerifiedSecondFactor.php index 5089db855..b8ac78aab 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VerifiedSecondFactor.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VerifiedSecondFactor.php @@ -18,9 +18,9 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Entity; -use DateTime; use Doctrine\ORM\Mapping as ORM; use JsonSerializable; +use Surfnet\Stepup\DateTime\DateTime; use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\VerifiedSecondFactorRepository; #[ORM\Table] @@ -28,55 +28,33 @@ #[ORM\Entity(repositoryClass: VerifiedSecondFactorRepository::class)] class VerifiedSecondFactor implements JsonSerializable { - /** - * @var string - */ #[ORM\Id] #[ORM\Column(length: 36)] - public $id; + public string $id; - /** - * @var string - */ #[ORM\Column(length: 36)] - public $identityId; + public string $identityId; - /** - * @var string - */ #[ORM\Column] - public $institution; + public string $institution; - /** - * @var string - */ #[ORM\Column] - public $commonName; + public string $commonName; - /** - * @var string - */ #[ORM\Column(length: 16)] - public $type; + public string $type; /** * The second factor identifier, ie. telephone number, Yubikey public ID, Tiqr ID - * @var string */ #[ORM\Column(length: 255)] - public $secondFactorIdentifier; + public string $secondFactorIdentifier; - /** - * @var string - */ #[ORM\Column(length: 8)] - public $registrationCode; + public string $registrationCode; - /** - * @var DateTime - */ #[ORM\Column(type: 'stepup_datetime')] - public $registrationRequestedAt; + public DateTime $registrationRequestedAt; public function jsonSerialize(): array { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettedSecondFactor.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettedSecondFactor.php index 12e6386ce..58e91b756 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettedSecondFactor.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettedSecondFactor.php @@ -34,32 +34,32 @@ class VettedSecondFactor implements JsonSerializable */ #[ORM\Id] #[ORM\Column(length: 36)] - public $id; + public string $id; /** * @var string */ #[ORM\Column(length: 36)] - public $identityId; + public string $identityId; /** * @var string */ #[ORM\Column(length: 16)] - public $type; + public string $type; /** * The second factor identifier, ie. telephone number, Yubikey public ID, Tiqr ID * @var string */ #[ORM\Column(length: 255)] - public $secondFactorIdentifier; + public string $secondFactorIdentifier; /** * @var string */ #[ORM\Column(length: 255, nullable: true)] - public $vettingType; + public string $vettingType; /** * @return bool diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/AuditLogProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/AuditLogProjector.php index e3b56ceb2..11ebe9274 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/AuditLogProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/AuditLogProjector.php @@ -161,7 +161,9 @@ private function applyIdentityForgottenEvent(IdentityForgottenEvent $event): voi private function augmentActorCommonName(AuditLogEntry $entry, Metadata $auditLogMetadata): void { if (property_exists($auditLogMetadata, 'vettingType') && !is_null($auditLogMetadata->vettingType)) { - $entry->actorCommonName .= $auditLogMetadata->vettingType->auditLog(); + $entry->actorCommonName = new CommonName( + $entry->actorCommonName->getCommonName() . $auditLogMetadata->vettingType->auditLog() + ); } } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaListingProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaListingProjector.php index 611a95757..8a5337575 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaListingProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaListingProjector.php @@ -147,7 +147,7 @@ public function applyRegistrationAuthorityRetractedForInstitutionEvent( } - protected function applyIdentityForgottenEvent(IdentityForgottenEvent $event) + protected function applyIdentityForgottenEvent(IdentityForgottenEvent $event): void { $this->raListingRepository->removeByIdentityId($event->identityId, $event->identityInstitution); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaSecondFactorProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaSecondFactorProjector.php index 6e10f20d0..f53847231 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaSecondFactorProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaSecondFactorProjector.php @@ -224,19 +224,19 @@ public function applyU2fDevicePossessionProvenAndVerifiedEvent(U2fDevicePossessi * @param DocumentNumber|null $documentNumber */ private function saveRaSecondFactor( - string $identityId, - string $secondFactorId, - string $secondFactorType, - $secondFactorIdentifier, - CommonName $commonName, - Email $email, + string $identityId, + string $secondFactorId, + string $secondFactorType, + string $secondFactorIdentifier, + CommonName $commonName, + Email $email, SecondFactorStatus $status = null, - DocumentNumber $documentNumber = null, + DocumentNumber $documentNumber = null, ): void { $identity = $this->identityRepository->find($identityId); $secondFactor = new RaSecondFactor( - (string)$secondFactorId, + $secondFactorId, $secondFactorType, $secondFactorIdentifier, $identity->id, @@ -302,40 +302,43 @@ public function applySecondFactorVettedWithoutTokenProofOfPossession( $this->raSecondFactorRepository->save($secondFactor); } - protected function applyUnverifiedSecondFactorRevokedEvent(UnverifiedSecondFactorRevokedEvent $event) + protected function applyUnverifiedSecondFactorRevokedEvent(UnverifiedSecondFactorRevokedEvent $event): void { $this->updateStatus($event->secondFactorId, SecondFactorStatus::revoked()); } protected function applyCompliedWithUnverifiedSecondFactorRevocationEvent( CompliedWithUnverifiedSecondFactorRevocationEvent $event, - ) { + ): void + { $this->updateStatus($event->secondFactorId, SecondFactorStatus::revoked()); } - protected function applyVerifiedSecondFactorRevokedEvent(VerifiedSecondFactorRevokedEvent $event) + protected function applyVerifiedSecondFactorRevokedEvent(VerifiedSecondFactorRevokedEvent $event): void { $this->updateStatus($event->secondFactorId, SecondFactorStatus::revoked()); } protected function applyCompliedWithVerifiedSecondFactorRevocationEvent( CompliedWithVerifiedSecondFactorRevocationEvent $event, - ) { + ): void + { $this->updateStatus($event->secondFactorId, SecondFactorStatus::revoked()); } - protected function applyVettedSecondFactorRevokedEvent(VettedSecondFactorRevokedEvent $event) + protected function applyVettedSecondFactorRevokedEvent(VettedSecondFactorRevokedEvent $event): void { $this->updateStatus($event->secondFactorId, SecondFactorStatus::revoked()); } protected function applyCompliedWithVettedSecondFactorRevocationEvent( CompliedWithVettedSecondFactorRevocationEvent $event, - ) { + ): void + { $this->updateStatus($event->secondFactorId, SecondFactorStatus::revoked()); } - protected function applyIdentityForgottenEvent(IdentityForgottenEvent $event) + protected function applyIdentityForgottenEvent(IdentityForgottenEvent $event): void { $this->raSecondFactorRepository->updateStatusByIdentityIdToForgotten($event->identityId); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RecoveryTokenProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RecoveryTokenProjector.php index 326454712..901eca786 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RecoveryTokenProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RecoveryTokenProjector.php @@ -87,7 +87,7 @@ public function applyRecoveryTokenRevokedEvent(RecoveryTokenRevokedEvent $event) * When Identity is forgotten, the recovery token projections for this identity * are removed from the recovery_tokens table. */ - protected function applyIdentityForgottenEvent(IdentityForgottenEvent $event) + protected function applyIdentityForgottenEvent(IdentityForgottenEvent $event): void { $this->recoveryTokenRepository->removeByIdentity($event->identityId); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php index 23b7f1122..42e5c64f0 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php @@ -230,7 +230,7 @@ public function applySecondFactorVettedWithoutTokenProofOfPossession( $this->verifiedRepository->remove($verified); } - protected function applyUnverifiedSecondFactorRevokedEvent(UnverifiedSecondFactorRevokedEvent $event) + protected function applyUnverifiedSecondFactorRevokedEvent(UnverifiedSecondFactorRevokedEvent $event): void { $this->unverifiedRepository->remove( $this->unverifiedRepository->find($event->secondFactorId->getSecondFactorId()), @@ -239,35 +239,38 @@ protected function applyUnverifiedSecondFactorRevokedEvent(UnverifiedSecondFacto protected function applyCompliedWithUnverifiedSecondFactorRevocationEvent( CompliedWithUnverifiedSecondFactorRevocationEvent $event, - ) { + ): void + { $this->unverifiedRepository->remove( $this->unverifiedRepository->find($event->secondFactorId->getSecondFactorId()), ); } - protected function applyVerifiedSecondFactorRevokedEvent(VerifiedSecondFactorRevokedEvent $event) + protected function applyVerifiedSecondFactorRevokedEvent(VerifiedSecondFactorRevokedEvent $event): void { $this->verifiedRepository->remove($this->verifiedRepository->find($event->secondFactorId->getSecondFactorId())); } protected function applyCompliedWithVerifiedSecondFactorRevocationEvent( CompliedWithVerifiedSecondFactorRevocationEvent $event, - ) { + ): void + { $this->verifiedRepository->remove($this->verifiedRepository->find($event->secondFactorId->getSecondFactorId())); } - protected function applyVettedSecondFactorRevokedEvent(VettedSecondFactorRevokedEvent $event) + protected function applyVettedSecondFactorRevokedEvent(VettedSecondFactorRevokedEvent $event): void { $this->vettedRepository->remove($this->vettedRepository->find($event->secondFactorId->getSecondFactorId())); } protected function applyCompliedWithVettedSecondFactorRevocationEvent( CompliedWithVettedSecondFactorRevocationEvent $event, - ) { + ): void + { $this->vettedRepository->remove($this->vettedRepository->find($event->secondFactorId->getSecondFactorId())); } - protected function applyIdentityForgottenEvent(IdentityForgottenEvent $event) + protected function applyIdentityForgottenEvent(IdentityForgottenEvent $event): void { $this->unverifiedRepository->removeByIdentityId($event->identityId); $this->verifiedRepository->removeByIdentityId($event->identityId); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorRevocationProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorRevocationProjector.php index 52dba6b32..87bd40b68 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorRevocationProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorRevocationProjector.php @@ -37,7 +37,8 @@ public function __construct(private readonly SecondFactorRevocationRepository $r protected function applyVettedSecondFactorRevokedEvent( VettedSecondFactorRevokedEvent $event, DomainMessage $domainMessage, - ) { + ): void + { $revocation = new SecondFactorRevocation(); $revocation->id = (string)Uuid::uuid4(); $revocation->institution = $event->identityInstitution; @@ -51,7 +52,8 @@ protected function applyVettedSecondFactorRevokedEvent( protected function applyCompliedWithVettedSecondFactorRevocationEvent( CompliedWithVettedSecondFactorRevocationEvent $event, DomainMessage $domainMessage, - ) { + ): void + { $revocation = new SecondFactorRevocation(); $revocation->id = (string)Uuid::uuid4(); $revocation->institution = $event->identityInstitution; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/WhitelistProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/WhitelistProjector.php index cd87bbfad..e08240a44 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/WhitelistProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/WhitelistProjector.php @@ -32,7 +32,7 @@ public function __construct(private readonly WhitelistEntryRepository $whitelist { } - protected function applyWhitelistCreatedEvent(WhitelistCreatedEvent $event) + protected function applyWhitelistCreatedEvent(WhitelistCreatedEvent $event): void { $whitelistEntries = []; foreach ($event->whitelistedInstitutions as $institution) { @@ -42,7 +42,7 @@ protected function applyWhitelistCreatedEvent(WhitelistCreatedEvent $event) $this->whitelistEntryRepository->saveEntries($whitelistEntries); } - protected function applyWhitelistReplacedEvent(WhitelistReplacedEvent $event) + protected function applyWhitelistReplacedEvent(WhitelistReplacedEvent $event): void { $this->whitelistEntryRepository->removeAll(); @@ -54,7 +54,7 @@ protected function applyWhitelistReplacedEvent(WhitelistReplacedEvent $event) $this->whitelistEntryRepository->saveEntries($whitelistEntries); } - protected function applyInstitutionsAddedToWhitelistEvent(InstitutionsAddedToWhitelistEvent $event) + protected function applyInstitutionsAddedToWhitelistEvent(InstitutionsAddedToWhitelistEvent $event): void { $whitelistEntries = []; foreach ($event->addedInstitutions as $institution) { @@ -64,7 +64,7 @@ protected function applyInstitutionsAddedToWhitelistEvent(InstitutionsAddedToWhi $this->whitelistEntryRepository->saveEntries($whitelistEntries); } - protected function applyInstitutionsRemovedFromWhitelistEvent(InstitutionsRemovedFromWhitelistEvent $event) + protected function applyInstitutionsRemovedFromWhitelistEvent(InstitutionsRemovedFromWhitelistEvent $event): void { $institutions = []; foreach ($event->removedInstitutions as $institution) { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/AbstractQuery.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/AbstractQuery.php index 0c23d2da7..f64e21e2e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/AbstractQuery.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/AbstractQuery.php @@ -23,10 +23,10 @@ abstract class AbstractQuery /** * @var int */ - public $pageNumber; + public int $pageNumber; /** * @var int */ - public $itemsPerPage = 25; + public int $itemsPerPage = 25; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/IdentityQuery.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/IdentityQuery.php index 49eceac11..9fa598625 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/IdentityQuery.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/IdentityQuery.php @@ -25,20 +25,20 @@ class IdentityQuery extends AbstractQuery /** * @var string */ - public $nameId; + public string $nameId; /** * @var string */ - public $commonName; + public string $commonName; /** * @var string|Institution */ - public $institution; + public string|Institution $institution; /** * @var string */ - public $email; + public string $email; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaCandidateQuery.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaCandidateQuery.php index 5251af564..7116e1af2 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaCandidateQuery.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaCandidateQuery.php @@ -26,30 +26,30 @@ class RaCandidateQuery extends AbstractQuery /** * @var string|Institution */ - public $institution; + public string|Institution $institution; /** * @var string */ - public $commonName; + public string $commonName; /** * @var string */ - public $email; + public string $email; /** * @var string[] */ - public $secondFactorTypes; + public array $secondFactorTypes; /** * @var string|Institution */ - public $raInstitution; + public string|Institution $raInstitution; /** * @var InstitutionAuthorizationContextInterface */ - public $authorizationContext; + public InstitutionAuthorizationContextInterface $authorizationContext; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaListingQuery.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaListingQuery.php index 044a2bac1..fbfda7f93 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaListingQuery.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaListingQuery.php @@ -27,45 +27,45 @@ class RaListingQuery extends AbstractQuery /** * @var string|Institution */ - public $institution; + public string|Institution $institution; /** * @var IdentityId */ - public $identityId; + public IdentityId $identityId; /** * @var string|null */ - public $name; + public ?string $name; /** * @var string|null */ - public $email; + public ?string $email; /** * @var string|null */ - public $role; + public ?string $role; /** * @var string|null */ - public $raInstitution; + public ?string $raInstitution; /** * @var string */ - public $orderBy; + public string $orderBy; /** * @var string */ - public $orderDirection; + public string $orderDirection; /** * @var InstitutionAuthorizationContextInterface */ - public $authorizationContext; + public InstitutionAuthorizationContextInterface $authorizationContext; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaSecondFactorQuery.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaSecondFactorQuery.php index 050f6d11f..12d2bfaf9 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaSecondFactorQuery.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaSecondFactorQuery.php @@ -25,45 +25,45 @@ final class RaSecondFactorQuery extends AbstractQuery /** * @var string|null */ - public $name; + public ?string $name; /** * @var string|null */ - public $type; + public ?string $type; /** * @var string|null The second factor type's ID (eg. Yubikey public ID) */ - public $secondFactorId; + public ?string $secondFactorId; /** * @var string|null */ - public $email; + public ?string $email; /** * @var string|null the filter value, not to be confused with the actorInstitution which is used for authorizations. */ - public $institution; + public ?string $institution; /** * @var string|null One of the ApiBundle\Identity\Entity\RaSecondFactor::STATUS_* constants. */ - public $status; + public ?string $status; /** * @var string|null */ - public $orderBy; + public ?string $orderBy; /** * @var string|null */ - public $orderDirection; + public ?string $orderDirection; /** * @var InstitutionAuthorizationContextInterface */ - public $authorizationContext; + public InstitutionAuthorizationContextInterface $authorizationContext; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaaQuery.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaaQuery.php index add5d7c7a..979080cc7 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaaQuery.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaaQuery.php @@ -25,10 +25,10 @@ class RaaQuery extends AbstractQuery /** * @var string|Institution */ - public $institution; + public string|Institution $institution; /** * @var string */ - public $nameId; + public string $nameId; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RecoveryTokenQuery.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RecoveryTokenQuery.php index 46dfb981a..450d1e857 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RecoveryTokenQuery.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RecoveryTokenQuery.php @@ -26,45 +26,45 @@ class RecoveryTokenQuery extends AbstractQuery /** * @var IdentityId */ - public $identityId; + public IdentityId $identityId; /** * @var string|null */ - public $type; + public ?string $type; /** * @var string|null */ - public $status; + public ?string $status; /** * @var string|null */ - public $institution; + public ?string $institution; /** * @var string|null */ - public $name; + public ?string $name; /** * @var string|null */ - public $email; + public ?string $email; /** * @var string|null */ - public $orderBy; + public ?string $orderBy; /** * @var string|null */ - public $orderDirection; + public ?string $orderDirection; /** * @var InstitutionAuthorizationContextInterface */ - public $authorizationContext; + public InstitutionAuthorizationContextInterface $authorizationContext; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/SecondFactorAuditLogQuery.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/SecondFactorAuditLogQuery.php index d03f1ab4f..f7e2fb3ef 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/SecondFactorAuditLogQuery.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/SecondFactorAuditLogQuery.php @@ -26,20 +26,20 @@ final class SecondFactorAuditLogQuery extends AbstractQuery /** * @var Institution */ - public $identityInstitution; + public Institution $identityInstitution; /** * @var IdentityId */ - public $identityId; + public IdentityId $identityId; /** * @var string */ - public $orderBy = 'recordedOn'; + public string $orderBy = 'recordedOn'; /** * @var string */ - public $orderDirection = 'desc'; + public string $orderDirection = 'desc'; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/UnverifiedSecondFactorQuery.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/UnverifiedSecondFactorQuery.php index 59bfb3224..5e43a6caf 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/UnverifiedSecondFactorQuery.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/UnverifiedSecondFactorQuery.php @@ -25,10 +25,10 @@ class UnverifiedSecondFactorQuery extends AbstractQuery /** * @var IdentityId */ - public $identityId; + public IdentityId $identityId; /** * @var string|null */ - public $verificationNonce; + public ?string $verificationNonce; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/VerifiedSecondFactorOfIdentityQuery.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/VerifiedSecondFactorOfIdentityQuery.php index 42fe3fb56..8a9b3d80c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/VerifiedSecondFactorOfIdentityQuery.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/VerifiedSecondFactorOfIdentityQuery.php @@ -25,5 +25,5 @@ class VerifiedSecondFactorOfIdentityQuery extends AbstractQuery /** * @var IdentityId|null */ - public $identityId; + public ?IdentityId $identityId; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/VerifiedSecondFactorQuery.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/VerifiedSecondFactorQuery.php index bf19570e2..03f0b9e40 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/VerifiedSecondFactorQuery.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/VerifiedSecondFactorQuery.php @@ -27,20 +27,20 @@ class VerifiedSecondFactorQuery extends AbstractQuery /** * @var IdentityId|null */ - public $identityId; + public ?IdentityId $identityId; /** * @var SecondFactorId|null */ - public $secondFactorId; + public ?SecondFactorId $secondFactorId; /** * @var string|null */ - public $registrationCode; + public ?string $registrationCode; /** * @var InstitutionAuthorizationContext */ - public $authorizationContext; + public InstitutionAuthorizationContext $authorizationContext; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/VettedSecondFactorQuery.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/VettedSecondFactorQuery.php index 727e20d3c..4fad4cef3 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/VettedSecondFactorQuery.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/VettedSecondFactorQuery.php @@ -25,5 +25,5 @@ class VettedSecondFactorQuery extends AbstractQuery /** * @var IdentityId */ - public $identityId; + public IdentityId $identityId; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php index f431b6716..00861a154 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php @@ -25,7 +25,6 @@ use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\Stepup\Identity\Value\NameId; -use Surfnet\StepupMiddleware\ApiBundle\Authorization\Filter\InstitutionAuthorizationRepositoryFilter; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Identity; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\IdentityQuery; @@ -33,7 +32,6 @@ class IdentityRepository extends ServiceEntityRepository { public function __construct( ManagerRegistry $registry, - private readonly InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter, ) { parent::__construct($registry, Identity::class); } @@ -92,7 +90,7 @@ public function createSearchQuery( * @param string[] $nameIds * @return Identity[] Indexed by NameID. */ - public function findByNameIdsIndexed(array $nameIds) + public function findByNameIdsIndexed(array $nameIds): array { return $this->getEntityManager()->createQueryBuilder() ->select('i') @@ -124,7 +122,7 @@ public function hasIdentityWithNameIdAndInstitution(NameId $nameId, Institution /** * @return Identity */ - public function findOneByNameIdAndInstitution(NameId $nameId, Institution $institution) + public function findOneByNameIdAndInstitution(NameId $nameId, Institution $institution): Identity { return $this->createQueryBuilder('i') ->where('i.nameId = :nameId') @@ -153,7 +151,7 @@ public function removeByIdentityId(IdentityId $identityId): void /** * @return ArrayCollection|Identity[] */ - public function findByInstitution(Institution $institution) + public function findByInstitution(Institution $institution): ArrayCollection|array { return $this->createQueryBuilder('i') ->where('i.institution = :institution') diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentitySelfAssertedTokenOptionsRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentitySelfAssertedTokenOptionsRepository.php index b1ac17b65..a6009de88 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentitySelfAssertedTokenOptionsRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentitySelfAssertedTokenOptionsRepository.php @@ -20,14 +20,12 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Persistence\ManagerRegistry; -use Surfnet\StepupMiddleware\ApiBundle\Authorization\Filter\InstitutionAuthorizationRepositoryFilter; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\IdentitySelfAssertedTokenOptions; class IdentitySelfAssertedTokenOptionsRepository extends ServiceEntityRepository { public function __construct( ManagerRegistry $registry, - private readonly InstitutionAuthorizationRepositoryFilter $authorizationRepositoryFilter, ) { parent::__construct($registry, IdentitySelfAssertedTokenOptions::class); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaCandidateRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaCandidateRepository.php index 0e46f507f..a9c9fed07 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaCandidateRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaCandidateRepository.php @@ -131,7 +131,7 @@ public function createOptionsQuery(RaCandidateQuery $query): Query /** * @return array|null */ - public function findOneByIdentityId(string $identityId) + public function findOneByIdentityId(string $identityId): ?array { // Finds a single identity by its identity id. Returns the identity as an array $queryBuilder = $this->getBaseQuery() @@ -146,7 +146,7 @@ public function findOneByIdentityId(string $identityId) /** * @return QueryBuilder */ - private function getBaseQuery() + private function getBaseQuery(): QueryBuilder { // Base query to get all allowed ra candidates $queryBuilder = $this->getEntityManager()->createQueryBuilder() diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php index bf68aa1c2..9a997be5e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php @@ -51,7 +51,7 @@ public function find(mixed $id, $lockMode = null, $lockVersion = null): ?RaSecon * @param string $identityId * @return RaSecondFactor[] */ - public function findByIdentityId($identityId): array + public function findByIdentityId(string $identityId): array { return parent::findBy(['identityId' => $identityId]); } @@ -61,7 +61,7 @@ public function findByIdentityId($identityId): array * @param string $institution * @return RaSecondFactor[] */ - public function findByInstitution($institution): array + public function findByInstitution(string $institution): array { return parent::findBy(['institution' => $institution]); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VerifiedSecondFactorRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VerifiedSecondFactorRepository.php index 3555ef02d..00d395564 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VerifiedSecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VerifiedSecondFactorRepository.php @@ -48,10 +48,10 @@ public function find(mixed $id, $lockMode = null, $lockVersion = null): ?Verifie /** * @return VerifiedSecondFactor[] */ - public function findByDate(DateTime $requestedAt) + public function findByDate(DateTime $requestedAt): array { $fromDate = clone $requestedAt; - $fromDate->setTime(0, 0, 0); + $fromDate->setTime(0, 0); $toDate = clone $requestedAt; $toDate->setTime(23, 59, 59); @@ -102,9 +102,6 @@ public function createSearchQuery(VerifiedSecondFactorQuery $query): Query return $queryBuilder->getQuery(); } - /** - * @return Query - */ public function createSearchForIdentityQuery(VerifiedSecondFactorOfIdentityQuery $query): Query { $queryBuilder = $this->createQueryBuilder('sf'); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php index 053cb4ca2..7f8ca425f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php @@ -35,7 +35,7 @@ public function __construct(ManagerRegistry $registry) * @param Institution[] $institutions * @return array */ - public function findEntriesByInstitutions(array $institutions) + public function findEntriesByInstitutions(array $institutions): array { $qb = $this->createQueryBuilder('w'); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AbstractSearchService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AbstractSearchService.php index 1820a7e86..add967864 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AbstractSearchService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AbstractSearchService.php @@ -61,7 +61,7 @@ protected function getFilteredQueryOptions(Query $doctrineQuery): array foreach ($results as $options) { foreach ($options as $key => $value) { $val = (string)$value; - $filters[$key][$val] = (string)$val; + $filters[$key][$val] = $val; } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AuditLogService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AuditLogService.php index 7293317eb..f6e39abb4 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AuditLogService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AuditLogService.php @@ -31,7 +31,7 @@ public function __construct(private readonly AuditLogRepository $repository) /** * @return Pagerfanta */ - public function searchSecondFactorAuditLog(SecondFactorAuditLogQuery $query) + public function searchSecondFactorAuditLog(SecondFactorAuditLogQuery $query): Pagerfanta { $doctrineQuery = $this->repository->createSecondFactorSearchQuery($query); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/IdentityService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/IdentityService.php index 0036ee754..86785487d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/IdentityService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/IdentityService.php @@ -19,12 +19,10 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Service; use Iterator; -use IteratorAggregate; use Pagerfanta\Pagerfanta; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\Stepup\Identity\Value\NameId; -use Surfnet\StepupMiddleware\ApiBundle\Authorization\Value\InstitutionRoleSet; use Surfnet\StepupMiddleware\ApiBundle\Exception\RuntimeException; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Identity; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\IdentitySelfAssertedTokenOptions; @@ -34,7 +32,6 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RaListingRepository; use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\SraaRepository; use Surfnet\StepupMiddleware\ApiBundle\Identity\Value\RegistrationAuthorityCredentials; -use Traversable; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) @@ -115,7 +112,7 @@ public function findRegistrationAuthorityCredentialsByNameIdAndInstitution( /** * @return null|RegistrationAuthorityCredentials */ - private function findRegistrationAuthorityCredentialsByIdentity(Identity $identity) + private function findRegistrationAuthorityCredentialsByIdentity(Identity $identity): ?RegistrationAuthorityCredentials { $raListing = $this->raListingRepository->findByIdentityId(new IdentityId($identity->id)); $sraa = $this->sraaRepository->findByNameId($identity->nameId); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/ProfileService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/ProfileService.php index d33bfb444..cfe3b5908 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/ProfileService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/ProfileService.php @@ -22,14 +22,12 @@ use Surfnet\Stepup\Identity\Value\RegistrationAuthorityRole; use Surfnet\StepupMiddleware\ApiBundle\Authorization\Service\AuthorizationContextService; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Identity; -use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RaListingRepository; use Surfnet\StepupMiddleware\ApiBundle\Identity\Value\AuthorizedInstitutionCollection; use Surfnet\StepupMiddleware\ApiBundle\Identity\Value\Profile; class ProfileService extends AbstractSearchService { public function __construct( - private readonly RaListingRepository $raListingRepository, private readonly IdentityService $identityService, private readonly AuthorizationContextService $authorizationService, ) { @@ -51,7 +49,7 @@ public function __construct( * @param string $identityId * @return Profile|null */ - public function createProfile($identityId): ?Profile + public function createProfile(string $identityId): ?Profile { $identity = $this->identityService->find($identityId); if (!$identity instanceof Identity) { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaCandidateService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaCandidateService.php index aa95d6390..48b0f05a3 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaCandidateService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaCandidateService.php @@ -33,7 +33,7 @@ public function __construct(private readonly RaCandidateRepository $raCandidateR /** * @return Pagerfanta */ - public function search(RaCandidateQuery $query) + public function search(RaCandidateQuery $query): Pagerfanta { $doctrineQuery = $this->raCandidateRepository->createSearchQuery($query); @@ -43,7 +43,7 @@ public function search(RaCandidateQuery $query) /** * @return array */ - public function getFilterOptions(RaCandidateQuery $query) + public function getFilterOptions(RaCandidateQuery $query): array { return $this->getFilteredQueryOptions($this->raCandidateRepository->createOptionsQuery($query)); } @@ -51,7 +51,7 @@ public function getFilterOptions(RaCandidateQuery $query) /** * @return null|array */ - public function findOneByIdentityId(string $identityId) + public function findOneByIdentityId(string $identityId): ?array { return $this->raCandidateRepository->findOneByIdentityId($identityId); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaListingService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaListingService.php index 333ffa7f5..902d3c134 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaListingService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaListingService.php @@ -40,7 +40,8 @@ public function findByIdentityIdAndRaInstitutionWithContext( IdentityId $identityId, Institution $raInstitution, InstitutionAuthorizationContextInterface $authorizationContext, - ) { + ): ?RaListing + { return $this->raListingRepository->findByIdentityIdAndRaInstitutionWithContext( $identityId, $raInstitution, @@ -51,7 +52,7 @@ public function findByIdentityIdAndRaInstitutionWithContext( /** * @return Pagerfanta */ - public function search(RaListingQuery $query) + public function search(RaListingQuery $query): Pagerfanta { $doctrineQuery = $this->raListingRepository->createSearchQuery($query); @@ -61,7 +62,7 @@ public function search(RaListingQuery $query) /** * @return array */ - public function getFilterOptions(RaListingQuery $query) + public function getFilterOptions(RaListingQuery $query): array { return $this->getFilteredQueryOptions($this->raListingRepository->createOptionsQuery($query)); } @@ -69,7 +70,7 @@ public function getFilterOptions(RaListingQuery $query) /** * @return RegistrationAuthorityCredentials[] */ - public function listRegistrationAuthoritiesFor(Institution $institution) + public function listRegistrationAuthoritiesFor(Institution $institution): array { $raListings = $this->raListingRepository->listRasFor($institution); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaSecondFactorService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaSecondFactorService.php index fab37d0dc..f58423391 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaSecondFactorService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaSecondFactorService.php @@ -31,7 +31,7 @@ public function __construct(private readonly RaSecondFactorRepository $repositor /** * @return Pagerfanta */ - public function search(RaSecondFactorQuery $query) + public function search(RaSecondFactorQuery $query): Pagerfanta { $doctrineQuery = $this->repository->createSearchQuery($query); @@ -41,7 +41,7 @@ public function search(RaSecondFactorQuery $query) /** * @return array */ - public function getFilterOptions(RaSecondFactorQuery $query) + public function getFilterOptions(RaSecondFactorQuery $query): array { return $this->getFilteredQueryOptions($this->repository->createOptionsQuery($query)); } @@ -49,7 +49,7 @@ public function getFilterOptions(RaSecondFactorQuery $query) /** * @return array */ - public function searchUnpaginated(RaSecondFactorQuery $query) + public function searchUnpaginated(RaSecondFactorQuery $query): array { return $this->repository->createSearchQuery($query)->getResult(); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RecoveryTokenService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RecoveryTokenService.php index 00d275ecc..3a3760e9b 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RecoveryTokenService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RecoveryTokenService.php @@ -49,7 +49,7 @@ public function get(RecoveryTokenId $id): RecoveryToken return $recoveryToken; } - public function getFilterOptions(RecoveryTokenQuery $query) + public function getFilterOptions(RecoveryTokenQuery $query): array { return $this->getFilteredQueryOptions($this->recoveryTokenRepository->createOptionsQuery($query)); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SecondFactorService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SecondFactorService.php index 626e7be7e..cb2372df8 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SecondFactorService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SecondFactorService.php @@ -48,7 +48,7 @@ public function __construct( /** * @return Pagerfanta */ - public function searchUnverifiedSecondFactors(UnverifiedSecondFactorQuery $query) + public function searchUnverifiedSecondFactors(UnverifiedSecondFactorQuery $query): Pagerfanta { $doctrineQuery = $this->unverifiedRepository->createSearchQuery($query); @@ -58,7 +58,7 @@ public function searchUnverifiedSecondFactors(UnverifiedSecondFactorQuery $query /** * @return Pagerfanta */ - public function searchVerifiedSecondFactors(VerifiedSecondFactorQuery $query) + public function searchVerifiedSecondFactors(VerifiedSecondFactorQuery $query): Pagerfanta { $doctrineQuery = $this->verifiedRepository->createSearchQuery($query); @@ -69,7 +69,7 @@ public function searchVerifiedSecondFactors(VerifiedSecondFactorQuery $query) /** * @return Pagerfanta */ - public function searchVerifiedSecondFactorsOfIdentity(VerifiedSecondFactorOfIdentityQuery $query) + public function searchVerifiedSecondFactorsOfIdentity(VerifiedSecondFactorOfIdentityQuery $query): Pagerfanta { $doctrineQuery = $this->verifiedRepository->createSearchForIdentityQuery($query); @@ -79,7 +79,7 @@ public function searchVerifiedSecondFactorsOfIdentity(VerifiedSecondFactorOfIden /** * @return Pagerfanta */ - public function searchVettedSecondFactors(VettedSecondFactorQuery $query) + public function searchVettedSecondFactors(VettedSecondFactorQuery $query): Pagerfanta { $doctrineQuery = $this->vettedRepository->createSearchQuery($query); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SraaService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SraaService.php index ac620af1f..6a924103d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SraaService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SraaService.php @@ -31,7 +31,7 @@ public function __construct(private readonly SraaRepository $sraaRepository) /** * @return Sraa|null */ - public function findByNameId(NameId $nameId) + public function findByNameId(NameId $nameId): ?Sraa { return $this->sraaRepository->findByNameId($nameId); } @@ -47,7 +47,7 @@ public function findAll(): array /** * @return bool */ - public function contains(NameId $nameId) + public function contains(NameId $nameId): bool { return $this->sraaRepository->contains($nameId); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/WhitelistService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/WhitelistService.php index 4960b1f12..966deb0e4 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/WhitelistService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/WhitelistService.php @@ -26,12 +26,12 @@ public function __construct(private readonly WhitelistEntryRepository $whitelist { } - public function isWhitelisted($institution) + public function isWhitelisted($institution): bool { return $this->whitelistEntryRepository->hasEntryFor($institution); } - public function getAllEntries() + public function getAllEntries(): \Doctrine\Common\Collections\ArrayCollection { return $this->whitelistEntryRepository->getAll(); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Specification/SpecificationInterface.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Specification/SpecificationInterface.php index 942f82938..5d7900c57 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Specification/SpecificationInterface.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Specification/SpecificationInterface.php @@ -25,5 +25,5 @@ interface SpecificationInterface /** * @return mixed */ - public function apply(EntityRepository $entityRepository); + public function apply(EntityRepository $entityRepository): mixed; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorityRole.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorityRole.php index 558ac61d1..6b3ff1ad1 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorityRole.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorityRole.php @@ -32,7 +32,7 @@ class AuthorityRole implements Stringable /** * @var string */ - private $role; + private string $role; public function __construct($role) { @@ -71,7 +71,7 @@ public static function raa(): self /** * @return AuthorityRole */ - public static function fromRegistrationAuthorityRole(RegistrationAuthorityRole $registrationAuthorityRole) + public static function fromRegistrationAuthorityRole(RegistrationAuthorityRole $registrationAuthorityRole): AuthorityRole { if ($registrationAuthorityRole->isRa()) { return static::ra(); @@ -82,7 +82,7 @@ public static function fromRegistrationAuthorityRole(RegistrationAuthorityRole $ throw new RuntimeException( sprintf( 'AuthorityRole cannot be created from RegistrationAuthorityRole of value "%s"', - (string)$registrationAuthorityRole, + $registrationAuthorityRole, ), ); } @@ -98,7 +98,7 @@ public function equals(AuthorityRole $other): bool /** * @return string */ - public function getRole() + public function getRole(): string { return $this->role; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorizedInstitutionCollection.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorizedInstitutionCollection.php index 50f726894..ea252bff8 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorizedInstitutionCollection.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorizedInstitutionCollection.php @@ -32,7 +32,7 @@ class AuthorizedInstitutionCollection * 'institution-3' => [select_raa], * ] * - * @var string[] + * @var array> */ private array $authorizations = []; @@ -42,24 +42,26 @@ public static function from( ): self { $collection = new self(); + /** @var string $institution */ foreach ($raInstitutions as $institution) { - $collection->authorizations[(string)$institution][] = (string)AuthorityRole::ROLE_RA; + $collection->authorizations[$institution][] = AuthorityRole::ROLE_RA; } if ($raaInstitutions instanceof InstitutionCollection) { + /** @var string $institution */ foreach ($raaInstitutions as $institution) { // Override existing lower role - if (isset($collection->authorizations[(string)$institution]) - && in_array(AuthorityRole::ROLE_RA, $collection->authorizations[(string)$institution]) + if (isset($collection->authorizations[$institution]) + && in_array(AuthorityRole::ROLE_RA, $collection->authorizations[$institution]) ) { - $collection->authorizations[(string)$institution] = []; + $collection->authorizations[$institution] = []; } - $collection->authorizations[(string)$institution][] = (string)AuthorityRole::ROLE_RAA; + $collection->authorizations[$institution][] = AuthorityRole::ROLE_RAA; } } return $collection; } - public function getAuthorizations() + public function getAuthorizations(): array { return $this->authorizations; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/Profile.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/Profile.php index 69f1de5fa..4b92abc0b 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/Profile.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/Profile.php @@ -28,9 +28,9 @@ class Profile implements JsonSerializable * @param bool $isSraa */ public function __construct( - private readonly Identity $identity, + private readonly Identity $identity, private readonly AuthorizedInstitutionCollection $authorizedInstitutionCollection, - private $isSraa, + private bool $isSraa, ) { } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/SecondFactorStatus.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/SecondFactorStatus.php index a56b8b548..3588cd1bc 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/SecondFactorStatus.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/SecondFactorStatus.php @@ -51,7 +51,7 @@ public static function forgotten(): self * @param string $status * @return bool */ - public static function isValidStatus($status): bool + public static function isValidStatus(string $status): bool { return in_array($status, ['unverified', 'verified', 'vetted', 'revoked', 'forgotten', true]); } @@ -59,7 +59,7 @@ public static function isValidStatus($status): bool /** * @param string $status */ - private function __construct(private $status) + private function __construct(private string $status) { } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php b/src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php index eb579f7dd..74690dc45 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php @@ -26,7 +26,7 @@ class CommandParamConverter implements ParamConverterInterface { - public function apply(Request $request, ParamConverter $configuration): void + public function apply(Request $request, ParamConverter $configuration): bool { $data = json_decode($request->getContent(), true); @@ -49,6 +49,7 @@ public function apply(Request $request, ParamConverter $configuration): void } $request->attributes->set('command', $command); + return true; } public function supports(ParamConverter $configuration): bool diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionParamConverter.php b/src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionParamConverter.php index 6a1108876..bc901b901 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionParamConverter.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionParamConverter.php @@ -28,9 +28,10 @@ class ConfigurationInstitutionParamConverter implements ParamConverterInterface { public const INSTITUTION = 'institution'; - public function apply(Request $request, ParamConverter $configuration): void + public function apply(Request $request, ParamConverter $configuration): bool { $request->attributes->set(self::INSTITUTION, new Institution($this->getInstitutionFromRequest($request))); + return true; } public function supports(ParamConverter $configuration): bool diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Request/InstitutionParamConverter.php b/src/Surfnet/StepupMiddleware/ApiBundle/Request/InstitutionParamConverter.php index 5fbba5c92..9f06abeba 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Request/InstitutionParamConverter.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Request/InstitutionParamConverter.php @@ -26,7 +26,7 @@ class InstitutionParamConverter implements ParamConverterInterface { - public function apply(Request $request, ParamConverter $configuration): void + public function apply(Request $request, ParamConverter $configuration): bool { $query = $request->query; $institution = $query->get('institution', false); @@ -38,6 +38,8 @@ public function apply(Request $request, ParamConverter $configuration): void $query->remove('institution'); $request->attributes->set('institution', new Institution($institution)); + + return true; } public function supports(ParamConverter $configuration): bool diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Request/MetadataParamConverter.php b/src/Surfnet/StepupMiddleware/ApiBundle/Request/MetadataParamConverter.php index 7e1704b75..51d596957 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Request/MetadataParamConverter.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Request/MetadataParamConverter.php @@ -31,7 +31,7 @@ public function __construct(private readonly ValidatorInterface $validator) { } - public function apply(Request $request, ParamConverter $configuration): void + public function apply(Request $request, ParamConverter $configuration): bool { $data = json_decode($request->getContent()); @@ -50,6 +50,7 @@ public function apply(Request $request, ParamConverter $configuration): void } $request->attributes->set('metadata', $metadata); + return true; } public function supports(ParamConverter $configuration): bool diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php index 2e160c5d6..ff665b3dc 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php @@ -77,6 +77,7 @@ use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\VerifyEmailCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\VetSecondFactorCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\Command\FixedUuidStubCommand; +use function property_exists; class CommandAuthorizationServiceTest extends TestCase { @@ -208,6 +209,9 @@ public function an_identity_should_be_able_to_execute_configured_ra_commands(str $actorInstitution = new Institution('institution'); $command = m::mock($command); + if (property_exists($command, 'identityId')) { + $command->identityId = $actorId; + } $command->shouldReceive('getRaInstitution') ->andReturn($actorInstitution->getInstitution()); @@ -391,6 +395,9 @@ public function an_identity_should_be_able_to_execute_unconfigured_ra_commands(s || $command instanceof RevokeRegistrantsSecondFactorCommand || $command instanceof RevokeRegistrantsRecoveryTokenCommand ) { + if (property_exists($command, 'identityId')) { + $command->identityId = $actorId; + } $role = RegistrationAuthorityRole::ra(); $mockInstitution = new Institution('mock institution'); $mockIdentity = m::mock(Identity::class); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationContactInformationTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationContactInformationTypeTest.php index b546b676d..dbb5fa8dd 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationContactInformationTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationContactInformationTypeTest.php @@ -1,5 +1,7 @@ expectException(InvalidArgumentException::class); + $this->expectException(TypeError::class); $type = Type::getType(DocumentNumberType::NAME); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocaleTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocaleTypeTest.php index 384bdaafa..d34e64068 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocaleTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/LocaleTypeTest.php @@ -1,5 +1,7 @@ client = static::createClient(); - $this->databaseTool = static::getContainer()->get(DatabaseToolCollection::class)->get(); + $this->databaseTool = static::getContainer()->get(ORMSqliteDatabaseTool::class); + $this->databaseTool->setRegistry(static::getContainer()->get(ManagerRegistry::class)); + $this->databaseTool->setObjectManagerName('middleware'); // Initialises schema. - $this->databaseTool->loadFixtures([]); + $this->databaseTool->loadFixtures(); $passwordSs = $this->client->getKernel()->getContainer()->getParameter('selfservice_api_password'); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php index ee7e9acbe..56d4d90be 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php @@ -20,6 +20,7 @@ use Generator; use Liip\TestFixturesBundle\Services\DatabaseToolCollection; +use Liip\TestFixturesBundle\Services\DatabaseTools\ORMSqliteDatabaseTool; use Liip\TestFixturesBundle\Test\FixturesTrait; use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use Symfony\Bundle\FrameworkBundle\Client; @@ -40,11 +41,11 @@ class SraaControllerTest extends WebTestCase private string $endpoint; - private DatabaseToolCollection $databaseTool; + private ORMSqliteDatabaseTool $databaseTool; public function setUp(): void { - $this->databaseTool = static::getContainer()->get(DatabaseToolCollection::class)->get(); + $this->databaseTool = static::getContainer()->get(ORMSqliteDatabaseTool::class); // Initialises schema. $this->databaseTool->loadFixtures([]); // Initialises schema. diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/AuditLogProjectorTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/AuditLogProjectorTest.php index 058b76fca..872b910c0 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/AuditLogProjectorTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/AuditLogProjectorTest.php @@ -28,6 +28,7 @@ use PHPUnit\Framework\TestCase; use Surfnet\Stepup\DateTime\DateTime as StepupDateTime; use Surfnet\Stepup\Identity\AuditLog\Metadata; +use Surfnet\Stepup\Identity\Value\CommonName; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\Stepup\Identity\Value\SecondFactorId; @@ -87,8 +88,6 @@ public function auditable_events(): array $this->createAuditLogMetadata( new IdentityId('abcd'), new Institution('efgh'), - null, - null, ), ), BroadwayDateTime::fromString('1970-01-01H00:00:00.000'), @@ -98,11 +97,6 @@ public function auditable_events(): array new Institution('efgh'), EventStub::class, new StepupDateTime(new CoreDateTime('1970-01-01H00:00:00.000')), - null, - null, - null, - null, - null, ), ], 'with actor, with second factor' => [ @@ -153,7 +147,7 @@ public function it_creates_entries_for_auditable_events(DomainMessage $message, $identityRepository = m::mock(IdentityRepository::class); $identity = new Identity(); - $identity->commonName = self::$actorCommonName; + $identity->commonName = new CommonName(self::$actorCommonName); $identityRepository->shouldReceive('find')->andReturn($identity); $projector = new AuditLogProjector($repository, $identityRepository); @@ -196,13 +190,13 @@ private function createExpectedAuditLogEntry( $actorCommonName = null, ): AuditLogEntry { $entry = new AuditLogEntry(); - $entry->actorId = $actorId instanceof IdentityId ? (string)$actorId : null; - $entry->actorInstitution = $actorInstitution instanceof Institution ? (string)$actorInstitution : null; - $entry->identityId = (string)$identityId; + $entry->actorId = $actorId instanceof IdentityId ? $actorId : null; + $entry->actorInstitution = $actorInstitution instanceof Institution ? $actorInstitution : null; + $entry->identityId = $identityId; $entry->identityInstitution = $identityInstitution; - $entry->secondFactorId = $secondFactorId instanceof SecondFactorId ? (string)$secondFactorId : null; - $entry->secondFactorType = $secondFactorType instanceof SecondFactorType ? (string)$secondFactorType : null; - $entry->secondFactorIdentifier = $secondFactorIdentifier instanceof YubikeyPublicId ? (string)$secondFactorIdentifier : null; + $entry->secondFactorId = $secondFactorId instanceof SecondFactorId ? $secondFactorId : null; + $entry->secondFactorType = $secondFactorType instanceof SecondFactorType ? $secondFactorType : null; + $entry->secondFactorIdentifier = $secondFactorIdentifier instanceof YubikeyPublicId ? $secondFactorIdentifier : null; $entry->event = $event; $entry->recordedOn = $recordedOn; $entry->actorCommonName = $actorCommonName; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/Event/EventStub.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/Event/EventStub.php index 5d1650014..62f74267d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/Event/EventStub.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/Event/EventStub.php @@ -28,7 +28,7 @@ public function __construct( ) { } - public function getAuditLogMetadata() + public function getAuditLogMetadata(): Metadata { return $this->metadata; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php index 9ef5b6cd6..d5ef74c05 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php @@ -29,7 +29,9 @@ use Surfnet\StepupMiddleware\ApiBundle\Request\CommandParamConverter; use Surfnet\StepupMiddleware\CommandHandlingBundle\Root\Command\FooBarCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Root\Command\Ns\QuuxCommand; +use Symfony\Component\HttpFoundation\ParameterBag; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag; class CommandParamConverterTest extends TestCase { @@ -68,9 +70,12 @@ public function it_can_convert_command_name_notation($expectedCommandClass, stri $request = m::mock(Request::class) ->shouldReceive('getContent')->with()->andReturn(json_encode($command)) ->getMock(); - $request->attributes = m::mock() + + /** @var ParameterBag $attributes */ + $attributes = m::mock() ->shouldReceive('set')->with('command', m::type($expectedCommandClass)) ->getMock(); + $request->attributes = $attributes; $configuration = m::mock(ParamConverter::class); $converter = new CommandParamConverter(); @@ -87,13 +92,17 @@ public function it_sets_uuid(): void { $command = ['command' => ['name' => 'Root:FooBar', 'uuid' => 'abcdef', 'payload' => new stdClass]]; - /** @var Request&MockInterface $request */ + /** @var Request $request */ $request = m::mock(Request::class) ->shouldReceive('getContent')->with()->andReturn(json_encode($command)) ->getMock(); - $request->attributes = m::mock() + + /** @var ParameterBag $attributes */ + $attributes = m::mock() ->shouldReceive('set')->with('command', $this->spy($spiedCommand)) ->getMock(); + $request->attributes = $attributes; + $configuration = m::mock(ParamConverter::class); $converter = new CommandParamConverter(); @@ -110,13 +119,18 @@ public function it_sets_payload(): void { $command = ['command' => ['name' => 'Root:FooBar', 'uuid' => 'abcdef', 'payload' => ['snake_case' => true]]]; - /** @var Request&MockInterface $request */ + /** @var Request $request */ $request = m::mock(Request::class) ->shouldReceive('getContent')->with()->andReturn(json_encode($command)) ->getMock(); - $request->attributes = m::mock() + + /** @var ParameterBag $attributes */ + $attributes = m::mock() ->shouldReceive('set')->with('command', $this->spy($spiedCommand)) ->getMock(); + + $request->attributes = $attributes; + $configuration = m::mock(ParamConverter::class); $converter = new CommandParamConverter(); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/AbstractCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/AbstractCommand.php index cc0430ea4..214817674 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/AbstractCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/AbstractCommand.php @@ -33,7 +33,7 @@ abstract class AbstractCommand implements Command #[Assert\NotBlank] #[Assert\Type(type: 'string')] #[Assert\Regex(pattern: '~^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$~i')] - public $UUID; + public string $UUID; public function __toString(): string { diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/Metadata.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/Metadata.php index ba3320c69..c1e39f8df 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/Metadata.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/Metadata.php @@ -28,11 +28,11 @@ final class Metadata */ #[Assert\Type(type: 'string')] #[Assert\Regex(pattern: '~^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$~i')] - public $actorId; + public ?string $actorId; /** * @var string|null */ #[Assert\Type(type: 'string')] - public $actorInstitution; + public ?string $actorInstitution; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/RaExecutable.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/RaExecutable.php index 8e63188f0..34a500ccd 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/RaExecutable.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/RaExecutable.php @@ -26,8 +26,6 @@ interface RaExecutable { /** * Returns the actor institution. This is done to be able to validate if we may execute certain commands for authorization purposes - * - * @return string|null */ - public function getRaInstitution(); + public function getRaInstitution(): ?string; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/SelfServiceExecutable.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/SelfServiceExecutable.php index df9794c56..8f13bde0e 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/SelfServiceExecutable.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/SelfServiceExecutable.php @@ -29,5 +29,5 @@ interface SelfServiceExecutable * * @return string */ - public function getIdentityId(); + public function getIdentityId(): string; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/AddRaLocationCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/AddRaLocationCommand.php index b63b34ed3..d978a2ee6 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/AddRaLocationCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/AddRaLocationCommand.php @@ -30,7 +30,7 @@ class AddRaLocationCommand extends AbstractCommand implements RaExecutable */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $raLocationId; + public string $raLocationId; /** * @@ -38,7 +38,7 @@ class AddRaLocationCommand extends AbstractCommand implements RaExecutable */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $institution; + public string $institution; /** * @@ -46,7 +46,7 @@ class AddRaLocationCommand extends AbstractCommand implements RaExecutable */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $raLocationName; + public string $raLocationName; /** * @@ -54,18 +54,15 @@ class AddRaLocationCommand extends AbstractCommand implements RaExecutable */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $location; + public string $location; /** * @var string */ #[Assert\Type(type: 'string')] - public $contactInformation; + public string $contactInformation; - /** - * @inheritDoc - */ - public function getRaInstitution() + public function getRaInstitution(): string { return $this->institution; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/ChangeRaLocationCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/ChangeRaLocationCommand.php index 79d5b8808..2d0d7f94c 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/ChangeRaLocationCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/ChangeRaLocationCommand.php @@ -29,39 +29,39 @@ class ChangeRaLocationCommand extends AbstractCommand implements RaExecutable */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $raLocationId; + public string $raLocationId; /** * @var string */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $institution; + public string $institution; /** * @var string */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $raLocationName; + public string $raLocationName; /** * @var string */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $location; + public string $location; /** * @var string */ #[Assert\Type(type: 'string')] - public $contactInformation; + public string $contactInformation; /** * @inheritDoc */ - public function getRaInstitution() + public function getRaInstitution(): string { return $this->institution; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/CreateInstitutionConfigurationCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/CreateInstitutionConfigurationCommand.php index 3792b0469..2cf477bed 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/CreateInstitutionConfigurationCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/CreateInstitutionConfigurationCommand.php @@ -29,5 +29,5 @@ class CreateInstitutionConfigurationCommand extends AbstractCommand implements M */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $institution; + public string $institution; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/ReconfigureInstitutionConfigurationOptionsCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/ReconfigureInstitutionConfigurationOptionsCommand.php index 46b4f7f2e..da41ba590 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/ReconfigureInstitutionConfigurationOptionsCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/ReconfigureInstitutionConfigurationOptionsCommand.php @@ -29,32 +29,32 @@ final class ReconfigureInstitutionConfigurationOptionsCommand extends AbstractCo */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $institution; + public string $institution; /** * @var bool */ #[Assert\Type(type: 'boolean')] - public $useRaLocationsOption; + public bool $useRaLocationsOption; /** * @var bool */ #[Assert\Type(type: 'boolean')] - public $showRaaContactInformationOption; + public bool $showRaaContactInformationOption; /** * @var bool */ #[Assert\Type(type: 'boolean')] - public $verifyEmailOption; + public bool $verifyEmailOption; /** * @var int */ #[Assert\Type(type: 'integer')] - public $numberOfTokensPerIdentityOption; + public int $numberOfTokensPerIdentityOption; #[Assert\NotNull] public $allowedSecondFactors; @@ -62,30 +62,30 @@ final class ReconfigureInstitutionConfigurationOptionsCommand extends AbstractCo /** * @var array|null */ - public $useRaOption; + public ?array $useRaOption; /** * @var array|null */ - public $useRaaOption; + public ?array $useRaaOption; /** * @var array|null */ - public $selectRaaOption; + public ?array $selectRaaOption; /** * @var bool|null */ - public $selfVetOption; + public ?bool $selfVetOption; /** * @var bool|null */ - public $selfAssertedTokensOption; + public ?bool $selfAssertedTokensOption; /** * @var bool|null */ - public $ssoOn2faOption; + public ?bool $ssoOn2faOption; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/RemoveInstitutionConfigurationByUnnormalizedIdCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/RemoveInstitutionConfigurationByUnnormalizedIdCommand.php index c20e7702c..e0c2c42a1 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/RemoveInstitutionConfigurationByUnnormalizedIdCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/RemoveInstitutionConfigurationByUnnormalizedIdCommand.php @@ -28,5 +28,5 @@ final class RemoveInstitutionConfigurationByUnnormalizedIdCommand extends Abstra */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $institution; + public string $institution; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/RemoveRaLocationCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/RemoveRaLocationCommand.php index df380b3e8..329ffef13 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/RemoveRaLocationCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/RemoveRaLocationCommand.php @@ -29,19 +29,19 @@ class RemoveRaLocationCommand extends AbstractCommand implements RaExecutable */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $raLocationId; + public string $raLocationId; /** * @var string */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $institution; + public string $institution; /** * @inheritDoc */ - public function getRaInstitution() + public function getRaInstitution(): string { return $this->institution; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/UpdateConfigurationCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/UpdateConfigurationCommand.php index 2ca7a5add..bfff29f15 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/UpdateConfigurationCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/UpdateConfigurationCommand.php @@ -29,5 +29,5 @@ class UpdateConfigurationCommand extends AbstractCommand implements ManagementEx * * @ManagementAssert\HasValidConfigurationStructure */ - public $configuration; + public string $configuration; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/ConfigurationCommandHandler.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/ConfigurationCommandHandler.php index 49004bdbc..57a64f9d6 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/ConfigurationCommandHandler.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/ConfigurationCommandHandler.php @@ -19,7 +19,6 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\CommandHandler; use Broadway\CommandHandling\SimpleCommandHandler; -use Broadway\Domain\AggregateRoot; use Broadway\Repository\AggregateNotFoundException; use Surfnet\Stepup\Configuration\Configuration; use Surfnet\Stepup\Configuration\EventSourcing\ConfigurationRepository; diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Dto/EmailTemplate.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Dto/EmailTemplate.php index fe6ac0649..4ba5f02ba 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Dto/EmailTemplate.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Dto/EmailTemplate.php @@ -23,15 +23,15 @@ final class EmailTemplate /** * @var string */ - public $name; + public string $name; /** * @var string */ - public $locale; + public string $locale; /** * @var string */ - public $htmlContent; + public string $htmlContent; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Service/EmailTemplateService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Service/EmailTemplateService.php index 1f18ade13..08dab4a5c 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Service/EmailTemplateService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Service/EmailTemplateService.php @@ -24,11 +24,7 @@ interface EmailTemplateService { /** - * @param string $name - * @param string $preferredLocale - * @param string $fallbackLocale - * @return EmailTemplate * @throws RuntimeException */ - public function findByName($name, $preferredLocale, $fallbackLocale); + public function findByName(string $name, string $preferredLocale, string $fallbackLocale): ?EmailTemplate; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Dto/VettingLocation.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Dto/VettingLocation.php index dcc458642..e3acc33d9 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Dto/VettingLocation.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Dto/VettingLocation.php @@ -25,7 +25,7 @@ class VettingLocation * @param string $location * @param string $contactInformation */ - public function __construct(public $name, public $location, public $contactInformation) + public function __construct(public string $name, public string $location, public string $contactInformation) { } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php index 490b21aa6..3ebbe965f 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php @@ -37,7 +37,7 @@ class BufferedEventBus implements EventBusInterface /** * @var DomainMessage[] */ - private $buffer = []; + private array $buffer = []; /** * Flag to ensure only one loop is publishing domain messages from the buffer. diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventSourcing/MetadataEnricher.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventSourcing/MetadataEnricher.php index 1ae4cf7ea..555c9b882 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventSourcing/MetadataEnricher.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventSourcing/MetadataEnricher.php @@ -26,5 +26,5 @@ interface MetadataEnricher * @param Metadata|null $metadata * @return void */ - public function setMetadata(Metadata $metadata = null); + public function setMetadata(Metadata $metadata = null): void; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Exception/SecondFactorNotAllowedException.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Exception/SecondFactorNotAllowedException.php index e417659e5..c85f0eb47 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Exception/SecondFactorNotAllowedException.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Exception/SecondFactorNotAllowedException.php @@ -25,12 +25,12 @@ class SecondFactorNotAllowedException extends RuntimeException implements Proces /** * @var string[] */ - private $errors; + private array $errors; /** * @return string[] */ - public function getErrors() + public function getErrors(): array { return $this->errors; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AccreditIdentityCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AccreditIdentityCommand.php index d94aa656f..021d9646c 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AccreditIdentityCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AccreditIdentityCommand.php @@ -24,58 +24,31 @@ class AccreditIdentityCommand extends AbstractCommand implements RaExecutable { - /** - * - * @var string - */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $identityId; + public string $identityId; - /** - * - * @var string - */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $institution; + public string $institution; - /** - * - * @var string - */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $role; + public string $role; - /** - * - * @var string - */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $location; + public string $location; - /** - * - * @var string - */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $contactInformation; + public string $contactInformation; - /** - * - * @var string - */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $raInstitution; + public string $raInstitution; - /** - * @inheritDoc - */ - public function getRaInstitution() + public function getRaInstitution(): ?string { return $this->raInstitution; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AmendRegistrationAuthorityInformationCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AmendRegistrationAuthorityInformationCommand.php index 4d0c05eae..1bd0f6bab 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AmendRegistrationAuthorityInformationCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AmendRegistrationAuthorityInformationCommand.php @@ -30,7 +30,7 @@ class AmendRegistrationAuthorityInformationCommand extends AbstractCommand imple */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $identityId; + public string $identityId; /** * @@ -38,7 +38,7 @@ class AmendRegistrationAuthorityInformationCommand extends AbstractCommand imple */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $location; + public string $location; /** * @@ -46,7 +46,7 @@ class AmendRegistrationAuthorityInformationCommand extends AbstractCommand imple */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $contactInformation; + public string $contactInformation; /** * @@ -54,12 +54,12 @@ class AmendRegistrationAuthorityInformationCommand extends AbstractCommand imple */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $raInstitution; + public string $raInstitution; /** * @inheritDoc */ - public function getRaInstitution() + public function getRaInstitution(): string { return $this->raInstitution; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AppointRoleCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AppointRoleCommand.php index ad2b99fc2..207f74347 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AppointRoleCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AppointRoleCommand.php @@ -29,23 +29,23 @@ class AppointRoleCommand extends AbstractCommand implements RaExecutable */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $identityId; + public string $identityId; /** * @var string */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $role; + public string $role; /** * @var string */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $raInstitution; + public string $raInstitution; - public function getRaInstitution() + public function getRaInstitution(): string { return $this->raInstitution; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php index fa6053620..c7c559312 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php @@ -29,7 +29,7 @@ final class BootstrapIdentityWithYubikeySecondFactorCommand extends AbstractComm */ #[Assert\NotBlank] #[Assert\Type('string')] - public $identityId; + public string $identityId; /** * @@ -37,7 +37,7 @@ final class BootstrapIdentityWithYubikeySecondFactorCommand extends AbstractComm */ #[Assert\NotBlank] #[Assert\Type('string')] - public $nameId; + public string $nameId; /** * @@ -45,7 +45,7 @@ final class BootstrapIdentityWithYubikeySecondFactorCommand extends AbstractComm */ #[Assert\NotBlank] #[Assert\Type('string')] - public $institution; + public string $institution; /** * @@ -53,7 +53,7 @@ final class BootstrapIdentityWithYubikeySecondFactorCommand extends AbstractComm */ #[Assert\NotBlank] #[Assert\Type('string')] - public $commonName; + public string $commonName; /** * @@ -61,7 +61,7 @@ final class BootstrapIdentityWithYubikeySecondFactorCommand extends AbstractComm */ #[Assert\NotBlank] #[Assert\Email] - public $email; + public string $email; /** * @@ -69,7 +69,7 @@ final class BootstrapIdentityWithYubikeySecondFactorCommand extends AbstractComm */ #[Assert\NotBlank] #[Assert\Type('string')] - public $preferredLocale; + public string $preferredLocale; /** * @@ -77,7 +77,7 @@ final class BootstrapIdentityWithYubikeySecondFactorCommand extends AbstractComm */ #[Assert\NotBlank] #[Assert\Type('string')] - public $secondFactorId; + public string $secondFactorId; /** * @@ -85,5 +85,5 @@ final class BootstrapIdentityWithYubikeySecondFactorCommand extends AbstractComm */ #[Assert\NotBlank] #[Assert\Type('string')] - public $yubikeyPublicId; + public string $yubikeyPublicId; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/CreateIdentityCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/CreateIdentityCommand.php index fdcaac9fe..cba8a3242 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/CreateIdentityCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/CreateIdentityCommand.php @@ -29,48 +29,48 @@ class CreateIdentityCommand extends AbstractCommand implements SelfServiceExecut */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $id; + public string $id; /** * @var string */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $nameId; + public string $nameId; /** * @var string */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $email; + public string $email; /** * @var string */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $institution; + public string $institution; /** * @var string */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $commonName; + public string $commonName; /** * @var string */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $preferredLocale; + public string $preferredLocale; /** * @return string */ - public function getIdentityId() + public function getIdentityId(): string { return $this->id; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ExpressLocalePreferenceCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ExpressLocalePreferenceCommand.php index e058c3716..59f83188b 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ExpressLocalePreferenceCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ExpressLocalePreferenceCommand.php @@ -31,7 +31,7 @@ class ExpressLocalePreferenceCommand extends AbstractCommand implements SelfServ */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $identityId; + public string $identityId; /** * @@ -39,12 +39,9 @@ class ExpressLocalePreferenceCommand extends AbstractCommand implements SelfServ */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $preferredLocale; + public string $preferredLocale; - /** - * @inheritDoc - */ - public function getRaInstitution() + public function getRaInstitution(): null { return null; } @@ -52,7 +49,7 @@ public function getRaInstitution() /** * @return string */ - public function getIdentityId() + public function getIdentityId(): string { return $this->identityId; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ForgetIdentityCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ForgetIdentityCommand.php index bc505e641..8e77903e1 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ForgetIdentityCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ForgetIdentityCommand.php @@ -31,7 +31,7 @@ final class ForgetIdentityCommand extends AbstractCommand implements ManagementE */ #[Assert\NotBlank] #[Assert\Type('string')] - public $nameId; + public string $nameId; /** * @@ -39,5 +39,5 @@ final class ForgetIdentityCommand extends AbstractCommand implements ManagementE */ #[Assert\NotBlank] #[Assert\Type('string')] - public $institution; + public string $institution; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/MigrateVettedSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/MigrateVettedSecondFactorCommand.php index 90666331f..e9981d3f4 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/MigrateVettedSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/MigrateVettedSecondFactorCommand.php @@ -30,7 +30,7 @@ class MigrateVettedSecondFactorCommand extends AbstractCommand */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $sourceIdentityId; + public string $sourceIdentityId; /** * The UUID of the target identity @@ -38,7 +38,7 @@ class MigrateVettedSecondFactorCommand extends AbstractCommand */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $targetIdentityId; + public string $targetIdentityId; /** * The source second factor UUID that is to be moved @@ -46,7 +46,7 @@ class MigrateVettedSecondFactorCommand extends AbstractCommand */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $sourceSecondFactorId; + public string $sourceSecondFactorId; /** @@ -55,5 +55,5 @@ class MigrateVettedSecondFactorCommand extends AbstractCommand */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $targetSecondFactorId; + public string $targetSecondFactorId; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/PromiseSafeStoreSecretTokenPossessionCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/PromiseSafeStoreSecretTokenPossessionCommand.php index d8277470d..229e8ec99 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/PromiseSafeStoreSecretTokenPossessionCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/PromiseSafeStoreSecretTokenPossessionCommand.php @@ -31,7 +31,7 @@ class PromiseSafeStoreSecretTokenPossessionCommand extends AbstractCommand imple */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $identityId; + public string $identityId; /** * The ID of the recovery code to create. @@ -39,14 +39,14 @@ class PromiseSafeStoreSecretTokenPossessionCommand extends AbstractCommand imple */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $recoveryTokenId; + public string $recoveryTokenId; /** * @var string */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $recoveryTokenType = RecoveryTokenType::TYPE_SAFE_STORE; + public string $recoveryTokenType = RecoveryTokenType::TYPE_SAFE_STORE; /** * The unhashed password @@ -54,12 +54,9 @@ class PromiseSafeStoreSecretTokenPossessionCommand extends AbstractCommand imple */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $secret; + public string $secret; - /** - * @return string - */ - public function getIdentityId() + public function getIdentityId(): string { return $this->identityId; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProveGssfPossessionCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProveGssfPossessionCommand.php index 1eb5d1587..dff30633f 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProveGssfPossessionCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProveGssfPossessionCommand.php @@ -30,7 +30,7 @@ class ProveGssfPossessionCommand extends AbstractCommand implements SelfServiceE */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $identityId; + public string $identityId; /** * The ID of the second factor to create. @@ -38,7 +38,7 @@ class ProveGssfPossessionCommand extends AbstractCommand implements SelfServiceE */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $secondFactorId; + public string $secondFactorId; /** * The SecondFactorType identifier. @@ -48,7 +48,7 @@ class ProveGssfPossessionCommand extends AbstractCommand implements SelfServiceE */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $stepupProvider; + public string $stepupProvider; /** * The identifier of the generic Stepup second factor type @@ -56,12 +56,12 @@ class ProveGssfPossessionCommand extends AbstractCommand implements SelfServiceE */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $gssfId; + public string $gssfId; /** * @return string */ - public function getIdentityId() + public function getIdentityId(): string { return $this->identityId; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProvePhonePossessionCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProvePhonePossessionCommand.php index d1d6f0d43..5149acbc3 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProvePhonePossessionCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProvePhonePossessionCommand.php @@ -30,7 +30,7 @@ class ProvePhonePossessionCommand extends AbstractCommand implements SelfService */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $identityId; + public string $identityId; /** * The ID of the second factor to create. @@ -38,7 +38,7 @@ class ProvePhonePossessionCommand extends AbstractCommand implements SelfService */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $secondFactorId; + public string $secondFactorId; /** * The phone number @@ -47,12 +47,12 @@ class ProvePhonePossessionCommand extends AbstractCommand implements SelfService #[Assert\NotBlank] #[Assert\Type(type: 'string')] #[Assert\Regex(pattern: '~^\+[\d\s]+ \(0\) \d+$~')] - public $phoneNumber; + public string $phoneNumber; /** * @return string */ - public function getIdentityId() + public function getIdentityId(): string { return $this->identityId; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProvePhoneRecoveryTokenPossessionCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProvePhoneRecoveryTokenPossessionCommand.php index 7958d8fe4..bd2ac3ab9 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProvePhoneRecoveryTokenPossessionCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProvePhoneRecoveryTokenPossessionCommand.php @@ -27,40 +27,31 @@ class ProvePhoneRecoveryTokenPossessionCommand extends AbstractCommand implement { /** * The ID of an existing identity. - * @var string */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $identityId; + public string $identityId; /** * The ID of the recovery code to create. - * @var string */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $recoveryTokenId; + public string $recoveryTokenId; - /** - * @var string - */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $recoveryTokenType = RecoveryTokenType::TYPE_SMS; + public string $recoveryTokenType = RecoveryTokenType::TYPE_SMS; /** * The phone number - * @var string */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] #[Assert\Regex(pattern: '~^\+[\d\s]+ \(0\) \d+$~')] - public $phoneNumber; + public string $phoneNumber; - /** - * @return string - */ - public function getIdentityId() + public function getIdentityId(): string { return $this->identityId; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProveU2fDevicePossessionCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProveU2fDevicePossessionCommand.php index c0a6c4a9a..71d76afce 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProveU2fDevicePossessionCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProveU2fDevicePossessionCommand.php @@ -30,7 +30,7 @@ class ProveU2fDevicePossessionCommand extends AbstractCommand implements SelfSer */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $identityId; + public string $identityId; /** * The ID of the second factor to create. @@ -38,7 +38,7 @@ class ProveU2fDevicePossessionCommand extends AbstractCommand implements SelfSer */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $secondFactorId; + public string $secondFactorId; /** * The key handle issued by the U2F device @@ -46,12 +46,12 @@ class ProveU2fDevicePossessionCommand extends AbstractCommand implements SelfSer */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $keyHandle; + public string $keyHandle; /** * @return string */ - public function getIdentityId() + public function getIdentityId(): string { return $this->identityId; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProveYubikeyPossessionCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProveYubikeyPossessionCommand.php index 13cb38f17..6971cf6a8 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProveYubikeyPossessionCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ProveYubikeyPossessionCommand.php @@ -30,7 +30,7 @@ class ProveYubikeyPossessionCommand extends AbstractCommand implements SelfServi */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $identityId; + public string $identityId; /** * The ID of the second factor to create. @@ -38,7 +38,7 @@ class ProveYubikeyPossessionCommand extends AbstractCommand implements SelfServi */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $secondFactorId; + public string $secondFactorId; /** * The Yubikey's public ID. @@ -46,12 +46,12 @@ class ProveYubikeyPossessionCommand extends AbstractCommand implements SelfServi */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $yubikeyPublicId; + public string $yubikeyPublicId; /** * @return string */ - public function getIdentityId() + public function getIdentityId(): string { return $this->identityId; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RegisterSelfAssertedSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RegisterSelfAssertedSecondFactorCommand.php index 9a1a339fd..397ed94f3 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RegisterSelfAssertedSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RegisterSelfAssertedSecondFactorCommand.php @@ -31,38 +31,38 @@ class RegisterSelfAssertedSecondFactorCommand extends AbstractCommand implements */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $identityId; + public string $identityId; /** * @var string */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $secondFactorId; + public string $secondFactorId; /** * @var string */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $secondFactorType; + public string $secondFactorType; /** * @var string */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $secondFactorIdentifier; + public string $secondFactorIdentifier; /** * @var string */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $authoringRecoveryTokenId; + public string $authoringRecoveryTokenId; - public function getIdentityId(): void + public function getIdentityId(): string { - $this->identityId; + return $this->identityId; } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RetractRegistrationAuthorityCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RetractRegistrationAuthorityCommand.php index 1e9d9b24e..b83910e88 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RetractRegistrationAuthorityCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RetractRegistrationAuthorityCommand.php @@ -29,19 +29,19 @@ class RetractRegistrationAuthorityCommand extends AbstractCommand implements RaE */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $identityId; + public string $identityId; /** * @var string */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $raInstitution; + public string $raInstitution; /** * @inheritDoc */ - public function getRaInstitution() + public function getRaInstitution(): string { return $this->raInstitution; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RevokeOwnRecoveryTokenCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RevokeOwnRecoveryTokenCommand.php index ccef83ca1..c5762ce99 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RevokeOwnRecoveryTokenCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RevokeOwnRecoveryTokenCommand.php @@ -33,7 +33,7 @@ class RevokeOwnRecoveryTokenCommand extends AbstractCommand implements SelfServi */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $identityId; + public string $identityId; /** * The ID of a recovery token. @@ -41,12 +41,12 @@ class RevokeOwnRecoveryTokenCommand extends AbstractCommand implements SelfServi */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $recoveryTokenId; + public string $recoveryTokenId; /** * @return string */ - public function getIdentityId() + public function getIdentityId(): string { return $this->identityId; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RevokeOwnSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RevokeOwnSecondFactorCommand.php index 8b3fcb471..ebdb0d8ab 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RevokeOwnSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RevokeOwnSecondFactorCommand.php @@ -33,7 +33,7 @@ class RevokeOwnSecondFactorCommand extends AbstractCommand implements SelfServic */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $identityId; + public string $identityId; /** * The ID of a verified or vetted second factor. @@ -41,12 +41,12 @@ class RevokeOwnSecondFactorCommand extends AbstractCommand implements SelfServic */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $secondFactorId; + public string $secondFactorId; /** * @return string */ - public function getIdentityId() + public function getIdentityId(): string { return $this->identityId; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RevokeRegistrantsRecoveryTokenCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RevokeRegistrantsRecoveryTokenCommand.php index 342451014..38c6fb96a 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RevokeRegistrantsRecoveryTokenCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RevokeRegistrantsRecoveryTokenCommand.php @@ -29,32 +29,29 @@ class RevokeRegistrantsRecoveryTokenCommand extends AbstractCommand implements R { /** * The ID of the identity that has the authority to issue the revocation of a registrant's second factor. - * @var string */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $authorityId; + public string $authorityId; /** * The ID of an identity. - * @var string */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $identityId; + public string $identityId; /** * The ID of a recovery token - * @var string */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $recoveryTokenId; + public string $recoveryTokenId; /** * @inheritDoc */ - public function getRaInstitution() + public function getRaInstitution(): ?string { // Returning null as opposed to having the institution on this command was done // because the RA (actor) institution can be loaded from the authorityId diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RevokeRegistrantsSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RevokeRegistrantsSecondFactorCommand.php index 382e59a02..ef02b8c5e 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RevokeRegistrantsSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RevokeRegistrantsSecondFactorCommand.php @@ -33,7 +33,7 @@ class RevokeRegistrantsSecondFactorCommand extends AbstractCommand implements Ra */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $authorityId; + public string $authorityId; /** * The ID of an identity. @@ -41,7 +41,7 @@ class RevokeRegistrantsSecondFactorCommand extends AbstractCommand implements Ra */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $identityId; + public string $identityId; /** * The ID of a verified or vetted second factor. @@ -49,12 +49,12 @@ class RevokeRegistrantsSecondFactorCommand extends AbstractCommand implements Ra */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $secondFactorId; + public string $secondFactorId; /** * @inheritDoc */ - public function getRaInstitution() + public function getRaInstitution(): ?string { // Returning null as opposed to having the institution on this command was done // because the RA (actor) institution can be loaded from the authorityId diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SaveVettingTypeHintCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SaveVettingTypeHintCommand.php index 8ead1d738..8067f44d2 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SaveVettingTypeHintCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SaveVettingTypeHintCommand.php @@ -38,14 +38,14 @@ class SaveVettingTypeHintCommand extends AbstractCommand implements RaExecutable */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $identityId; + public string $identityId; /** * @var string */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $institution; + public string $institution; #[Assert\Type(type: 'array')] #[Assert\All([ @@ -53,7 +53,7 @@ class SaveVettingTypeHintCommand extends AbstractCommand implements RaExecutable ])] public array $hints; - public function getRaInstitution() + public function getRaInstitution(): ?string { return null; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SelfVetSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SelfVetSecondFactorCommand.php index 8b14c5ad3..7fc0b4310 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SelfVetSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SelfVetSecondFactorCommand.php @@ -25,49 +25,30 @@ class SelfVetSecondFactorCommand extends AbstractCommand implements SelfServiceExecutable, SelfAsserted { - /** - * The ID of an existing identity. - * @var string - */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $identityId; + public string $identityId; - /** - * @var string - */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $secondFactorId; + public string $secondFactorId; - /** - * @var string - */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $secondFactorType; + public string $secondFactorType; - /** - * @var string - */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $registrationCode; + public string $registrationCode; - /** - * @var string - */ #[Assert\Type(type: 'string')] - public $authoringSecondFactorLoa; + public string $authoringSecondFactorLoa; - /** - * @var string - */ #[Assert\Type(type: 'string')] - public $authoringSecondFactorIdentifier; + public ?string $authoringSecondFactorIdentifier = null; - public function getIdentityId(): void + public function getIdentityId(): string { - $this->identityId; + return $this->identityId; } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SendSecondFactorRegistrationEmailCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SendSecondFactorRegistrationEmailCommand.php index 034817946..e1f0ace67 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SendSecondFactorRegistrationEmailCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SendSecondFactorRegistrationEmailCommand.php @@ -30,7 +30,7 @@ class SendSecondFactorRegistrationEmailCommand extends AbstractCommand implement */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $identityId; + public string $identityId; /** * The ID of a second factor token @@ -38,9 +38,9 @@ class SendSecondFactorRegistrationEmailCommand extends AbstractCommand implement */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $secondFactorId; + public string $secondFactorId; - public function getIdentityId() + public function getIdentityId(): string { return $this->identityId; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SendVerifiedSecondFactorRemindersCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SendVerifiedSecondFactorRemindersCommand.php index e065c67ce..36c59a5db 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SendVerifiedSecondFactorRemindersCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SendVerifiedSecondFactorRemindersCommand.php @@ -26,10 +26,10 @@ class SendVerifiedSecondFactorRemindersCommand extends AbstractCommand /** * @var bool */ - public $dryRun; + public bool $dryRun; /** * @var DateTime */ - public $requestedAt; + public DateTime $requestedAt; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/UpdateIdentityCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/UpdateIdentityCommand.php index 3fc8c45ee..addd8293c 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/UpdateIdentityCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/UpdateIdentityCommand.php @@ -29,26 +29,26 @@ class UpdateIdentityCommand extends AbstractCommand implements SelfServiceExecut */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $id; + public string $id; /** * @var string */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $email; + public string $email; /** * @var string */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $commonName; + public string $commonName; /** * @return string */ - public function getIdentityId() + public function getIdentityId(): string { return $this->id; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/VerifyEmailCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/VerifyEmailCommand.php index 22018b202..4fd703fc1 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/VerifyEmailCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/VerifyEmailCommand.php @@ -30,19 +30,19 @@ class VerifyEmailCommand extends AbstractCommand implements SelfServiceExecutabl */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $identityId; + public string $identityId; /** * @var string */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $verificationNonce; + public string $verificationNonce; /** * @return string */ - public function getIdentityId() + public function getIdentityId(): string { return $this->identityId; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/VetSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/VetSecondFactorCommand.php index 83acae82c..a96992d43 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/VetSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/VetSecondFactorCommand.php @@ -29,7 +29,7 @@ class VetSecondFactorCommand extends AbstractCommand implements RaExecutable */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $authorityId; + public string $authorityId; /** * The ID of an existing identity. @@ -37,14 +37,14 @@ class VetSecondFactorCommand extends AbstractCommand implements RaExecutable */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $identityId; + public string $identityId; /** * @var string */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $secondFactorId; + public string $secondFactorId; /** * @@ -52,45 +52,45 @@ class VetSecondFactorCommand extends AbstractCommand implements RaExecutable */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $registrationCode; + public string $registrationCode; /** * @var string */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $secondFactorType; + public string $secondFactorType; /** * @var string */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $secondFactorIdentifier; + public string $secondFactorIdentifier; /** * @var string */ #[Assert\NotBlank] #[Assert\Type(type: 'string')] - public $documentNumber; + public string $documentNumber; /** * @var boolean */ #[Assert\EqualTo(value: true)] - public $identityVerified; + public bool $identityVerified; /** * @var boolean */ #[Assert\Type(type: 'bool')] - public $provePossessionSkipped; + public bool $provePossessionSkipped; /** * @inheritDoc */ - public function getRaInstitution() + public function getRaInstitution(): ?string { // Returning null as opposed to having the institution on this command was done // because the RA (actor) institution can be loaded from the authorityId diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/IdentityCommandHandler.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/IdentityCommandHandler.php index 972dbb66b..3bc442271 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/IdentityCommandHandler.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/IdentityCommandHandler.php @@ -529,7 +529,7 @@ public function assertSelfAssertedTokensEnabled(Institution $institution): void /** * @return bool */ - private function emailVerificationIsRequired(IdentityApi $identity) + private function emailVerificationIsRequired(IdentityApi $identity): bool { $institution = new ConfigurationInstitution( (string)$identity->getInstitution(), diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/RegistrationAuthorityCommandHandler.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/RegistrationAuthorityCommandHandler.php index 0fbb1575c..6b13d8e67 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/RegistrationAuthorityCommandHandler.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/RegistrationAuthorityCommandHandler.php @@ -130,7 +130,7 @@ public function handleSaveVettingTypeHintCommand(SaveVettingTypeHintCommand $com * @param string $commandId * @return RegistrationAuthorityRole */ - private function assertValidRoleAndConvertIfValid($role, $commandId): RegistrationAuthorityRole + private function assertValidRoleAndConvertIfValid(string $role, string $commandId): RegistrationAuthorityRole { if ($role === 'ra') { return new RegistrationAuthorityRole(RegistrationAuthorityRole::ROLE_RA); @@ -148,11 +148,9 @@ private function assertValidRoleAndConvertIfValid($role, $commandId): Registrati } /** - * @return InstitutionConfiguration * @deprecated Should be used until existing institution configurations have been migrated to using normalized ids - * */ - private function loadInstitutionConfigurationFor(Institution $institution) + private function loadInstitutionConfigurationFor(Institution $institution): InstitutionConfiguration { $institution = new ConfigurationInstitution($institution->getInstitution()); try { @@ -166,7 +164,7 @@ private function loadInstitutionConfigurationFor(Institution $institution) $institutionConfigurationId->getInstitutionConfigurationId(), ); } - + assert($institutionConfiguration instanceof InstitutionConfiguration); return $institutionConfiguration; } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/WhitelistCommandHandler.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/WhitelistCommandHandler.php index f69e572e3..9ebe2d578 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/WhitelistCommandHandler.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/WhitelistCommandHandler.php @@ -19,7 +19,6 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\CommandHandler; use Broadway\CommandHandling\SimpleCommandHandler; -use Broadway\Domain\AggregateRoot; use Broadway\Repository\AggregateNotFoundException; use Broadway\Repository\Repository as RepositoryInterface; use Surfnet\Stepup\Identity\Collection\InstitutionCollection; @@ -66,13 +65,12 @@ public function handleRemoveFromWhitelistCommand(RemoveFromWhitelistCommand $com $this->repository->save($whitelist); } - /** - * @return Whitelist - */ - private function getWhitelist(): AggregateRoot|Whitelist + private function getWhitelist(): Whitelist { try { - return $this->repository->load(Whitelist::WHITELIST_AGGREGATE_ID); + $whitelist = $this->repository->load(Whitelist::WHITELIST_AGGREGATE_ID); + assert($whitelist instanceof Whitelist); + return $whitelist; } catch (AggregateNotFoundException) { return Whitelist::create(new InstitutionCollection()); } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RecoveryTokenMailService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RecoveryTokenMailService.php index bc30b0dc3..b0eec1904 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RecoveryTokenMailService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RecoveryTokenMailService.php @@ -41,7 +41,7 @@ class RecoveryTokenMailService /** * @var TranslatorInterface */ - private $translator; + private TranslatorInterface $translator; private readonly string $fallbackLocale; diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php index 652f28608..37fadf041 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php @@ -42,12 +42,12 @@ */ class RegistrationMailService { - public $institutionConfigurationOptionsService; + public InstitutionConfigurationOptionsService $institutionConfigurationOptionsService; /** * @var TranslatorInterface */ - private $translator; + private TranslatorInterface $translator; private readonly string $fallbackLocale; @@ -232,7 +232,7 @@ private function sendRegistrationEmailWithRaLocations( $this->mailer->send($message); } - private function getExpirationDateOfRegistration(DateTime $date) + private function getExpirationDateOfRegistration(DateTime $date): DateTime { return $date->add( new DateInterval('P14D'), diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorRevocationMailService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorRevocationMailService.php index 8580b5f38..0e556393b 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorRevocationMailService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorRevocationMailService.php @@ -42,7 +42,7 @@ final class SecondFactorRevocationMailService /** * @var TranslatorInterface */ - private $translator; + private TranslatorInterface $translator; private readonly string $fallbackLocale; diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorVettedMailService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorVettedMailService.php index 03f80c205..815f5f8e0 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorVettedMailService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorVettedMailService.php @@ -35,7 +35,7 @@ final class SecondFactorVettedMailService /** * @var TranslatorInterface */ - private $translator; + private TranslatorInterface $translator; private readonly string $fallbackLocale; diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/AuthorizingStage.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/AuthorizingStage.php index b6defca0b..f2497e046 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/AuthorizingStage.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/AuthorizingStage.php @@ -19,7 +19,7 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline; use Psr\Log\LoggerInterface; -use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\AbstractCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\DeprovisionExecutable; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\ManagementExecutable; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\RaExecutable; @@ -35,7 +35,7 @@ public function __construct( ) { } - public function process(Command $command): Command + public function process(AbstractCommand $command): AbstractCommand { $this->logger->debug(sprintf('Processing authorization for command "%s"', $command)); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/DispatchStage.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/DispatchStage.php index 4fef41161..862326fc5 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/DispatchStage.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/DispatchStage.php @@ -20,7 +20,7 @@ use Broadway\CommandHandling\CommandBus; use Psr\Log\LoggerInterface; -use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\AbstractCommand; class DispatchStage implements Stage { @@ -30,7 +30,7 @@ public function __construct( ) { } - public function process(Command $command): Command + public function process(AbstractCommand $command): AbstractCommand { $this->logger->debug(sprintf('Dispatching command "%s" for handling', $command)); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/EventDispatchingStage.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/EventDispatchingStage.php index c694681e2..b770c6fcf 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/EventDispatchingStage.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/EventDispatchingStage.php @@ -19,7 +19,7 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline; use Psr\Log\LoggerInterface; -use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\AbstractCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\EventHandling\BufferedEventBus; class EventDispatchingStage implements Stage @@ -30,7 +30,7 @@ public function __construct( ) { } - public function process(Command $command): Command + public function process(AbstractCommand $command): AbstractCommand { $this->logger->debug(sprintf('Dispatching Events for "%s"', $command)); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Exception/InvalidCommandException.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Exception/InvalidCommandException.php index c523bce62..b05321c92 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Exception/InvalidCommandException.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Exception/InvalidCommandException.php @@ -45,7 +45,7 @@ public function __construct(array $errors, $code = 0, Exception $previous = null /** * @return string[] */ - public function getErrors() + public function getErrors(): array { return $this->errors; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Exception/ProcessingAbortedException.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Exception/ProcessingAbortedException.php index 65f2170fc..e77666126 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Exception/ProcessingAbortedException.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Exception/ProcessingAbortedException.php @@ -23,5 +23,5 @@ interface ProcessingAbortedException /** * @return string[] */ - public function getErrors(); + public function getErrors(): array; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Stage.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Stage.php index c96c25dbe..2a55cc749 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Stage.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Stage.php @@ -18,7 +18,7 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline; -use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\AbstractCommand; /** * A stage is used in context of a pipeline and represents a stage in the processing of a command. Stages may block @@ -26,8 +26,5 @@ */ interface Stage { - /** - * @return Command - */ - public function process(Command $command); + public function process(AbstractCommand $command): AbstractCommand; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/StagedPipeline.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/StagedPipeline.php index d993c48ec..7930557f6 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/StagedPipeline.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/StagedPipeline.php @@ -20,7 +20,6 @@ use Psr\Log\LoggerInterface; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\AbstractCommand; -use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; class StagedPipeline implements Pipeline { diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/ValidationStage.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/ValidationStage.php index 89267cdac..ea17d1f4f 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/ValidationStage.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/ValidationStage.php @@ -19,7 +19,7 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline; use Psr\Log\LoggerInterface; -use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\AbstractCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\Exception\InvalidCommandException; use Symfony\Component\Validator\Validator\ValidatorInterface; @@ -31,7 +31,7 @@ public function __construct( ) { } - public function process(Command $command): Command + public function process(AbstractCommand $command): AbstractCommand { $this->logger->debug(sprintf('Processing validation for "%s"', $command)); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessage.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessage.php index e71080f57..8d0b5e31c 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessage.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessage.php @@ -49,7 +49,7 @@ public function forget(): void /** * @return IdentityId */ - public function getIdentityId() + public function getIdentityId(): IdentityId { return $this->identityId; } @@ -57,7 +57,7 @@ public function getIdentityId() /** * @return int */ - public function getPlayhead() + public function getPlayhead(): int { return $this->playhead; } @@ -65,7 +65,7 @@ public function getPlayhead() /** * @return SensitiveData */ - public function getSensitiveData() + public function getSensitiveData(): SensitiveData { return $this->sensitiveData; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/Forgettable.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/Forgettable.php index ac6e0e269..b0dd0c460 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/Forgettable.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/Forgettable.php @@ -23,10 +23,10 @@ interface Forgettable /** * @return SensitiveData */ - public function getSensitiveData(); + public function getSensitiveData(): SensitiveData; /** * @return void */ - public function setSensitiveData(SensitiveData $sensitiveData); + public function setSensitiveData(SensitiveData $sensitiveData): void; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/SensitiveData.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/SensitiveData.php index 638e04bcb..95bf88113 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/SensitiveData.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/SensitiveData.php @@ -39,10 +39,7 @@ class SensitiveData implements SerializableInterface private ?SecondFactorIdentifier $secondFactorIdentifier = null; - /** - * @var SecondFactorType|null - */ - private $secondFactorType; + private ?SecondFactorType $secondFactorType = null; private ?VettingType $vettingType = null; diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Command/FixedUuidStubCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Command/FixedUuidStubCommand.php index ef9bacda9..ba6da8a52 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Command/FixedUuidStubCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Command/FixedUuidStubCommand.php @@ -26,5 +26,5 @@ class FixedUuidStubCommand extends AbstractCommand implements Command /** * @var string generated using \Ramsey\Uuid\Uuid::uuid4() */ - public $UUID = '1e8a8dc6-852e-4df8-ba23-8c18061b7c38'; + public string $UUID = '1e8a8dc6-852e-4df8-ba23-8c18061b7c38'; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/InstitutionConfigurationCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/InstitutionConfigurationCommandHandlerTest.php index 26a8d629a..56aa5d90b 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/InstitutionConfigurationCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/InstitutionConfigurationCommandHandlerTest.php @@ -19,7 +19,6 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\Configuration\CommandHandler; use Broadway\CommandHandling\CommandHandler; -use Broadway\CommandHandling\CommandHandlerInterface; use Broadway\EventHandling\EventBus as EventBusInterface; use Broadway\EventSourcing\AggregateFactory\PublicConstructorAggregateFactory; use Broadway\EventStore\EventStore as EventStoreInterface; diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/Processor/InstitutionConfigurationProcessorTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/Processor/InstitutionConfigurationProcessorTest.php index 2618eabc7..01e34a921 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/Processor/InstitutionConfigurationProcessorTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/Processor/InstitutionConfigurationProcessorTest.php @@ -20,6 +20,7 @@ use Mockery; use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; +use Mockery\MockInterface; use PHPUnit\Framework\TestCase as TestCase; use Surfnet\Stepup\Identity\Collection\InstitutionCollection; use Surfnet\Stepup\Identity\Event\IdentityCreatedEvent; @@ -42,7 +43,7 @@ class InstitutionConfigurationProcessorTest extends TestCase { use MockeryPHPUnitIntegration; - private $pipelineMock; + private Pipeline&MockInterface $pipelineMock; public function setUp(): void { @@ -383,7 +384,7 @@ public function no_create_institution_configuration_command_is_created_for_an_al /** * @return ContainerInterface */ - private function getContainerMock() + private function getContainerMock(): ContainerInterface { $containerMock = Mockery::mock(ContainerInterface::class); $containerMock diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/BufferedEventBusTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/BufferedEventBusTest.php index 9ad95924e..fc4d28f14 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/BufferedEventBusTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/BufferedEventBusTest.php @@ -26,6 +26,7 @@ use Doctrine\ORM\EntityManagerInterface; use Mockery as m; use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; +use Mockery\MockInterface; use PHPUnit\Framework\TestCase; use Surfnet\StepupMiddleware\CommandHandlingBundle\EventHandling\BufferedEventBus; @@ -131,7 +132,7 @@ private function createDummyDomainMessage(?string $payload): DomainMessage return new DomainMessage('1', 0, new Metadata(), $payload, DateTime::fromString('1970-01-01H00:00:00.000')); } - private function getDummyEntityManager() + private function getDummyEntityManager(): EntityManagerInterface&MockInterface { return m::mock(EntityManagerInterface::class)->shouldIgnoreMissing(true); } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/RecordEventsAndPublishToBusOnFirstCallEventListener.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/RecordEventsAndPublishToBusOnFirstCallEventListener.php index bb674c23d..5d3740246 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/RecordEventsAndPublishToBusOnFirstCallEventListener.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/RecordEventsAndPublishToBusOnFirstCallEventListener.php @@ -56,7 +56,7 @@ public function handle(DomainMessage $domainMessage): void /** * @return DomainMessage[] */ - public function getRecordedEvents() + public function getRecordedEvents(): array { return $this->recordedEvents; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerMoveTokenTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerMoveTokenTest.php index 3a2e44c48..b379e7eba 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerMoveTokenTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerMoveTokenTest.php @@ -23,6 +23,7 @@ use Broadway\EventSourcing\AggregateFactory\PublicConstructorAggregateFactory; use Broadway\EventStore\EventStore as EventStoreInterface; use Mockery as m; +use Mockery\MockInterface; use Psr\Log\LoggerInterface; use Surfnet\Stepup\Configuration\Value\AllowedSecondFactorList; use Surfnet\Stepup\DateTime\DateTime; @@ -71,25 +72,13 @@ class IdentityCommandHandlerMoveTokenTest extends CommandHandlerTest { private static int $window = 3600; - /** - * @var AllowedSecondFactorListService|m\MockInterface - */ - private $allowedSecondFactorListServiceMock; + private AllowedSecondFactorListService&MockInterface $allowedSecondFactorListServiceMock; - /** - * @var LoaResolutionService - */ - private $loaResolutionService; + private LoaResolutionService&MockInterface $loaResolutionService; - /** - * @var m\Mock|InstitutionConfigurationOptionsService - */ - private $configService; + private InstitutionConfigurationOptionsService&MockInterface $configService; - /** - * @var IdentityProjectionRepository|m\MockInterface - */ - private $identityProjectionRepository; + private IdentityProjectionRepository&MockInterface $identityProjectionRepository; public function setUp(): void diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerSelfAssertedTokensTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerSelfAssertedTokensTest.php index 6ad9b6680..b218ad001 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerSelfAssertedTokensTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerSelfAssertedTokensTest.php @@ -93,35 +93,17 @@ class IdentityCommandHandlerSelfAssertedTokensTest extends CommandHandlerTest { private static int $window = 3600; - /** - * @var AllowedSecondFactorListService|MockInterface - */ - private $allowedSecondFactorListServiceMock; + private AllowedSecondFactorListService&MockInterface $allowedSecondFactorListServiceMock; - /** - * @var MockInterface|IdentityProjectionRepository - */ - private $identityProjectionRepository; + private IdentityProjectionRepository&MockInterface $identityProjectionRepository; - /** - * @var SecondFactorTypeService|MockInterface - */ - private $secondFactorTypeService; + private SecondFactorTypeService&MockInterface $secondFactorTypeService; - /** - * @var SecondFactorProvePossessionHelper|MockInterface - */ - private $secondFactorProvePossessionHelper; + private SecondFactorProvePossessionHelper&MockInterface $secondFactorProvePossessionHelper; - /** - * @var InstitutionConfigurationOptionsService|MockInterface - */ - private $configService; + private InstitutionConfigurationOptionsService&MockInterface $configService; - /** - * @var LoaResolutionService|MockInterface - */ - private $loaResolutionService; + private LoaResolutionService&MockInterface $loaResolutionService; /** * @var IdentityId @@ -150,7 +132,7 @@ class IdentityCommandHandlerSelfAssertedTokensTest extends CommandHandlerTest /** * @var RecoveryTokenSecretHelper|MockInterface */ - private $recoveryTokenSecretHelper; + private RecoveryTokenSecretHelper|MockInterface $recoveryTokenSecretHelper; private ?NameId $nameId = null; diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php index f98b8717b..5f0fb6de4 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php @@ -25,7 +25,6 @@ use DateTime as CoreDateTime; use Hamcrest\Matchers; use Mockery as m; -use Mockery\Mock; use Mockery\MockInterface; use Psr\Log\LoggerInterface; use Surfnet\Stepup\Configuration\Value\AllowedSecondFactorList; @@ -100,40 +99,19 @@ class IdentityCommandHandlerTest extends CommandHandlerTest { private static int $window = 3600; - /** - * @var AllowedSecondFactorListService|MockInterface - */ - private $allowedSecondFactorListServiceMock; + private AllowedSecondFactorListService&MockInterface $allowedSecondFactorListServiceMock; - /** - * @var MockInterface|IdentityProjectionRepository - */ - private $identityProjectionRepository; + private IdentityProjectionRepository&MockInterface $identityProjectionRepository; - /** - * @var SecondFactorTypeService|MockInterface - */ - private $secondFactorTypeService; + private SecondFactorTypeService&MockInterface $secondFactorTypeService; - /** - * @var SecondFactorProvePossessionHelper|MockInterface - */ - private $secondFactorProvePossessionHelper; + private SecondFactorProvePossessionHelper&MockInterface $secondFactorProvePossessionHelper; - /** - * @var InstitutionConfigurationOptionsService|MockInterface $configService - */ - private $configService; + private InstitutionConfigurationOptionsService|MockInterface $configService; - /** - * @var LoaResolutionService|MockInterface - */ - private $loaResolutionService; + private LoaResolutionService&MockInterface $loaResolutionService; - /** - * @var RegistrationMailService|MockInterface - */ - private $registrationMailService; + private RegistrationMailService|MockInterface $registrationMailService; public function setUp(): void { diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityIdEnforcingEventStoreDecorator.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityIdEnforcingEventStoreDecorator.php index dee6e9864..847d00104 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityIdEnforcingEventStoreDecorator.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityIdEnforcingEventStoreDecorator.php @@ -24,7 +24,7 @@ use Surfnet\Stepup\Identity\Event\IdentityEvent; use Surfnet\StepupMiddleware\CommandHandlingBundle\Exception\InvalidArgumentException; -final readonly class IdentityIdEnforcingEventStoreDecorator implements EventStoreInterface +final class IdentityIdEnforcingEventStoreDecorator implements EventStoreInterface { use MockeryPHPUnitIntegration; diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RegistrationAuthorityCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RegistrationAuthorityCommandHandlerTest.php index c6f7908cc..17449496a 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RegistrationAuthorityCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RegistrationAuthorityCommandHandlerTest.php @@ -63,15 +63,9 @@ class RegistrationAuthorityCommandHandlerTest extends CommandHandlerTest { - /** - * @var InstitutionConfigurationRepository|MockInterface - */ - private $institutionConfigurationRepositoryMock; + private MockInterface|InstitutionConfigurationRepository $institutionConfigurationRepositoryMock; - /** - * @var InstitutionConfiguration|MockInterface - */ - private $institutionConfiguration; + private MockInterface|InstitutionConfiguration $institutionConfiguration; /** * Create a command handler for the given scenario test case. diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RightToBeForgottenCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RightToBeForgottenCommandHandlerTest.php index e7698124d..5594f4902 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RightToBeForgottenCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RightToBeForgottenCommandHandlerTest.php @@ -58,13 +58,13 @@ class RightToBeForgottenCommandHandlerTest extends CommandHandlerTest { /** @var MockInterface */ - private $apiIdentityRepository; + private MockInterface $apiIdentityRepository; /** @var MockInterface */ - private $sensitiveDataService; + private MockInterface $sensitiveDataService; /** @var MockInterface */ - private $sraaRepository; + private MockInterface $sraaRepository; protected function createCommandHandler( EventStoreInterface $eventStore, diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/AuthorizingStageTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/AuthorizingStageTest.php index b464443d9..7b9238f9f 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/AuthorizingStageTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/AuthorizingStageTest.php @@ -35,14 +35,8 @@ class AuthorizingStageTest extends UnitTest { use MockeryPHPUnitIntegration; - /** - * @var MockInterface mock of Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface - */ - private $authorizationChecker; + private MockInterface&AuthorizationCheckerInterface $authorizationChecker; - /** - * @var NullLogger - */ private NullLogger $logger; public function setUp(): void diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Processor/RecoveryTokenEmailProcessorTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Processor/RecoveryTokenEmailProcessorTest.php index 839e358ac..add7b0c48 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Processor/RecoveryTokenEmailProcessorTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Processor/RecoveryTokenEmailProcessorTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\Processor; use Mockery; +use Mockery\MockInterface; use PHPUnit\Framework\TestCase; use Surfnet\Stepup\Identity\Event\CompliedWithRecoveryCodeRevocationEvent; use Surfnet\Stepup\Identity\Event\PhoneRecoveryTokenPossessionProvenEvent; @@ -38,24 +39,16 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\IdentityService; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Service\RecoveryTokenMailService; use Surfnet\StepupMiddleware\CommandHandlingBundle\Processor\RecoveryTokenEmailProcessor; -use Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\Identity\Processor\InstitutionConfigurationProcessor; class RecoveryTokenEmailProcessorTest extends TestCase { use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; - /** - * @var RecoveryTokenEmailProcessor - */ private RecoveryTokenEmailProcessor $processor; - /** - * @var Mockery\MockInterface|RecoveryTokenMailService - */ - private $mailService; - /** - * @var Mockery\MockInterface|IdentityService - */ - private $identityService; + + private RecoveryTokenMailService&MockInterface $mailService; + + private IdentityService&MockInterface $identityService; public function setUp(): void { diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/EventSourcing/ForgettableEventStub.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/EventSourcing/ForgettableEventStub.php index 6c89de3b5..8ba62a886 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/EventSourcing/ForgettableEventStub.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/EventSourcing/ForgettableEventStub.php @@ -26,12 +26,12 @@ final class ForgettableEventStub implements Forgettable /** * @var SensitiveData */ - public $sensitiveData; + public SensitiveData $sensitiveData; /** * @return SensitiveData */ - public function getSensitiveData() + public function getSensitiveData(): SensitiveData { return $this->sensitiveData; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Value/Institution.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Value/Institution.php index 43577a25b..787dd9234 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Value/Institution.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Value/Institution.php @@ -28,7 +28,7 @@ final class Institution implements Stringable /** * @param string $institution may not be an empty string */ - public function __construct($institution) + public function __construct(string $institution) { if (!is_string($institution) || trim($institution) === '') { throw InvalidArgumentException::invalidType('non-empty string', 'institution', $institution); @@ -40,7 +40,7 @@ public function __construct($institution) /** * @return string */ - public function getInstitution() + public function getInstitution(): string { return $this->institution; } diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Service/EmailTemplateService.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Service/EmailTemplateService.php index b5e49cd92..0eb2fa7c3 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Service/EmailTemplateService.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Service/EmailTemplateService.php @@ -37,7 +37,7 @@ public function __construct( * @param string $fallbackLocale * @return null|EmailTemplate */ - public function findByName($name, $preferredLocale, $fallbackLocale): ?EmailTemplate + public function findByName(string $name, string $preferredLocale, string $fallbackLocale): ?EmailTemplate { try { $emailTemplateEntity = $this->repository->findOneByName($name, $preferredLocale, $fallbackLocale); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php index d2afde83e..e64be1f4d 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ManagementBundle\Tests\Controller; use Liip\TestFixturesBundle\Services\DatabaseToolCollection; +use Liip\TestFixturesBundle\Services\DatabaseTools\ORMSqliteDatabaseTool; use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use Symfony\Bundle\FrameworkBundle\KernelBrowser; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; @@ -40,11 +41,12 @@ class ConfigurationControllerTest extends WebTestCase */ private $passwordRo; - private DatabaseToolCollection $databaseTool; + private ORMSqliteDatabaseTool $databaseTool; public function setUp(): void { - $this->databaseTool = static::getContainer()->get(DatabaseToolCollection::class)->get(); + $this->databaseTool = static::getContainer()->get(ORMSqliteDatabaseTool::class); + // Initialises schema. $this->databaseTool->loadFixtures([]); // Initialises schema. diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php index bc41ec202..c8fa63ef6 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ManagementBundle\Tests\Controller; use Liip\TestFixturesBundle\Services\DatabaseToolCollection; +use Liip\TestFixturesBundle\Services\DatabaseTools\ORMSqliteDatabaseTool; use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use Symfony\Bundle\FrameworkBundle\KernelBrowser; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; @@ -40,11 +41,12 @@ class InstitutionConfigurationControllerTest extends WebTestCase */ private $passwordRo; - private DatabaseToolCollection $databaseTool; + private ORMSqliteDatabaseTool $databaseTool; public function setUp(): void { - $this->databaseTool = static::getContainer()->get(DatabaseToolCollection::class)->get(); + $this->databaseTool = static::getContainer()->get(ORMSqliteDatabaseTool::class); + // Initialises schema. $this->databaseTool->loadFixtures([]); // Initialises schema. diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php index cb7e5614b..de18d2685 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php @@ -62,7 +62,7 @@ protected function configure(): void ->addArgument('actor-id', InputArgument::REQUIRED, 'The id of the vetting actor'); } - protected function execute(InputInterface $input, OutputInterface $output): void + protected function execute(InputInterface $input, OutputInterface $output): int { $registrationStatus = $input->getArgument('registration-status'); $this->bootstrapService->validRegistrationStatus($registrationStatus); @@ -84,7 +84,7 @@ protected function execute(InputInterface $input, OutputInterface $output): void ), ); - return; + return 1; } $identity = $this->bootstrapService->getIdentity($nameId, $institution); $output->writeln( @@ -154,7 +154,7 @@ protected function execute(InputInterface $input, OutputInterface $output): void ), ); $this->transactionHelper->rollback(); - throw $e; + return 1; } $output->writeln( sprintf( @@ -164,5 +164,6 @@ protected function execute(InputInterface $input, OutputInterface $output): void $secondFactorId, ), ); + return 0; } } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityCommand.php index 1db27ff4b..7b8b7e0b6 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityCommand.php @@ -49,7 +49,7 @@ protected function configure(): void ->addArgument('actor-id', InputArgument::REQUIRED, 'The id of the vetting actor'); } - protected function execute(InputInterface $input, OutputInterface $output): void + protected function execute(InputInterface $input, OutputInterface $output): int { $nameId = new NameId($input->getArgument('name-id')); $institutionText = $input->getArgument('institution'); @@ -70,7 +70,7 @@ protected function execute(InputInterface $input, OutputInterface $output): void $institution->getInstitution(), ), ); - return; + return 1; } try { $this->transactionHelper->beginTransaction(); @@ -91,10 +91,12 @@ protected function execute(InputInterface $input, OutputInterface $output): void ), ); $this->transactionHelper->rollback(); - throw $e; + return 1; } $output->writeln( sprintf('Successfully created identity with UUID %s', $identity->id), ); + + return 0; } } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapSmsSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapSmsSecondFactorCommand.php index 0e84b0ca1..b79000553 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapSmsSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapSmsSecondFactorCommand.php @@ -57,7 +57,7 @@ protected function configure(): void ->addArgument('actor-id', InputArgument::REQUIRED, 'The id of the vetting actor'); } - protected function execute(InputInterface $input, OutputInterface $output): void + protected function execute(InputInterface $input, OutputInterface $output): int { $registrationStatus = $input->getArgument('registration-status'); $this->bootstrapService->validRegistrationStatus($registrationStatus); @@ -78,7 +78,7 @@ protected function execute(InputInterface $input, OutputInterface $output): void ), ); - return; + return 1; } $identity = $this->bootstrapService->getIdentity($nameId, $institution); $output->writeln( @@ -127,7 +127,7 @@ protected function execute(InputInterface $input, OutputInterface $output): void ), ); $this->transactionHelper->rollback(); - throw $e; + return 1; } $output->writeln( sprintf( @@ -135,5 +135,6 @@ protected function execute(InputInterface $input, OutputInterface $output): void $secondFactorId, ), ); + return 0; } } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapYubikeySecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapYubikeySecondFactorCommand.php index c906949a9..ee35cd331 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapYubikeySecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapYubikeySecondFactorCommand.php @@ -57,7 +57,7 @@ protected function configure(): void ->addArgument('actor-id', InputArgument::REQUIRED, 'The id of the vetting actor'); } - protected function execute(InputInterface $input, OutputInterface $output): void + protected function execute(InputInterface $input, OutputInterface $output): int { $registrationStatus = $input->getArgument('registration-status'); $this->bootstrapService->validRegistrationStatus($registrationStatus); @@ -79,7 +79,7 @@ protected function execute(InputInterface $input, OutputInterface $output): void ), ); - return; + return 1; } $identity = $this->bootstrapService->getIdentity($nameId, $institution); $output->writeln( @@ -128,7 +128,7 @@ protected function execute(InputInterface $input, OutputInterface $output): void ), ); $this->transactionHelper->rollback(); - throw $e; + return 1; } $output->writeln( sprintf( @@ -136,5 +136,6 @@ protected function execute(InputInterface $input, OutputInterface $output): void $secondFactorId, ), ); + return 0; } } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php index 8ef0bee8d..f4e95ad3b 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php @@ -58,7 +58,7 @@ protected function configure(): void ->addArgument('email', InputArgument::OPTIONAL, 'The e-mail address of the identity to create'); } - protected function execute(InputInterface $input, OutputInterface $output): void + protected function execute(InputInterface $input, OutputInterface $output): int { $sourceNameId = new NameId($input->getArgument('old-name-id')); $targetNameId = new NameId($input->getArgument('new-name-id')); @@ -109,7 +109,7 @@ protected function execute(InputInterface $input, OutputInterface $output): void ), ); $this->transactionHelper->rollback(); - throw $e; + return 1; } $output->writeln( sprintf( @@ -118,6 +118,7 @@ protected function execute(InputInterface $input, OutputInterface $output): void $targetIdentity->id, ), ); + return 0; } /** diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php index f4e59a9b7..76cb29d92 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php @@ -23,17 +23,14 @@ use Broadway\Domain\DomainMessage; use Broadway\Serializer\SimpleInterfaceSerializer; use Doctrine\DBAL\Connection; -use Doctrine\DBAL\Driver\Statement; +use Doctrine\DBAL\Statement; use PDO; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Forgettable; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\SensitiveData; class DBALEventHydrator { - /** - * @var Statement - */ - private $loadStatement = null; + private ?Statement $loadStatement = null; /** * @param string $eventStreamTableName diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Service/VerifiedSecondFactorReminderServiceTest.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Service/VerifiedSecondFactorReminderServiceTest.php index d61a2441a..2a8d1fb88 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Service/VerifiedSecondFactorReminderServiceTest.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Service/VerifiedSecondFactorReminderServiceTest.php @@ -23,12 +23,18 @@ use Mockery\MockInterface; use PHPUnit\Framework\TestCase; use Psr\Log\LoggerInterface; +use Surfnet\Stepup\DateTime\DateTime as MiddlewareDateTime; +use Surfnet\Stepup\Identity\Value\CommonName; +use Surfnet\Stepup\Identity\Value\Email; +use Surfnet\Stepup\Identity\Value\Institution; +use Surfnet\Stepup\Identity\Value\Locale; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Identity; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\VerifiedSecondFactor; use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\IdentityRepository; use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\VerifiedSecondFactorRepository; use Surfnet\StepupMiddleware\MiddlewareBundle\Service\VerifiedSecondFactorReminderMailService; use Surfnet\StepupMiddleware\MiddlewareBundle\Service\VerifiedSecondFactorReminderService; +use Symfony\Component\Mailer\Exception\TransportException; class VerifiedSecondFactorReminderServiceTest extends TestCase { @@ -189,7 +195,7 @@ public function test_one_token_reminders_sent_failing_mailer(): void $this->mailService ->shouldReceive('sendReminder') ->once() - ->andReturn(0); + ->andThrow(TransportException::class); $this->logger ->shouldReceive('info') @@ -431,9 +437,9 @@ private function buildVerifiedSecondFactors(int $numberOfResults, DateTime $requ for ($i = 1; $i <= $numberOfResults; $i++) { $token = new VerifiedSecondFactor(); $token->id = "fa125c7c-c9ee-11e7-800{$i}-00000000000{$i}"; - $token->identityId = $i; + $token->identityId = (string) $i; $token->registrationCode = "CODE_{$i}"; - $token->registrationRequestedAt = $requestedAt; + $token->registrationRequestedAt = new MiddlewareDateTime($requestedAt); $token->type = 'yubikey'; $token->commonName = "John Doe {$i}"; $collection[] = $token; @@ -449,10 +455,10 @@ private function buildIdentity(VerifiedSecondFactor $token): Identity { $identity = new Identity(); $identity->id = $token->identityId; - $identity->commonName = "John Doe {$token->identityId}"; - $identity->institution = "Institution {$token->identityId}"; - $identity->preferredLocale = 'nl_NL'; - $identity->email = "mail@example{$token->identityId}.org"; + $identity->commonName = new CommonName("John Doe {$token->identityId}"); + $identity->institution = new Institution("Institution {$token->identityId}"); + $identity->preferredLocale = new Locale('nl_NL'); + $identity->email = new Email("mail@example{$token->identityId}.org"); return $identity; } From 6e97aad840aff9fb27931512fee1d8e98725d91f Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Wed, 20 Mar 2024 09:46:23 +0100 Subject: [PATCH 41/89] Address level 4 PHPStan issues Doctrine extention was added to the Stan setup. Preventing unused field warnings. Three warnings have been ignored. They are regarding a hidden use of three RegistraoinAuthority fields. Static analysis does not evaluate that they are written when persisted to db storage The rest of the fixes are mainly removal of unused code fragments. Or removal of redundant sections of logical expressions. --- composer.json | 1 + composer.lock | 74 ++++++++++++++++++- src/Surfnet/Stepup/DateTime/DateTime.php | 29 ++------ .../Stepup/Identity/AuditLog/Metadata.php | 24 +----- .../Identity/Entity/RegistrationAuthority.php | 6 +- .../Event/SecondFactorVettedEvent.php | 3 +- ...torVettedWithoutTokenProofOfPossession.php | 3 +- src/Surfnet/Stepup/Identity/Identity.php | 14 ++-- .../Service/AuthorizationService.php | 2 +- .../InstitutionAuthorizationProjector.php | 1 - .../Projector/RaLocationProjector.php | 11 +-- ...titutionConfigurationOptionsRepository.php | 3 +- .../Repository/RaLocationRepository.php | 7 +- .../AllowedSecondFactorListService.php | 2 - .../Service/RaLocationService.php | 9 +-- .../Controller/IdentityController.php | 9 +-- .../Identity/Entity/VettedSecondFactor.php | 23 +----- .../Identity/Projector/AuditLogProjector.php | 3 +- .../Identity/Projector/RaListingProjector.php | 22 ++---- .../Identity/Query/RaListingQuery.php | 37 ++-------- .../Identity/Query/RaSecondFactorQuery.php | 46 ++++-------- .../Identity/Query/RecoveryTokenQuery.php | 45 +++-------- .../Query/UnverifiedSecondFactorQuery.php | 5 +- .../VerifiedSecondFactorOfIdentityQuery.php | 5 +- .../Query/VerifiedSecondFactorQuery.php | 15 +--- .../Query/VettedSecondFactorQuery.php | 5 +- .../Repository/RaSecondFactorRepository.php | 2 +- .../Repository/RecoveryTokenRepository.php | 2 +- .../Request/InstitutionParamConverter.php | 3 +- .../CommandAuthorizationServiceTest.php | 3 - .../AddPipelineStagesCompilerPass.php | 4 - .../EventHandling/BufferedEventBus.php | 2 +- .../SensitiveDataMessageStream.php | 5 +- .../GatewayBundle/Entity/SecondFactor.php | 25 ++----- .../InstitutionConfigurationProjector.php | 12 ++- 35 files changed, 170 insertions(+), 292 deletions(-) diff --git a/composer.json b/composer.json index 85a565d71..751c9a5cc 100644 --- a/composer.json +++ b/composer.json @@ -66,6 +66,7 @@ "overtrue/phplint": "*", "phpmd/phpmd": "^2.15", "phpstan/phpstan": "^1.11.x-dev", + "phpstan/phpstan-doctrine": "^1.3", "phpstan/phpstan-mockery": "^1.1", "phpstan/phpstan-symfony": "^1.3", "phpunit/phpunit": "^9.5", diff --git a/composer.lock b/composer.lock index 5214ee37d..ba29dbfe0 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "668bf259b1e063066c54e7be27f14c3c", + "content-hash": "d34c31554d9e3de69b068c92584b0496", "packages": [ { "name": "beberlei/assert", @@ -10014,6 +10014,78 @@ ], "time": "2024-03-13T14:17:45+00:00" }, + { + "name": "phpstan/phpstan-doctrine", + "version": "1.3.63", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpstan-doctrine.git", + "reference": "6ccde2b243e30ba47f7cd29f87fb752263bcb25c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/6ccde2b243e30ba47f7cd29f87fb752263bcb25c", + "reference": "6ccde2b243e30ba47f7cd29f87fb752263bcb25c", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0", + "phpstan/phpstan": "^1.10.63" + }, + "conflict": { + "doctrine/collections": "<1.0", + "doctrine/common": "<2.7", + "doctrine/mongodb-odm": "<1.2", + "doctrine/orm": "<2.5", + "doctrine/persistence": "<1.3" + }, + "require-dev": { + "cache/array-adapter": "^1.1", + "composer/semver": "^3.3.2", + "cweagans/composer-patches": "^1.7.3", + "doctrine/annotations": "^1.11 || ^2.0", + "doctrine/collections": "^1.6 || ^2.1", + "doctrine/common": "^2.7 || ^3.0", + "doctrine/dbal": "^2.13.8 || ^3.3.3", + "doctrine/lexer": "^2.0 || ^3.0", + "doctrine/mongodb-odm": "^1.3 || ^2.4.3", + "doctrine/orm": "^2.16.0", + "doctrine/persistence": "^2.2.1 || ^3.2", + "gedmo/doctrine-extensions": "^3.8", + "nesbot/carbon": "^2.49", + "nikic/php-parser": "^4.13.2", + "php-parallel-lint/php-parallel-lint": "^1.2", + "phpstan/phpstan-phpunit": "^1.3.13", + "phpstan/phpstan-strict-rules": "^1.5.1", + "phpunit/phpunit": "^9.6.16", + "ramsey/uuid": "^4.2", + "symfony/cache": "^5.4" + }, + "type": "phpstan-extension", + "extra": { + "phpstan": { + "includes": [ + "extension.neon", + "rules.neon" + ] + } + }, + "autoload": { + "psr-4": { + "PHPStan\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Doctrine extensions for PHPStan", + "support": { + "issues": "https://github.com/phpstan/phpstan-doctrine/issues", + "source": "https://github.com/phpstan/phpstan-doctrine/tree/1.3.63" + }, + "time": "2024-03-18T18:05:58+00:00" + }, { "name": "phpstan/phpstan-mockery", "version": "1.1.2", diff --git a/src/Surfnet/Stepup/DateTime/DateTime.php b/src/Surfnet/Stepup/DateTime/DateTime.php index 77556611d..00778cc8c 100644 --- a/src/Surfnet/Stepup/DateTime/DateTime.php +++ b/src/Surfnet/Stepup/DateTime/DateTime.php @@ -22,6 +22,7 @@ use DateTime as CoreDateTime; use Stringable; use Surfnet\Stepup\Exception\InvalidArgumentException; +use TypeError; /** * @SuppressWarnings(PHPMD.TooManyMethods) @@ -37,14 +38,15 @@ class DateTime implements Stringable /** * Allows for mocking of time. - * + * @see DateTimeHelper::setCurrentTime here you can see how now can be overridden using reflection * @var self|null */ - private static ?DateTime $now; + private static ?DateTime $now; // @phpstan-ignore-line PHPStan can not see that the DateTimeHelper is able to set the now value using reflection private readonly CoreDateTime $dateTime; /** + * @see DateTimeHelper::setCurrentTime here you can see how now can be overridden using reflection * @return self */ public static function now(): DateTime @@ -118,9 +120,7 @@ public function comesBeforeOrIsEqual(DateTime $dateTime): bool public function comesAfter(DateTime $dateTime): bool { - $end = $this->dateTime->getTimestamp(); - $start = $dateTime->dateTime->getTimestamp(); - return $end > $start; + return $this->dateTime > $dateTime->dateTime; } public function comesAfterOrIsEqual(DateTime $dateTime): bool @@ -128,24 +128,9 @@ public function comesAfterOrIsEqual(DateTime $dateTime): bool return $this->dateTime >= $dateTime->dateTime; } - /** - * @param $format - * @return string - */ - public function format($format): string + public function format(string $format): string { - $formatted = $this->dateTime->format($format); - - if ($formatted === false) { - throw new InvalidArgumentException( - sprintf( - 'Given format "%s" is not a valid format for DateTime', - $format, - ), - ); - } - - return $formatted; + return $this->dateTime->format($format); } /** diff --git a/src/Surfnet/Stepup/Identity/AuditLog/Metadata.php b/src/Surfnet/Stepup/Identity/AuditLog/Metadata.php index 1435235ad..ebc62e980 100644 --- a/src/Surfnet/Stepup/Identity/AuditLog/Metadata.php +++ b/src/Surfnet/Stepup/Identity/AuditLog/Metadata.php @@ -39,19 +39,10 @@ final class Metadata */ public Institution $identityInstitution; - /** - * @var Institution - */ - public Institution $raInstitution; + public ?Institution $raInstitution; - /** - * @var SecondFactorId|null - */ public ?SecondFactorId $secondFactorId; - /** - * @var SecondFactorType|null - */ public ?SecondFactorType $secondFactorType; /** @@ -59,16 +50,9 @@ final class Metadata */ public ?SecondFactorIdentifier $secondFactorIdentifier; - /** @var VettingType */ - public VettingType $vettingType; + public ?VettingType $vettingType; - /** - * @var RecoveryTokenId - */ - public RecoveryTokenId $recoveryTokenId; + public ?RecoveryTokenId $recoveryTokenId; - /** - * @var RecoveryTokenType - */ - public RecoveryTokenType $recoveryTokenType; + public ?RecoveryTokenType $recoveryTokenType; } diff --git a/src/Surfnet/Stepup/Identity/Entity/RegistrationAuthority.php b/src/Surfnet/Stepup/Identity/Entity/RegistrationAuthority.php index 87dbc7c11..92bdcf620 100644 --- a/src/Surfnet/Stepup/Identity/Entity/RegistrationAuthority.php +++ b/src/Surfnet/Stepup/Identity/Entity/RegistrationAuthority.php @@ -31,11 +31,11 @@ final class RegistrationAuthority extends SimpleEventSourcedEntity { private ?RegistrationAuthorityRole $role = null; - private ?Location $location = null; + private ?Location $location = null; // @phpstan-ignore-line PHPStan can not see that this field is written when serialized to the database - private ?ContactInformation $contactInformation = null; + private ?ContactInformation $contactInformation = null; // @phpstan-ignore-line PHPStan can not see that this field is written when serialized to the database - private ?Institution $institution = null; + private ?Institution $institution = null; // @phpstan-ignore-line PHPStan can not see that this field is written when serialized to the database public static function accreditWith( RegistrationAuthorityRole $role, diff --git a/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php b/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php index b1b9aa517..5ed1ac3f7 100644 --- a/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php @@ -88,8 +88,7 @@ class SecondFactorVettedEvent extends IdentityEvent implements Forgettable, Righ */ public Locale $preferredLocale; - /** @var VettingType */ - public VettingType $vettingType; + public ?VettingType $vettingType; /** * @SuppressWarnings(PHPMD.ExcessiveParameterList) diff --git a/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php b/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php index 81d819c64..058b6334e 100644 --- a/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php +++ b/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php @@ -96,8 +96,7 @@ class SecondFactorVettedWithoutTokenProofOfPossession extends IdentityEvent impl */ public Locale $preferredLocale; - /** @var VettingType */ - public VettingType $vettingType; + public ?VettingType $vettingType; /** * @SuppressWarnings(PHPMD.ExcessiveParameterList) diff --git a/src/Surfnet/Stepup/Identity/Identity.php b/src/Surfnet/Stepup/Identity/Identity.php index d3da0c230..8f6dfed00 100644 --- a/src/Surfnet/Stepup/Identity/Identity.php +++ b/src/Surfnet/Stepup/Identity/Identity.php @@ -821,9 +821,10 @@ public function complyWithSecondFactorRevocation(SecondFactorId $secondFactorId, public function revokeRecoveryToken(RecoveryTokenId $recoveryTokenId): void { $this->assertNotForgotten(); - $recoveryToken = $this->recoveryTokens->get($recoveryTokenId); - if (!$recoveryToken) { - throw new DomainException('Cannot revoke recovery token: no token with given id exists.'); + try { + $recoveryToken = $this->recoveryTokens->get($recoveryTokenId); + } catch (DomainException $e) { + throw new DomainException('Cannot revoke recovery token: no token with given id exists.', 0, $e); } $recoveryToken->revoke(); } @@ -831,9 +832,10 @@ public function revokeRecoveryToken(RecoveryTokenId $recoveryTokenId): void public function complyWithRecoveryTokenRevocation(RecoveryTokenId $recoveryTokenId, IdentityId $authorityId): void { $this->assertNotForgotten(); - $recoveryToken = $this->recoveryTokens->get($recoveryTokenId); - if (!$recoveryToken) { - throw new DomainException('Cannot revoke recovery token: no token with given id exists.'); + try { + $recoveryToken = $this->recoveryTokens->get($recoveryTokenId); + } catch (DomainException $e) { + throw new DomainException('Cannot revoke recovery token: no token with given id exists.', 0, $e); } $recoveryToken->complyWithRevocation($authorityId); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/AuthorizationService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/AuthorizationService.php index c3019a7cb..0b3b96314 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/AuthorizationService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/AuthorizationService.php @@ -96,7 +96,7 @@ public function assertRegistrationOfSelfAssertedTokensIsAllowed(IdentityId $iden } // The Identity is not allowed to do a SAT when he had a RT, but lost it. And also currently has no SF $hasActiveRecoveryToken = $this->recoveryTokenService->identityHasActiveRecoveryToken($identity); - if ($options->possessedSelfAssertedToken && !$hasActiveRecoveryToken && !$hasVettedSecondFactorToken) { + if ($options->possessedSelfAssertedToken && !$hasActiveRecoveryToken) { return $this->deny('Identity lost both Recovery and Second Factor token, SAT is not allowed'); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/InstitutionAuthorizationProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/InstitutionAuthorizationProjector.php index 7fd76f770..a13db3a70 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/InstitutionAuthorizationProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/InstitutionAuthorizationProjector.php @@ -34,7 +34,6 @@ final class InstitutionAuthorizationProjector extends Projector { public function __construct( private readonly InstitutionAuthorizationRepository $institutionAuthorizationRepository, - private readonly InstitutionConfigurationOptionsRepository $institutionConfigurationOptionsRepository, ) { } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/RaLocationProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/RaLocationProjector.php index cc308a544..183ec7946 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/RaLocationProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/RaLocationProjector.php @@ -88,10 +88,7 @@ public function applyInstitutionConfigurationRemovedEvent(InstitutionConfigurati $this->repository->removeRaLocationsFor($event->institution); } - /** - * @return RaLocation - */ - private function fetchRaLocationById(RaLocationId $raLocationId) + private function fetchRaLocationById(RaLocationId $raLocationId): RaLocation { $raLocation = $this->repository->findByRaLocationId($raLocationId); @@ -101,12 +98,6 @@ private function fetchRaLocationById(RaLocationId $raLocationId) ); } - if (!$raLocation instanceof RaLocation) { - throw new RuntimeException( - 'Tried to update an RA Locations contact information, but location is of the wrong type', - ); - } - return $raLocation; } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionConfigurationOptionsRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionConfigurationOptionsRepository.php index 7d5beeb97..ba9f5b9d7 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionConfigurationOptionsRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionConfigurationOptionsRepository.php @@ -32,10 +32,9 @@ public function __construct(ManagerRegistry $registry) } /** - * @return InstitutionConfigurationOptions * @throws NonUniqueResultException */ - public function findConfigurationOptionsFor(Institution $institution) + public function findConfigurationOptionsFor(Institution $institution): ?InstitutionConfigurationOptions { return $this->createQueryBuilder('ico') ->where('ico.institution = :institution') diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/RaLocationRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/RaLocationRepository.php index d659a8032..924a31fad 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/RaLocationRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/RaLocationRepository.php @@ -55,10 +55,7 @@ public function search(RaLocationQuery $query) ->getResult(); } - /** - * @return RaLocation[] - */ - public function findByRaLocationId(RaLocationId $raLocationId) + public function findByRaLocationId(RaLocationId $raLocationId): ?RaLocation { return $this->createQueryBuilder('rl') ->where('rl.id = :id') @@ -84,7 +81,7 @@ public function remove(RaLocation $raLocation): void /** * @return RaLocation[] */ - public function findByInstitution(Institution $institution) + public function findByInstitution(Institution $institution): array { return $this->createQueryBuilder('rl') ->where('rl.institution = :institution') diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/AllowedSecondFactorListService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/AllowedSecondFactorListService.php index 127ab72c1..0f9bfb775 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/AllowedSecondFactorListService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/AllowedSecondFactorListService.php @@ -22,13 +22,11 @@ use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity\AllowedSecondFactor; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository\AllowedSecondFactorRepository; -use Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository\ConfiguredInstitutionRepository; class AllowedSecondFactorListService { public function __construct( private readonly AllowedSecondFactorRepository $allowedSecondFactorRepository, - private readonly ConfiguredInstitutionRepository $configuredInstitutionRepository, ) { } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/RaLocationService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/RaLocationService.php index 29dc42e14..0100df773 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/RaLocationService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/RaLocationService.php @@ -33,15 +33,12 @@ public function __construct(private readonly RaLocationRepository $repository) /** * @return null|RaLocation[] */ - public function search(RaLocationQuery $query) + public function search(RaLocationQuery $query): ?array { return $this->repository->search($query); } - /** - * @return RaLocation[] - */ - public function findByRaLocationId(RaLocationId $raLocationId) + public function findByRaLocationId(RaLocationId $raLocationId): ?RaLocation { return $this->repository->findByRaLocationId($raLocationId); } @@ -50,7 +47,7 @@ public function findByRaLocationId(RaLocationId $raLocationId) /** * @return RaLocation[] */ - public function listRaLocationsFor(Institution $institution) + public function listRaLocationsFor(Institution $institution): ?array { return $this->repository->findByInstitution($institution); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php index 1119e39a6..a231c531a 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php @@ -18,9 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Controller; -use Surfnet\Stepup\Configuration\Value\InstitutionRole; use Surfnet\Stepup\Identity\Value\Institution; -use Surfnet\StepupMiddleware\ApiBundle\Authorization\Value\InstitutionRoleSet; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Identity; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\IdentityQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\IdentityService; @@ -33,14 +31,9 @@ class IdentityController extends AbstractController { - private readonly InstitutionRoleSet $roleRequirements; - public function __construct( - private IdentityService $identityService, + private readonly IdentityService $identityService, ) { - $this->roleRequirements = new InstitutionRoleSet( - [new InstitutionRole(InstitutionRole::ROLE_USE_RA), new InstitutionRole(InstitutionRole::ROLE_USE_RAA)], - ); } public function get($id): JsonResponse diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettedSecondFactor.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettedSecondFactor.php index 58e91b756..f3ea7d99b 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettedSecondFactor.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettedSecondFactor.php @@ -29,41 +29,22 @@ #[ORM\Entity(repositoryClass: VettedSecondFactorRepository::class)] class VettedSecondFactor implements JsonSerializable { - /** - * @var string - */ #[ORM\Id] #[ORM\Column(length: 36)] public string $id; - /** - * @var string - */ #[ORM\Column(length: 36)] public string $identityId; - /** - * @var string - */ #[ORM\Column(length: 16)] public string $type; - /** - * The second factor identifier, ie. telephone number, Yubikey public ID, Tiqr ID - * @var string - */ #[ORM\Column(length: 255)] public string $secondFactorIdentifier; - /** - * @var string - */ #[ORM\Column(length: 255, nullable: true)] - public string $vettingType; + public ?string $vettingType; - /** - * @return bool - */ public function isEqual(VettedSecondFactor $vettedSecondFactor): bool { return $vettedSecondFactor->type == $this->type && $vettedSecondFactor->secondFactorIdentifier == $this->secondFactorIdentifier; @@ -71,7 +52,7 @@ public function isEqual(VettedSecondFactor $vettedSecondFactor): bool public function vettingType(): string { - if (is_null($this->vettingType)) { + if (!$this->vettingType) { return VettingType::TYPE_ON_PREMISE; } return $this->vettingType; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/AuditLogProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/AuditLogProjector.php index 11ebe9274..73babc76e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/AuditLogProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/AuditLogProjector.php @@ -31,6 +31,7 @@ use Surfnet\Stepup\Identity\Value\CommonName; use Surfnet\Stepup\Identity\Value\RecoveryTokenIdentifierFactory; use Surfnet\Stepup\Identity\Value\RecoveryTokenType; +use Surfnet\Stepup\Identity\Value\VettingType; use Surfnet\StepupMiddleware\ApiBundle\Exception\RuntimeException; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\AuditLogEntry; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Identity; @@ -160,7 +161,7 @@ private function applyIdentityForgottenEvent(IdentityForgottenEvent $event): voi private function augmentActorCommonName(AuditLogEntry $entry, Metadata $auditLogMetadata): void { - if (property_exists($auditLogMetadata, 'vettingType') && !is_null($auditLogMetadata->vettingType)) { + if (property_exists($auditLogMetadata, 'vettingType') && $auditLogMetadata->vettingType instanceof VettingType) { $entry->actorCommonName = new CommonName( $entry->actorCommonName->getCommonName() . $auditLogMetadata->vettingType->auditLog() ); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaListingProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaListingProjector.php index 8a5337575..dfaca7205 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaListingProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaListingProjector.php @@ -50,9 +50,6 @@ public function __construct( ) { } - /** - * @return void - */ public function applyIdentityAccreditedAsRaForInstitutionEvent(IdentityAccreditedAsRaForInstitutionEvent $event,): void { $identity = $this->identityRepository->find((string)$event->identityId); @@ -71,9 +68,6 @@ public function applyIdentityAccreditedAsRaForInstitutionEvent(IdentityAccredite $this->raListingRepository->save($raListing); } - /** - * @return void - */ public function applyIdentityAccreditedAsRaaForInstitutionEvent(IdentityAccreditedAsRaaForInstitutionEvent $event,): void { $identity = $this->identityRepository->find((string)$event->identityId); @@ -95,7 +89,6 @@ public function applyIdentityAccreditedAsRaaForInstitutionEvent(IdentityAccredit public function applyRegistrationAuthorityInformationAmendedForInstitutionEvent( RegistrationAuthorityInformationAmendedForInstitutionEvent $event, ): void { - /** @var RaListing $raListing */ $raListing = $this->raListingRepository->findByIdentityIdAndRaInstitution( $event->identityId, $event->raInstitution, @@ -116,7 +109,6 @@ public function applyRegistrationAuthorityInformationAmendedForInstitutionEvent( public function applyAppointedAsRaForInstitutionEvent(AppointedAsRaForInstitutionEvent $event): void { - /** @var RaListing $raListing */ $raListing = $this->raListingRepository->findByIdentityIdAndRaInstitution( $event->identityId, $event->raInstitution, @@ -129,7 +121,6 @@ public function applyAppointedAsRaForInstitutionEvent(AppointedAsRaForInstitutio public function applyAppointedAsRaaForInstitutionEvent(AppointedAsRaaForInstitutionEvent $event): void { - /** @var RaListing $raListing */ $raListing = $this->raListingRepository->findByIdentityIdAndRaInstitution( $event->identityId, $event->raInstitution, @@ -160,7 +151,6 @@ protected function applyIdentityForgottenEvent(IdentityForgottenEvent $event): v public function applyIdentityAccreditedAsRaEvent(IdentityAccreditedAsRaEvent $event): void { $identity = $this->identityRepository->find((string)$event->identityId); - $raListing = RaListing::create( (string)$event->identityId, $event->identityInstitution, @@ -183,7 +173,6 @@ public function applyIdentityAccreditedAsRaEvent(IdentityAccreditedAsRaEvent $ev public function applyIdentityAccreditedAsRaaEvent(IdentityAccreditedAsRaaEvent $event): void { $identity = $this->identityRepository->find((string)$event->identityId); - $raListing = RaListing::create( (string)$event->identityId, $event->identityInstitution, @@ -204,7 +193,6 @@ public function applyIdentityAccreditedAsRaaEvent(IdentityAccreditedAsRaaEvent $ public function applyRegistrationAuthorityInformationAmendedEvent( RegistrationAuthorityInformationAmendedEvent $event, ): void { - /** @var RaListing $raListing */ $raListing = $this->raListingRepository->findByIdentityIdAndRaInstitution( $event->identityId, $event->identityInstitution, @@ -228,13 +216,14 @@ public function applyRegistrationAuthorityInformationAmendedEvent( */ public function applyAppointedAsRaEvent(AppointedAsRaEvent $event): void { - /** @var RaListing $raListing */ $raListing = $this->raListingRepository->findByIdentityIdAndInstitution( $event->identityId, $event->identityInstitution, ); - $raListing->role = AuthorityRole::ra(); + foreach ($raListing as $listing) { + $listing->role = AuthorityRole::ra(); + } $this->raListingRepository->save($raListing); } @@ -244,13 +233,14 @@ public function applyAppointedAsRaEvent(AppointedAsRaEvent $event): void */ public function applyAppointedAsRaaEvent(AppointedAsRaaEvent $event): void { - /** @var RaListing $raListing */ $raListing = $this->raListingRepository->findByIdentityIdAndInstitution( $event->identityId, $event->identityInstitution, ); - $raListing->role = AuthorityRole::raa(); + foreach ($raListing as $listing) { + $listing->role = AuthorityRole::raa(); + } $this->raListingRepository->save($raListing); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaListingQuery.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaListingQuery.php index fbfda7f93..4a85b8bf3 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaListingQuery.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaListingQuery.php @@ -24,48 +24,21 @@ class RaListingQuery extends AbstractQuery { - /** - * @var string|Institution - */ public string|Institution $institution; - /** - * @var IdentityId - */ - public IdentityId $identityId; + public ?IdentityId $identityId = null; - /** - * @var string|null - */ - public ?string $name; + public ?string $name = null; - /** - * @var string|null - */ - public ?string $email; + public ?string $email = null; - /** - * @var string|null - */ - public ?string $role; + public ?string $role = null; - /** - * @var string|null - */ - public ?string $raInstitution; + public ?string $raInstitution = null; - /** - * @var string - */ public string $orderBy; - /** - * @var string - */ public string $orderDirection; - /** - * @var InstitutionAuthorizationContextInterface - */ public InstitutionAuthorizationContextInterface $authorizationContext; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaSecondFactorQuery.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaSecondFactorQuery.php index 12d2bfaf9..7c26d277d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaSecondFactorQuery.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaSecondFactorQuery.php @@ -22,48 +22,30 @@ final class RaSecondFactorQuery extends AbstractQuery { - /** - * @var string|null - */ - public ?string $name; + public ?string $name = null; - /** - * @var string|null - */ - public ?string $type; + public ?string $type = null; - /** - * @var string|null The second factor type's ID (eg. Yubikey public ID) + /* + * The second factor type's ID (eg. Yubikey public ID) */ - public ?string $secondFactorId; + public ?string $secondFactorId = null; - /** - * @var string|null - */ - public ?string $email; + public ?string $email = null; - /** - * @var string|null the filter value, not to be confused with the actorInstitution which is used for authorizations. + /* + * the filter value, not to be confused with the actorInstitution which is used for authorizations. */ - public ?string $institution; + public ?string $institution = null; - /** - * @var string|null One of the ApiBundle\Identity\Entity\RaSecondFactor::STATUS_* constants. + /* + * One of the ApiBundle\Identity\Entity\RaSecondFactor::STATUS_* constants. */ - public ?string $status; + public ?string $status = null; - /** - * @var string|null - */ - public ?string $orderBy; + public ?string $orderBy = null; - /** - * @var string|null - */ - public ?string $orderDirection; + public ?string $orderDirection = null; - /** - * @var InstitutionAuthorizationContextInterface - */ public InstitutionAuthorizationContextInterface $authorizationContext; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RecoveryTokenQuery.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RecoveryTokenQuery.php index 450d1e857..713c64be2 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RecoveryTokenQuery.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RecoveryTokenQuery.php @@ -23,48 +23,21 @@ class RecoveryTokenQuery extends AbstractQuery { - /** - * @var IdentityId - */ - public IdentityId $identityId; + public ?IdentityId $identityId = null; - /** - * @var string|null - */ - public ?string $type; + public ?string $type = null; - /** - * @var string|null - */ - public ?string $status; + public ?string $status = null; - /** - * @var string|null - */ - public ?string $institution; + public ?string $institution = null; - /** - * @var string|null - */ - public ?string $name; + public ?string $name = null; - /** - * @var string|null - */ - public ?string $email; + public ?string $email = null; - /** - * @var string|null - */ - public ?string $orderBy; + public ?string $orderBy = null; - /** - * @var string|null - */ - public ?string $orderDirection; + public ?string $orderDirection = null; - /** - * @var InstitutionAuthorizationContextInterface - */ - public InstitutionAuthorizationContextInterface $authorizationContext; + public ?InstitutionAuthorizationContextInterface $authorizationContext = null; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/UnverifiedSecondFactorQuery.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/UnverifiedSecondFactorQuery.php index 5e43a6caf..5bbc0a001 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/UnverifiedSecondFactorQuery.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/UnverifiedSecondFactorQuery.php @@ -22,10 +22,7 @@ class UnverifiedSecondFactorQuery extends AbstractQuery { - /** - * @var IdentityId - */ - public IdentityId $identityId; + public ?IdentityId $identityId = null; /** * @var string|null diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/VerifiedSecondFactorOfIdentityQuery.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/VerifiedSecondFactorOfIdentityQuery.php index 8a9b3d80c..fb5775f15 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/VerifiedSecondFactorOfIdentityQuery.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/VerifiedSecondFactorOfIdentityQuery.php @@ -22,8 +22,5 @@ class VerifiedSecondFactorOfIdentityQuery extends AbstractQuery { - /** - * @var IdentityId|null - */ - public ?IdentityId $identityId; + public ?IdentityId $identityId = null; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/VerifiedSecondFactorQuery.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/VerifiedSecondFactorQuery.php index 03f0b9e40..f8a9b2e1a 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/VerifiedSecondFactorQuery.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/VerifiedSecondFactorQuery.php @@ -24,20 +24,11 @@ class VerifiedSecondFactorQuery extends AbstractQuery { - /** - * @var IdentityId|null - */ - public ?IdentityId $identityId; + public ?IdentityId $identityId = null; - /** - * @var SecondFactorId|null - */ - public ?SecondFactorId $secondFactorId; + public ?SecondFactorId $secondFactorId = null; - /** - * @var string|null - */ - public ?string $registrationCode; + public ?string $registrationCode = null; /** * @var InstitutionAuthorizationContext diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/VettedSecondFactorQuery.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/VettedSecondFactorQuery.php index 4fad4cef3..d8d1cad7c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/VettedSecondFactorQuery.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/VettedSecondFactorQuery.php @@ -22,8 +22,5 @@ class VettedSecondFactorQuery extends AbstractQuery { - /** - * @var IdentityId - */ - public IdentityId $identityId; + public ?IdentityId $identityId = null; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php index 9a997be5e..e9bd671dc 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php @@ -113,7 +113,7 @@ public function createSearchQuery(RaSecondFactorQuery $query): Query throw new RuntimeException( sprintf( 'Received invalid status "%s" in RaSecondFactorRepository::createSearchQuery', - is_object($stringStatus) ? $stringStatus::class : (string)$stringStatus, + $stringStatus, ), ); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RecoveryTokenRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RecoveryTokenRepository.php index 050c63281..9923a9a25 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RecoveryTokenRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RecoveryTokenRepository.php @@ -86,7 +86,7 @@ public function createSearchQuery(RecoveryTokenQuery $query): Query throw new RuntimeException( sprintf( 'Received invalid status "%s" in RecoveryTokenRepository::createSearchQuery', - is_object($stringStatus) ? $stringStatus::class : (string)$stringStatus, + $stringStatus, ), ); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Request/InstitutionParamConverter.php b/src/Surfnet/StepupMiddleware/ApiBundle/Request/InstitutionParamConverter.php index 9f06abeba..b4c5d7f74 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Request/InstitutionParamConverter.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Request/InstitutionParamConverter.php @@ -23,6 +23,7 @@ use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Exception\BadApiRequestException; use Symfony\Component\HttpFoundation\Request; +use function is_bool; class InstitutionParamConverter implements ParamConverterInterface { @@ -31,7 +32,7 @@ public function apply(Request $request, ParamConverter $configuration): bool $query = $request->query; $institution = $query->get('institution', false); - if ($institution === false) { + if (!is_string($institution)) { throw new BadApiRequestException(['This API-call MUST include the institution as get parameter']); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php index ff665b3dc..5d89ca7c1 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php @@ -83,8 +83,6 @@ class CommandAuthorizationServiceTest extends TestCase { use MockeryPHPUnitIntegration; - private WhitelistService&MockInterface $whitelistService; - private IdentityService&MockInterface $identityService; private LoggerInterface&MockInterface $logger; @@ -107,7 +105,6 @@ public function setUp(): void $authorizationContextService, ); - $this->whitelistService = $whitelistService; $this->identityService = $identityService; $this->logger = $logger; $this->authorizationContextService = $authorizationContextService; diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/CompilerPass/AddPipelineStagesCompilerPass.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/CompilerPass/AddPipelineStagesCompilerPass.php index f1f95c04c..a43d46fb9 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/CompilerPass/AddPipelineStagesCompilerPass.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/CompilerPass/AddPipelineStagesCompilerPass.php @@ -53,10 +53,6 @@ public function process(ContainerBuilder $container): void $prioritized[$priority] = new Reference($stageServiceId); } - if (!ksort($prioritized)) { - throw new RuntimeException('Could not sort stages based on prioritization (ksort failed)'); - } - // ksort sorts low -> high, so reversing to get them sorted correctly. $prioritized = array_reverse($prioritized); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php index 3ebbe965f..47e24d705 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php @@ -103,7 +103,7 @@ public function flush(): void unset($buffer); // if during the handling of events new events have been queued, we need to flush them - if ($this->buffer !== []) { + if (!empty($this->buffer)) { $this->flush(); } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessageStream.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessageStream.php index fd2183eba..d61b41f25 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessageStream.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessageStream.php @@ -69,9 +69,6 @@ public function getIterator(): Iterator return new ArrayIterator($this->messages); } - /** - * @param SensitiveDataMessage|null $sensitiveDataMessage - */ private function setSensitiveData( DomainMessage $domainMessage, SensitiveDataMessage $sensitiveDataMessage = null, @@ -93,7 +90,7 @@ private function setSensitiveData( ); } - if (!$eventIsForgettable && $sensitiveDataMessage) { + if (!$eventIsForgettable) { throw new SensitiveDataApplicationException( sprintf( 'Encountered sensitive data for event which does not support sensitive data, UUID %s, playhead %d', diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SecondFactor.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SecondFactor.php index bcc548ff1..de35a6fef 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SecondFactor.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SecondFactor.php @@ -37,34 +37,25 @@ class SecondFactor #[ORM\Column(length: 36)] private string $id; - /** - * @param string $identityId - * @param string $nameId - * @param string $institution - * @param string $displayLocale - * @param string $secondFactorId - * @param string $secondFactorType - * @param string $secondFactorIdentifier - */ public function __construct( #[ORM\Id] #[ORM\Column(length: 36)] - private $identityId, + private string $identityId, #[ORM\Column(length: 200)] - private $nameId, + private string $nameId, #[ORM\Column(length: 200)] - private $institution, + private string $institution, /** * In which language to display any second factor verification screens. */ #[ORM\Column] - public $displayLocale, + public string $displayLocale, #[ORM\Column(length: 36)] - private $secondFactorId, + private string $secondFactorId, #[ORM\Column(length: 255)] - private $secondFactorIdentifier, + private string $secondFactorIdentifier, #[ORM\Column(length: 50)] - private $secondFactorType, + private string $secondFactorType, /** * This boolean indicates if the second factor token was vetted * using one of the vetting types that are considered 'identity-vetted'. @@ -74,7 +65,7 @@ public function __construct( * was RA vetted. */ #[ORM\Column(type: 'boolean', options: ['default' => '1'])] - private $identityVetted, + private bool $identityVetted, ) { $this->id = (string)Uuid::uuid4(); } diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/InstitutionConfigurationProjector.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/InstitutionConfigurationProjector.php index c680a8268..6d4672d8b 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/InstitutionConfigurationProjector.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/InstitutionConfigurationProjector.php @@ -53,13 +53,11 @@ public function applySsoOn2faOptionChangedEvent(SsoOn2faOptionChangedEvent $even } // It can happen that the event changed for an institution that already exists, but is not yet projected to // this projection. In that case we can create it. - if (!$institutionConfiguration) { - $institutionConfiguration = new InstitutionConfiguration( - (string)$event->institution, - $event->ssoOn2faOption->isEnabled(), - ); - $this->repository->save($institutionConfiguration); - } + $institutionConfiguration = new InstitutionConfiguration( + (string)$event->institution, + $event->ssoOn2faOption->isEnabled(), + ); + $this->repository->save($institutionConfiguration); } public function applyInstitutionConfigurationRemovedEvent(InstitutionConfigurationRemovedEvent $event): void From d146101e3952991f8efe3c795d5b866aa3667609 Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Thu, 21 Mar 2024 10:27:09 +0100 Subject: [PATCH 42/89] Address level 5 PHPStan issues - Rolled back the tests on TypeErrors in the Idenity/Value tests. They are not valuable enough, testing PHP's type system is not the sport we are practicing. - Added many Mockery MockInterface&ActualClass PHPDoc type hints - Created the first 3 baseline entries of type hints that are not fixable in our own code. And one array_map 'strtolower' warning that I could not comprehend. --- ci/qa/phpstan-baseline.neon | 9 ++++++ src/Surfnet/Stepup/Identity/Api/Identity.php | 1 + .../Stepup/Identity/Entity/RecoveryToken.php | 3 +- .../Value/ContactInformationTest.php | 27 ----------------- .../Configuration/Value/InstitutionTest.php | 24 --------------- .../Configuration/Value/LocationTest.php | 30 ------------------- .../Configuration/Value/RaLocationIdTest.php | 25 ---------------- .../Value/RaLocationNameTest.php | 25 ---------------- .../Tests/Identity/Value/CommonNameTest.php | 24 --------------- .../Identity/Value/ContactInformationTest.php | 28 ----------------- .../Identity/Value/DocumentNumberTest.php | 23 -------------- .../Stepup/Tests/Identity/Value/EmailTest.php | 23 -------------- .../Tests/Identity/Value/InstitutionTest.php | 26 ---------------- .../Tests/Identity/Value/LocationTest.php | 27 ----------------- .../Value/RegistrationAuthorityRoleTest.php | 27 ----------------- .../Tests/Identity/Value/TimeFrameTest.php | 29 ------------------ .../Exception/BadApiRequestException.php | 16 ++++------ .../Exception/BadCommandRequestException.php | 20 ++++--------- .../Identity/Projector/RaListingProjector.php | 5 ++-- ...ConfigurationInstitutionParamConverter.php | 4 +-- .../Request/InstitutionParamConverter.php | 2 +- ...utionAuthorizationRepositoryFilterTest.php | 4 +-- .../CommandAuthorizationServiceTest.php | 6 ++++ .../Request/CommandParamConverterTest.php | 8 +++-- .../Request/InstitutionParamConverterTest.php | 13 +++----- .../EventHandling/BufferedEventBusTest.php | 6 ++-- .../IdentityCommandHandlerMoveTokenTest.php | 4 +-- .../Tests/Pipeline/AuthorizingStageTest.php | 29 +++++++++++------- .../Tests/Pipeline/DispatchStageTest.php | 7 +++-- .../Pipeline/EventDispatchingStageTest.php | 8 +++-- .../Tests/Pipeline/StagedPipelineTest.php | 16 ++++++---- .../Tests/Pipeline/ValidationStageTest.php | 9 ++++-- .../SensitiveDataMessageStreamTest.php | 11 +++---- .../Controller/ConfigurationController.php | 7 ++--- .../InstitutionConfigurationController.php | 4 +-- .../RightToBeForgottenController.php | 7 ++--- .../Controller/WhitelistController.php | 7 ++--- .../Service/TransactionHelper.php | 4 +-- 38 files changed, 113 insertions(+), 435 deletions(-) diff --git a/ci/qa/phpstan-baseline.neon b/ci/qa/phpstan-baseline.neon index 364905f71..f799efe3b 100644 --- a/ci/qa/phpstan-baseline.neon +++ b/ci/qa/phpstan-baseline.neon @@ -1,2 +1,11 @@ parameters: ignoreErrors: + - + message: "#^Parameter \\#1 \\$callback of function array_map expects \\(callable\\(Surfnet\\\\Stepup\\\\Configuration\\\\Value\\\\Institution\\)\\: mixed\\)\\|null, 'strtolower' given\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Value/InstitutionSet.php + + - + message: "#^Parameter \\#2 \\$criteria of method Doctrine\\\\DBAL\\\\Connection\\:\\:delete\\(\\) expects array\\, array\\ given\\.$#" + count: 2 + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php diff --git a/src/Surfnet/Stepup/Identity/Api/Identity.php b/src/Surfnet/Stepup/Identity/Api/Identity.php index e79547d1e..f49ead61d 100644 --- a/src/Surfnet/Stepup/Identity/Api/Identity.php +++ b/src/Surfnet/Stepup/Identity/Api/Identity.php @@ -19,6 +19,7 @@ namespace Surfnet\Stepup\Identity\Api; use Broadway\Domain\AggregateRoot; +use Broadway\EventSourcing\EventSourcedAggregateRoot; use Surfnet\Stepup\Configuration\InstitutionConfiguration; use Surfnet\Stepup\Exception\DomainException; use Surfnet\Stepup\Helper\SecondFactorProvePossessionHelper; diff --git a/src/Surfnet/Stepup/Identity/Entity/RecoveryToken.php b/src/Surfnet/Stepup/Identity/Entity/RecoveryToken.php index 826475928..0790f5096 100644 --- a/src/Surfnet/Stepup/Identity/Entity/RecoveryToken.php +++ b/src/Surfnet/Stepup/Identity/Entity/RecoveryToken.php @@ -18,6 +18,7 @@ namespace Surfnet\Stepup\Identity\Entity; +use Broadway\EventSourcing\EventSourcedAggregateRoot; use Broadway\EventSourcing\SimpleEventSourcedEntity; use Surfnet\Stepup\Identity\Api\Identity; use Surfnet\Stepup\Identity\Event\CompliedWithRecoveryCodeRevocationEvent; @@ -37,7 +38,7 @@ final class RecoveryToken extends SimpleEventSourcedEntity public static function create( RecoveryTokenId $id, RecoveryTokenType $type, - Identity $identity, + Identity&EventSourcedAggregateRoot $identity, ): self { $token = new self; $token->tokenId = $id; diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/ContactInformationTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/ContactInformationTest.php index 8d538678f..c6fac3bf1 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/ContactInformationTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/ContactInformationTest.php @@ -22,26 +22,12 @@ use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; -use StdClass; use Surfnet\Stepup\Configuration\Value\ContactInformation; -use Surfnet\Stepup\Exception\InvalidArgumentException; -use TypeError; class ContactInformationTest extends UnitTest { use MockeryPHPUnitIntegration; - /** - * @test - * @group domain - * @dataProvider invalidValueProvider - */ - public function it_cannot_be_created_with_anything_but_a_nonempty_string(int|float|StdClass|array $invalidValue,): void - { - $this->expectException(TypeError::class); - new ContactInformation($invalidValue); - } - /** * @test * @group domain @@ -57,17 +43,4 @@ public function two_instances_with_the_same_value_are_equal(): void $this->assertTrue($contactInformation->equals($theSameWithSpaces)); $this->assertFalse($contactInformation->equals($different)); } - - /** - * dataprovider - */ - public function invalidValueProvider(): array - { - return [ - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], - ]; - } } diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionTest.php index 185d2fc1d..999341ebb 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionTest.php @@ -22,10 +22,8 @@ use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; -use StdClass; use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\Stepup\Exception\InvalidArgumentException; -use TypeError; class InstitutionTest extends UnitTest { @@ -43,18 +41,6 @@ public function an_institution_cannot_be_created_with_anything_but_a_nonempty_st new Institution($invalidValue); } - /** - * @test - * @group domain - * @dataProvider nonStringOrNonEmptyStringProviderTypeError - */ - public function an_institution_cannot_be_created_with_anything_but_a_nonempty_string_type_errors( - int|float|StdClass|array $invalidValue, - ): void { - $this->expectException(TypeError::class); - new Institution($invalidValue); - } - /** * @test * @group domain @@ -78,14 +64,4 @@ public function nonStringOrNonEmptyStringProvider(): array 'blank string' => [' '], ]; } - - public function nonStringOrNonEmptyStringProviderTypeError(): array - { - return [ - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], - ]; - } } diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/LocationTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/LocationTest.php index 0f23c8686..a85043c1d 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/LocationTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/LocationTest.php @@ -22,27 +22,12 @@ use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; -use stdClass; use Surfnet\Stepup\Configuration\Value\Location; -use Surfnet\Stepup\Exception\InvalidArgumentException; -use TypeError; class LocationTest extends UnitTest { use MockeryPHPUnitIntegration; - /** - * @test - * @group domain - * @dataProvider nonStringProvider - */ - public function it_cannot_be_created_with_anything_but_a_string(bool|int|float|stdClass|array|null $nonString): void - { - $this->expectException(TypeError::class); - - new Location($nonString); - } - /** * @test * @group domain @@ -58,19 +43,4 @@ public function two_locations_with_the_same_value_are_equal(): void $this->assertTrue($location->equals($theSameWithSpaces)); $this->assertFalse($location->equals($different)); } - - /** - * dataprovider - */ - public function nonStringProvider(): array - { - return [ - 'null' => [null], - 'boolean' => [false], - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new stdClass()], - ]; - } } diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php index fa1287ce0..4cc9b255b 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php @@ -23,10 +23,8 @@ use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as TestCase; use Ramsey\Uuid\Uuid; -use StdClass; use Surfnet\Stepup\Configuration\Value\RaLocationId; use Surfnet\Stepup\Exception\InvalidArgumentException; -use TypeError; class RaLocationIdTest extends TestCase { @@ -45,19 +43,6 @@ public function an_ra_location_id_cannot_be_created_with_anything_but_a_nonempty new RaLocationId($nonStringOrEmptyString); } - /** - * @test - * @group domain - * @dataProvider nonStringOrEmptyStringProviderTypeError - */ - public function an_ra_location_id_cannot_be_created_with_anything_but_a_nonempty_string_type_errors( - int|float|StdClass|array $errorValue, - ): void { - $this->expectException(TypeError::class); - - new RaLocationId($errorValue); - } - /** * @test * @group domain @@ -105,16 +90,6 @@ public function nonStringOrEmptyStringProvider(): array ]; } - public function nonStringOrEmptyStringProviderTypeError(): array - { - return [ - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], - ]; - } - private function uuid(): string { return (string)Uuid::uuid4(); diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationNameTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationNameTest.php index 5c46c6aa4..5fdf4714c 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationNameTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationNameTest.php @@ -22,10 +22,8 @@ use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as TestCase; -use StdClass; use Surfnet\Stepup\Configuration\Value\RaLocationName; use Surfnet\Stepup\Exception\InvalidArgumentException; -use TypeError; class RaLocationNameTest extends TestCase { @@ -44,19 +42,6 @@ public function an_ra_location_name_cannot_be_created_with_anything_but_a_nonemp new RaLocationName($nonStringOrEmptyString); } - /** - * @test - * @group domain - * @dataProvider nonStringOrEmptyStringProviderTypeError - */ - public function an_ra_location_name_cannot_be_created_with_anything_but_a_nonempty_string_type_errors( - int|float|StdClass|array $error, - ): void { - $this->expectException(TypeError::class); - - new RaLocationName($error); - } - /** * @test * @group domain @@ -88,14 +73,4 @@ public function nonStringOrEmptyStringProvider(): array 'blank string' => [' '], ]; } - - public function nonStringOrEmptyStringProviderTypeError(): array - { - return [ - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], - ]; - } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/CommonNameTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/CommonNameTest.php index b48fe4d70..7ca82305b 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/CommonNameTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/CommonNameTest.php @@ -22,10 +22,8 @@ use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; -use StdClass; use Surfnet\Stepup\Exception\InvalidArgumentException; use Surfnet\Stepup\Identity\Value\CommonName; -use TypeError; class CommonNameTest extends UnitTest { @@ -43,18 +41,6 @@ public function the_common_name_address_must_be_a_non_empty_string(string $inval new CommonName($invalidValue); } - /** - * @test - * @group domain - * @dataProvider invalidArgumentProviderTypeError - */ - public function the_common_name_address_must_be_a_non_empty_string_type_error(int|float|StdClass|array $invalidValue): void - { - $this->expectException(TypeError::class); - - new CommonName($invalidValue); - } - /** * @test * @group domain @@ -78,14 +64,4 @@ public function invalidArgumentProvider(): array 'blank string' => [' '], ]; } - - public function invalidArgumentProviderTypeError(): array - { - return [ - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], - ]; - } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/ContactInformationTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/ContactInformationTest.php index 0af33851f..63b0652af 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/ContactInformationTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/ContactInformationTest.php @@ -22,27 +22,12 @@ use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; -use StdClass; -use Surfnet\Stepup\Exception\InvalidArgumentException; use Surfnet\Stepup\Identity\Value\ContactInformation; -use TypeError; class ContactInformationTest extends UnitTest { use MockeryPHPUnitIntegration; - /** - * @test - * @group domain - * @dataProvider invalidValueProvider - */ - public function it_cannot_be_created_with_anything_but_a_nonempty_string(int|float|StdClass|array $invalidValue,): void - { - $this->expectException(TypeError::class); - - new ContactInformation($invalidValue); - } - /** * @test * @group domain @@ -58,17 +43,4 @@ public function two_instances_with_the_same_value_are_equal(): void $this->assertTrue($contactInformation->equals($theSameWithSpaces)); $this->assertFalse($contactInformation->equals($different)); } - - /** - * dataprovider - */ - public function invalidValueProvider(): array - { - return [ - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], - ]; - } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/DocumentNumberTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/DocumentNumberTest.php index e9904c7e1..83d4e5d9a 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/DocumentNumberTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/DocumentNumberTest.php @@ -22,10 +22,8 @@ use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; -use StdClass; use Surfnet\Stepup\Exception\InvalidArgumentException; use Surfnet\Stepup\Identity\Value\DocumentNumber; -use TypeError; class DocumentNumberTest extends UnitTest { @@ -42,17 +40,6 @@ public function the_document_number_must_be_a_non_empty_string(string $invalidVa new DocumentNumber($invalidValue); } - /** - * @test - * @group domain - * @dataProvider invalidArgumentProviderTypeError - */ - public function the_document_number_must_be_a_non_empty_string_type_error(int|float|StdClass|array $invalidValue): void - { - $this->expectException(TypeError::class); - new DocumentNumber($invalidValue); - } - /** * @test * @group domain @@ -75,14 +62,4 @@ public function invalidArgumentProvider(): array 'empty string' => [''], ]; } - - public function invalidArgumentProviderTypeError(): array - { - return [ - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], - ]; - } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/EmailTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/EmailTest.php index 1bd8dfbbd..14be0428d 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/EmailTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/EmailTest.php @@ -22,10 +22,8 @@ use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; -use StdClass; use Surfnet\Stepup\Exception\InvalidArgumentException; use Surfnet\Stepup\Identity\Value\Email; -use TypeError; class EmailTest extends UnitTest { @@ -42,17 +40,6 @@ public function the_email_address_must_be_a_non_empty_string(string $invalidValu new Email($invalidValue); } - /** - * @test - * @group domain - * @dataProvider invalidArgumentProviderTypeErrors - */ - public function the_email_address_must_be_a_non_empty_string_invalid_types(int|float|StdClass|array $invalidValue): void - { - $this->expectException(TypeError::class); - new Email($invalidValue); - } - /** * @test * @group domain @@ -89,16 +76,6 @@ public function invalidArgumentProvider(): array ]; } - public function invalidArgumentProviderTypeErrors(): array - { - return [ - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], - ]; - } - /** * provider for {@see the_email_address_given_must_be_rfc_822_compliant()} * This is by no means meant to be an exhaustive provider as we rely on PHP's filter_var for catching the invalid diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/InstitutionTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/InstitutionTest.php index e03ba36df..3e32aeb58 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/InstitutionTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/InstitutionTest.php @@ -22,26 +22,13 @@ use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; -use StdClass; use Surfnet\Stepup\Exception\InvalidArgumentException; use Surfnet\Stepup\Identity\Value\Institution; -use TypeError; class InstitutionTest extends UnitTest { use MockeryPHPUnitIntegration; - /** - * @test - * @group domain - * @dataProvider invalidValueProvider - */ - public function an_institution_cannot_be_created_with_anything_but_a_nonempty_string( - int|float|StdClass|array $invalidValue, - ): void { - $this->expectException(TypeError::class); - new Institution($invalidValue); - } /** * @test * @group domain @@ -68,19 +55,6 @@ public function two_institutions_with_the_same_value_are_equal(): void $this->assertTrue($institution->equals($different)); } - /** - * dataprovider - */ - public function invalidValueProvider(): array - { - return [ - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], - ]; - } - /** * dataprovider */ diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/LocationTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/LocationTest.php index 55844f2f6..931f9eec8 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/LocationTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/LocationTest.php @@ -22,26 +22,12 @@ use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; -use StdClass; -use Surfnet\Stepup\Exception\InvalidArgumentException; use Surfnet\Stepup\Identity\Value\Location; -use TypeError; class LocationTest extends UnitTest { use MockeryPHPUnitIntegration; - /** - * @test - * @group domain - * @dataProvider invalidValueProvider - */ - public function it_cannot_be_created_with_anything_but_a_nonempty_string(int|float|StdClass|array $invalidValue,): void - { - $this->expectException(TypeError::class); - new Location($invalidValue); - } - /** * @test * @group domain @@ -57,17 +43,4 @@ public function two_locations_with_the_same_value_are_equal(): void $this->assertTrue($location->equals($theSameWithSpaces)); $this->assertFalse($location->equals($different)); } - - /** - * dataprovider - */ - public function invalidValueProvider(): array - { - return [ - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], - ]; - } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/RegistrationAuthorityRoleTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/RegistrationAuthorityRoleTest.php index ea612aa2b..dad2c5e86 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/RegistrationAuthorityRoleTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/RegistrationAuthorityRoleTest.php @@ -22,27 +22,12 @@ use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; -use StdClass; -use Surfnet\Stepup\Exception\InvalidArgumentException; use Surfnet\Stepup\Identity\Value\RegistrationAuthorityRole; -use TypeError; class RegistrationAuthorityRoleTest extends UnitTest { use MockeryPHPUnitIntegration; - /** - * @test - * @group domain - * @dataProvider invalidValueProvider - */ - public function it_cannot_be_created_with_anything_but_a_valid_role(float|StdClass|array $invalidValue): void - { - $this->expectException(TypeError::class); - - new RegistrationAuthorityRole($invalidValue); - } - /** * @test * @group domain @@ -56,16 +41,4 @@ public function two_roles_with_the_same_value_are_equal(): void $this->assertTrue($role->equals($theSame)); $this->assertFalse($role->equals($different)); } - - /** - * dataprovider - */ - public function invalidValueProvider(): array - { - return [ - 'array' => [[]], - 'float' => [1.2], - 'object' => [new StdClass()], - ]; - } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/TimeFrameTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/TimeFrameTest.php index fc868f883..bf137a49a 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/TimeFrameTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/TimeFrameTest.php @@ -22,11 +22,8 @@ use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; -use StdClass; use Surfnet\Stepup\Exception\InvalidArgumentException; use Surfnet\Stepup\Identity\Value\TimeFrame; -use Throwable; -use TypeError; class TimeFrameTest extends UnitTest { @@ -44,18 +41,6 @@ public function it_cannot_be_given_an_non_positive_amount_of_seconds(int $invali TimeFrame::ofSeconds($invalidValue); } - /** - * @test - * @group domain - * @dataProvider invalidValueProviderOtherTypes - */ - public function it_cannot_be_given_an_non_positive_amount_of_secondsOtherTypes(string|float|StdClass|array $invalidValue): void - { - $this->expectException(TypeError::class); - - TimeFrame::ofSeconds($invalidValue); - } - /** * @test * @group domain @@ -83,18 +68,4 @@ public function invalidValueProviderInt(): array 'negative int' => [-1], ]; } - - /** - * dataprovider - */ - public function invalidValueProviderOtherTypes(): array - { - return [ - 'empty string' => [''], - 'string' => ['abc'], - 'array' => [[]], - 'float' => [2.123], - 'object' => [new StdClass()], - ]; - } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadApiRequestException.php b/src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadApiRequestException.php index 7d247de8e..ad0e059dc 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadApiRequestException.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadApiRequestException.php @@ -18,22 +18,18 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Exception; +use Throwable; + /** * Thrown when a client provided invalid command input to the application. */ class BadApiRequestException extends RuntimeException { - /** - * @param string[] $errors - * @param string $message - * @param int $code - * @param Exception|null $previous - */ public function __construct( private readonly array $errors, - $message = 'Invalid Request', - $code = 0, - Exception $previous = null, + string $message = 'Invalid Request', + int $code = 0, + ?Throwable $previous = null, ) { parent::__construct($message, $code, $previous); } @@ -41,7 +37,7 @@ public function __construct( /** * @return string[] */ - public function getErrors() + public function getErrors(): array { return $this->errors; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadCommandRequestException.php b/src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadCommandRequestException.php index 7a91f3b3a..01450bffb 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadCommandRequestException.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadCommandRequestException.php @@ -20,17 +20,14 @@ use Symfony\Component\Validator\ConstraintViolationInterface; use Symfony\Component\Validator\ConstraintViolationListInterface; +use Throwable; /** * Thrown when a client provided invalid command input to the application. */ class BadCommandRequestException extends RuntimeException { - /** - * @param string $message - * @return self - */ - public static function withViolations($message, ConstraintViolationListInterface $violations): self + public static function withViolations(string $message, ConstraintViolationListInterface $violations): self { $violationStrings = self::convertViolationsToStrings($violations); $message = sprintf('%s (%s)', $message, implode('; ', $violationStrings)); @@ -53,16 +50,11 @@ private static function convertViolationsToStrings(ConstraintViolationListInterf return $violationStrings; } - /** - * @param string[] $errors - * @param string $message - * @param int $code - */ public function __construct( private readonly array $errors, - $message = 'JSON could not be reconstituted into valid object.', - $code = 0, - Exception $previous = null, + string $message = 'JSON could not be reconstituted into valid object.', + int $code = 0, + ?Throwable $previous = null, ) { parent::__construct($message, $code, $previous); } @@ -70,7 +62,7 @@ public function __construct( /** * @return string[] */ - public function getErrors() + public function getErrors(): array { return $this->errors; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaListingProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaListingProjector.php index dfaca7205..51b74d97d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaListingProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaListingProjector.php @@ -223,9 +223,8 @@ public function applyAppointedAsRaEvent(AppointedAsRaEvent $event): void foreach ($raListing as $listing) { $listing->role = AuthorityRole::ra(); + $this->raListingRepository->save($listing); } - - $this->raListingRepository->save($raListing); } /** @@ -240,9 +239,9 @@ public function applyAppointedAsRaaEvent(AppointedAsRaaEvent $event): void foreach ($raListing as $listing) { $listing->role = AuthorityRole::raa(); + $this->raListingRepository->save($listing); } - $this->raListingRepository->save($raListing); } /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionParamConverter.php b/src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionParamConverter.php index bc901b901..380fe1185 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionParamConverter.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionParamConverter.php @@ -45,14 +45,14 @@ public function supports(ParamConverter $configuration): bool */ private function getInstitutionFromRequest(Request $request) { - $institution = $request->attributes->get(self::INSTITUTION, false); + $institution = $request->attributes->get(self::INSTITUTION); $request->attributes->remove(self::INSTITUTION); if (is_string($institution) && ($institution !== '' && $institution !== '0')) { return $institution; } - $institution = $request->query->get(self::INSTITUTION, false); + $institution = $request->query->get(self::INSTITUTION); $request->query->remove(self::INSTITUTION); if (is_string($institution) && ($institution !== '' && $institution !== '0')) { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Request/InstitutionParamConverter.php b/src/Surfnet/StepupMiddleware/ApiBundle/Request/InstitutionParamConverter.php index b4c5d7f74..d3acaa98c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Request/InstitutionParamConverter.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Request/InstitutionParamConverter.php @@ -30,7 +30,7 @@ class InstitutionParamConverter implements ParamConverterInterface public function apply(Request $request, ParamConverter $configuration): bool { $query = $request->query; - $institution = $query->get('institution', false); + $institution = $query->get('institution'); if (!is_string($institution)) { throw new BadApiRequestException(['This API-call MUST include the institution as get parameter']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Filter/InstitutionAuthorizationRepositoryFilterTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Filter/InstitutionAuthorizationRepositoryFilterTest.php index 72a6810f4..6269e4105 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Filter/InstitutionAuthorizationRepositoryFilterTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Filter/InstitutionAuthorizationRepositoryFilterTest.php @@ -47,7 +47,7 @@ public function setUp(): void ->getMock(); $this->queryBuilder = new QueryBuilder($this->entityManager); - $this->queryBuilder->from('institution', 'i'); + $this->queryBuilder->from(InstitutionValue::class, 'i'); } /** @@ -73,7 +73,7 @@ public function a_querybuilder_object_is_filtered_with_an_institution_authorizat ); $this->assertEquals( - 'SELECT FROM institution i WHERE i.institution IN (:iacalias_institutions)', + sprintf('SELECT FROM %s i WHERE i.institution IN (:iacalias_institutions)', InstitutionValue::class), $this->queryBuilder->getDQL(), ); $this->assertEquals(1, $this->queryBuilder->getParameters()->count()); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php index 5d89ca7c1..294913a12 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php @@ -35,6 +35,7 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\IdentityService; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\WhitelistService; use Surfnet\StepupMiddleware\ApiBundle\Identity\Value\RegistrationAuthorityCredentials; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\AbstractCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\RaExecutable; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\SelfAsserted; @@ -173,6 +174,7 @@ public function an_identity_should_be_able_to_execute_own_selfservice_commands(s $actorId = new IdentityId('123'); $actorInstitution = new Institution('institution'); + /** @var SelfServiceExecutable&AbstractCommand&MockInterface $command */ $command = m::mock($command); $command->shouldReceive('getIdentityId') ->andReturn($actorId->getIdentityId()); @@ -205,6 +207,7 @@ public function an_identity_should_be_able_to_execute_configured_ra_commands(str $actorId = new IdentityId('123'); $actorInstitution = new Institution('institution'); + /** @var RaExecutable&AbstractCommand&MockInterface $command */ $command = m::mock($command); if (property_exists($command, 'identityId')) { $command->identityId = $actorId; @@ -268,6 +271,7 @@ public function an_identity_should_be_able_to_execute_configured_ra_and_selfserv $actorId = new IdentityId('123'); $actorInstitution = new Institution('institution'); + /** @var RaExecutable&AbstractCommand&MockInterface $command */ $command = m::mock($command); $command->shouldReceive('getRaInstitution') ->andReturn($actorInstitution->getInstitution()); @@ -324,6 +328,7 @@ public function an_identity_should_not_be_able_to_execute_someone_elses_selfserv $actorId = new IdentityId('123'); $actorInstitution = new Institution('institution'); + /** @var SelfServiceExecutable&AbstractCommand&MockInterface $command */ $command = m::mock($command); $command->shouldReceive('getIdentityId') ->andReturn(new IdentityId('someone else')); @@ -364,6 +369,7 @@ public function an_identity_should_be_able_to_execute_unconfigured_ra_commands(s $actorId = new IdentityId('123'); $actorInstitution = new Institution('institution'); + /** @var RaExecutable&AbstractCommand&MockInterface $command */ $command = m::mock($command); $command->shouldReceive('getRaInstitution') ->andReturn($actorInstitution->getInstitution()); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php index d5ef74c05..9a6e6ecbe 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php @@ -31,7 +31,6 @@ use Surfnet\StepupMiddleware\CommandHandlingBundle\Root\Command\Ns\QuuxCommand; use Symfony\Component\HttpFoundation\ParameterBag; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag; class CommandParamConverterTest extends TestCase { @@ -47,10 +46,13 @@ public function it_validates_the_command_structure($commandJson): void { $this->expectException(BadCommandRequestException::class); + /** @var Request&MockInterface $request */ $request = m::mock(Request::class) ->shouldReceive('getContent')->with()->andReturn($commandJson) ->getMock(); - $configuration = m::mock('Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter'); + + /** @var ParamConverter&MockInterface $configuration */ + $configuration = m::mock(ParamConverter::class); $converter = new CommandParamConverter(); $converter->apply($request, $configuration); @@ -71,7 +73,7 @@ public function it_can_convert_command_name_notation($expectedCommandClass, stri ->shouldReceive('getContent')->with()->andReturn(json_encode($command)) ->getMock(); - /** @var ParameterBag $attributes */ + /** @var ParameterBag&MockInterface $attributes */ $attributes = m::mock() ->shouldReceive('set')->with('command', m::type($expectedCommandClass)) ->getMock(); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php index 19597b425..35da5e046 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php @@ -22,6 +22,7 @@ use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use Mockery\MockInterface; use PHPUnit\Framework\TestCase as UnitTest; +use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Exception\BadApiRequestException; use Surfnet\StepupMiddleware\ApiBundle\Request\InstitutionParamConverter; @@ -32,20 +33,14 @@ class InstitutionParamConverterTest extends UnitTest { use MockeryPHPUnitIntegration; - /** - * @var MockInterface&Request - */ - private $request; + private MockInterface&Request $request; - /** - * @var MockInterface - */ - private $paramConverterConfig; + private MockInterface&ParamConverter $paramConverterConfig; public function setUp(): void { $this->request = m::mock(Request::class); - $this->paramConverterConfig = m::mock('Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter'); + $this->paramConverterConfig = m::mock(ParamConverter::class); } /** diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/BufferedEventBusTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/BufferedEventBusTest.php index fc4d28f14..2ea525393 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/BufferedEventBusTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/BufferedEventBusTest.php @@ -41,6 +41,7 @@ class BufferedEventBusTest extends TestCase public function it_buffers_events(): void { $event = $this->createDummyDomainMessage(null); + /** @var EventListener&MockInterface $listener */ $listener = m::mock(EventListener::class) ->shouldNotHaveReceived('handle') ->getMock(); @@ -61,6 +62,7 @@ public function it_buffers_events(): void public function it_flushes_events(): void { $event = $this->createDummyDomainMessage(null); + /** @var EventListener&MockInterface $listener */ $listener = m::mock(EventListener::class) ->shouldReceive('handle')->once()->with($event) ->getMock(); @@ -83,6 +85,7 @@ public function it_flushes_events(): void public function flushing_succesfully_empties_the_buffer_to_prevent_flushing_the_same_event_twice(): void { $event = $this->createDummyDomainMessage(null); + /** @var EventListener&MockInterface $listener */ $listener = m::mock(EventListener::class) ->shouldReceive('handle')->once()->with($event) ->getMock(); @@ -124,9 +127,6 @@ public function an_event_caused_by_an_event_in_the_current_buffer_being_flushed_ $this->assertEquals($expectedEventSequence, $actualEventSequence); } - /** - * @return DomainMessage - */ private function createDummyDomainMessage(?string $payload): DomainMessage { return new DomainMessage('1', 0, new Metadata(), $payload, DateTime::fromString('1970-01-01H00:00:00.000')); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerMoveTokenTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerMoveTokenTest.php index b379e7eba..14ed8ae17 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerMoveTokenTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerMoveTokenTest.php @@ -810,12 +810,12 @@ public function test_can_not_be_moved_if_token_type_not_allowed_for_institution( ->then([ new SecondFactorMigratedToEvent( $targetRegistrantId, - $sourceRegistrantNameId, - $targetRegistrantNameId, + $sourceRegistrantInstitution, $targetRegistrantInstitution, $sourceRegistrantSecFacId, $targetRegistrantSecFacId, new SecondFactorType('yubikey'), + $sourceYubikeySecFacId, ), ]); } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/AuthorizingStageTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/AuthorizingStageTest.php index 7b9238f9f..4ad5e6c7f 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/AuthorizingStageTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/AuthorizingStageTest.php @@ -23,7 +23,7 @@ use Mockery\MockInterface; use PHPUnit\Framework\TestCase as UnitTest; use Psr\Log\NullLogger; -use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\AbstractCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\ManagementExecutable; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\RaExecutable; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\SelfServiceExecutable; @@ -53,7 +53,7 @@ public function setUp(): void */ public function when_a_command_has_no_marker_interface_authorization_is_granted_by_default(): void { - $command = m::mock(Command::class); + $command = m::mock(AbstractCommand::class); $this->authorizationChecker->shouldNotHaveReceived('isGranted'); $authorizingStage = new AuthorizingStage($this->logger, $this->authorizationChecker); @@ -72,7 +72,8 @@ public function a_command_with_a_marker_interface_triggers_a_check_for_the_corre string $interface, string $role, ): void { - $command = m::mock('Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command, ' . $interface); + /** @var MockInterface&AbstractCommand $command */ + $command = m::mock(AbstractCommand::class . ', ' . $interface); $this->authorizationChecker ->shouldReceive('isGranted') ->once() @@ -92,11 +93,15 @@ public function a_command_with_a_marker_interface_triggers_a_check_for_the_corre */ public function when_a_command_implements_multiple_marker_interfaces_at_least_one_corresponding_role_is_required(): void { + /** @var AbstractCommand&SelfServiceExecutable&RaExecutable&ManagementExecutable&MockInterface $command */ $command = m::mock( - 'Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command, ' - . 'Surfnet\StepupMiddleware\CommandHandlingBundle\Command\SelfServiceExecutable, ' - . 'Surfnet\StepupMiddleware\CommandHandlingBundle\Command\RaExecutable, ' - . ManagementExecutable::class, + sprintf( + "%s, %s, %s, %s", + AbstractCommand::class, + SelfServiceExecutable::class, + RaExecutable::class, + ManagementExecutable::class + ) ); $this->authorizationChecker @@ -129,9 +134,13 @@ public function when_the_client_does_not_have_the_required_role_an_forbidden_exc { $this->expectException(ForbiddenException::class); + /** @var AbstractCommand&SelfServiceExecutable&MockInterface $command */ $command = m::mock( - 'Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command, ' - . SelfServiceExecutable::class, + sprintf( + "%s, %s", + AbstractCommand::class, + SelfServiceExecutable::class, + ) ); $this->authorizationChecker @@ -144,7 +153,7 @@ public function when_the_client_does_not_have_the_required_role_an_forbidden_exc $authorizingStage->process($command); - $this->assertInstanceOf($authorizingStage, AuthorizingStage::class); + $this->assertInstanceOf(AuthorizingStage::class, $authorizingStage); } public function interfaceToRoleMappingProvider(): array diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/DispatchStageTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/DispatchStageTest.php index 94473ded5..9d75430f7 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/DispatchStageTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/DispatchStageTest.php @@ -21,9 +21,11 @@ use Broadway\CommandHandling\CommandBus; use Mockery as m; use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; +use Mockery\MockInterface; use PHPUnit\Framework\TestCase; use Psr\Log\NullLogger; -use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\AbstractCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\EventHandling\BufferedEventBus; use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\DispatchStage; class DispatchStageTest extends TestCase @@ -36,7 +38,8 @@ class DispatchStageTest extends TestCase */ public function it_dispatches_commands(): void { - $command = m::mock(Command::class); + $command = m::mock(AbstractCommand::class); + /** @var CommandBus&MockInterface $commandBus */ $commandBus = m::mock(CommandBus::class)->makePartial() ->shouldReceive('dispatch')->once()->with($command)->andReturnNull() ->getMock(); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/EventDispatchingStageTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/EventDispatchingStageTest.php index c36755072..c6fa4d44e 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/EventDispatchingStageTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/EventDispatchingStageTest.php @@ -20,9 +20,10 @@ use Mockery as m; use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; +use Mockery\MockInterface; use PHPUnit\Framework\TestCase as UnitTest; use Psr\Log\NullLogger; -use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\AbstractCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\EventHandling\BufferedEventBus; use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\EventDispatchingStage; use Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\Command\FixedUuidStubCommand; @@ -37,7 +38,8 @@ class EventDispatchingStageTest extends UnitTest */ public function buffered_event_bus_flush_is_called_during_process(): void { - $command = m::mock(Command::class); + $command = m::mock(AbstractCommand::class); + /** @var BufferedEventBus&MockInterface $eventBus */ $eventBus = m::mock(BufferedEventBus::class) ->shouldReceive('flush')->once() ->getMock(); @@ -56,7 +58,7 @@ public function it_returns_the_same_command_as_it_processes_unmodified(): void { $command = new FixedUuidStubCommand(); $uuid = $command->UUID; - + /** @var BufferedEventBus&MockInterface $eventBus */ $eventBus = m::mock(BufferedEventBus::class) ->shouldReceive('flush')->once() ->getMock(); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/StagedPipelineTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/StagedPipelineTest.php index 5f6ca1bff..d3b791345 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/StagedPipelineTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/StagedPipelineTest.php @@ -20,9 +20,10 @@ use Mockery as m; use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; +use Mockery\MockInterface; use PHPUnit\Framework\TestCase; use Psr\Log\NullLogger; -use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\AbstractCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\Stage; use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\StagedPipeline; @@ -36,7 +37,8 @@ class StagedPipelineTest extends TestCase */ public function it_passes_a_command_through_a_single_stage(): void { - $command = m::mock(Command::class); + $command = m::mock(AbstractCommand::class); + /** @var Stage&MockInterface $stage */ $stage = m::mock(Stage::class) ->shouldReceive('process')->once()->with($command)->andReturn($command) ->getMock(); @@ -53,10 +55,12 @@ public function it_passes_a_command_through_a_single_stage(): void */ public function it_passes_a_command_through_multiple_stages(): void { - $command = m::mock(Command::class); + $command = m::mock(AbstractCommand::class); + /** @var Stage&MockInterface $stage1 */ $stage1 = m::mock(Stage::class) ->shouldReceive('process')->once()->with($command)->andReturn($command) ->getMock(); + /** @var Stage&MockInterface $stage2 */ $stage2 = m::mock(Stage::class) ->shouldReceive('process')->once()->with($command)->andReturn($command) ->getMock(); @@ -74,11 +78,13 @@ public function it_passes_a_command_through_multiple_stages(): void */ public function it_passes_the_command_returned_from_an_earlier_stage_on_to_the_next(): void { - $command1 = m::mock(Command::class); - $command2 = m::mock(Command::class); + $command1 = m::mock(AbstractCommand::class); + $command2 = m::mock(AbstractCommand::class); + /** @var Stage&MockInterface $stage1 */ $stage1 = m::mock(Stage::class) ->shouldReceive('process')->once()->with($command1)->andReturn($command2) ->getMock(); + /** @var Stage&MockInterface $stage2 */ $stage2 = m::mock(Stage::class) ->shouldReceive('process')->once()->with($command2)->andReturn($command2) ->getMock(); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/ValidationStageTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/ValidationStageTest.php index c0fd0f831..c8e24da65 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/ValidationStageTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/ValidationStageTest.php @@ -21,9 +21,10 @@ use ArrayIterator; use Mockery as m; use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; +use Mockery\MockInterface; use PHPUnit\Framework\TestCase; use Psr\Log\NullLogger; -use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\AbstractCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\Exception\InvalidCommandException; use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\ValidationStage; use Symfony\Component\Validator\ConstraintViolationListInterface; @@ -39,10 +40,11 @@ class ValidationStageTest extends TestCase */ public function it_validates_commands(): void { - $command = m::mock(Command::class); + $command = m::mock(AbstractCommand::class); $violations = m::mock(ConstraintViolationListInterface::class) ->shouldReceive('count')->with()->andReturn(0) ->getMock(); + /** @var ValidatorInterface&MockInterface $validator */ $validator = m::mock(ValidatorInterface::class) ->shouldReceive('validate')->once()->with($command)->andReturn($violations) ->getMock(); @@ -60,11 +62,12 @@ public function it_throws_an_exception_when_validation_fails(): void { $this->expectException(InvalidCommandException::class); - $command = m::mock(Command::class); + $command = m::mock(AbstractCommand::class); $violations = m::mock(ConstraintViolationListInterface::class); $violations->allows()->count()->andReturn(1); $violations->allows()->getIterator()->andReturn(new ArrayIterator())->getMock(); + /** @var ValidatorInterface&MockInterface $validator */ $validator = m::mock(ValidatorInterface::class) ->shouldReceive('validate')->once()->with($command)->andReturn($violations) ->getMock(); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/EventSourcing/SensitiveDataMessageStreamTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/EventSourcing/SensitiveDataMessageStreamTest.php index 0afae9ff7..490cd8f8e 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/EventSourcing/SensitiveDataMessageStreamTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/EventSourcing/SensitiveDataMessageStreamTest.php @@ -24,6 +24,7 @@ use Broadway\Domain\Metadata; use Mockery as m; use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; +use Mockery\MockInterface; use PHPUnit\Framework\TestCase as TestCase; use Surfnet\Stepup\Identity\Value\CommonName; use Surfnet\Stepup\Identity\Value\Email; @@ -269,11 +270,11 @@ public function it_fails_when_stream_ids_dont_match(): void */ public function it_can_forget_all_sensitive_data(): void { - $sensitiveDataMessageStream = new SensitiveDataMessageStream([ - m::mock(SensitiveDataMessage::class) - ->shouldReceive('forget')->once() - ->getMock(), - ]); + /** @var MockInterface&SensitiveDataMessage $command */ + $command = m::mock(SensitiveDataMessage::class) + ->shouldReceive('forget')->once() + ->getMock(); + $sensitiveDataMessageStream = new SensitiveDataMessageStream([$command]); $sensitiveDataMessageStream->forget(); $this->assertInstanceOf(SensitiveDataMessageStream::class, $sensitiveDataMessageStream); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php index f1570a612..f1bd3941e 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php @@ -20,7 +20,7 @@ use DateTime; use Ramsey\Uuid\Uuid; -use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\AbstractCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\Command\UpdateConfigurationCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\TransactionAwarePipeline; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; @@ -43,10 +43,7 @@ public function update(Request $request) return $this->handleCommand($request, $command); } - /** - * @return JsonResponse - */ - private function handleCommand(Request $request, Command $command): JsonResponse + private function handleCommand(Request $request, AbstractCommand $command): JsonResponse { $this->pipeline->process($command); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php index d3e5f4edf..7418963fd 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php @@ -29,7 +29,7 @@ use Surfnet\StepupMiddleware\ApiBundle\Configuration\Service\InstitutionAuthorizationService; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Service\InstitutionConfigurationOptionsService; use Surfnet\StepupMiddleware\ApiBundle\Exception\BadCommandRequestException; -use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\AbstractCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\Command\ReconfigureInstitutionConfigurationOptionsCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Exception\ForbiddenException; use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\TransactionAwarePipeline; @@ -159,7 +159,7 @@ public function reconfigure(Request $request): JsonResponse } /** - * @param Command[] $commands + * @param AbstractCommand[] $commands * @throws Exception */ private function handleCommands(array $commands): void diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php index d5fffe23f..9c3556499 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php @@ -24,7 +24,7 @@ use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\Stepup\Identity\Value\NameId; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\IdentityService; -use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\AbstractCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\ForgetIdentityCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\TransactionAwarePipeline; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; @@ -71,10 +71,7 @@ public function forgetIdentity(Request $request) return $this->handleCommand($request, $command); } - /** - * @return JsonResponse - */ - private function handleCommand(Request $request, Command $command): JsonResponse + private function handleCommand(Request $request, AbstractCommand $command): JsonResponse { $this->pipeline->process($command); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php index 0df7fc1dd..132de9931 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php @@ -22,7 +22,7 @@ use Ramsey\Uuid\Uuid; use Surfnet\Stepup\Helper\JsonHelper; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\WhitelistService; -use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\AbstractCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Exception\ForbiddenException; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\AddToWhitelistCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\RemoveFromWhitelistCommand; @@ -88,10 +88,7 @@ public function showWhitelist(): JsonResponse return new JsonResponse(['institutions' => $entries->getValues()]); } - /** - * @return JsonResponse - */ - private function handleCommand(Request $request, Command $command): JsonResponse + private function handleCommand(Request $request, AbstractCommand $command): JsonResponse { try { $this->pipeline->process($command); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/TransactionHelper.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/TransactionHelper.php index 4e7f73854..9764ce1ec 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/TransactionHelper.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/TransactionHelper.php @@ -18,7 +18,7 @@ namespace Surfnet\StepupMiddleware\MiddlewareBundle\Service; -use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command as MiddlewareCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\AbstractCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\EventHandling\BufferedEventBus; use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\Pipeline; @@ -47,7 +47,7 @@ public function rollback(): void $this->connection->rollBack(); } - public function process(MiddlewareCommand $command): MiddlewareCommand + public function process(AbstractCommand $command): AbstractCommand { return $this->pipeline->process($command); } From 807ca93dfd0024a17a613e4eebc9d93a30899ea8 Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Mon, 25 Mar 2024 14:27:48 +0100 Subject: [PATCH 43/89] Address PHPStan 6 findings Note that the warnings about missing array type specifications have been added to the baseline. Adding quite a lot of new entries for this level. The additional time it would cost to investigate and set them all would be great. And we need to keep things economically viable.. --- ci/qa/phpstan-baseline.neon | 2017 ++++++++++++++++- composer.json | 4 +- composer.lock | 61 +- .../Migrations/Version20141125173004.php | 4 +- .../Migrations/Version20141209150426.php | 4 +- .../Migrations/Version20141210174213.php | 2 +- .../Migrations/Version20150508085838.php | 2 +- .../Migrations/Version20150522163053.php | 2 +- .../Migrations/Version20150522164907.php | 2 +- .../Migrations/Version20150528154959.php | 2 +- .../Migrations/Version20150615114646.php | 6 +- .../Migrations/Version20180131150800.php | 2 +- .../Migrations/Version20200114161618.php | 2 +- .../Migrations/Version20220519134637.php | 2 +- .../Migrations/Version20221102143350.php | 2 +- .../Configuration/Api/Configuration.php | 1 - .../Event/ConfigurationEvent.php | 9 +- .../Event/ConfigurationUpdatedEvent.php | 15 +- .../Event/EmailTemplatesUpdatedEvent.php | 9 +- .../Event/IdentityProvidersUpdatedEvent.php | 9 +- .../InstitutionConfigurationRemovedEvent.php | 14 +- ...ewInstitutionConfigurationCreatedEvent.php | 66 +- .../Event/RaLocationAddedEvent.php | 45 +- ...LocationContactInformationChangedEvent.php | 25 +- .../Event/RaLocationRelocatedEvent.php | 25 +- .../Event/RaLocationRemovedEvent.php | 18 +- .../Event/RaLocationRenamedEvent.php | 25 +- .../Event/ServiceProvidersUpdatedEvent.php | 9 +- .../Configuration/Event/SraaUpdatedEvent.php | 9 +- .../InstitutionConfiguration.php | 69 +- .../Value/AllowedSecondFactorList.php | 12 +- .../Value/ContactInformation.php | 7 - .../Configuration/Value/Institution.php | 2 +- .../Value/InstitutionAuthorizationOption.php | 18 +- .../Value/InstitutionConfigurationId.php | 8 +- .../Configuration/Value/InstitutionRole.php | 29 +- .../Configuration/Value/InstitutionSet.php | 8 +- .../Stepup/Configuration/Value/Location.php | 7 - .../Value/NumberOfTokensPerIdentityOption.php | 12 +- .../Configuration/Value/RaLocationId.php | 5 +- .../Configuration/Value/RaLocationList.php | 3 + .../Configuration/Value/RaLocationName.php | 2 +- .../Value/SelfAssertedTokensOption.php | 5 +- .../Configuration/Value/SelfVetOption.php | 5 +- .../Value/ShowRaaContactInformationOption.php | 16 +- .../Configuration/Value/SsoOn2faOption.php | 5 +- .../Value/UseRaLocationsOption.php | 22 +- .../Configuration/Value/VerifyEmailOption.php | 16 +- src/Surfnet/Stepup/DateTime/DateTime.php | 6 +- .../Stepup/Exception/JsonException.php | 2 +- src/Surfnet/Stepup/Helper/JsonHelper.php | 6 +- .../Stepup/Helper/UserDataFormatter.php | 2 +- src/Surfnet/Stepup/Identity/Api/Id.php | 2 +- src/Surfnet/Stepup/Identity/Api/Identity.php | 7 +- .../Stepup/Identity/AuditLog/Metadata.php | 14 +- .../Collection/InstitutionCollection.php | 3 + .../Collection/VettingTypeHintCollection.php | 2 +- .../Identity/Entity/ConfigurableSettings.php | 2 +- .../Entity/UnverifiedSecondFactor.php | 7 +- .../Identity/Entity/VerifiedSecondFactor.php | 6 +- .../Identity/Event/AppointedAsRaEvent.php | 12 +- .../AppointedAsRaForInstitutionEvent.php | 25 +- .../Identity/Event/AppointedAsRaaEvent.php | 12 +- .../AppointedAsRaaForInstitutionEvent.php | 19 +- ...ompliedWithRecoveryCodeRevocationEvent.php | 24 +- .../Event/CompliedWithRevocationEvent.php | 39 +- .../Identity/Event/EmailVerifiedEvent.php | 57 +- .../GssfPossessionProvenAndVerifiedEvent.php | 67 +- .../Event/GssfPossessionProvenEvent.php | 68 +- .../Event/IdentityAccreditedAsRaEvent.php | 41 +- ...ntityAccreditedAsRaForInstitutionEvent.php | 60 +- .../Event/IdentityAccreditedAsRaaEvent.php | 54 +- ...tityAccreditedAsRaaForInstitutionEvent.php | 63 +- .../Identity/Event/IdentityCreatedEvent.php | 41 +- .../Event/IdentityEmailChangedEvent.php | 17 +- .../Stepup/Identity/Event/IdentityEvent.php | 14 +- .../Identity/Event/IdentityForgottenEvent.php | 8 + .../Identity/Event/IdentityRenamedEvent.php | 17 +- .../InstitutionsAddedToWhitelistEvent.php | 10 +- .../InstitutionsRemovedFromWhitelistEvent.php | 10 +- .../Event/LocalePreferenceExpressedEvent.php | 17 +- .../PhonePossessionProvenAndVerifiedEvent.php | 59 +- .../Event/PhonePossessionProvenEvent.php | 57 +- ...honeRecoveryTokenPossessionProvenEvent.php | 52 +- .../Event/RecoveryTokenRevokedEvent.php | 17 +- ...rationAuthorityInformationAmendedEvent.php | 31 +- ...yInformationAmendedForInstitutionEvent.php | 39 +- .../RegistrationAuthorityRetractedEvent.php | 31 +- ...nAuthorityRetractedForInstitutionEvent.php | 41 +- ...etRecoveryTokenPossessionPromisedEvent.php | 34 +- .../Event/SecondFactorMigratedEvent.php | 78 +- .../Event/SecondFactorMigratedToEvent.php | 49 +- .../Event/SecondFactorRevokedEvent.php | 31 +- .../Event/SecondFactorVettedEvent.php | 73 +- ...torVettedWithoutTokenProofOfPossession.php | 73 +- ...DevicePossessionProvenAndVerifiedEvent.php | 59 +- .../Event/U2fDevicePossessionProvenEvent.php | 57 +- .../VettedSecondFactorsAllRevokedEvent.php | 6 + .../Event/VettingTypeHintsSavedEvent.php | 22 +- .../Identity/Event/WhitelistCreatedEvent.php | 10 +- .../Identity/Event/WhitelistReplacedEvent.php | 10 +- ...ubikeyPossessionProvenAndVerifiedEvent.php | 64 +- .../Event/YubikeyPossessionProvenEvent.php | 65 +- .../YubikeySecondFactorBootstrappedEvent.php | 8 + src/Surfnet/Stepup/Identity/Identity.php | 8 +- .../Stepup/Identity/Value/CommonName.php | 5 +- .../Identity/Value/ContactInformation.php | 3 - src/Surfnet/Stepup/Identity/Value/Email.php | 5 +- src/Surfnet/Stepup/Identity/Value/GssfId.php | 4 +- .../Stepup/Identity/Value/IdentityId.php | 6 +- .../Stepup/Identity/Value/Institution.php | 2 +- src/Surfnet/Stepup/Identity/Value/Locale.php | 14 +- .../Stepup/Identity/Value/Location.php | 3 - src/Surfnet/Stepup/Identity/Value/NameId.php | 10 +- .../Stepup/Identity/Value/PhoneNumber.php | 8 +- .../Stepup/Identity/Value/RecoveryTokenId.php | 6 +- .../Value/RecoveryTokenIdentifier.php | 8 +- .../Identity/Value/RecoveryTokenType.php | 8 +- .../Value/RegistrationAuthorityRole.php | 4 +- .../Stepup/Identity/Value/SafeStore.php | 2 +- .../Stepup/Identity/Value/SecondFactorId.php | 6 +- .../Identity/Value/SecondFactorIdentifier.php | 1 - .../Stepup/Identity/Value/StepupProvider.php | 4 +- .../Stepup/Identity/Value/TimeFrame.php | 3 +- .../Stepup/Identity/Value/U2fKeyHandle.php | 8 +- .../Stepup/Identity/Value/VettingTypeHint.php | 2 +- .../Stepup/Identity/Value/YubikeyPublicId.php | 6 +- .../InstitutionConfigurationTest.php | 4 +- .../Value/AllowedSecondFactorListTest.php | 20 +- .../Value/InstitutionSetTest.php | 2 + .../ShowRaaContactInformationOptionTest.php | 25 - .../Value/UseRaLocationsOptionTest.php | 26 +- .../Stepup/Tests/Helper/JsonHelperTest.php | 13 - ...stitutionAuthorizationRepositoryFilter.php | 17 +- .../Service/AuthorizationService.php | 2 +- .../Service/CommandAuthorizationService.php | 2 +- ...stitutionAuthorizationContextInterface.php | 4 +- .../Value/InstitutionRoleSet.php | 2 +- .../Value/InstitutionRoleSetInterface.php | 2 +- .../Entity/AllowedSecondFactor.php | 4 +- .../Entity/ConfiguredInstitution.php | 2 +- .../Entity/InstitutionAuthorization.php | 6 +- .../InstitutionConfigurationOptions.php | 16 +- .../Configuration/Entity/RaLocation.php | 16 +- .../Configuration/Query/RaLocationQuery.php | 6 +- .../AllowedSecondFactorRepository.php | 3 + .../ConfiguredInstitutionRepository.php | 3 + .../InstitutionAuthorizationRepository.php | 7 +- ...titutionConfigurationOptionsRepository.php | 3 + .../Repository/RaLocationRepository.php | 5 +- .../AllowedSecondFactorListService.php | 4 +- .../Service/AllowedSecondFactorMap.php | 2 +- .../InstitutionAuthorizationService.php | 2 +- ...InstitutionConfigurationOptionsService.php | 6 +- .../Service/RaLocationService.php | 2 +- .../Controller/AuditLogController.php | 2 +- .../Controller/AuthorizationController.php | 6 +- .../Controller/DeprovisionController.php | 1 - .../Controller/IdentityController.php | 11 +- ...titutionConfigurationOptionsController.php | 4 +- .../Controller/ProfileController.php | 2 +- .../Controller/RaCandidateController.php | 2 +- .../Controller/RaListingController.php | 6 +- .../Controller/RaSecondFactorController.php | 2 +- .../Controller/RecoveryTokenController.php | 4 +- .../ApiBundle/Controller/SraaController.php | 5 +- .../UnverifiedSecondFactorController.php | 4 +- .../VerifiedSecondFactorController.php | 8 +- .../VettedSecondFactorController.php | 4 +- .../Controller/VettingTypeHintController.php | 2 +- .../DependencyInjection/Configuration.php | 2 +- .../Doctrine/Type/AuthorityRoleType.php | 4 +- .../Doctrine/Type/CommonNameType.php | 4 +- .../ConfigurationContactInformationType.php | 2 +- .../Type/ConfigurationInstitutionType.php | 4 +- .../Type/ConfigurationLocationType.php | 4 +- .../Doctrine/Type/ContactInformationType.php | 4 +- .../ApiBundle/Doctrine/Type/DateTimeType.php | 2 +- .../ApiBundle/Doctrine/Type/EmailType.php | 4 +- .../Doctrine/Type/InstitutionRoleType.php | 4 +- .../Doctrine/Type/InstitutionType.php | 4 +- .../ApiBundle/Doctrine/Type/LocaleType.php | 4 +- .../ApiBundle/Doctrine/Type/LocationType.php | 4 +- .../ApiBundle/Doctrine/Type/NameIdType.php | 4 +- .../Type/NumberOfTokensPerIdentityType.php | 4 +- .../Doctrine/Type/RaLocationNameType.php | 4 +- .../Doctrine/Type/SecondFactorTypeType.php | 4 +- .../Type/SelfAssertedTokensOptionType.php | 6 +- .../Doctrine/Type/SelfVetOptionType.php | 6 +- .../ShowRaaContactInformationOptionType.php | 6 +- .../Doctrine/Type/SsoOn2faOptionType.php | 6 +- .../Type/UseRaLocationsOptionType.php | 6 +- .../Doctrine/Type/VerifyEmailOptionType.php | 6 +- .../EventListener/ExceptionListener.php | 2 +- .../Identity/Entity/AuditLogEntry.php | 20 +- .../ApiBundle/Identity/Entity/Identity.php | 2 +- .../ApiBundle/Identity/Entity/RaListing.php | 6 +- .../Identity/Entity/RaSecondFactor.php | 59 +- .../Entity/SecondFactorRevocation.php | 2 +- .../Identity/Entity/VettedSecondFactor.php | 4 +- .../Identity/Projector/AuditLogProjector.php | 13 +- .../Identity/Projector/RaListingProjector.php | 4 +- .../Projector/RaSecondFactorProjector.php | 1 - .../Projector/SecondFactorProjector.php | 4 +- .../Query/UnverifiedSecondFactorQuery.php | 2 +- .../Repository/AuditLogRepository.php | 3 + .../Repository/AuthorizationRepository.php | 1 + .../Repository/IdentityRepository.php | 31 +- ...titySelfAssertedTokenOptionsRepository.php | 3 + .../InstitutionListingRepository.php | 2 + .../Repository/RaCandidateRepository.php | 7 +- .../Repository/RaListingRepository.php | 8 +- .../Repository/RaSecondFactorRepository.php | 5 +- .../Repository/RecoveryTokenRepository.php | 9 +- .../SecondFactorRevocationRepository.php | 3 + .../Identity/Repository/SraaRepository.php | 8 +- .../UnverifiedSecondFactorRepository.php | 5 +- .../VerifiedSecondFactorRepository.php | 7 +- .../VettedSecondFactorRepository.php | 5 +- .../Repository/VettingTypeHintRepository.php | 3 + .../Repository/WhitelistEntryRepository.php | 7 +- .../Service/AbstractSearchService.php | 5 +- .../Identity/Service/AuditLogService.php | 3 +- .../Identity/Service/IdentityService.php | 12 +- .../Identity/Service/ProfileService.php | 3 - .../Identity/Service/RaCandidateService.php | 3 +- .../Identity/Service/RaListingService.php | 6 +- .../Service/RaSecondFactorService.php | 3 +- .../Identity/Service/RecoveryTokenService.php | 3 + .../Identity/Service/SecondFactorService.php | 19 +- .../Identity/Service/SraaService.php | 6 - .../Identity/Service/WhitelistService.php | 9 +- .../Specification/SpecificationInterface.php | 3 - .../Identity/Value/AuthorityRole.php | 4 +- .../ApiBundle/Identity/Value/Profile.php | 5 +- .../RegistrationAuthorityCredentials.php | 4 +- .../Identity/Value/SecondFactorStatus.php | 6 +- .../Value/VerifiedTokenInformation.php | 44 +- ...ConfigurationInstitutionParamConverter.php | 2 +- .../ApiBundle/Resources/config/projection.yml | 2 +- .../Response/JsonCollectionResponse.php | 12 +- .../JsonBasicAuthenticationEntryPoint.php | 2 +- .../AuthorizationContextServiceTest.php | 21 +- .../Service/AuthorizationServiceTest.php | 32 +- .../CommandAuthorizationServiceTest.php | 2 +- .../InstitutionAuthorizationServiceTest.php | 11 +- ...itutionConfigurationOptionsServiceTest.php | 2 +- ...onfigurationContactInformationTypeTest.php | 3 +- .../Type/ConfigurationInstitutionTypeTest.php | 3 +- .../Type/ConfigurationLocationTypeTest.php | 3 +- .../Doctrine/Type/DocumentNumberTypeTest.php | 3 +- .../NumberOfTokensPerIdentityTypeTest.php | 3 +- .../Doctrine/Type/RaLocationNameTypeTest.php | 3 +- .../Doctrine/Type/SelfVetOptionTypeTest.php | 5 +- ...howRaaContactInformationOptionTypeTest.php | 3 +- .../Type/UseRaLocationsOptionTypeTest.php | 3 +- .../Type/VerifyEmailOptionTypeTest.php | 3 +- .../Projector/AuditLogProjectorTest.php | 6 +- .../AuthorizedInstitutionCollectionTest.php | 5 +- .../Request/CommandParamConverterTest.php | 8 +- .../Request/InstitutionParamConverterTest.php | 2 +- .../Tests/Service/DeprovisionServiceTest.php | 20 +- .../ApiBundle/Tests/TestDataProvider.php | 3 + .../Command/Metadata.php | 4 +- ...InstitutionConfigurationOptionsCommand.php | 14 +- .../ConfigurationCommandHandler.php | 2 +- .../DependencyInjection/Configuration.php | 4 +- .../Dto/VettingLocation.php | 5 - .../EventHandling/BufferedEventBus.php | 3 +- .../MetadataEnrichingEventStreamDecorator.php | 4 +- .../SecondFactorNotAllowedException.php | 3 +- .../Exception/DuplicateIdentityException.php | 4 +- .../CommandHandler/IdentityCommandHandler.php | 4 +- .../RegistrationAuthorityCommandHandler.php | 2 - .../Service/EmailVerificationMailService.php | 5 +- .../Service/RecoveryTokenMailService.php | 8 +- .../Service/RegistrationMailService.php | 13 +- .../SecondFactorRevocationMailService.php | 8 +- .../Service/SecondFactorVettedMailService.php | 8 +- .../Exception/InvalidCommandException.php | 4 +- .../EmailVerificationEmailProcessor.php | 6 +- .../EventSourcing/SensitiveDataMessage.php | 9 +- .../SensitiveDataMessageStream.php | 3 + ...itutionConfigurationCommandHandlerTest.php | 12 +- .../Tests/Mockery/HasInstitutionMatcher.php | 9 +- .../Mockery/HasInstitutionMatcherTest.php | 15 +- .../ObjectWithInstitutionAccessor.php | 4 +- .../ObjectWithInstitutionProperty.php | 2 +- .../Value/Institution.php | 2 +- .../CommandHandlingBundle/Value/Sender.php | 14 +- .../Entity/InstitutionConfiguration.php | 27 +- .../GatewayBundle/Entity/SamlEntity.php | 8 +- .../Entity/SamlEntityRepository.php | 7 +- .../Projector/SecondFactorProjector.php | 9 +- .../Projector/WhitelistProjector.php | 8 +- .../InstitutionConfigurationRepository.php | 3 + .../Repository/SecondFactorRepository.php | 5 +- .../Repository/WhitelistEntryRepository.php | 7 +- .../InstitutionConfigurationProjectorTest.php | 7 +- .../Configuration/Entity/EmailTemplate.php | 14 +- .../Repository/EmailTemplateRepository.php | 5 +- .../Service/EmailTemplateService.php | 2 +- .../Controller/ConfigurationController.php | 2 +- .../RightToBeForgottenController.php | 4 +- .../Controller/WhitelistController.php | 8 +- .../UnknownDBALConnectionException.php | 2 +- .../Resources/config/services.yml | 3 - .../Service/DBALConnectionHelper.php | 3 +- .../ConfigurationControllerTest.php | 4 +- ...InstitutionConfigurationControllerTest.php | 5 +- .../Validator/ConfigurationValidationTest.php | 6 +- ...nfigureInstitutionRequestValidatorTest.php | 8 +- .../ManagementBundle/Validator/Assert.php | 10 +- .../ConfigurationStructureValidator.php | 16 +- .../ConfigurationValidatorInterface.php | 5 +- .../HasValidConfigurationStructure.php | 2 +- .../ValidReconfigureInstitutionsRequest.php | 2 +- .../EmailTemplatesConfigurationValidator.php | 6 +- .../GatewayConfigurationValidator.php | 35 +- ...IdentityProviderConfigurationValidator.php | 7 +- ...ReconfigureInstitutionRequestValidator.php | 15 +- .../ServiceProviderConfigurationValidator.php | 18 +- .../Command/MigrateSecondFactorCommand.php | 4 +- .../Command/ReplaySpecificEventsCommand.php | 2 +- .../EventSourcing/DBALEventHydrator.php | 11 +- .../EventSourcing/EventCollection.php | 26 +- .../EventSourcing/ProjectorCollection.php | 3 + .../UnknownDBALConnectionException.php | 2 +- .../InstitutionConfigurationState.php | 16 +- .../Service/BootstrapCommandService.php | 62 +- .../Service/DBALConnectionHelper.php | 7 +- .../Service/EventStreamReplayer.php | 3 +- .../Service/PastEventsService.php | 2 +- ...erifiedSecondFactorReminderMailService.php | 51 +- .../EventSourcing/EventCollectionTest.php | 5 +- ...erifiedSecondFactorReminderServiceTest.php | 24 +- .../AuthorizationRepositoryMatrixTest.php | 19 +- 337 files changed, 3376 insertions(+), 2658 deletions(-) diff --git a/ci/qa/phpstan-baseline.neon b/ci/qa/phpstan-baseline.neon index f799efe3b..7d7761515 100644 --- a/ci/qa/phpstan-baseline.neon +++ b/ci/qa/phpstan-baseline.neon @@ -1,11 +1,2026 @@ parameters: ignoreErrors: - - message: "#^Parameter \\#1 \\$callback of function array_map expects \\(callable\\(Surfnet\\\\Stepup\\\\Configuration\\\\Value\\\\Institution\\)\\: mixed\\)\\|null, 'strtolower' given\\.$#" + message: "#^Method Surfnet\\\\Migrations\\\\Version20141125173004\\:\\:getGatewaySchema\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Migrations/Version20141125173004.php + + - + message: "#^Method Surfnet\\\\Migrations\\\\Version20141125173004\\:\\:getMiddlewareUser\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Migrations/Version20141125173004.php + + - + message: "#^Method Surfnet\\\\Migrations\\\\Version20141209150426\\:\\:getGatewaySchema\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Migrations/Version20141209150426.php + + - + message: "#^Method Surfnet\\\\Migrations\\\\Version20141209150426\\:\\:getMiddlewareUser\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Migrations/Version20141209150426.php + + - + message: "#^Method Surfnet\\\\Migrations\\\\Version20141210174213\\:\\:getGatewaySchema\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Migrations/Version20141210174213.php + + - + message: "#^Method Surfnet\\\\Migrations\\\\Version20150522163053\\:\\:getGatewaySchema\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Migrations/Version20150522163053.php + + - + message: "#^Method Surfnet\\\\Migrations\\\\Version20150522164907\\:\\:getGatewaySchema\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Migrations/Version20150522164907.php + + - + message: "#^Method Surfnet\\\\Migrations\\\\Version20150615114646\\:\\:getGatewaySchema\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Migrations/Version20150615114646.php + + - + message: "#^Method Surfnet\\\\Migrations\\\\Version20150615114646\\:\\:getMiddlewareSchema\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Migrations/Version20150615114646.php + + - + message: "#^Method Surfnet\\\\Migrations\\\\Version20150615114646\\:\\:getMiddlewareUser\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Migrations/Version20150615114646.php + + - + message: "#^Method Surfnet\\\\Migrations\\\\Version20200114161618\\:\\:getGatewaySchema\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Migrations/Version20200114161618.php + + - + message: "#^Method Surfnet\\\\Migrations\\\\Version20220519134637\\:\\:getGatewaySchema\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Migrations/Version20220519134637.php + + - + message: "#^Method Surfnet\\\\Migrations\\\\Version20221102143350\\:\\:getGatewaySchema\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Migrations/Version20221102143350.php + + - + message: "#^Property Surfnet\\\\Stepup\\\\Configuration\\\\Configuration\\:\\:\\$configuration type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Configuration.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\AllowedSecondFactorListUpdatedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/AllowedSecondFactorListUpdatedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\AllowedSecondFactorListUpdatedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/AllowedSecondFactorListUpdatedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\ConfigurationUpdatedEvent\\:\\:__construct\\(\\) has parameter \\$newConfiguration with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/ConfigurationUpdatedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\ConfigurationUpdatedEvent\\:\\:__construct\\(\\) has parameter \\$oldConfiguration with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/ConfigurationUpdatedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\ConfigurationUpdatedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/ConfigurationUpdatedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\ConfigurationUpdatedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/ConfigurationUpdatedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\EmailTemplatesUpdatedEvent\\:\\:__construct\\(\\) has parameter \\$emailTemplates with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/EmailTemplatesUpdatedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\EmailTemplatesUpdatedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/EmailTemplatesUpdatedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\EmailTemplatesUpdatedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/EmailTemplatesUpdatedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\IdentityProvidersUpdatedEvent\\:\\:__construct\\(\\) has parameter \\$identityProviders with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/IdentityProvidersUpdatedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\IdentityProvidersUpdatedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/IdentityProvidersUpdatedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\IdentityProvidersUpdatedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/IdentityProvidersUpdatedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\InstitutionConfigurationRemovedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/InstitutionConfigurationRemovedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\InstitutionConfigurationRemovedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/InstitutionConfigurationRemovedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\NewConfigurationCreatedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/NewConfigurationCreatedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\NewConfigurationCreatedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/NewConfigurationCreatedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\NewInstitutionConfigurationCreatedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/NewInstitutionConfigurationCreatedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\NewInstitutionConfigurationCreatedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/NewInstitutionConfigurationCreatedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\NumberOfTokensPerIdentityOptionChangedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/NumberOfTokensPerIdentityOptionChangedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\NumberOfTokensPerIdentityOptionChangedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/NumberOfTokensPerIdentityOptionChangedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\RaLocationAddedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/RaLocationAddedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\RaLocationAddedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/RaLocationAddedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\RaLocationContactInformationChangedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/RaLocationContactInformationChangedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\RaLocationContactInformationChangedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/RaLocationContactInformationChangedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\RaLocationRelocatedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/RaLocationRelocatedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\RaLocationRelocatedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/RaLocationRelocatedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\RaLocationRemovedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/RaLocationRemovedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\RaLocationRemovedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/RaLocationRemovedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\RaLocationRenamedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/RaLocationRenamedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\RaLocationRenamedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/RaLocationRenamedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\SelectRaaOptionChangedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/SelectRaaOptionChangedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\SelectRaaOptionChangedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/SelectRaaOptionChangedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\SelfAssertedTokensOptionChangedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/SelfAssertedTokensOptionChangedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\SelfAssertedTokensOptionChangedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/SelfAssertedTokensOptionChangedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\SelfVetOptionChangedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/SelfVetOptionChangedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\SelfVetOptionChangedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/SelfVetOptionChangedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\ServiceProvidersUpdatedEvent\\:\\:__construct\\(\\) has parameter \\$serviceProviders with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/ServiceProvidersUpdatedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\ServiceProvidersUpdatedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/ServiceProvidersUpdatedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\ServiceProvidersUpdatedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/ServiceProvidersUpdatedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\ShowRaaContactInformationOptionChangedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/ShowRaaContactInformationOptionChangedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\ShowRaaContactInformationOptionChangedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/ShowRaaContactInformationOptionChangedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\SraaUpdatedEvent\\:\\:__construct\\(\\) has parameter \\$sraaList with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/SraaUpdatedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\SraaUpdatedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/SraaUpdatedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\SraaUpdatedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/SraaUpdatedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\SsoOn2faOptionChangedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/SsoOn2faOptionChangedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\SsoOn2faOptionChangedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/SsoOn2faOptionChangedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\UseRaLocationsOptionChangedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/UseRaLocationsOptionChangedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\UseRaLocationsOptionChangedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/UseRaLocationsOptionChangedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\UseRaOptionChangedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/UseRaOptionChangedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\UseRaOptionChangedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/UseRaOptionChangedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\UseRaaOptionChangedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/UseRaaOptionChangedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\UseRaaOptionChangedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/UseRaaOptionChangedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\VerifyEmailOptionChangedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/VerifyEmailOptionChangedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\VerifyEmailOptionChangedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Event/VerifyEmailOptionChangedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Value\\\\AllowedSecondFactorList\\:\\:__construct\\(\\) has parameter \\$allowedSecondFactors with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Value/AllowedSecondFactorList.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Value\\\\AllowedSecondFactorList\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Value/AllowedSecondFactorList.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Value\\\\AllowedSecondFactorList\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Value/AllowedSecondFactorList.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Value\\\\AllowedSecondFactorList\\:\\:ofTypes\\(\\) has parameter \\$allowedSecondFactors with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Value/AllowedSecondFactorList.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Value\\\\AllowedSecondFactorList\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Value/AllowedSecondFactorList.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Value\\\\InstitutionAuthorizationOption\\:\\:fromInstitutionConfig\\(\\) has parameter \\$institutions with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Value/InstitutionAuthorizationOption.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Value\\\\InstitutionAuthorizationOption\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Value/InstitutionAuthorizationOption.php + + - + message: "#^Property Surfnet\\\\Stepup\\\\Configuration\\\\Value\\\\InstitutionRole\\:\\:\\$validRoles type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Value/InstitutionRole.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Value\\\\InstitutionSet\\:\\:toScalarArray\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 path: ../../src/Surfnet/Stepup/Configuration/Value/InstitutionSet.php + - + message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Value\\\\RaLocationList\\:\\:__construct\\(\\) has parameter \\$raLocations with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Value/RaLocationList.php + + - + message: "#^Property Surfnet\\\\Stepup\\\\Helper\\\\JsonHelper\\:\\:\\$jsonErrors type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Helper/JsonHelper.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Helper\\\\SecondFactorProvePossessionHelper\\:\\:__construct\\(\\) has parameter \\$skipProvePossessionSecondFactorTypes with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Helper/SecondFactorProvePossessionHelper.php + + - + message: "#^Property Surfnet\\\\Stepup\\\\Helper\\\\SecondFactorProvePossessionHelper\\:\\:\\$skipProvePossessionSecondFactorTypes type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Helper/SecondFactorProvePossessionHelper.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Helper\\\\UserDataFilter\\:\\:filter\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Helper/UserDataFilter.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Helper\\\\UserDataFilterInterface\\:\\:filter\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Helper/UserDataFilterInterface.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Helper\\\\UserDataFormatter\\:\\:format\\(\\) has parameter \\$errors with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Helper/UserDataFormatter.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Helper\\\\UserDataFormatter\\:\\:format\\(\\) has parameter \\$userData with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Helper/UserDataFormatter.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Helper\\\\UserDataFormatter\\:\\:format\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Helper/UserDataFormatter.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Helper\\\\UserDataFormatter\\:\\:formatResponse\\(\\) has parameter \\$errors with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Helper/UserDataFormatter.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Helper\\\\UserDataFormatter\\:\\:formatResponse\\(\\) has parameter \\$userData with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Helper/UserDataFormatter.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Helper\\\\UserDataFormatter\\:\\:formatResponse\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Helper/UserDataFormatter.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Helper\\\\UserDataFormatterInterface\\:\\:format\\(\\) has parameter \\$errors with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Helper/UserDataFormatterInterface.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Helper\\\\UserDataFormatterInterface\\:\\:format\\(\\) has parameter \\$userData with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Helper/UserDataFormatterInterface.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Helper\\\\UserDataFormatterInterface\\:\\:format\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Helper/UserDataFormatterInterface.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Collection\\\\InstitutionCollection\\:\\:__construct\\(\\) has parameter \\$institutions with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Collection/InstitutionCollection.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Collection\\\\InstitutionCollection\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Collection/InstitutionCollection.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Collection\\\\InstitutionCollection\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Collection/InstitutionCollection.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Collection\\\\InstitutionCollection\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Collection/InstitutionCollection.php + + - + message: "#^Property Surfnet\\\\Stepup\\\\Identity\\\\Collection\\\\InstitutionCollection\\:\\:\\$elements type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Collection/InstitutionCollection.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Collection\\\\VettingTypeHintCollection\\:\\:__construct\\(\\) has parameter \\$hints with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Collection\\\\VettingTypeHintCollection\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Collection\\\\VettingTypeHintCollection\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Collection\\\\VettingTypeHintCollection\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php + + - + message: "#^Property Surfnet\\\\Stepup\\\\Identity\\\\Collection\\\\VettingTypeHintCollection\\:\\:\\$elements type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php + + - + message: "#^Property Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\InstitutionCollection\\:\\:\\$institutions type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Entity/InstitutionCollection.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\RegistrationAuthorityCollection\\:\\:getValues\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Entity/RegistrationAuthorityCollection.php + + - + message: "#^Class Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\SecondFactorCollection extends generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Entity/SecondFactorCollection.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\AppointedAsRaEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\AppointedAsRaEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\AppointedAsRaEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\AppointedAsRaForInstitutionEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\AppointedAsRaForInstitutionEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\AppointedAsRaaEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\AppointedAsRaaEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\AppointedAsRaaEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\AppointedAsRaaForInstitutionEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/AppointedAsRaaForInstitutionEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\AppointedAsRaaForInstitutionEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/AppointedAsRaaForInstitutionEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\CompliedWithRecoveryCodeRevocationEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\CompliedWithRecoveryCodeRevocationEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\CompliedWithRecoveryCodeRevocationEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\CompliedWithRevocationEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/CompliedWithRevocationEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\CompliedWithRevocationEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/CompliedWithRevocationEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\CompliedWithRevocationEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/CompliedWithRevocationEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\EmailVerifiedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/EmailVerifiedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\EmailVerifiedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/EmailVerifiedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\GssfPossessionProvenAndVerifiedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenAndVerifiedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\GssfPossessionProvenAndVerifiedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenAndVerifiedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\GssfPossessionProvenEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\GssfPossessionProvenEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityAccreditedAsRaEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityAccreditedAsRaEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityAccreditedAsRaEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityAccreditedAsRaForInstitutionEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaForInstitutionEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityAccreditedAsRaaEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityCreatedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityCreatedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityEmailChangedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityEmailChangedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityEmailChangedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityEmailChangedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityForgottenEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityForgottenEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityForgottenEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityForgottenEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityRenamedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityRenamedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityRenamedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityRenamedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\InstitutionsAddedToWhitelistEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/InstitutionsAddedToWhitelistEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\InstitutionsRemovedFromWhitelistEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/InstitutionsRemovedFromWhitelistEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\LocalePreferenceExpressedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\LocalePreferenceExpressedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\PhonePossessionProvenAndVerifiedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenAndVerifiedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\PhonePossessionProvenAndVerifiedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenAndVerifiedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\PhonePossessionProvenEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\PhonePossessionProvenEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\PhoneRecoveryTokenPossessionProvenEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/PhoneRecoveryTokenPossessionProvenEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\PhoneRecoveryTokenPossessionProvenEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/PhoneRecoveryTokenPossessionProvenEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RecoveryTokenRevokedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RecoveryTokenRevokedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RecoveryTokenRevokedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RegistrationAuthorityInformationAmendedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RegistrationAuthorityInformationAmendedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RegistrationAuthorityInformationAmendedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RegistrationAuthorityInformationAmendedForInstitutionEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedForInstitutionEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RegistrationAuthorityInformationAmendedForInstitutionEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedForInstitutionEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RegistrationAuthorityInformationAmendedForInstitutionEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedForInstitutionEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RegistrationAuthorityRetractedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RegistrationAuthorityRetractedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RegistrationAuthorityRetractedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RegistrationAuthorityRetractedForInstitutionEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedForInstitutionEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RegistrationAuthorityRetractedForInstitutionEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedForInstitutionEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SafeStoreSecretRecoveryTokenPossessionPromisedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SafeStoreSecretRecoveryTokenPossessionPromisedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorMigratedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorMigratedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorMigratedToEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedToEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorMigratedToEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedToEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorRevokedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorRevokedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorRevokedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorVettedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorVettedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorVettedWithoutTokenProofOfPossession\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorVettedWithoutTokenProofOfPossession\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\U2fDevicePossessionProvenAndVerifiedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenAndVerifiedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\U2fDevicePossessionProvenAndVerifiedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenAndVerifiedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\U2fDevicePossessionProvenEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\U2fDevicePossessionProvenEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\VettedSecondFactorsAllRevokedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/VettedSecondFactorsAllRevokedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\VettedSecondFactorsAllRevokedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/VettedSecondFactorsAllRevokedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\VettedSecondFactorsAllRevokedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/VettedSecondFactorsAllRevokedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\VettingTypeHintsSavedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/VettingTypeHintsSavedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\VettingTypeHintsSavedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/VettingTypeHintsSavedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\VettingTypeHintsSavedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/VettingTypeHintsSavedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\WhitelistCreatedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/WhitelistCreatedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\WhitelistReplacedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/WhitelistReplacedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\YubikeyPossessionProvenAndVerifiedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenAndVerifiedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\YubikeyPossessionProvenAndVerifiedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenAndVerifiedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\YubikeyPossessionProvenEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\YubikeyPossessionProvenEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\YubikeySecondFactorBootstrappedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/YubikeySecondFactorBootstrappedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\YubikeySecondFactorBootstrappedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/YubikeySecondFactorBootstrappedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\EventSourcing\\\\IdentityRepository\\:\\:obtainInformation\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/EventSourcing/IdentityRepository.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\EmailVerificationWindow\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Value/EmailVerificationWindow.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\EmailVerificationWindow\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Value/EmailVerificationWindow.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\OnPremiseVettingType\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Value/OnPremiseVettingType.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\OnPremiseVettingType\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Value/OnPremiseVettingType.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\RegistrationAuthorityRole\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\RegistrationAuthorityRole\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SelfAssertedRegistrationVettingType\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Value/SelfAssertedRegistrationVettingType.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SelfAssertedRegistrationVettingType\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Value/SelfAssertedRegistrationVettingType.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SelfVetVettingType\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Value/SelfVetVettingType.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SelfVetVettingType\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Value/SelfVetVettingType.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\UnknownVettingType\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Value/UnknownVettingType.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\VettingTypeFactory\\:\\:fromData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Value/VettingTypeFactory.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\VettingTypeHint\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Value/VettingTypeHint.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Event\\\\EventSerializationAndDeserializationTest\\:\\:institutionConfigurationEventsProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Event/EventSerializationAndDeserializationTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\AllowedSecondFactorListTest\\:\\:availableSecondFactorTypeProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/AllowedSecondFactorListTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\AllowedSecondFactorListTest\\:\\:differentAllowedSecondFactorListsProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/AllowedSecondFactorListTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\AllowedSecondFactorListTest\\:\\:sameAllowedSecondFactorListsProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/AllowedSecondFactorListTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionAuthorizationOptionTest\\:\\:institutionHasInstitutionProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionAuthorizationOptionTest\\:\\:institutionSetComparisonProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionAuthorizationOptionTest\\:\\:institution_option_instances_can_be_compared\\(\\) has parameter \\$configurationA with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionAuthorizationOptionTest\\:\\:institution_option_instances_can_be_compared\\(\\) has parameter \\$configurationB with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionAuthorizationOptionTest\\:\\:invalidConstructorArgumentsProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionAuthorizationOptionTest\\:\\:invalid_types_are_rejected_during_construction\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionAuthorizationOptionTest\\:\\:the_has_institution_method_should_check_for_institutions\\(\\) has parameter \\$institutionList with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionConfigurationIdTest\\:\\:an_institution_configuration_id_cannot_be_created_from_something_other_than_a_string\\(\\) has parameter \\$nonStringOrEmptyString with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionConfigurationIdTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionConfigurationIdTest\\:\\:nonStringOrEmptyStringProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionConfigurationIdTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionRoleTest\\:\\:institutionTypeProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionRoleTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionRoleTest\\:\\:invalidConstructorArgumentsProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionRoleTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionSetTest\\:\\:dirtyInstitutionListProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionSetTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionSetTest\\:\\:factory_method_can_build_from_array_of_string_and_rejects_invalid_types\\(\\) has parameter \\$invalid with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionSetTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionTest\\:\\:nonStringOrNonEmptyStringProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\RaLocationIdTest\\:\\:nonStringOrEmptyStringProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\RaLocationListTest\\:\\:getRaLocationsArray\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationListTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\RaLocationNameTest\\:\\:nonStringOrEmptyStringProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationNameTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Helper\\\\JsonHelperTest\\:\\:nonStringProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Helper/JsonHelperTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Helper\\\\UserDataFilterTest\\:\\:test_filtering_is_applied_with_expected_result\\(\\) has parameter \\$expectation with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Helper/UserDataFilterTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Collection\\\\InstitutionCollectionTest\\:\\:getInstitutions\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Collection/InstitutionCollectionTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Entity\\\\ConfigurableSettingsTest\\:\\:localeVerifications\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Entity/ConfigurableSettingsTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Event\\\\EventSerializationAndDeserializationTest\\:\\:eventProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Event/EventSerializationAndDeserializationTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Event\\\\EventSerializationAndDeserializationTest\\:\\:serializedDataProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Event/EventSerializationAndDeserializationTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Event\\\\WhitelistEventSerializationAndDeserializationTest\\:\\:eventProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Event/WhitelistEventSerializationAndDeserializationTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\CommonNameTest\\:\\:invalidArgumentProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Value/CommonNameTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\DocumentNumberTest\\:\\:invalidArgumentProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Value/DocumentNumberTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\EmailTest\\:\\:invalidArgumentProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Value/EmailTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\EmailTest\\:\\:invalidEmailProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Value/EmailTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\GssfIdTest\\:\\:a_gssf_id_cannot_be_created_with_anything_but_a_nonempty_string\\(\\) has parameter \\$invalidValue with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Value/GssfIdTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\GssfIdTest\\:\\:invalidValueProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Value/GssfIdTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\InstitutionTest\\:\\:invalidValueProviderInvalidString\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Value/InstitutionTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\PhoneNumberTest\\:\\:a_phone_number_cannot_be_created_with_anything_but_a_nonempty_string\\(\\) has parameter \\$invalidValue with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Value/PhoneNumberTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\PhoneNumberTest\\:\\:invalidValueProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Value/PhoneNumberTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\StepupProviderTest\\:\\:a_stepup_provider_cannot_be_created_with_anything_but_a_nonempty_string\\(\\) has parameter \\$invalidValue with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Value/StepupProviderTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\StepupProviderTest\\:\\:invalidValueProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Value/StepupProviderTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\TimeFrameTest\\:\\:invalidValueProviderInt\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Value/TimeFrameTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\YubikeyPublicIdTest\\:\\:invalidFormatProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Value/YubikeyPublicIdTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\YubikeyPublicIdTest\\:\\:validFormatProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Value/YubikeyPublicIdTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Authorization\\\\Value\\\\AuthorizationDecision\\:\\:__construct\\(\\) has parameter \\$errorMessages with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/AuthorizationDecision.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Authorization\\\\Value\\\\AuthorizationDecision\\:\\:denied\\(\\) has parameter \\$messages with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/AuthorizationDecision.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Authorization\\\\Value\\\\AuthorizationDecision\\:\\:getErrorMessages\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/AuthorizationDecision.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Authorization\\\\Value\\\\InstitutionRoleSet\\:\\:__construct\\(\\) has parameter \\$institutionRoles with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionRoleSet.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Authorization\\\\Value\\\\InstitutionRoleSet\\:\\:getRoles\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionRoleSet.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Authorization\\\\Value\\\\InstitutionRoleSetInterface\\:\\:getRoles\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionRoleSetInterface.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Entity\\\\ConfiguredInstitution\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/ConfiguredInstitution.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Entity\\\\RaLocation\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/RaLocation.php + + - + message: "#^Parameter \\#1 \\$allowedSecondFactors of static method Surfnet\\\\Stepup\\\\Configuration\\\\Value\\\\AllowedSecondFactorList\\:\\:ofTypes\\(\\) expects array, Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Entity\\\\AllowedSecondFactor given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/AllowedSecondFactorMap.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Service\\\\InstitutionAuthorizationOptionMap\\:\\:fromInstitutionAuthorizations\\(\\) has parameter \\$institutionAuthorizations with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionAuthorizationOptionMap.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Doctrine\\\\Type\\\\DateTimeType\\:\\:getSQLDeclaration\\(\\) has parameter \\$column with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DateTimeType.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Doctrine\\\\Type\\\\SecondFactorStatusType\\:\\:getSQLDeclaration\\(\\) has parameter \\$column with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorStatusType.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\EventListener\\\\ExceptionListener\\:\\:createJsonErrorResponse\\(\\) has parameter \\$headers with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/EventListener/ExceptionListener.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Exception\\\\BadApiRequestException\\:\\:__construct\\(\\) has parameter \\$errors with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadApiRequestException.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Exception\\\\BadCommandRequestException\\:\\:__construct\\(\\) has parameter \\$errors with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadCommandRequestException.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\AuditLogEntry\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/AuditLogEntry.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\Identity\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Identity.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\IdentitySelfAssertedTokenOptions\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/IdentitySelfAssertedTokenOptions.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\InstitutionListing\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/InstitutionListing.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\RaCandidate\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaCandidate.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\RaListing\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaListing.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\RaSecondFactor\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaSecondFactor.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\RecoveryToken\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RecoveryToken.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\UnverifiedSecondFactor\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/UnverifiedSecondFactor.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\VerifiedSecondFactor\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VerifiedSecondFactor.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\VettedSecondFactor\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettedSecondFactor.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\VettingTypeHint\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettingTypeHint.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\AuditLogRepository\\:\\:saveAll\\(\\) has parameter \\$entries with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuditLogRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\AuthorizationRepository\\:\\:getAllowedIdentityRoles\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\AuthorizationRepository\\:\\:getAllowedInstitutionRoles\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\RaCandidateRepository\\:\\:findOneByIdentityId\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaCandidateRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\RaListingRepository\\:\\:findByIdentityId\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\RaListingRepository\\:\\:listRasFor\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\SraaRepository\\:\\:saveAll\\(\\) has parameter \\$sraaList with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\WhitelistEntryRepository\\:\\:findEntriesByInstitutions\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\WhitelistEntryRepository\\:\\:getAll\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Service\\\\AbstractSearchService\\:\\:createPaginatorFrom\\(\\) return type with generic class Pagerfanta\\\\Pagerfanta does not specify its types\\: T$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AbstractSearchService.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Service\\\\RaCandidateService\\:\\:findOneByIdentityId\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaCandidateService.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Service\\\\RaCandidateService\\:\\:getFilterOptions\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaCandidateService.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Service\\\\RaCandidateService\\:\\:setUseRaInstitutionsOnRaCandidate\\(\\) has parameter \\$raCandidate with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaCandidateService.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Service\\\\RaCandidateService\\:\\:setUseRaInstitutionsOnRaCandidate\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaCandidateService.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Service\\\\RaSecondFactorService\\:\\:getFilterOptions\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaSecondFactorService.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Service\\\\RaSecondFactorService\\:\\:searchUnpaginated\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaSecondFactorService.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Service\\\\RecoveryTokenService\\:\\:getFilterOptions\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RecoveryTokenService.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Specification\\\\SpecificationInterface\\:\\:apply\\(\\) has parameter \\$entityRepository with generic class Doctrine\\\\ORM\\\\EntityRepository but does not specify its types\\: TEntityClass$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Specification/SpecificationInterface.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Value\\\\AuthorizedInstitutionCollection\\:\\:getAuthorizations\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorizedInstitutionCollection.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Value\\\\Profile\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/Profile.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Value\\\\RegistrationAuthorityCredentials\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RegistrationAuthorityCredentials.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Response\\\\JsonAuthorizationResponse\\:\\:__construct\\(\\) has parameter \\$errors with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonAuthorizationResponse.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Response\\\\JsonCollectionResponse\\:\\:__construct\\(\\) has parameter \\$collection with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonCollectionResponse.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Response\\\\JsonCollectionResponse\\:\\:__construct\\(\\) has parameter \\$filters with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonCollectionResponse.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Response\\\\JsonCollectionResponse\\:\\:__construct\\(\\) has parameter \\$headers with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonCollectionResponse.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Response\\\\JsonCollectionResponse\\:\\:fromPaginator\\(\\) has parameter \\$filters with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonCollectionResponse.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Response\\\\JsonCollectionResponse\\:\\:fromPaginator\\(\\) has parameter \\$paginator with generic class Pagerfanta\\\\Pagerfanta but does not specify its types\\: T$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonCollectionResponse.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Response\\\\JsonNotFoundResponse\\:\\:__construct\\(\\) has parameter \\$headers with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonNotFoundResponse.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Service\\\\DeprovisionService\\:\\:readUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Service/DeprovisionService.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Service\\\\DeprovisionServiceInterface\\:\\:readUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Service/DeprovisionServiceInterface.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Configuration\\\\Service\\\\InstitutionAuthorizationServiceTest\\:\\:buildAuthorizations\\(\\) has parameter \\$expectedInstitutions with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationServiceTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Doctrine\\\\Type\\\\RecoveryTokenStatusTypeTest\\:\\:invalidDatabaseValues\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RecoveryTokenStatusTypeTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Doctrine\\\\Type\\\\RecoveryTokenStatusTypeTest\\:\\:invalidPhpValues\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RecoveryTokenStatusTypeTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Doctrine\\\\Type\\\\RecoveryTokenStatusTypeTest\\:\\:validDatabaseValues\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RecoveryTokenStatusTypeTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Doctrine\\\\Type\\\\RecoveryTokenStatusTypeTest\\:\\:validPhpValues\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RecoveryTokenStatusTypeTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Doctrine\\\\Type\\\\SecondFactorStatusTypeTest\\:\\:invalidDatabaseValues\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SecondFactorStatusTypeTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Doctrine\\\\Type\\\\SecondFactorStatusTypeTest\\:\\:invalidPhpValues\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SecondFactorStatusTypeTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Doctrine\\\\Type\\\\SecondFactorStatusTypeTest\\:\\:validDatabaseValues\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SecondFactorStatusTypeTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Doctrine\\\\Type\\\\SecondFactorStatusTypeTest\\:\\:validPhpValues\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SecondFactorStatusTypeTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Endpoint\\\\ConfiguredInstitutionControllerTest\\:\\:invalidHttpMethodProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Endpoint\\\\SraaControllerTest\\:\\:invalidHttpMethodProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Identity\\\\Projector\\\\AuditLogProjectorTest\\:\\:auditable_events\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/AuditLogProjectorTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Request\\\\CommandParamConverterTest\\:\\:convertibleCommandNames\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Request\\\\CommandParamConverterTest\\:\\:invalidCommandJsonStructures\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php + + - + message: "#^Property Symfony\\\\Component\\\\HttpFoundation\\\\Request\\:\\:\\$query \\(Symfony\\\\Component\\\\HttpFoundation\\\\InputBag\\\\) does not accept Mockery\\\\MockInterface&Symfony\\\\Component\\\\HttpFoundation\\\\ParameterBag\\.$#" + count: 2 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Configuration\\\\Command\\\\ReconfigureInstitutionConfigurationOptionsCommand\\:\\:\\$allowedSecondFactors type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/ReconfigureInstitutionConfigurationOptionsCommand.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Configuration\\\\Command\\\\ReconfigureInstitutionConfigurationOptionsCommand\\:\\:\\$selectRaaOption type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/ReconfigureInstitutionConfigurationOptionsCommand.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Configuration\\\\Command\\\\ReconfigureInstitutionConfigurationOptionsCommand\\:\\:\\$useRaOption type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/ReconfigureInstitutionConfigurationOptionsCommand.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Configuration\\\\Command\\\\ReconfigureInstitutionConfigurationOptionsCommand\\:\\:\\$useRaaOption type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/ReconfigureInstitutionConfigurationOptionsCommand.php + + - + message: "#^Strict comparison using \\!\\=\\= between array\\{\\} and array\\{\\} will always evaluate to false\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Command\\\\AddToWhitelistCommand\\:\\:\\$institutionsToBeAdded type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AddToWhitelistCommand.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Command\\\\RemoveFromWhitelistCommand\\:\\:\\$institutionsToBeRemoved type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RemoveFromWhitelistCommand.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Command\\\\ReplaceWhitelistCommand\\:\\:\\$institutions type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ReplaceWhitelistCommand.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Command\\\\SaveVettingTypeHintCommand\\:\\:\\$hints type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SaveVettingTypeHintCommand.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\CommandHandler\\\\WhitelistCommandHandler\\:\\:mapArrayToInstitutions\\(\\) has parameter \\$institutions with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/WhitelistCommandHandler.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Service\\\\RegistrationMailService\\:\\:sendRegistrationEmailWithRaLocations\\(\\) has parameter \\$raLocations with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Service\\\\RegistrationMailService\\:\\:sendRegistrationEmailWithRas\\(\\) has parameter \\$ras with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Service\\\\VettingTypeHintService\\:\\:__construct\\(\\) has parameter \\$locales with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/VettingTypeHintService.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Service\\\\VettingTypeHintService\\:\\:collectionFrom\\(\\) has parameter \\$hints with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/VettingTypeHintService.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Pipeline\\\\AuthorizingStage\\:\\:clientHasAtLeastOneRole\\(\\) has parameter \\$rolesToCheck with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/AuthorizingStage.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Pipeline\\\\Exception\\\\InvalidCommandException\\:\\:__construct\\(\\) has parameter \\$errors with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Exception/InvalidCommandException.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Pipeline\\\\Exception\\\\InvalidCommandException\\:\\:mapViolationsToErrorStrings\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Exception/InvalidCommandException.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\SensitiveData\\\\RightToObtainDataInterface\\:\\:getAllowlist\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/RightToObtainDataInterface.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\SensitiveData\\\\RightToObtainDataInterface\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/RightToObtainDataInterface.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\SensitiveData\\\\SensitiveData\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/SensitiveData.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\SensitiveData\\\\SensitiveData\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/SensitiveData.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Configuration\\\\CommandHandler\\\\ConfigurationCommandHandlerTest\\:\\:createConfigurationUpdatedEvents\\(\\) has parameter \\$newConfiguration with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Configuration\\\\CommandHandler\\\\ConfigurationCommandHandlerTest\\:\\:createConfigurationUpdatedEvents\\(\\) has parameter \\$oldConfiguration with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Configuration\\\\CommandHandler\\\\ConfigurationCommandHandlerTest\\:\\:createConfigurationUpdatedEvents\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Configuration\\\\CommandHandler\\\\ConfigurationCommandHandlerTest\\:\\:createUpdateCommand\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Identity\\\\CommandHandler\\\\IdentityCommandHandlerMoveTokenTest\\:\\:setUpInstitutionConfiguration\\(\\) has parameter \\$allowedTokenTypes with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerMoveTokenTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Identity\\\\CommandHandler\\\\WhitelistCommandHandlerTest\\:\\:mapStringValuesToInstitutions\\(\\) has parameter \\$institutions with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/WhitelistCommandHandlerTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Identity\\\\CommandHandler\\\\WhitelistCommandHandlerTest\\:\\:mapStringValuesToInstitutions\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/WhitelistCommandHandlerTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Mockery\\\\HasInstitutionMatcherTest\\:\\:has_institution_matcher_only_matches_objects_against_a_given_institution\\(\\) has parameter \\$nonObject with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcherTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Mockery\\\\HasInstitutionMatcherTest\\:\\:nonObjectProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcherTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Mockery\\\\HasInstitutionMatcherTest\\:\\:nonStringProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcherTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Pipeline\\\\AuthorizingStageTest\\:\\:interfaceToRoleMappingProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/AuthorizingStageTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\SensitiveData\\\\EventSourcing\\\\SensitiveDataMessageStreamTest\\:\\:apply\\(\\) has parameter \\$domainMessages with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/EventSourcing/SensitiveDataMessageStreamTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\SensitiveData\\\\EventSourcing\\\\SensitiveDataMessageStreamTest\\:\\:apply\\(\\) has parameter \\$sensitiveDataMessages with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/EventSourcing/SensitiveDataMessageStreamTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\SensitiveData\\\\SensitiveDataTest\\:\\:it_serialises_and_deserialises\\(\\) has parameter \\$getterExpectations with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/SensitiveDataTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\SensitiveData\\\\SensitiveDataTest\\:\\:sensitiveDataToSerialise\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/SensitiveDataTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Value\\\\InstitutionTest\\:\\:an_institution_cannot_be_created_with_anything_but_a_nonempty_string\\(\\) has parameter \\$invalidValue with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Value/InstitutionTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Value\\\\InstitutionTest\\:\\:nonStringOrNonEmptyStringProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Value/InstitutionTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\GatewayBundle\\\\Entity\\\\SamlEntity\\:\\:createIdentityProvider\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntity.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\GatewayBundle\\\\Entity\\\\SamlEntity\\:\\:createServiceProvider\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntity.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\GatewayBundle\\\\Entity\\\\SamlEntityRepository\\:\\:replaceAllIdps\\(\\) has parameter \\$newSamlEntities with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntityRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\GatewayBundle\\\\Entity\\\\SamlEntityRepository\\:\\:replaceAllOfType\\(\\) has parameter \\$newSamlEntities with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntityRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\GatewayBundle\\\\Entity\\\\SamlEntityRepository\\:\\:replaceAllSps\\(\\) has parameter \\$newSamlEntities with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntityRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Controller\\\\WhitelistController\\:\\:getInstitutionsFromBody\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Tests\\\\Controller\\\\ConfigurationControllerTest\\:\\:invalidHttpMethodProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Tests\\\\Controller\\\\ConfigurationControllerTest\\:\\:\\$password type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Tests\\\\Controller\\\\ConfigurationControllerTest\\:\\:\\$passwordRo type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Tests\\\\Controller\\\\InstitutionConfigurationControllerTest\\:\\:invalidHttpMethodProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Tests\\\\Controller\\\\InstitutionConfigurationControllerTest\\:\\:\\$password type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Tests\\\\Controller\\\\InstitutionConfigurationControllerTest\\:\\:\\$passwordRo type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Tests\\\\Validator\\\\ConfigurationValidationTest\\:\\:it_rejects_invalid_configuration\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ConfigurationValidationTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Tests\\\\Validator\\\\ReconfigureInstitutionRequestValidatorTest\\:\\:it_rejects_invalid_configuration\\(\\) has parameter \\$reconfigureRequest with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ReconfigureInstitutionRequestValidatorTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\Assert\\:\\:keysMatch\\(\\) has parameter \\$keys with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Assert.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\Assert\\:\\:keysMatch\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Assert.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\Assert\\:\\:requiredAndOptionalOptions\\(\\) has parameter \\$optional with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Assert.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\Assert\\:\\:requiredAndOptionalOptions\\(\\) has parameter \\$required with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Assert.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\Assert\\:\\:requiredAndOptionalOptions\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Assert.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ConfigurationStructureValidator\\:\\:validateGatewayConfiguration\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationStructureValidator.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ConfigurationStructureValidator\\:\\:validateRoot\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationStructureValidator.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ConfigurationStructureValidator\\:\\:validateSraaConfiguration\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationStructureValidator.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\IdentityProviderConfigurationValidator\\:\\:validateBooleanValue\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/IdentityProviderConfigurationValidator.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\IdentityProviderConfigurationValidator\\:\\:validateLoaDefinition\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/IdentityProviderConfigurationValidator.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\IdentityProviderConfigurationValidator\\:\\:validateStringValue\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/IdentityProviderConfigurationValidator.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ReconfigureInstitutionRequestValidator\\:\\:validateAuthorizationSettings\\(\\) has parameter \\$authorizationSettings with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ReconfigureInstitutionRequestValidator\\:\\:validateInstitutionConfigurationOptions\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ReconfigureInstitutionRequestValidator\\:\\:validateInstitutionsExist\\(\\) has parameter \\$institutions with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ReconfigureInstitutionRequestValidator\\:\\:validateRoot\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ServiceProviderConfigurationValidator\\:\\:assertValidInstitutionIdentifiers\\(\\) has parameter \\$spLoaConfiguration with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ServiceProviderConfigurationValidator\\:\\:validateAssertionConsumerUrls\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ServiceProviderConfigurationValidator\\:\\:validateBooleanValue\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ServiceProviderConfigurationValidator\\:\\:validateListOfNameIdPatterns\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ServiceProviderConfigurationValidator\\:\\:validateLoaDefinition\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ServiceProviderConfigurationValidator\\:\\:validateStringValue\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ServiceProviderConfigurationValidator\\:\\:validateStringValues\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Console\\\\Command\\\\MigrateSecondFactorCommand\\:\\:tokenExists\\(\\) has parameter \\$targetSecondFactors with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\EventSourcing\\\\DBALEventHydrator\\:\\:deserializeEvent\\(\\) has parameter \\$row with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\EventSourcing\\\\EventCollection\\:\\:select\\(\\) has parameter \\$subset with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/EventCollection.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\EventSourcing\\\\ProjectorCollection\\:\\:selectByNames\\(\\) has parameter \\$projectorNames with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/ProjectorCollection.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Migrations\\\\InstitutionConfiguration\\\\MappedInstitutionConfiguration\\:\\:__construct\\(\\) has parameter \\$raLocations with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/MappedInstitutionConfiguration.php + - message: "#^Parameter \\#2 \\$criteria of method Doctrine\\\\DBAL\\\\Connection\\:\\:delete\\(\\) expects array\\, array\\ given\\.$#" count: 2 path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Service\\\\SecondFactorDisplayNameResolverService\\:\\:__construct\\(\\) has parameter \\$secondFactors with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/SecondFactorDisplayNameResolverService.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Tests\\\\EventSourcing\\\\EventCollectionTest\\:\\:an_event_collection_must_be_created_from_an_array_of_non_empty_strings\\(\\) has parameter \\$emptyOrNonString with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/EventSourcing/EventCollectionTest.php diff --git a/composer.json b/composer.json index 751c9a5cc..446a54242 100644 --- a/composer.json +++ b/composer.json @@ -55,7 +55,8 @@ "twig/extra-bundle": "^3.0", "twig/intl-extra": "^3", "twig/twig": "^3", - "ext-pdo": "*" + "ext-pdo": "*", + "ext-openssl": "*" }, "require-dev": { "doctrine/data-fixtures": "~1.7", @@ -70,6 +71,7 @@ "phpstan/phpstan-mockery": "^1.1", "phpstan/phpstan-symfony": "^1.3", "phpunit/phpunit": "^9.5", + "rector/rector": "^1.0", "sebastian/phpcpd": "^6.0", "squizlabs/php_codesniffer": "^3.7", "symfony/browser-kit": "6.4.*", diff --git a/composer.lock b/composer.lock index ba29dbfe0..e94f081b9 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d34c31554d9e3de69b068c92584b0496", + "content-hash": "4681103c3b1b653100a98769264006bb", "packages": [ { "name": "beberlei/assert", @@ -10630,6 +10630,62 @@ ], "time": "2024-02-23T13:14:51+00:00" }, + { + "name": "rector/rector", + "version": "1.0.3", + "source": { + "type": "git", + "url": "https://github.com/rectorphp/rector.git", + "reference": "c59507a9090b465d65e1aceed91e5b81986e375b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/rectorphp/rector/zipball/c59507a9090b465d65e1aceed91e5b81986e375b", + "reference": "c59507a9090b465d65e1aceed91e5b81986e375b", + "shasum": "" + }, + "require": { + "php": "^7.2|^8.0", + "phpstan/phpstan": "^1.10.57" + }, + "conflict": { + "rector/rector-doctrine": "*", + "rector/rector-downgrade-php": "*", + "rector/rector-phpunit": "*", + "rector/rector-symfony": "*" + }, + "bin": [ + "bin/rector" + ], + "type": "library", + "autoload": { + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Instant Upgrade and Automated Refactoring of any PHP code", + "keywords": [ + "automation", + "dev", + "migration", + "refactoring" + ], + "support": { + "issues": "https://github.com/rectorphp/rector/issues", + "source": "https://github.com/rectorphp/rector/tree/1.0.3" + }, + "funding": [ + { + "url": "https://github.com/tomasvotruba", + "type": "github" + } + ], + "time": "2024-03-14T15:04:18+00:00" + }, { "name": "sebastian/cli-parser", "version": "1.0.1", @@ -12158,7 +12214,8 @@ "php": "^8.2", "ext-gmp": "*", "ext-json": "*", - "ext-pdo": "*" + "ext-pdo": "*", + "ext-openssl": "*" }, "platform-dev": [], "platform-overrides": { diff --git a/src/Surfnet/Migrations/Version20141125173004.php b/src/Surfnet/Migrations/Version20141125173004.php index 2167a800a..290c68db7 100644 --- a/src/Surfnet/Migrations/Version20141125173004.php +++ b/src/Surfnet/Migrations/Version20141125173004.php @@ -74,12 +74,12 @@ public function down(Schema $schema): void $this->addSql(sprintf('DROP TABLE %s.saml_entity', $gatewaySchema)); } - private function getGatewaySchema() + private function getGatewaySchema(): float|array|bool|int|string|null { return $this->container->getParameter('database_gateway_name'); } - private function getMiddlewareUser() + private function getMiddlewareUser(): float|array|bool|int|string|null { return $this->container->getParameter('database_middleware_user'); } diff --git a/src/Surfnet/Migrations/Version20141209150426.php b/src/Surfnet/Migrations/Version20141209150426.php index 810f65b95..5f2ae7161 100644 --- a/src/Surfnet/Migrations/Version20141209150426.php +++ b/src/Surfnet/Migrations/Version20141209150426.php @@ -64,12 +64,12 @@ public function down(Schema $schema): void $this->addSql('DROP TABLE second_factor'); } - private function getGatewaySchema() + private function getGatewaySchema(): float|array|bool|int|string|null { return $this->container->getParameter('database_gateway_name'); } - private function getMiddlewareUser() + private function getMiddlewareUser(): float|array|bool|int|string|null { return $this->container->getParameter('database_middleware_user'); } diff --git a/src/Surfnet/Migrations/Version20141210174213.php b/src/Surfnet/Migrations/Version20141210174213.php index 3739d3db7..963c8d7c8 100644 --- a/src/Surfnet/Migrations/Version20141210174213.php +++ b/src/Surfnet/Migrations/Version20141210174213.php @@ -47,7 +47,7 @@ public function down(Schema $schema): void $this->addSql(sprintf('ALTER TABLE %s.second_factor ADD PRIMARY KEY (identity_id)', $gatewaySchema)); } - private function getGatewaySchema() + private function getGatewaySchema(): float|array|bool|int|string|null { return $this->container->getParameter('database_gateway_name'); } diff --git a/src/Surfnet/Migrations/Version20150508085838.php b/src/Surfnet/Migrations/Version20150508085838.php index 6836d738f..9efbd5905 100644 --- a/src/Surfnet/Migrations/Version20150508085838.php +++ b/src/Surfnet/Migrations/Version20150508085838.php @@ -63,7 +63,7 @@ public function down(Schema $schema): void /** * @return string */ - private function getGatewaySchema() + private function getGatewaySchema(): string { return $this->container->getParameter('database_gateway_name'); } diff --git a/src/Surfnet/Migrations/Version20150522163053.php b/src/Surfnet/Migrations/Version20150522163053.php index 380eaedbe..23d780f15 100644 --- a/src/Surfnet/Migrations/Version20150522163053.php +++ b/src/Surfnet/Migrations/Version20150522163053.php @@ -57,7 +57,7 @@ public function down(Schema $schema): void $this->addSql(sprintf('ALTER TABLE %s.saml_entity ADD PRIMARY KEY (entity_id)', $gatewaySchema)); } - private function getGatewaySchema() + private function getGatewaySchema(): float|array|bool|int|string|null { return $this->container->getParameter('database_gateway_name'); } diff --git a/src/Surfnet/Migrations/Version20150522164907.php b/src/Surfnet/Migrations/Version20150522164907.php index dcb602be6..89037478b 100644 --- a/src/Surfnet/Migrations/Version20150522164907.php +++ b/src/Surfnet/Migrations/Version20150522164907.php @@ -56,7 +56,7 @@ public function down(Schema $schema): void $this->addSql(sprintf('DROP INDEX unq_saml_entity_entity_id_type ON %s.saml_entity', $gatewaySchema)); } - private function getGatewaySchema() + private function getGatewaySchema(): float|array|bool|int|string|null { return $this->container->getParameter('database_gateway_name'); } diff --git a/src/Surfnet/Migrations/Version20150528154959.php b/src/Surfnet/Migrations/Version20150528154959.php index bcc18022f..8aee83f11 100644 --- a/src/Surfnet/Migrations/Version20150528154959.php +++ b/src/Surfnet/Migrations/Version20150528154959.php @@ -54,7 +54,7 @@ public function down(Schema $schema): void /** * @return string */ - private function getGatewaySchema() + private function getGatewaySchema(): string { return $this->container->getParameter('database_gateway_name'); } diff --git a/src/Surfnet/Migrations/Version20150615114646.php b/src/Surfnet/Migrations/Version20150615114646.php index 1d505a301..9432111a1 100644 --- a/src/Surfnet/Migrations/Version20150615114646.php +++ b/src/Surfnet/Migrations/Version20150615114646.php @@ -75,17 +75,17 @@ public function down(Schema $schema): void $this->addSql(sprintf('DROP TABLE %s.saml_entity', $gatewaySchema)); } - private function getGatewaySchema() + private function getGatewaySchema(): float|array|bool|int|string|null { return $this->container->getParameter('database_gateway_name'); } - private function getMiddlewareUser() + private function getMiddlewareUser(): float|array|bool|int|string|null { return $this->container->getParameter('database_middleware_user'); } - private function getMiddlewareSchema() + private function getMiddlewareSchema(): float|array|bool|int|string|null { return $this->container->getParameter('database_middleware_name'); } diff --git a/src/Surfnet/Migrations/Version20180131150800.php b/src/Surfnet/Migrations/Version20180131150800.php index 7a01fd1b3..fd552cb7a 100644 --- a/src/Surfnet/Migrations/Version20180131150800.php +++ b/src/Surfnet/Migrations/Version20180131150800.php @@ -56,7 +56,7 @@ public function down(Schema $schema): void /** * @return string */ - private function getGatewaySchema() + private function getGatewaySchema(): string { return $this->container->getParameter('database_gateway_name'); } diff --git a/src/Surfnet/Migrations/Version20200114161618.php b/src/Surfnet/Migrations/Version20200114161618.php index c9a891dd5..2f306a1e3 100644 --- a/src/Surfnet/Migrations/Version20200114161618.php +++ b/src/Surfnet/Migrations/Version20200114161618.php @@ -63,7 +63,7 @@ public function down(Schema $schema): void $this->throwIrreversibleMigrationException('This migration is irreversible'); } - private function getGatewaySchema() + private function getGatewaySchema(): float|array|bool|int|string|null { return $this->container->getParameter('database_gateway_name'); } diff --git a/src/Surfnet/Migrations/Version20220519134637.php b/src/Surfnet/Migrations/Version20220519134637.php index 527b41dfe..4f84f603f 100644 --- a/src/Surfnet/Migrations/Version20220519134637.php +++ b/src/Surfnet/Migrations/Version20220519134637.php @@ -79,7 +79,7 @@ public function down(Schema $schema): void $this->addSql(sprintf('ALTER TABLE %s.second_factor DROP identity_vetted', $gatewaySchema)); } - private function getGatewaySchema() + private function getGatewaySchema(): float|array|bool|int|string|null { return $this->container->getParameter('database_gateway_name'); } diff --git a/src/Surfnet/Migrations/Version20221102143350.php b/src/Surfnet/Migrations/Version20221102143350.php index c4fc668ae..35b33ce3f 100644 --- a/src/Surfnet/Migrations/Version20221102143350.php +++ b/src/Surfnet/Migrations/Version20221102143350.php @@ -48,7 +48,7 @@ public function down(Schema $schema): void $this->addSql(sprintf('DROP TABLE %s.institution_configuration', $gatewaySchema)); } - private function getGatewaySchema() + private function getGatewaySchema(): float|array|bool|int|string|null { return $this->container->getParameter('database_gateway_name'); } diff --git a/src/Surfnet/Stepup/Configuration/Api/Configuration.php b/src/Surfnet/Stepup/Configuration/Api/Configuration.php index 2857d3e6b..b14e39c83 100644 --- a/src/Surfnet/Stepup/Configuration/Api/Configuration.php +++ b/src/Surfnet/Stepup/Configuration/Api/Configuration.php @@ -28,7 +28,6 @@ interface Configuration extends AggregateRoot public static function create(): Configuration; /** - * @param string $newConfiguration * @return void */ public function update(string $newConfiguration): void; diff --git a/src/Surfnet/Stepup/Configuration/Event/ConfigurationEvent.php b/src/Surfnet/Stepup/Configuration/Event/ConfigurationEvent.php index c62e3cdcf..b3ff80122 100644 --- a/src/Surfnet/Stepup/Configuration/Event/ConfigurationEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/ConfigurationEvent.php @@ -24,17 +24,10 @@ abstract class ConfigurationEvent implements SerializableInterface { - /** - * @var string - */ public string $id; - public function __construct($id) + public function __construct(string $id) { - if ($id !== Configuration::CONFIGURATION_ID) { - throw new LogicException('Configuration Events must use the fixed Configuration::CONFIGURATION_ID as id'); - } - $this->id = $id; } } diff --git a/src/Surfnet/Stepup/Configuration/Event/ConfigurationUpdatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/ConfigurationUpdatedEvent.php index f5352c46f..4d3ed8f9f 100644 --- a/src/Surfnet/Stepup/Configuration/Event/ConfigurationUpdatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/ConfigurationUpdatedEvent.php @@ -20,27 +20,14 @@ class ConfigurationUpdatedEvent extends ConfigurationEvent { - /** - * @var array - */ - public array $newConfiguration; - - /** - * @var array|null - */ - public ?array $oldConfiguration; - /** * @param string $id * @param array $newConfiguration * @param array|null $oldConfiguration */ - public function __construct($id, array $newConfiguration, array $oldConfiguration = null) + public function __construct($id, public array $newConfiguration, public ?array $oldConfiguration = null) { parent::__construct($id); - - $this->newConfiguration = $newConfiguration; - $this->oldConfiguration = $oldConfiguration; } public static function deserialize(array $data): self diff --git a/src/Surfnet/Stepup/Configuration/Event/EmailTemplatesUpdatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/EmailTemplatesUpdatedEvent.php index 907050773..d01ebcd71 100644 --- a/src/Surfnet/Stepup/Configuration/Event/EmailTemplatesUpdatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/EmailTemplatesUpdatedEvent.php @@ -20,20 +20,13 @@ class EmailTemplatesUpdatedEvent extends ConfigurationEvent { - /** - * @var array - */ - public array $emailTemplates; - /** * @param string $configurationId * @param array $emailTemplates */ - public function __construct($configurationId, array $emailTemplates) + public function __construct($configurationId, public array $emailTemplates) { parent::__construct($configurationId); - - $this->emailTemplates = $emailTemplates; } public static function deserialize(array $data): self diff --git a/src/Surfnet/Stepup/Configuration/Event/IdentityProvidersUpdatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/IdentityProvidersUpdatedEvent.php index 08514bf77..4d77840e0 100644 --- a/src/Surfnet/Stepup/Configuration/Event/IdentityProvidersUpdatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/IdentityProvidersUpdatedEvent.php @@ -20,20 +20,13 @@ class IdentityProvidersUpdatedEvent extends ConfigurationEvent { - /** - * @var array - */ - public array $identityProviders; - /** * @param string $configurationId * @param array $identityProviders */ - public function __construct($configurationId, array $identityProviders) + public function __construct($configurationId, public array $identityProviders) { parent::__construct($configurationId); - - $this->identityProviders = $identityProviders; } public static function deserialize(array $data): self diff --git a/src/Surfnet/Stepup/Configuration/Event/InstitutionConfigurationRemovedEvent.php b/src/Surfnet/Stepup/Configuration/Event/InstitutionConfigurationRemovedEvent.php index aba2495e0..3818087d6 100644 --- a/src/Surfnet/Stepup/Configuration/Event/InstitutionConfigurationRemovedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/InstitutionConfigurationRemovedEvent.php @@ -24,20 +24,8 @@ class InstitutionConfigurationRemovedEvent implements SerializableInterface { - /** - * @var Institution - */ - public Institution $institution; - - /** - * @var InstitutionConfigurationId - */ - public InstitutionConfigurationId $institutionConfigurationId; - - public function __construct(InstitutionConfigurationId $institutionConfigurationId, Institution $institution) + public function __construct(public InstitutionConfigurationId $institutionConfigurationId, public Institution $institution) { - $this->institutionConfigurationId = $institutionConfigurationId; - $this->institution = $institution; } /** diff --git a/src/Surfnet/Stepup/Configuration/Event/NewInstitutionConfigurationCreatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/NewInstitutionConfigurationCreatedEvent.php index e85fe71ea..d4350ee85 100644 --- a/src/Surfnet/Stepup/Configuration/Event/NewInstitutionConfigurationCreatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/NewInstitutionConfigurationCreatedEvent.php @@ -35,70 +35,8 @@ */ class NewInstitutionConfigurationCreatedEvent implements SerializableInterface { - /** - * @var InstitutionConfigurationId - */ - public InstitutionConfigurationId $institutionConfigurationId; - - /** - * @var Institution - */ - public Institution $institution; - /** - * @var UseRaLocationsOption - */ - public UseRaLocationsOption $useRaLocationsOption; - - /** - * @var ShowRaaContactInformationOption - */ - public ShowRaaContactInformationOption $showRaaContactInformationOption; - - /** - * @var VerifyEmailOption - */ - public VerifyEmailOption $verifyEmailOption; - - /** - * @var NumberOfTokensPerIdentityOption - */ - public NumberOfTokensPerIdentityOption $numberOfTokensPerIdentityOption; - - /** - * @var SelfVetOption - */ - public SelfVetOption $selfVetOption; - - /** - * @var SelfAssertedTokensOption - */ - public SelfAssertedTokensOption $selfAssertedTokensOption; - - /** - * @var SsoOn2faOption - */ - public SsoOn2faOption $ssoOn2faOption; - - public function __construct( - InstitutionConfigurationId $institutionConfigurationId, - Institution $institution, - UseRaLocationsOption $useRaLocationsOption, - ShowRaaContactInformationOption $showRaaContactInformationOption, - VerifyEmailOption $verifyEmailOption, - NumberOfTokensPerIdentityOption $numberOfTokensPerIdentityOption, - SsoOn2faOption $ssoOn2faOption, - SelfVetOption $selfVetOption, - SelfAssertedTokensOption $selfAssertedTokensOption, - ) { - $this->institutionConfigurationId = $institutionConfigurationId; - $this->institution = $institution; - $this->useRaLocationsOption = $useRaLocationsOption; - $this->showRaaContactInformationOption = $showRaaContactInformationOption; - $this->verifyEmailOption = $verifyEmailOption; - $this->numberOfTokensPerIdentityOption = $numberOfTokensPerIdentityOption; - $this->ssoOn2faOption = $ssoOn2faOption; - $this->selfVetOption = $selfVetOption; - $this->selfAssertedTokensOption = $selfAssertedTokensOption; + public function __construct(public InstitutionConfigurationId $institutionConfigurationId, public Institution $institution, public UseRaLocationsOption $useRaLocationsOption, public ShowRaaContactInformationOption $showRaaContactInformationOption, public VerifyEmailOption $verifyEmailOption, public NumberOfTokensPerIdentityOption $numberOfTokensPerIdentityOption, public SsoOn2faOption $ssoOn2faOption, public SelfVetOption $selfVetOption, public SelfAssertedTokensOption $selfAssertedTokensOption) + { } public static function deserialize(array $data): self diff --git a/src/Surfnet/Stepup/Configuration/Event/RaLocationAddedEvent.php b/src/Surfnet/Stepup/Configuration/Event/RaLocationAddedEvent.php index 7459b50ac..64627f6d6 100644 --- a/src/Surfnet/Stepup/Configuration/Event/RaLocationAddedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/RaLocationAddedEvent.php @@ -28,49 +28,8 @@ class RaLocationAddedEvent implements SerializableInterface { - /** - * @var InstitutionConfigurationId - */ - public InstitutionConfigurationId $institutionConfigurationId; - - /** - * @var Institution - */ - public Institution $institution; - - /** - * @var RaLocationId - */ - public RaLocationId $raLocationId; - - /** - * @var RaLocationName - */ - public RaLocationName $raLocationName; - - /** - * @var Location - */ - public Location $location; - /** - * @var ContactInformation - */ - public ContactInformation $contactInformation; - - public function __construct( - InstitutionConfigurationId $institutionConfigurationId, - Institution $institution, - RaLocationId $raLocationId, - RaLocationName $raLocationName, - Location $location, - ContactInformation $contactInformation, - ) { - $this->institutionConfigurationId = $institutionConfigurationId; - $this->institution = $institution; - $this->raLocationId = $raLocationId; - $this->raLocationName = $raLocationName; - $this->location = $location; - $this->contactInformation = $contactInformation; + public function __construct(public InstitutionConfigurationId $institutionConfigurationId, public Institution $institution, public RaLocationId $raLocationId, public RaLocationName $raLocationName, public Location $location, public ContactInformation $contactInformation) + { } public static function deserialize(array $data): self diff --git a/src/Surfnet/Stepup/Configuration/Event/RaLocationContactInformationChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/RaLocationContactInformationChangedEvent.php index c3bcc3ff7..f8179e345 100644 --- a/src/Surfnet/Stepup/Configuration/Event/RaLocationContactInformationChangedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/RaLocationContactInformationChangedEvent.php @@ -25,29 +25,8 @@ class RaLocationContactInformationChangedEvent implements SerializableInterface { - /** - * @var InstitutionConfigurationId - */ - public InstitutionConfigurationId $institutionConfigurationId; - - /** - * @var RaLocationId - */ - public RaLocationId $raLocationId; - - /** - * @var ContactInformation - */ - public ContactInformation $contactInformation; - - public function __construct( - InstitutionConfigurationId $institutionConfigurationId, - RaLocationId $raLocationId, - ContactInformation $contactInformation, - ) { - $this->institutionConfigurationId = $institutionConfigurationId; - $this->raLocationId = $raLocationId; - $this->contactInformation = $contactInformation; + public function __construct(public InstitutionConfigurationId $institutionConfigurationId, public RaLocationId $raLocationId, public ContactInformation $contactInformation) + { } public static function deserialize(array $data): self diff --git a/src/Surfnet/Stepup/Configuration/Event/RaLocationRelocatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/RaLocationRelocatedEvent.php index 8a37c040d..b583e0b35 100644 --- a/src/Surfnet/Stepup/Configuration/Event/RaLocationRelocatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/RaLocationRelocatedEvent.php @@ -25,29 +25,8 @@ class RaLocationRelocatedEvent implements SerializableInterface { - /** - * @var InstitutionConfigurationId - */ - public InstitutionConfigurationId $institutionConfigurationId; - - /** - * @var RaLocationId - */ - public RaLocationId $raLocationId; - - /** - * @var Location - */ - public Location $location; - - public function __construct( - InstitutionConfigurationId $institutionConfigurationId, - RaLocationId $raLocationId, - Location $location, - ) { - $this->institutionConfigurationId = $institutionConfigurationId; - $this->raLocationId = $raLocationId; - $this->location = $location; + public function __construct(public InstitutionConfigurationId $institutionConfigurationId, public RaLocationId $raLocationId, public Location $location) + { } public static function deserialize(array $data): self diff --git a/src/Surfnet/Stepup/Configuration/Event/RaLocationRemovedEvent.php b/src/Surfnet/Stepup/Configuration/Event/RaLocationRemovedEvent.php index 2a2bf8eed..2784fbcfe 100644 --- a/src/Surfnet/Stepup/Configuration/Event/RaLocationRemovedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/RaLocationRemovedEvent.php @@ -25,27 +25,13 @@ class RaLocationRemovedEvent implements SerializableInterface { - /** - * @var InstitutionConfigurationId - */ - public InstitutionConfigurationId $institutionConfigurationId; - /** * @var Institution */ public Institution $institution; - /** - * @var RaLocationId - */ - public RaLocationId $raLocationId; - - public function __construct( - InstitutionConfigurationId $institutionConfigurationId, - RaLocationId $raLocationId, - ) { - $this->institutionConfigurationId = $institutionConfigurationId; - $this->raLocationId = $raLocationId; + public function __construct(public InstitutionConfigurationId $institutionConfigurationId, public RaLocationId $raLocationId) + { } public static function deserialize(array $data): self diff --git a/src/Surfnet/Stepup/Configuration/Event/RaLocationRenamedEvent.php b/src/Surfnet/Stepup/Configuration/Event/RaLocationRenamedEvent.php index 4d775a2bf..7fc9a32ba 100644 --- a/src/Surfnet/Stepup/Configuration/Event/RaLocationRenamedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/RaLocationRenamedEvent.php @@ -25,29 +25,8 @@ class RaLocationRenamedEvent implements SerializableInterface { - /** - * @var InstitutionConfigurationId - */ - public InstitutionConfigurationId $institutionConfigurationId; - - /** - * @var RaLocationId - */ - public RaLocationId $raLocationId; - - /** - * @var RaLocationName - */ - public RaLocationName $raLocationName; - - public function __construct( - InstitutionConfigurationId $institutionConfigurationId, - RaLocationId $raLocationId, - RaLocationName $raLocationName, - ) { - $this->institutionConfigurationId = $institutionConfigurationId; - $this->raLocationId = $raLocationId; - $this->raLocationName = $raLocationName; + public function __construct(public InstitutionConfigurationId $institutionConfigurationId, public RaLocationId $raLocationId, public RaLocationName $raLocationName) + { } public static function deserialize(array $data): self diff --git a/src/Surfnet/Stepup/Configuration/Event/ServiceProvidersUpdatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/ServiceProvidersUpdatedEvent.php index cbbf318da..e6a165466 100644 --- a/src/Surfnet/Stepup/Configuration/Event/ServiceProvidersUpdatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/ServiceProvidersUpdatedEvent.php @@ -20,20 +20,13 @@ class ServiceProvidersUpdatedEvent extends ConfigurationEvent { - /** - * @var array - */ - public array $serviceProviders; - /** * @param string $configurationId * @param array $serviceProviders */ - public function __construct($configurationId, array $serviceProviders) + public function __construct($configurationId, public array $serviceProviders) { parent::__construct($configurationId); - - $this->serviceProviders = $serviceProviders; } public static function deserialize(array $data): self diff --git a/src/Surfnet/Stepup/Configuration/Event/SraaUpdatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/SraaUpdatedEvent.php index 5d6c7ec2c..7c3d41502 100644 --- a/src/Surfnet/Stepup/Configuration/Event/SraaUpdatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/SraaUpdatedEvent.php @@ -20,20 +20,13 @@ class SraaUpdatedEvent extends ConfigurationEvent { - /** - * @var array - */ - public array $sraaList; - /** * @param string $configurationId * @param array $sraaList */ - public function __construct($configurationId, array $sraaList) + public function __construct($configurationId, public array $sraaList) { parent::__construct($configurationId); - - $this->sraaList = $sraaList; } public static function deserialize(array $data): self diff --git a/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php b/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php index f7fdae537..1c29b2156 100644 --- a/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php +++ b/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php @@ -75,81 +75,36 @@ */ class InstitutionConfiguration extends EventSourcedAggregateRoot implements InstitutionConfigurationInterface { - /** - * @var InstitutionConfigurationId - */ private InstitutionConfigurationId $institutionConfigurationId; - /** - * @var Institution - */ private Institution $institution; private ?RaLocationList $raLocations = null; - /** - * @var UseRaLocationsOption - */ private UseRaLocationsOption $useRaLocationsOption; - /** - * @var ShowRaaContactInformationOption - */ private ShowRaaContactInformationOption $showRaaContactInformationOption; - /** - * @var VerifyEmailOption - */ private VerifyEmailOption $verifyEmailOption; - /** - * @var NumberOfTokensPerIdentityOption - */ private NumberOfTokensPerIdentityOption $numberOfTokensPerIdentityOption; - /** - * @var SelfVetOption - */ private SelfVetOption $selfVetOption; - /** - * @var SsoOn2faOption - */ - private SsoOn2faOption $ssoOn2faOption; + private ?SsoOn2faOption $ssoOn2faOption = null; - /** - * @var SelfAssertedTokensOption - */ - private SelfAssertedTokensOption $selfAssertedTokensOption; + private ?SelfAssertedTokensOption $selfAssertedTokensOption = null; - /** - * @var InstitutionAuthorizationOption - */ - private InstitutionAuthorizationOption $useRaOption; - - /** - * @var InstitutionAuthorizationOption - */ + private ?InstitutionAuthorizationOption $useRaOption = null; - private InstitutionAuthorizationOption $useRaaOption; + private ?InstitutionAuthorizationOption $useRaaOption = null; - /** - * @var InstitutionAuthorizationOption - */ - private InstitutionAuthorizationOption $selectRaaOption; + private ?InstitutionAuthorizationOption $selectRaaOption = null; - /** - * @var AllowedSecondFactorList - */ - private AllowedSecondFactorList $allowedSecondFactorList; + private ?AllowedSecondFactorList $allowedSecondFactorList = null; private ?bool $isMarkedAsDestroyed = null; - /** - * @param InstitutionConfigurationId $institutionConfigurationId - * @param Institution $institution - * @return InstitutionConfiguration - */ public static function create( InstitutionConfigurationId $institutionConfigurationId, Institution $institution, @@ -335,7 +290,7 @@ public function configureSelfVetOption(SelfVetOption $selfVetOption): void public function configureSelfAssertedTokensOption(SelfAssertedTokensOption $selfAssertedTokensOption): void { - if ($this->selfAssertedTokensOption !== null && + if ($this->selfAssertedTokensOption instanceof \Surfnet\Stepup\Configuration\Value\SelfAssertedTokensOption && $this->selfAssertedTokensOption->equals($selfAssertedTokensOption) ) { return; @@ -352,7 +307,7 @@ public function configureSelfAssertedTokensOption(SelfAssertedTokensOption $self public function configureSsoOn2faOption(SsoOn2faOption $ssoOn2faOption): void { - if ($this->ssoOn2faOption !== null && $this->ssoOn2faOption->equals($ssoOn2faOption)) { + if ($this->ssoOn2faOption instanceof \Surfnet\Stepup\Configuration\Value\SsoOn2faOption && $this->ssoOn2faOption->equals($ssoOn2faOption)) { return; } @@ -367,7 +322,7 @@ public function configureSsoOn2faOption(SsoOn2faOption $ssoOn2faOption): void public function updateUseRaOption(InstitutionAuthorizationOption $useRaOption): void { - if ($this->useRaOption !== null + if ($this->useRaOption instanceof \Surfnet\Stepup\Configuration\Value\InstitutionAuthorizationOption && $this->useRaOption->equals($useRaOption) ) { return; @@ -384,7 +339,7 @@ public function updateUseRaOption(InstitutionAuthorizationOption $useRaOption): public function updateUseRaaOption(InstitutionAuthorizationOption $useRaaOption): void { - if ($this->useRaaOption !== null + if ($this->useRaaOption instanceof \Surfnet\Stepup\Configuration\Value\InstitutionAuthorizationOption && $this->useRaaOption->equals($useRaaOption) ) { return; @@ -401,7 +356,7 @@ public function updateUseRaaOption(InstitutionAuthorizationOption $useRaaOption) public function updateSelectRaaOption(InstitutionAuthorizationOption $selectRaaOption): void { - if ($this->selectRaaOption !== null + if ($this->selectRaaOption instanceof \Surfnet\Stepup\Configuration\Value\InstitutionAuthorizationOption && $this->selectRaaOption->equals($selectRaaOption) ) { return; @@ -419,7 +374,7 @@ public function updateSelectRaaOption(InstitutionAuthorizationOption $selectRaaO public function updateAllowedSecondFactorList(AllowedSecondFactorList $allowedSecondFactorList): void { // AllowedSecondFactorList can be null for InstitutionConfigurations for which this functionality did not exist - if ($this->allowedSecondFactorList !== null + if ($this->allowedSecondFactorList instanceof \Surfnet\Stepup\Configuration\Value\AllowedSecondFactorList && $this->allowedSecondFactorList->equals($allowedSecondFactorList) ) { return; diff --git a/src/Surfnet/Stepup/Configuration/Value/AllowedSecondFactorList.php b/src/Surfnet/Stepup/Configuration/Value/AllowedSecondFactorList.php index 30d6fd945..4c62fa56b 100644 --- a/src/Surfnet/Stepup/Configuration/Value/AllowedSecondFactorList.php +++ b/src/Surfnet/Stepup/Configuration/Value/AllowedSecondFactorList.php @@ -25,6 +25,9 @@ use JsonSerializable; use Surfnet\StepupBundle\Value\SecondFactorType; +/** + * @implements IteratorAggregate + */ final class AllowedSecondFactorList implements JsonSerializable, IteratorAggregate, SerializableInterface { /** @@ -47,11 +50,7 @@ public static function blank(): self return new self([]); } - /** - * @param $allowedSecondFactors - * @return AllowedSecondFactorList - */ - public static function ofTypes($allowedSecondFactors): self + public static function ofTypes(array $allowedSecondFactors): self { return new self($allowedSecondFactors); } @@ -61,9 +60,6 @@ public function allows(SecondFactorType $secondFactor): bool return $this->isBlank() || $this->contains($secondFactor); } - /** - * @return bool - */ public function isBlank(): bool { return $this->allowedSecondFactors === []; diff --git a/src/Surfnet/Stepup/Configuration/Value/ContactInformation.php b/src/Surfnet/Stepup/Configuration/Value/ContactInformation.php index ff7c1fa8d..34c1ebc10 100644 --- a/src/Surfnet/Stepup/Configuration/Value/ContactInformation.php +++ b/src/Surfnet/Stepup/Configuration/Value/ContactInformation.php @@ -28,15 +28,8 @@ final class ContactInformation implements JsonSerializable, Stringable { private readonly string $contactInformation; - /** - * @param string $contactInformation - */ public function __construct(string $contactInformation) { - if (!is_string($contactInformation)) { - throw InvalidArgumentException::invalidType('string', 'contactInformation', $contactInformation); - } - $this->contactInformation = trim($contactInformation); } diff --git a/src/Surfnet/Stepup/Configuration/Value/Institution.php b/src/Surfnet/Stepup/Configuration/Value/Institution.php index 9920d80e8..aad065a9a 100644 --- a/src/Surfnet/Stepup/Configuration/Value/Institution.php +++ b/src/Surfnet/Stepup/Configuration/Value/Institution.php @@ -33,7 +33,7 @@ final class Institution implements JsonSerializable, Stringable */ public function __construct(string $institution) { - if (!is_string($institution) || trim($institution) === '') { + if (trim($institution) === '') { throw InvalidArgumentException::invalidType('non-empty string', 'institution', $institution); } diff --git a/src/Surfnet/Stepup/Configuration/Value/InstitutionAuthorizationOption.php b/src/Surfnet/Stepup/Configuration/Value/InstitutionAuthorizationOption.php index a7acf308d..ea9e71087 100644 --- a/src/Surfnet/Stepup/Configuration/Value/InstitutionAuthorizationOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/InstitutionAuthorizationOption.php @@ -35,23 +35,17 @@ private function __construct( private readonly InstitutionSet $institutionSet, bool $isDefault, ) { - $this->isDefault = (bool)$isDefault; + $this->isDefault = $isDefault; } - public static function fromInstitutionConfig(InstitutionRole $role, $institutions = null): InstitutionAuthorizationOption - { + public static function fromInstitutionConfig( + InstitutionRole $role, + ?array $institutions = null + ): InstitutionAuthorizationOption { if (is_null($institutions)) { return self::getDefault($role); } - if (!is_array($institutions)) { - throw InvalidArgumentException::invalidType( - 'array', - 'institutions', - $institutions, - ); - } - array_walk( $institutions, function ($institution, $key) use ($institutions): void { @@ -137,7 +131,7 @@ public function hasInstitution(Institution $institution, Institution $default): { $institutions = $this->getInstitutions($default); $list = array_map( - fn(Institution $institution) => $institution->getInstitution(), + fn(Institution $institution): string => $institution->getInstitution(), $institutions, ); return in_array($institution->getInstitution(), $list); diff --git a/src/Surfnet/Stepup/Configuration/Value/InstitutionConfigurationId.php b/src/Surfnet/Stepup/Configuration/Value/InstitutionConfigurationId.php index 27cf86c22..702d5ef69 100644 --- a/src/Surfnet/Stepup/Configuration/Value/InstitutionConfigurationId.php +++ b/src/Surfnet/Stepup/Configuration/Value/InstitutionConfigurationId.php @@ -31,7 +31,6 @@ final class InstitutionConfigurationId implements JsonSerializable, Stringable /** * @deprecated To be removed in next release; use normalizedFrom method to account for case-(in)sensitivity issues - * */ public static function from(Institution $institution): self { @@ -43,9 +42,9 @@ public static function normalizedFrom(Institution $institution): self return new self((string)Uuid::uuid5(self::UUID_NAMESPACE, strtolower($institution->getInstitution()))); } - public function __construct($institutionConfigurationId) + public function __construct(string $institutionConfigurationId) { - if (!is_string($institutionConfigurationId) || trim($institutionConfigurationId) === '') { + if (trim($institutionConfigurationId) === '') { throw InvalidArgumentException::invalidType( 'non-empty string', 'institutionConfigurationId', @@ -69,9 +68,6 @@ public function equals(InstitutionConfigurationId $otherInstitutionConfiguration return $this->institutionConfigurationId === $otherInstitutionConfigurationId->institutionConfigurationId; } - /** - * @return string - */ public function getInstitutionConfigurationId(): string { return $this->institutionConfigurationId; diff --git a/src/Surfnet/Stepup/Configuration/Value/InstitutionRole.php b/src/Surfnet/Stepup/Configuration/Value/InstitutionRole.php index e528ca3b3..992011338 100644 --- a/src/Surfnet/Stepup/Configuration/Value/InstitutionRole.php +++ b/src/Surfnet/Stepup/Configuration/Value/InstitutionRole.php @@ -33,43 +33,26 @@ final class InstitutionRole implements JsonSerializable, Stringable self::ROLE_SELECT_RAA, ]; - /** - * @var string - */ - private string $type; + private readonly string $type; - /** - * InstitutionRole constructor. - * @param $type - */ - public function __construct($type) + public function __construct(string $type) { if (!in_array($type, self::$validRoles)) { throw new InvalidArgumentException(); } - $this->type = $type; } - /** - * @return InstitutionRole - */ public static function useRa(): self { return new self(self::ROLE_USE_RA); } - /** - * @return InstitutionRole - */ public static function useRaa(): self { return new self(self::ROLE_USE_RAA); } - /** - * @return InstitutionRole - */ public static function selectRaa(): self { return new self(self::ROLE_SELECT_RAA); @@ -77,12 +60,9 @@ public static function selectRaa(): self public function equals(InstitutionRole $role): bool { - return $this->type == $role->getType(); + return $this->type === $role->getType(); } - /** - * @return string - */ public function getType(): string { return $this->type; @@ -93,9 +73,6 @@ public function jsonSerialize(): string return $this->type; } - /** - * @return string - */ public function __toString(): string { return $this->type; diff --git a/src/Surfnet/Stepup/Configuration/Value/InstitutionSet.php b/src/Surfnet/Stepup/Configuration/Value/InstitutionSet.php index 1b99edb6a..ac697de4a 100644 --- a/src/Surfnet/Stepup/Configuration/Value/InstitutionSet.php +++ b/src/Surfnet/Stepup/Configuration/Value/InstitutionSet.php @@ -1,5 +1,7 @@ location = trim($location); } diff --git a/src/Surfnet/Stepup/Configuration/Value/NumberOfTokensPerIdentityOption.php b/src/Surfnet/Stepup/Configuration/Value/NumberOfTokensPerIdentityOption.php index d19b18632..be205d30e 100644 --- a/src/Surfnet/Stepup/Configuration/Value/NumberOfTokensPerIdentityOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/NumberOfTokensPerIdentityOption.php @@ -25,23 +25,15 @@ class NumberOfTokensPerIdentityOption implements JsonSerializable { public const DISABLED = 0; - private int $numberOfTokensPerIdentity; + private readonly int $numberOfTokensPerIdentity; public static function getDefault(): self { return new self(self::DISABLED); } - public function __construct($numberOfTokensPerIdentity) + public function __construct(int $numberOfTokensPerIdentity) { - if (!is_numeric($numberOfTokensPerIdentity)) { - throw InvalidArgumentException::invalidType( - 'integer', - 'numberOfTokensPerIdentity', - $numberOfTokensPerIdentity, - ); - } - $this->numberOfTokensPerIdentity = $numberOfTokensPerIdentity; } diff --git a/src/Surfnet/Stepup/Configuration/Value/RaLocationId.php b/src/Surfnet/Stepup/Configuration/Value/RaLocationId.php index 798873c5a..59a5430e9 100644 --- a/src/Surfnet/Stepup/Configuration/Value/RaLocationId.php +++ b/src/Surfnet/Stepup/Configuration/Value/RaLocationId.php @@ -29,12 +29,9 @@ final class RaLocationId implements JsonSerializable, Stringable { private readonly string $raLocationId; - /** - * @param string $raLocationId - */ public function __construct(string $raLocationId) { - if (!is_string($raLocationId) || trim($raLocationId) === '') { + if (trim($raLocationId) === '') { throw InvalidArgumentException::invalidType( 'non-empty string', 'raLocationId', diff --git a/src/Surfnet/Stepup/Configuration/Value/RaLocationList.php b/src/Surfnet/Stepup/Configuration/Value/RaLocationList.php index 0a092ec52..70fd31172 100644 --- a/src/Surfnet/Stepup/Configuration/Value/RaLocationList.php +++ b/src/Surfnet/Stepup/Configuration/Value/RaLocationList.php @@ -24,6 +24,9 @@ use Surfnet\Stepup\Configuration\Entity\RaLocation; use Surfnet\Stepup\Exception\LogicException; +/** + * @implements IteratorAggregate + */ final class RaLocationList implements IteratorAggregate { /** diff --git a/src/Surfnet/Stepup/Configuration/Value/RaLocationName.php b/src/Surfnet/Stepup/Configuration/Value/RaLocationName.php index c44f371e5..3cb6572f6 100644 --- a/src/Surfnet/Stepup/Configuration/Value/RaLocationName.php +++ b/src/Surfnet/Stepup/Configuration/Value/RaLocationName.php @@ -30,7 +30,7 @@ final class RaLocationName implements JsonSerializable, Stringable public function __construct(string $raLocationName) { - if (!is_string($raLocationName) || trim($raLocationName) === '') { + if (trim($raLocationName) === '') { throw InvalidArgumentException::invalidType('non-empty string', 'raLocationName', $raLocationName); } diff --git a/src/Surfnet/Stepup/Configuration/Value/SelfAssertedTokensOption.php b/src/Surfnet/Stepup/Configuration/Value/SelfAssertedTokensOption.php index 4165d131c..eb2afa458 100644 --- a/src/Surfnet/Stepup/Configuration/Value/SelfAssertedTokensOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/SelfAssertedTokensOption.php @@ -27,8 +27,9 @@ public static function getDefault(): self return new self(false); } - public function __construct(private bool $allowed) - { + public function __construct( + private bool $allowed + ) { } public function equals(SelfAssertedTokensOption $other): bool diff --git a/src/Surfnet/Stepup/Configuration/Value/SelfVetOption.php b/src/Surfnet/Stepup/Configuration/Value/SelfVetOption.php index 6f5048623..7946a3a93 100644 --- a/src/Surfnet/Stepup/Configuration/Value/SelfVetOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/SelfVetOption.php @@ -27,8 +27,9 @@ public static function getDefault(): self return new self(false); } - public function __construct(private bool $selfVetOption) - { + public function __construct( + private bool $selfVetOption + ) { } public function equals(SelfVetOption $other): bool diff --git a/src/Surfnet/Stepup/Configuration/Value/ShowRaaContactInformationOption.php b/src/Surfnet/Stepup/Configuration/Value/ShowRaaContactInformationOption.php index 15ced7e13..fb791c3a7 100644 --- a/src/Surfnet/Stepup/Configuration/Value/ShowRaaContactInformationOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/ShowRaaContactInformationOption.php @@ -23,24 +23,16 @@ final class ShowRaaContactInformationOption implements JsonSerializable { - private readonly bool $showRaaContactInformationOption; + public static function getDefault(): self { return new self(true); } - public function __construct($showRaaContactInformationOption) - { - if (!is_bool($showRaaContactInformationOption)) { - throw InvalidArgumentException::invalidType( - 'boolean', - 'showRaaContactInformationOption', - $showRaaContactInformationOption, - ); - } - - $this->showRaaContactInformationOption = $showRaaContactInformationOption; + public function __construct( + private readonly bool $showRaaContactInformationOption + ) { } public function equals(ShowRaaContactInformationOption $other): bool diff --git a/src/Surfnet/Stepup/Configuration/Value/SsoOn2faOption.php b/src/Surfnet/Stepup/Configuration/Value/SsoOn2faOption.php index 2b7e4eebf..cc529d77d 100644 --- a/src/Surfnet/Stepup/Configuration/Value/SsoOn2faOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/SsoOn2faOption.php @@ -29,8 +29,9 @@ public static function getDefault(): self return new self(false); } - public function __construct(private bool $ssoOn2faOption) - { + public function __construct( + private bool $ssoOn2faOption + ) { } public function equals(SsoOn2faOption $other): bool diff --git a/src/Surfnet/Stepup/Configuration/Value/UseRaLocationsOption.php b/src/Surfnet/Stepup/Configuration/Value/UseRaLocationsOption.php index e785c06a7..4d10a31ee 100644 --- a/src/Surfnet/Stepup/Configuration/Value/UseRaLocationsOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/UseRaLocationsOption.php @@ -23,27 +23,14 @@ final class UseRaLocationsOption implements JsonSerializable { - private readonly bool $useRaLocationsOption; - - /** - * @return UseRaLocationsOption - */ public static function getDefault(): self { return new self(false); } - public function __construct($useRaLocationsOption) - { - if (!is_bool($useRaLocationsOption)) { - throw InvalidArgumentException::invalidType( - 'boolean', - 'useRaLocationsOption', - $useRaLocationsOption, - ); - } - - $this->useRaLocationsOption = $useRaLocationsOption; + public function __construct( + private readonly bool $useRaLocationsOption + ) { } public function equals(UseRaLocationsOption $other): bool @@ -51,9 +38,6 @@ public function equals(UseRaLocationsOption $other): bool return $this->useRaLocationsOption === $other->useRaLocationsOption; } - /** - * @return boolean - */ public function isEnabled(): bool { return $this->useRaLocationsOption; diff --git a/src/Surfnet/Stepup/Configuration/Value/VerifyEmailOption.php b/src/Surfnet/Stepup/Configuration/Value/VerifyEmailOption.php index f42f613dd..4422063f4 100644 --- a/src/Surfnet/Stepup/Configuration/Value/VerifyEmailOption.php +++ b/src/Surfnet/Stepup/Configuration/Value/VerifyEmailOption.php @@ -23,24 +23,14 @@ final class VerifyEmailOption implements JsonSerializable { - private readonly bool $verifyEmailOption; - public static function getDefault(): self { return new self(true); } - public function __construct($verifyEmailOption) - { - if (!is_bool($verifyEmailOption)) { - throw InvalidArgumentException::invalidType( - 'boolean', - 'verifyEmailOption', - $verifyEmailOption, - ); - } - - $this->verifyEmailOption = $verifyEmailOption; + public function __construct( + private readonly bool $verifyEmailOption + ) { } public function equals(VerifyEmailOption $other): bool diff --git a/src/Surfnet/Stepup/DateTime/DateTime.php b/src/Surfnet/Stepup/DateTime/DateTime.php index 00778cc8c..4a038ec1b 100644 --- a/src/Surfnet/Stepup/DateTime/DateTime.php +++ b/src/Surfnet/Stepup/DateTime/DateTime.php @@ -41,7 +41,7 @@ class DateTime implements Stringable * @see DateTimeHelper::setCurrentTime here you can see how now can be overridden using reflection * @var self|null */ - private static ?DateTime $now; // @phpstan-ignore-line PHPStan can not see that the DateTimeHelper is able to set the now value using reflection + private static ?DateTime $now = null; private readonly CoreDateTime $dateTime; @@ -60,10 +60,6 @@ public static function now(): DateTime */ public static function fromString(string $string): self { - if (!is_string($string)) { - InvalidArgumentException::invalidType('string', 'dateTime', $string); - } - $dateTime = CoreDateTime::createFromFormat(self::FORMAT, $string); if ($dateTime === false) { diff --git a/src/Surfnet/Stepup/Exception/JsonException.php b/src/Surfnet/Stepup/Exception/JsonException.php index 4fb60f985..c454b8ebf 100644 --- a/src/Surfnet/Stepup/Exception/JsonException.php +++ b/src/Surfnet/Stepup/Exception/JsonException.php @@ -20,7 +20,7 @@ final class JsonException extends RuntimeException { - public static function withMessage($errorMessage): self + public static function withMessage(string $errorMessage): self { return new self(sprintf('Unable to parse JSON data: %s', $errorMessage)); } diff --git a/src/Surfnet/Stepup/Helper/JsonHelper.php b/src/Surfnet/Stepup/Helper/JsonHelper.php index 3e8cbf89b..02e2acf45 100644 --- a/src/Surfnet/Stepup/Helper/JsonHelper.php +++ b/src/Surfnet/Stepup/Helper/JsonHelper.php @@ -31,12 +31,8 @@ final class JsonHelper JSON_ERROR_UTF8 => 'JSON_ERROR_UTF8 - Malformed UTF-8 characters, possibly incorrectly encoded', ]; - public static function decode($json) + public static function decode(string $json): mixed { - if (!is_string($json)) { - throw InvalidArgumentException::invalidType('string', 'json', $json); - } - $data = json_decode($json, true); if (JSON_ERROR_NONE !== json_last_error()) { diff --git a/src/Surfnet/Stepup/Helper/UserDataFormatter.php b/src/Surfnet/Stepup/Helper/UserDataFormatter.php index 4e2d978cb..dc8b32bee 100644 --- a/src/Surfnet/Stepup/Helper/UserDataFormatter.php +++ b/src/Surfnet/Stepup/Helper/UserDataFormatter.php @@ -44,7 +44,7 @@ private function formatResponse(array $userData, array $errors): array 'data' => $userData, ]; - if (!empty($errors)) { + if ($errors !== []) { $data['message'] = $errors; $status = 'FAILED'; } diff --git a/src/Surfnet/Stepup/Identity/Api/Id.php b/src/Surfnet/Stepup/Identity/Api/Id.php index 09aad9efc..24ec29f17 100644 --- a/src/Surfnet/Stepup/Identity/Api/Id.php +++ b/src/Surfnet/Stepup/Identity/Api/Id.php @@ -25,7 +25,7 @@ interface Id /** * @throws InvalidArgumentException */ - public function __construct(mixed $value); + public function __construct(string $value); /** * @return string diff --git a/src/Surfnet/Stepup/Identity/Api/Identity.php b/src/Surfnet/Stepup/Identity/Api/Identity.php index f49ead61d..9027e291c 100644 --- a/src/Surfnet/Stepup/Identity/Api/Identity.php +++ b/src/Surfnet/Stepup/Identity/Api/Identity.php @@ -101,7 +101,7 @@ public function provePossessionOfGssf( GssfId $gssfId, bool $emailVerificationRequired, EmailVerificationWindow $emailVerificationWindow, - $maxNumberOfTokens, + int $maxNumberOfTokens, ): void; /** @@ -113,11 +113,10 @@ public function provePossessionOfU2fDevice( U2fKeyHandle $keyHandle, bool $emailVerificationRequired, EmailVerificationWindow $emailVerificationWindow, - $maxNumberOfTokens, + int $maxNumberOfTokens, ): void; /** - * @param string $verificationNonce * @return void */ public function verifyEmail(string $verificationNonce): void; @@ -280,5 +279,5 @@ public function provePossessionOfPhoneRecoveryToken( */ public function promisePossessionOfSafeStoreSecretRecoveryToken(RecoveryTokenId $tokenId, SafeStore $secret): void; - public function saveVettingTypeHints(Institution $institution, VettingTypeHintCollection $hints); + public function saveVettingTypeHints(Institution $institution, VettingTypeHintCollection $hints): void; } diff --git a/src/Surfnet/Stepup/Identity/AuditLog/Metadata.php b/src/Surfnet/Stepup/Identity/AuditLog/Metadata.php index ebc62e980..2b965831b 100644 --- a/src/Surfnet/Stepup/Identity/AuditLog/Metadata.php +++ b/src/Surfnet/Stepup/Identity/AuditLog/Metadata.php @@ -39,20 +39,20 @@ final class Metadata */ public Institution $identityInstitution; - public ?Institution $raInstitution; + public ?Institution $raInstitution = null; - public ?SecondFactorId $secondFactorId; + public ?SecondFactorId $secondFactorId = null; - public ?SecondFactorType $secondFactorType; + public ?SecondFactorType $secondFactorType = null; /** * @var SecondFactorIdentifier|null */ - public ?SecondFactorIdentifier $secondFactorIdentifier; + public ?SecondFactorIdentifier $secondFactorIdentifier = null; - public ?VettingType $vettingType; + public ?VettingType $vettingType = null; - public ?RecoveryTokenId $recoveryTokenId; + public ?RecoveryTokenId $recoveryTokenId = null; - public ?RecoveryTokenType $recoveryTokenType; + public ?RecoveryTokenType $recoveryTokenType = null; } diff --git a/src/Surfnet/Stepup/Identity/Collection/InstitutionCollection.php b/src/Surfnet/Stepup/Identity/Collection/InstitutionCollection.php index afa841fb7..016765f9e 100644 --- a/src/Surfnet/Stepup/Identity/Collection/InstitutionCollection.php +++ b/src/Surfnet/Stepup/Identity/Collection/InstitutionCollection.php @@ -26,6 +26,9 @@ use Surfnet\Stepup\Exception\RuntimeException; use Surfnet\Stepup\Identity\Value\Institution; +/** + * @implements IteratorAggregate + */ final class InstitutionCollection implements IteratorAggregate, JsonSerializable, SerializableInterface { private array $elements = []; diff --git a/src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php b/src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php index 53f7c1042..640e1b746 100644 --- a/src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php +++ b/src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php @@ -71,6 +71,6 @@ public function __toString(): string public function serialize(): array { - return array_map(fn(VettingTypeHint $hint) => $hint->jsonSerialize(), $this->elements); + return array_map(fn(VettingTypeHint $hint): array => $hint->jsonSerialize(), $this->elements); } } diff --git a/src/Surfnet/Stepup/Identity/Entity/ConfigurableSettings.php b/src/Surfnet/Stepup/Identity/Entity/ConfigurableSettings.php index 3ebab62d6..de692793d 100644 --- a/src/Surfnet/Stepup/Identity/Entity/ConfigurableSettings.php +++ b/src/Surfnet/Stepup/Identity/Entity/ConfigurableSettings.php @@ -61,7 +61,7 @@ private function __construct( * @throws Exception * @throws Exception */ - public static function create($emailVerificationTimeFrame, array $locales): self + public static function create(int $emailVerificationTimeFrame, array $locales): self { return new self( TimeFrame::ofSeconds($emailVerificationTimeFrame), diff --git a/src/Surfnet/Stepup/Identity/Entity/UnverifiedSecondFactor.php b/src/Surfnet/Stepup/Identity/Entity/UnverifiedSecondFactor.php index 51c35f40c..3c9569364 100644 --- a/src/Surfnet/Stepup/Identity/Entity/UnverifiedSecondFactor.php +++ b/src/Surfnet/Stepup/Identity/Entity/UnverifiedSecondFactor.php @@ -63,11 +63,7 @@ public static function create( EmailVerificationWindow $emailVerificationWindow, string $verificationNonce, ): self { - if (!is_string($verificationNonce)) { - throw InvalidArgumentException::invalidType('string', 'verificationNonce', $verificationNonce); - } - - if (empty($verificationNonce)) { + if ($verificationNonce === '' || $verificationNonce === '0') { throw new InvalidArgumentException("'verificationNonce' may not be empty"); } @@ -92,7 +88,6 @@ public function getId(): ?SecondFactorId } /** - * @param string $verificationNonce * @return bool */ public function hasNonce(string $verificationNonce): bool diff --git a/src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php b/src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php index 2e7043d1c..478cc917b 100644 --- a/src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php +++ b/src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php @@ -67,10 +67,6 @@ public static function create( DateTime $registrationRequestedAt, string $registrationCode, ): self { - if (!is_string($registrationCode)) { - throw InvalidArgumentException::invalidType('string', 'registrationCode', $registrationCode); - } - $secondFactor = new self; $secondFactor->id = $id; $secondFactor->identity = $identity; @@ -111,7 +107,7 @@ public function canBeVettedNow(): bool ); } - public function vet($provePossessionSkipped, VettingType $type): void + public function vet(bool $provePossessionSkipped, VettingType $type): void { if ($provePossessionSkipped) { $this->apply( diff --git a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php index 54e8895d9..d9f3bbd73 100644 --- a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php @@ -29,22 +29,21 @@ */ class AppointedAsRaEvent extends IdentityEvent implements RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'identity_id', 'institution', 'name_id', ]; - public NameId $nameId; - public function __construct( IdentityId $identityId, Institution $identityInstitution, - NameId $nameId, + public NameId $nameId, ) { parent::__construct($identityId, $identityInstitution); - - $this->nameId = $nameId; } public function getAuditLogMetadata(): Metadata @@ -79,6 +78,9 @@ public function obtainUserData(): array return $this->serialize(); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php index a1f9b27f8..5bfda2f8f 100644 --- a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php @@ -26,6 +26,9 @@ class AppointedAsRaForInstitutionEvent extends IdentityEvent implements RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'identity_id', 'institution', @@ -33,26 +36,13 @@ class AppointedAsRaForInstitutionEvent extends IdentityEvent implements RightToO 'ra_institution', ]; - /** - * @var NameId - */ - public NameId $nameId; - - /** - * @var Institution - */ - public Institution $raInstitution; - public function __construct( IdentityId $identityId, Institution $identityInstitution, - NameId $nameId, - Institution $raInstitution, + public NameId $nameId, + public Institution $raInstitution, ) { parent::__construct($identityId, $identityInstitution); - - $this->nameId = $nameId; - $this->raInstitution = $raInstitution; } public function getAuditLogMetadata(): Metadata @@ -77,6 +67,8 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! + * + * @return array */ public function serialize(): array { @@ -93,6 +85,9 @@ public function obtainUserData(): array return $this->serialize(); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php index 5f8de76c3..33a8bf8b5 100644 --- a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php @@ -29,22 +29,21 @@ */ class AppointedAsRaaEvent extends IdentityEvent implements RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'identity_id', 'institution', 'name_id', ]; - public NameId $nameId; - public function __construct( IdentityId $identityId, Institution $identityInstitution, - NameId $nameId, + public NameId $nameId, ) { parent::__construct($identityId, $identityInstitution); - - $this->nameId = $nameId; } public function getAuditLogMetadata(): Metadata @@ -79,6 +78,9 @@ public function obtainUserData(): array return $this->serialize(); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaForInstitutionEvent.php index 3694fabb6..123a0255d 100644 --- a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaForInstitutionEvent.php @@ -26,6 +26,9 @@ class AppointedAsRaaForInstitutionEvent extends IdentityEvent implements RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'identity_id', 'institution', @@ -33,20 +36,13 @@ class AppointedAsRaaForInstitutionEvent extends IdentityEvent implements RightTo 'ra_institution', ]; - public NameId $nameId; - - public Institution $raInstitution; - public function __construct( IdentityId $identityId, Institution $identityInstitution, - NameId $nameId, - Institution $raInstitution, + public NameId $nameId, + public Institution $raInstitution, ) { parent::__construct($identityId, $identityInstitution); - - $this->nameId = $nameId; - $this->raInstitution = $raInstitution; } public function getAuditLogMetadata(): Metadata @@ -71,6 +67,8 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! + * + * @return array */ public function serialize(): array { @@ -87,6 +85,9 @@ public function obtainUserData(): array return $this->serialize(); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php b/src/Surfnet/Stepup/Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php index 631d76ce4..1d19efd39 100644 --- a/src/Surfnet/Stepup/Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php @@ -28,17 +28,8 @@ class CompliedWithRecoveryCodeRevocationEvent extends IdentityEvent implements RightToObtainDataInterface { /** - * @var IdentityId + * @var string[] */ - public IdentityId $authorityId; - /** - * @var RecoveryTokenId - */ - public RecoveryTokenId $recoveryTokenId; - /** - * @var RecoveryTokenType - */ - public RecoveryTokenType $recoveryTokenType; private array $allowlist = [ 'identity_id', 'identity_institution', @@ -49,15 +40,11 @@ class CompliedWithRecoveryCodeRevocationEvent extends IdentityEvent implements R final public function __construct( IdentityId $identityId, Institution $identityInstitution, - RecoveryTokenId $recoveryTokenId, - RecoveryTokenType $recoveryTokenType, - IdentityId $authorityId, + public RecoveryTokenId $recoveryTokenId, + public RecoveryTokenType $recoveryTokenType, + public IdentityId $authorityId, ) { parent::__construct($identityId, $identityInstitution); - - $this->authorityId = $authorityId; - $this->recoveryTokenId = $recoveryTokenId; - $this->recoveryTokenType = $recoveryTokenType; } final public static function deserialize(array $data): self @@ -103,6 +90,9 @@ final public function serialize(): array ]; } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/CompliedWithRevocationEvent.php b/src/Surfnet/Stepup/Identity/Event/CompliedWithRevocationEvent.php index e79aa3fa2..235161a51 100644 --- a/src/Surfnet/Stepup/Identity/Event/CompliedWithRevocationEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/CompliedWithRevocationEvent.php @@ -31,6 +31,9 @@ abstract class CompliedWithRevocationEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'identity_id', 'identity_institution', @@ -39,40 +42,15 @@ abstract class CompliedWithRevocationEvent extends IdentityEvent implements Forg 'authority_id', ]; - /** - * @var IdentityId - */ - public IdentityId $authorityId; - - /** - * @var SecondFactorId - */ - public SecondFactorId $secondFactorId; - - /** - * @var SecondFactorType - */ - public SecondFactorType $secondFactorType; - - /** - * @var SecondFactorIdentifier - */ - public SecondFactorIdentifier $secondFactorIdentifier; - final public function __construct( IdentityId $identityId, Institution $identityInstitution, - SecondFactorId $secondFactorId, - SecondFactorType $secondFactorType, - SecondFactorIdentifier $secondFactorIdentifier, - IdentityId $authorityId, + public SecondFactorId $secondFactorId, + public SecondFactorType $secondFactorType, + public SecondFactorIdentifier $secondFactorIdentifier, + public IdentityId $authorityId, ) { parent::__construct($identityId, $identityInstitution); - - $this->authorityId = $authorityId; - $this->secondFactorId = $secondFactorId; - $this->secondFactorType = $secondFactorType; - $this->secondFactorIdentifier = $secondFactorIdentifier; } public function getAuditLogMetadata(): Metadata @@ -133,6 +111,9 @@ public function obtainUserData(): array return array_merge($serializedPublicUserData, $serializedSensitiveUserData); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/EmailVerifiedEvent.php b/src/Surfnet/Stepup/Identity/Event/EmailVerifiedEvent.php index 618fef8b3..e3a0120c1 100644 --- a/src/Surfnet/Stepup/Identity/Event/EmailVerifiedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/EmailVerifiedEvent.php @@ -38,6 +38,9 @@ class EmailVerifiedEvent extends IdentityEvent implements PossessionProvenAndVerified, RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'identity_id', 'identity_institution', @@ -50,36 +53,6 @@ class EmailVerifiedEvent extends IdentityEvent implements 'email', ]; - /** - * @var SecondFactorId - */ - public SecondFactorId $secondFactorId; - - /** - * @var SecondFactorType - */ - public SecondFactorType $secondFactorType; - - /** - * @var DateTime - */ - public DateTime $registrationRequestedAt; - - /** - * @var CommonName - */ - public CommonName $commonName; - - /** - * @var Email - */ - public Email $email; - - /** - * @var Locale Eg. "en_GB" - */ - public Locale $preferredLocale; - /** * @param IdentityId $identityId * @param Institution $identityInstitution @@ -97,23 +70,16 @@ class EmailVerifiedEvent extends IdentityEvent implements public function __construct( IdentityId $identityId, Institution $identityInstitution, - SecondFactorId $secondFactorId, - SecondFactorType $secondFactorType, + public SecondFactorId $secondFactorId, + public SecondFactorType $secondFactorType, private SecondFactorIdentifier $secondFactorIdentifier, - DateTime $registrationRequestedAt, + public DateTime $registrationRequestedAt, public string $registrationCode, - CommonName $commonName, - Email $email, - Locale $preferredLocale, + public CommonName $commonName, + public Email $email, + public Locale $preferredLocale, ) { parent::__construct($identityId, $identityInstitution); - - $this->secondFactorId = $secondFactorId; - $this->secondFactorType = $secondFactorType; - $this->registrationRequestedAt = $registrationRequestedAt; - $this->commonName = $commonName; - $this->email = $email; - $this->preferredLocale = $preferredLocale; } public function getAuditLogMetadata(): Metadata @@ -148,6 +114,8 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! + * + * @return array */ public function serialize(): array { @@ -184,6 +152,9 @@ public function obtainUserData(): array return array_merge($serializedPublicUserData, $serializedSensitiveUserData); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenAndVerifiedEvent.php b/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenAndVerifiedEvent.php index da6455bc0..484d5b2e8 100644 --- a/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenAndVerifiedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenAndVerifiedEvent.php @@ -38,6 +38,9 @@ class GssfPossessionProvenAndVerifiedEvent extends IdentityEvent implements PossessionProvenAndVerified, RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'identity_id', 'identity_institution', @@ -50,41 +53,6 @@ class GssfPossessionProvenAndVerifiedEvent extends IdentityEvent implements 'email', ]; - /** - * @var SecondFactorId - */ - public SecondFactorId $secondFactorId; - - /** - * @var StepupProvider - */ - public StepupProvider $stepupProvider; - - /** - * @var GssfId - */ - public GssfId $gssfId; - - /** - * @var CommonName - */ - public CommonName $commonName; - - /** - * @var Email - */ - public Email $email; - - /** - * @var Locale Eg. "en_GB" - */ - public Locale $preferredLocale; - - /** - * @var DateTime - */ - public DateTime $registrationRequestedAt; - /** * @param IdentityId $identityId * @param Institution $identityInstitution @@ -93,7 +61,7 @@ class GssfPossessionProvenAndVerifiedEvent extends IdentityEvent implements * @param GssfId $gssfId * @param CommonName $commonName * @param Email $email - * @param Locale $locale + * @param Locale $preferredLocale * @param DateTime $registrationRequestedAt * @param string $registrationCode * @@ -102,24 +70,16 @@ class GssfPossessionProvenAndVerifiedEvent extends IdentityEvent implements public function __construct( IdentityId $identityId, Institution $identityInstitution, - SecondFactorId $secondFactorId, - StepupProvider $stepupProvider, - GssfId $gssfId, - CommonName $commonName, - Email $email, - Locale $locale, - DateTime $registrationRequestedAt, + public SecondFactorId $secondFactorId, + public StepupProvider $stepupProvider, + public GssfId $gssfId, + public CommonName $commonName, + public Email $email, + public Locale $preferredLocale, + public DateTime $registrationRequestedAt, public string $registrationCode, ) { parent::__construct($identityId, $identityInstitution); - - $this->secondFactorId = $secondFactorId; - $this->stepupProvider = $stepupProvider; - $this->gssfId = $gssfId; - $this->commonName = $commonName; - $this->email = $email; - $this->preferredLocale = $locale; - $this->registrationRequestedAt = $registrationRequestedAt; } public function getAuditLogMetadata(): Metadata @@ -157,6 +117,8 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! + * + * @return array */ public function serialize(): array { @@ -195,6 +157,9 @@ public function obtainUserData(): array return array_merge($serializedPublicUserData, $serializedSensitiveUserData); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenEvent.php b/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenEvent.php index c8244c0f2..6a64ba7f3 100644 --- a/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenEvent.php @@ -35,6 +35,9 @@ class GssfPossessionProvenEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'identity_id', 'identity_institution', @@ -46,66 +49,26 @@ class GssfPossessionProvenEvent extends IdentityEvent implements Forgettable, Ri 'email', ]; - /** - * @var SecondFactorId - */ - public SecondFactorId $secondFactorId; - - /** - * @var StepupProvider - */ - public StepupProvider $stepupProvider; - - /** - * @var GssfId - */ - public GssfId $gssfId; - - /** - * @var EmailVerificationWindow - */ - public EmailVerificationWindow $emailVerificationWindow; - - /** - * @var CommonName - */ - public CommonName $commonName; - - /** - * @var Email - */ - public Email $email; - - /** - * @var Locale Eg. "en_GB" - */ - public Locale $preferredLocale; - /** * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function __construct( IdentityId $identityId, Institution $identityInstitution, - SecondFactorId $secondFactorId, - StepupProvider $stepupProvider, - GssfId $gssfId, + public SecondFactorId $secondFactorId, + public StepupProvider $stepupProvider, + public GssfId $gssfId, public bool $emailVerificationRequired, - EmailVerificationWindow $emailVerificationWindow, + public EmailVerificationWindow $emailVerificationWindow, public string $emailVerificationNonce, - CommonName $commonName, - Email $email, - Locale $preferredLocale, + public CommonName $commonName, + public Email $email, + /** + * @var Locale Eg. "en_GB" + */ + public Locale $preferredLocale, ) { parent::__construct($identityId, $identityInstitution); - - $this->secondFactorId = $secondFactorId; - $this->stepupProvider = $stepupProvider; - $this->gssfId = $gssfId; - $this->emailVerificationWindow = $emailVerificationWindow; - $this->commonName = $commonName; - $this->email = $email; - $this->preferredLocale = $preferredLocale; } public function getAuditLogMetadata(): Metadata @@ -143,6 +106,8 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! + * + * @return array */ public function serialize(): array { @@ -182,6 +147,9 @@ public function obtainUserData(): array return array_merge($serializedPublicUserData, $serializedSensitiveUserData); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php index f236f3c60..1df5a9190 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php @@ -32,6 +32,9 @@ */ class IdentityAccreditedAsRaEvent extends IdentityEvent implements RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'identity_id', 'name_id', @@ -41,48 +44,23 @@ class IdentityAccreditedAsRaEvent extends IdentityEvent implements RightToObtain 'contact_information', ]; - /** - * @var NameId - */ - public NameId $nameId; - - /** - * @var RegistrationAuthorityRole - */ - public RegistrationAuthorityRole $registrationAuthorityRole; - - /** - * @var Location - */ - public Location $location; - - /** - * @var ContactInformation - */ - public ContactInformation $contactInformation; - /** * @param IdentityId $identityId * @param NameId $nameId * @param Institution $institution - * @param RegistrationAuthorityRole $role + * @param RegistrationAuthorityRole $registrationAuthorityRole * @param Location $location * @param ContactInformation $contactInformation */ public function __construct( IdentityId $identityId, - NameId $nameId, + public NameId $nameId, Institution $institution, - RegistrationAuthorityRole $role, - Location $location, - ContactInformation $contactInformation, + public RegistrationAuthorityRole $registrationAuthorityRole, + public Location $location, + public ContactInformation $contactInformation, ) { parent::__construct($identityId, $institution); - - $this->nameId = $nameId; - $this->registrationAuthorityRole = $role; - $this->location = $location; - $this->contactInformation = $contactInformation; } public function getAuditLogMetadata(): Metadata @@ -123,6 +101,9 @@ public function obtainUserData(): array return $this->serialize(); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaForInstitutionEvent.php index 36235b5fe..71c9b0d03 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaForInstitutionEvent.php @@ -29,6 +29,9 @@ class IdentityAccreditedAsRaForInstitutionEvent extends IdentityEvent implements RightToObtainDataInterface { +/** + * @var string[] + */ private array $allowlist = [ 'identity_id', 'name_id', @@ -39,56 +42,16 @@ class IdentityAccreditedAsRaForInstitutionEvent extends IdentityEvent implements 'ra_institution', ]; - /** - * @var NameId - */ - public NameId $nameId; - - /** - * @var RegistrationAuthorityRole - */ - public RegistrationAuthorityRole $registrationAuthorityRole; - - /** - * @var Location - */ - public Location $location; - - /** - * @var ContactInformation - */ - public ContactInformation $contactInformation; - - /** - * @var Institution - */ - public Institution $raInstitution; - - /** - * @param IdentityId $identityId - * @param NameId $nameId - * @param Institution $institution - * @param RegistrationAuthorityRole $role - * @param Location $location - * @param ContactInformation $contactInformation - * @param Institution $raInstitution - */ public function __construct( IdentityId $identityId, - NameId $nameId, + public NameId $nameId, Institution $institution, - RegistrationAuthorityRole $role, - Location $location, - ContactInformation $contactInformation, - Institution $raInstitution, + public RegistrationAuthorityRole $registrationAuthorityRole, + public Location $location, + public ContactInformation $contactInformation, + public Institution $raInstitution, ) { parent::__construct($identityId, $institution); - - $this->nameId = $nameId; - $this->registrationAuthorityRole = $role; - $this->location = $location; - $this->contactInformation = $contactInformation; - $this->raInstitution = $raInstitution; } public function getAuditLogMetadata(): Metadata @@ -116,6 +79,7 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! + * @return array */ public function serialize(): array { @@ -130,11 +94,17 @@ public function serialize(): array ]; } + /** + * @return array + */ public function obtainUserData(): array { return $this->serialize(); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php index 3eee576bc..c3bfe3f1d 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php @@ -32,6 +32,10 @@ */ class IdentityAccreditedAsRaaEvent extends IdentityEvent implements RightToObtainDataInterface { + /** @var string[] */ + /** + * @var string[] + */ private array $allowlist = [ 'identity_id', 'name_id', @@ -41,48 +45,15 @@ class IdentityAccreditedAsRaaEvent extends IdentityEvent implements RightToObtai 'contact_information', ]; - /** - * @var NameId - */ - public NameId $nameId; - - /** - * @var RegistrationAuthorityRole - */ - public RegistrationAuthorityRole $registrationAuthorityRole; - - /** - * @var Location - */ - public Location $location; - - /** - * @var ContactInformation - */ - public ContactInformation $contactInformation; - - /** - * @param IdentityId $identityId - * @param NameId $nameId - * @param Institution $institution - * @param RegistrationAuthorityRole $role - * @param Location $location - * @param ContactInformation $contactInformation - */ public function __construct( IdentityId $identityId, - NameId $nameId, + public NameId $nameId, Institution $institution, - RegistrationAuthorityRole $role, - Location $location, - ContactInformation $contactInformation, + public RegistrationAuthorityRole $registrationAuthorityRole, + public Location $location, + public ContactInformation $contactInformation, ) { parent::__construct($identityId, $institution); - - $this->nameId = $nameId; - $this->registrationAuthorityRole = $role; - $this->location = $location; - $this->contactInformation = $contactInformation; } public function getAuditLogMetadata(): Metadata @@ -94,6 +65,9 @@ public function getAuditLogMetadata(): Metadata return $metadata; } + /** + * @param array $data + */ public static function deserialize(array $data): self { return new self( @@ -106,6 +80,9 @@ public static function deserialize(array $data): self ); } + /** + * @return array + */ public function serialize(): array { return [ @@ -123,6 +100,9 @@ public function obtainUserData(): array return $this->serialize(); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaForInstitutionEvent.php index 775bdb563..00ea52dc7 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaForInstitutionEvent.php @@ -29,6 +29,10 @@ class IdentityAccreditedAsRaaForInstitutionEvent extends IdentityEvent implements RightToObtainDataInterface { + /** @var string[] */ + /** + * @var string[] + */ private array $allowlist = [ 'identity_id', 'name_id', @@ -39,55 +43,16 @@ class IdentityAccreditedAsRaaForInstitutionEvent extends IdentityEvent implement 'ra_institution', ]; - /** - * @var NameId - */ - public NameId $nameId; - - /** - * @var RegistrationAuthorityRole - */ - public RegistrationAuthorityRole $registrationAuthorityRole; - - /** - * @var Location - */ - public Location $location; - - /** - * @var ContactInformation - */ - public ContactInformation $contactInformation; - /** - * @var Institution - */ - public Institution $raInstitution; - - /** - * @param IdentityId $identityId - * @param NameId $nameId - * @param Institution $institution - * @param RegistrationAuthorityRole $role - * @param Location $location - * @param ContactInformation $contactInformation - * @param Institution $raInstitution - */ public function __construct( IdentityId $identityId, - NameId $nameId, + public NameId $nameId, Institution $institution, - RegistrationAuthorityRole $role, - Location $location, - ContactInformation $contactInformation, - Institution $raInstitution, + public RegistrationAuthorityRole $registrationAuthorityRole, + public Location $location, + public ContactInformation $contactInformation, + public Institution $raInstitution, ) { parent::__construct($identityId, $institution); - - $this->nameId = $nameId; - $this->registrationAuthorityRole = $role; - $this->location = $location; - $this->contactInformation = $contactInformation; - $this->raInstitution = $raInstitution; } public function getAuditLogMetadata(): Metadata @@ -100,6 +65,9 @@ public function getAuditLogMetadata(): Metadata return $metadata; } + /** + * @param array $data + */ public static function deserialize(array $data): self { return new self( @@ -115,6 +83,7 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! + * @return array */ public function serialize(): array { @@ -129,11 +98,17 @@ public function serialize(): array ]; } + /** + * @return array + */ public function obtainUserData(): array { return $this->serialize(); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php index f80c42663..124f65040 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php @@ -31,6 +31,9 @@ class IdentityCreatedEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'id', 'institution', @@ -40,40 +43,15 @@ class IdentityCreatedEvent extends IdentityEvent implements Forgettable, RightTo 'email', ]; - /** - * @var NameId - */ - public NameId $nameId; - - /** - * @var CommonName - */ - public CommonName $commonName; - - /** - * @var Email - */ - public Email $email; - - /** - * @var Locale - */ - public Locale $preferredLocale; - public function __construct( IdentityId $id, Institution $institution, - NameId $nameId, - CommonName $commonName, - Email $email, - Locale $preferredLocale, + public NameId $nameId, + public CommonName $commonName, + public Email $email, + public Locale $preferredLocale, ) { parent::__construct($id, $institution); - - $this->nameId = $nameId; - $this->commonName = $commonName; - $this->email = $email; - $this->preferredLocale = $preferredLocale; } public function getAuditLogMetadata(): Metadata @@ -99,6 +77,8 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! + * + * @return array */ public function serialize(): array { @@ -130,6 +110,9 @@ public function obtainUserData(): array return array_merge($serializedPublicUserData, $serializedSensitiveUserData); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityEmailChangedEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityEmailChangedEvent.php index 154bf73cb..c55cd923e 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityEmailChangedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityEmailChangedEvent.php @@ -28,22 +28,18 @@ class IdentityEmailChangedEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'id', 'identity_institution', 'email', ]; - /** - * @var Email - */ - public Email $email; - - public function __construct(IdentityId $identityId, Institution $institution, Email $email) + public function __construct(IdentityId $identityId, Institution $institution, public Email $email) { parent::__construct($identityId, $institution); - - $this->email = $email; } public function getAuditLogMetadata(): Metadata @@ -70,6 +66,8 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! + * + * @return array */ public function serialize(): array { @@ -97,6 +95,9 @@ public function obtainUserData(): array return array_merge($serializedPublicUserData, $serializedSensitiveUserData); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityEvent.php index 8856dab21..952dcd893 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityEvent.php @@ -27,19 +27,7 @@ */ abstract class IdentityEvent implements AuditableEvent, SerializableInterface { - /** - * @var IdentityId - */ - public IdentityId $identityId; - - /** - * @var Institution - */ - public Institution $identityInstitution; - - public function __construct(IdentityId $identityId, Institution $identityInstitution) + public function __construct(public IdentityId $identityId, public Institution $identityInstitution) { - $this->identityId = $identityId; - $this->identityInstitution = $identityInstitution; } } diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityForgottenEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityForgottenEvent.php index be6a2eefe..552037111 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityForgottenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityForgottenEvent.php @@ -25,6 +25,9 @@ class IdentityForgottenEvent extends IdentityEvent implements RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'identity_id', 'institution', @@ -49,6 +52,8 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! + * + * @return array */ public function serialize(): array { @@ -63,6 +68,9 @@ public function obtainUserData(): array return $this->serialize(); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityRenamedEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityRenamedEvent.php index 71a017159..0acfdc71f 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityRenamedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityRenamedEvent.php @@ -28,22 +28,18 @@ class IdentityRenamedEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'id', 'institution', 'common_name', ]; - /** - * @var CommonName - */ - public CommonName $commonName; - - public function __construct(IdentityId $id, Institution $institution, CommonName $commonName) + public function __construct(IdentityId $id, Institution $institution, public CommonName $commonName) { parent::__construct($id, $institution); - - $this->commonName = $commonName; } public function getAuditLogMetadata(): Metadata @@ -70,6 +66,8 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! + * + * @return array */ public function serialize(): array { @@ -97,6 +95,9 @@ public function obtainUserData(): array return array_merge($serializedPublicUserData, $serializedSensitiveUserData); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/InstitutionsAddedToWhitelistEvent.php b/src/Surfnet/Stepup/Identity/Event/InstitutionsAddedToWhitelistEvent.php index d9d7fc7a5..52f27f3d3 100644 --- a/src/Surfnet/Stepup/Identity/Event/InstitutionsAddedToWhitelistEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/InstitutionsAddedToWhitelistEvent.php @@ -22,14 +22,8 @@ class InstitutionsAddedToWhitelistEvent implements WhitelistEvent { - /** - * @var InstitutionCollection - */ - public InstitutionCollection $addedInstitutions; - - public function __construct(InstitutionCollection $addedInstitutions) + public function __construct(public InstitutionCollection $addedInstitutions) { - $this->addedInstitutions = $addedInstitutions; } /** @@ -44,6 +38,8 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! + * + * @return array */ public function serialize(): array { diff --git a/src/Surfnet/Stepup/Identity/Event/InstitutionsRemovedFromWhitelistEvent.php b/src/Surfnet/Stepup/Identity/Event/InstitutionsRemovedFromWhitelistEvent.php index f69fc1957..4457c3446 100644 --- a/src/Surfnet/Stepup/Identity/Event/InstitutionsRemovedFromWhitelistEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/InstitutionsRemovedFromWhitelistEvent.php @@ -22,14 +22,8 @@ class InstitutionsRemovedFromWhitelistEvent implements WhitelistEvent { - /** - * @var InstitutionCollection - */ - public InstitutionCollection $removedInstitutions; - - public function __construct(InstitutionCollection $removedInstitutions) + public function __construct(public InstitutionCollection $removedInstitutions) { - $this->removedInstitutions = $removedInstitutions; } /** @@ -44,6 +38,8 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! + * + * @return array */ public function serialize(): array { diff --git a/src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php b/src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php index e17d2ddc6..07057161a 100644 --- a/src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php @@ -26,27 +26,23 @@ class LocalePreferenceExpressedEvent extends IdentityEvent implements RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'id', 'institution', 'preferred_locale', ]; - /** - * @var Locale - */ - public Locale $preferredLocale; - /** * @param IdentityId $id * @param Institution $institution * @param Locale $preferredLocale */ - public function __construct(IdentityId $id, Institution $institution, Locale $preferredLocale) + public function __construct(IdentityId $id, Institution $institution, public Locale $preferredLocale) { parent::__construct($id, $institution); - - $this->preferredLocale = $preferredLocale; } public function getAuditLogMetadata(): Metadata @@ -69,6 +65,8 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! + * + * @return array */ public function serialize(): array { @@ -84,6 +82,9 @@ public function obtainUserData(): array return $this->serialize(); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenAndVerifiedEvent.php b/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenAndVerifiedEvent.php index 4ac4ea094..9fb8d4a80 100644 --- a/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenAndVerifiedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenAndVerifiedEvent.php @@ -37,6 +37,9 @@ class PhonePossessionProvenAndVerifiedEvent extends IdentityEvent implements PossessionProvenAndVerified, RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'identity_id', 'identity_institution', @@ -49,36 +52,6 @@ class PhonePossessionProvenAndVerifiedEvent extends IdentityEvent implements 'common_name', ]; - /** - * @var SecondFactorId - */ - public SecondFactorId $secondFactorId; - - /** - * @var PhoneNumber - */ - public PhoneNumber $phoneNumber; - - /** - * @var CommonName - */ - public CommonName $commonName; - - /** - * @var Email - */ - public Email $email; - - /** - * @var Locale Eg. "en_GB" - */ - public Locale $preferredLocale; - - /** - * @var DateTime - */ - public DateTime $registrationRequestedAt; - /** * @param IdentityId $identityId * @param Institution $identityInstitution @@ -86,29 +59,22 @@ class PhonePossessionProvenAndVerifiedEvent extends IdentityEvent implements * @param PhoneNumber $phoneNumber * @param CommonName $commonName * @param Email $email - * @param Locale $locale + * @param Locale $preferredLocale * @param DateTime $registrationRequestedAt * @param string $registrationCode */ public function __construct( IdentityId $identityId, Institution $identityInstitution, - SecondFactorId $secondFactorId, - PhoneNumber $phoneNumber, - CommonName $commonName, - Email $email, - Locale $locale, - DateTime $registrationRequestedAt, + public SecondFactorId $secondFactorId, + public PhoneNumber $phoneNumber, + public CommonName $commonName, + public Email $email, + public Locale $preferredLocale, + public DateTime $registrationRequestedAt, public string $registrationCode, ) { parent::__construct($identityId, $identityInstitution); - - $this->secondFactorId = $secondFactorId; - $this->phoneNumber = $phoneNumber; - $this->commonName = $commonName; - $this->email = $email; - $this->preferredLocale = $locale; - $this->registrationRequestedAt = $registrationRequestedAt; } public function getAuditLogMetadata(): Metadata @@ -145,6 +111,8 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! + * + * @return array */ public function serialize(): array { @@ -182,6 +150,9 @@ public function obtainUserData(): array return array_merge($serializedPublicUserData, $serializedSensitiveUserData); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenEvent.php b/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenEvent.php index 904709ed6..56ae17f69 100644 --- a/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenEvent.php @@ -34,6 +34,9 @@ class PhonePossessionProvenEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'identity_id', 'identity_institution', @@ -45,36 +48,6 @@ class PhonePossessionProvenEvent extends IdentityEvent implements Forgettable, R 'common_name', ]; - /** - * @var SecondFactorId - */ - public SecondFactorId $secondFactorId; - - /** - * @var PhoneNumber - */ - public PhoneNumber $phoneNumber; - - /** - * @var EmailVerificationWindow - */ - public EmailVerificationWindow $emailVerificationWindow; - - /** - * @var CommonName - */ - public CommonName $commonName; - - /** - * @var Email - */ - public Email $email; - - /** - * @var Locale Eg. "en_GB" - */ - public Locale $preferredLocale; - /** * @param IdentityId $identityId * @param Institution $identityInstitution @@ -92,23 +65,16 @@ class PhonePossessionProvenEvent extends IdentityEvent implements Forgettable, R public function __construct( IdentityId $identityId, Institution $identityInstitution, - SecondFactorId $secondFactorId, - PhoneNumber $phoneNumber, + public SecondFactorId $secondFactorId, + public PhoneNumber $phoneNumber, public bool $emailVerificationRequired, - EmailVerificationWindow $emailVerificationWindow, + public EmailVerificationWindow $emailVerificationWindow, public string $emailVerificationNonce, - CommonName $commonName, - Email $email, - Locale $preferredLocale, + public CommonName $commonName, + public Email $email, + public Locale $preferredLocale, ) { parent::__construct($identityId, $identityInstitution); - - $this->secondFactorId = $secondFactorId; - $this->phoneNumber = $phoneNumber; - $this->emailVerificationWindow = $emailVerificationWindow; - $this->commonName = $commonName; - $this->email = $email; - $this->preferredLocale = $preferredLocale; } public function getAuditLogMetadata(): Metadata @@ -145,6 +111,8 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! + * + * @return array */ public function serialize(): array { @@ -183,6 +151,9 @@ public function obtainUserData(): array return array_merge($serializedPublicUserData, $serializedSensitiveUserData); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/PhoneRecoveryTokenPossessionProvenEvent.php b/src/Surfnet/Stepup/Identity/Event/PhoneRecoveryTokenPossessionProvenEvent.php index 328baaeaa..fa27c8dee 100644 --- a/src/Surfnet/Stepup/Identity/Event/PhoneRecoveryTokenPossessionProvenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/PhoneRecoveryTokenPossessionProvenEvent.php @@ -39,6 +39,9 @@ */ class PhoneRecoveryTokenPossessionProvenEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'identity_id', 'identity_institution', @@ -48,47 +51,19 @@ class PhoneRecoveryTokenPossessionProvenEvent extends IdentityEvent implements F 'common_name', ]; - /** - * @var RecoveryTokenId - */ - public RecoveryTokenId $recoveryTokenId; - - /** - * @var PhoneNumber - */ - public PhoneNumber $phoneNumber; - - /** - * @var CommonName - */ - public CommonName $commonName; - - /** - * @var Email - */ - public Email $email; - - /** - * @var Locale Eg. "en_GB" - */ - public Locale $preferredLocale; - public function __construct( IdentityId $identityId, Institution $identityInstitution, - RecoveryTokenId $recoveryTokenId, - PhoneNumber $phoneNumber, - CommonName $commonName, - Email $email, - Locale $preferredLocale, + public RecoveryTokenId $recoveryTokenId, + public PhoneNumber $phoneNumber, + public CommonName $commonName, + public Email $email, + /** + * @var Locale Eg. "en_GB" + */ + public Locale $preferredLocale, ) { parent::__construct($identityId, $identityInstitution); - - $this->recoveryTokenId = $recoveryTokenId; - $this->phoneNumber = $phoneNumber; - $this->commonName = $commonName; - $this->email = $email; - $this->preferredLocale = $preferredLocale; } public function getAuditLogMetadata(): Metadata @@ -116,6 +91,8 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! + * + * @return array */ public function serialize(): array { @@ -152,6 +129,9 @@ public function obtainUserData(): array return array_merge($serializedPublicUserData, $serializedSensitiveUserData); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php b/src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php index e1cf90c80..074997bf2 100644 --- a/src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php @@ -28,14 +28,8 @@ class RecoveryTokenRevokedEvent extends IdentityEvent implements RightToObtainDataInterface { /** - * @var RecoveryTokenId + * @var string[] */ - public RecoveryTokenId $recoveryTokenId; - /** - * @var RecoveryTokenType - */ - public RecoveryTokenType $recoveryTokenType; - private array $allowlist = [ 'identity_id', 'identity_institution', @@ -46,12 +40,10 @@ class RecoveryTokenRevokedEvent extends IdentityEvent implements RightToObtainDa final public function __construct( IdentityId $identityId, Institution $identityInstitution, - RecoveryTokenId $recoveryTokenId, - RecoveryTokenType $recoveryTokenType, + public RecoveryTokenId $recoveryTokenId, + public RecoveryTokenType $recoveryTokenType, ) { parent::__construct($identityId, $identityInstitution); - $this->recoveryTokenId = $recoveryTokenId; - $this->recoveryTokenType = $recoveryTokenType; } final public static function deserialize(array $data): self @@ -95,6 +87,9 @@ final public function serialize(): array ]; } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedEvent.php b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedEvent.php index 38fc00ae6..bab676149 100644 --- a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedEvent.php @@ -31,6 +31,9 @@ */ class RegistrationAuthorityInformationAmendedEvent extends IdentityEvent implements RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'identity_id', 'name_id', @@ -39,21 +42,6 @@ class RegistrationAuthorityInformationAmendedEvent extends IdentityEvent impleme 'contact_information', ]; - /** - * @var NameId - */ - public NameId $nameId; - - /** - * @var Location - */ - public Location $location; - - /** - * @var ContactInformation - */ - public ContactInformation $contactInformation; - /** * @param IdentityId $identityId * @param Institution $institution @@ -64,15 +52,11 @@ class RegistrationAuthorityInformationAmendedEvent extends IdentityEvent impleme public function __construct( IdentityId $identityId, Institution $institution, - NameId $nameId, - Location $location, - ContactInformation $contactInformation, + public NameId $nameId, + public Location $location, + public ContactInformation $contactInformation, ) { parent::__construct($identityId, $institution); - - $this->nameId = $nameId; - $this->location = $location; - $this->contactInformation = $contactInformation; } public function getAuditLogMetadata(): Metadata @@ -111,6 +95,9 @@ public function obtainUserData(): array return $this->serialize(); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedForInstitutionEvent.php index e23ab8f21..0574df110 100644 --- a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedForInstitutionEvent.php @@ -29,6 +29,9 @@ class RegistrationAuthorityInformationAmendedForInstitutionEvent extends IdentityEvent implements RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'identity_id', 'institution', @@ -38,26 +41,6 @@ class RegistrationAuthorityInformationAmendedForInstitutionEvent extends Identit 'ra_institution', ]; - /** - * @var NameId - */ - public NameId $nameId; - - /** - * @var Location - */ - public Location $location; - - /** - * @var ContactInformation - */ - public ContactInformation $contactInformation; - - /** - * @var Institution - */ - public Institution $raInstitution; - /** * @param IdentityId $identityId * @param Institution $institution @@ -69,17 +52,12 @@ class RegistrationAuthorityInformationAmendedForInstitutionEvent extends Identit public function __construct( IdentityId $identityId, Institution $institution, - NameId $nameId, - Location $location, - ContactInformation $contactInformation, - Institution $raInstitution, + public NameId $nameId, + public Location $location, + public ContactInformation $contactInformation, + public Institution $raInstitution, ) { parent::__construct($identityId, $institution); - - $this->nameId = $nameId; - $this->location = $location; - $this->contactInformation = $contactInformation; - $this->raInstitution = $raInstitution; } public function getAuditLogMetadata(): Metadata @@ -120,6 +98,9 @@ public function obtainUserData(): array return $this->serialize(); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedEvent.php b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedEvent.php index 922a751a8..c7dd0b6d5 100644 --- a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedEvent.php @@ -33,6 +33,9 @@ */ class RegistrationAuthorityRetractedEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'identity_id', 'identity_institution', @@ -41,33 +44,14 @@ class RegistrationAuthorityRetractedEvent extends IdentityEvent implements Forge 'email', ]; - /** - * @var NameId - */ - public NameId $nameId; - - /** - * @var CommonName - */ - public CommonName $commonName; - - /** - * @var Email - */ - public Email $email; - public function __construct( IdentityId $identityId, Institution $institution, - NameId $nameId, - CommonName $commonName, - Email $email, + public NameId $nameId, + public CommonName $commonName, + public Email $email, ) { parent::__construct($identityId, $institution); - - $this->nameId = $nameId; - $this->commonName = $commonName; - $this->email = $email; } public function getAuditLogMetadata(): Metadata @@ -119,6 +103,9 @@ public function obtainUserData(): array return array_merge($serializedPublicUserData, $serializedSensitiveUserData); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedForInstitutionEvent.php index b2613861a..3cbe8a920 100644 --- a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedForInstitutionEvent.php @@ -32,6 +32,9 @@ class RegistrationAuthorityRetractedForInstitutionEvent extends IdentityEvent im Forgettable, RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'identity_id', 'identity_institution', @@ -41,40 +44,15 @@ class RegistrationAuthorityRetractedForInstitutionEvent extends IdentityEvent im 'common_name', ]; - /** - * @var NameId - */ - public NameId $nameId; - - /** - * @var CommonName - */ - public CommonName $commonName; - - /** - * @var Email - */ - public Email $email; - - /** - * @var Institution - */ - public Institution $raInstitution; - public function __construct( IdentityId $identityId, Institution $institution, - NameId $nameId, - CommonName $commonName, - Email $email, - Institution $raInstitution, + public NameId $nameId, + public CommonName $commonName, + public Email $email, + public Institution $raInstitution, ) { parent::__construct($identityId, $institution); - - $this->nameId = $nameId; - $this->commonName = $commonName; - $this->email = $email; - $this->raInstitution = $raInstitution; } public function getAuditLogMetadata(): Metadata @@ -100,6 +78,8 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! + * + * @return array */ public function serialize(): array { @@ -131,6 +111,9 @@ public function obtainUserData(): array return array_merge($serializedPublicUserData, $serializedSensitiveUserData); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php b/src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php index 78b77587e..911a39406 100644 --- a/src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php @@ -42,6 +42,9 @@ class SafeStoreSecretRecoveryTokenPossessionPromisedEvent extends IdentityEvent Forgettable, RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'identity_id', 'identity_institution', @@ -51,32 +54,16 @@ class SafeStoreSecretRecoveryTokenPossessionPromisedEvent extends IdentityEvent 'common_name', ]; - public RecoveryTokenId $recoveryTokenId; - - public RecoveryTokenIdentifier $secret; - - public CommonName $commonName; - - public Email $email; - - public Locale $preferredLocale; - public function __construct( IdentityId $identityId, Institution $identityInstitution, - RecoveryTokenId $recoveryTokenId, - RecoveryTokenIdentifier $secret, - CommonName $commonName, - Email $email, - Locale $preferredLocale, + public RecoveryTokenId $recoveryTokenId, + public RecoveryTokenIdentifier $secret, + public CommonName $commonName, + public Email $email, + public Locale $preferredLocale, ) { parent::__construct($identityId, $identityInstitution); - - $this->recoveryTokenId = $recoveryTokenId; - $this->secret = $secret; - $this->commonName = $commonName; - $this->email = $email; - $this->preferredLocale = $preferredLocale; } public function getAuditLogMetadata(): Metadata @@ -105,6 +92,8 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! + * + * @return array */ public function serialize(): array { @@ -139,6 +128,9 @@ public function obtainUserData(): array return array_merge($serializedPublicUserData, $serializedSensitiveUserData); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php b/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php index 72652f4d5..41350c661 100644 --- a/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php @@ -42,6 +42,9 @@ */ class SecondFactorMigratedEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'identity_id', 'source_institution', @@ -56,76 +59,24 @@ class SecondFactorMigratedEvent extends IdentityEvent implements Forgettable, Ri 'email', ]; - /** - * @var NameId - */ - public NameId $targetNameId; - - /** - * @var SecondFactorId - */ - public SecondFactorId $secondFactorId; - - /** - * @var SecondFactorId - */ - public SecondFactorId $newSecondFactorId; - - /** - * @var SecondFactorType - */ - public SecondFactorType $secondFactorType; - - /** - * @var SecondFactorIdentifier - */ - public SecondFactorIdentifier $secondFactorIdentifier; - - /** - * @var CommonName - */ - public CommonName $commonName; - - /** - * @var Email - */ - public Email $email; - /** - * @var Locale - */ - public Locale $preferredLocale; - /** - * @var VettingType - */ - public VettingType $vettingType; - /** * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function __construct( IdentityId $identityId, - NameId $targetNameId, + public NameId $targetNameId, Institution $targetInstitution, private Institution $sourceInstitution, - SecondFactorId $secondFactorId, - SecondFactorId $newSecondFactorId, - SecondFactorType $secondFactorType, - SecondFactorIdentifier $secondFactorIdentifier, - VettingType $vettingType, - CommonName $commonName, - Email $email, - Locale $preferredLocale, + public SecondFactorId $secondFactorId, + public SecondFactorId $newSecondFactorId, + public SecondFactorType $secondFactorType, + public SecondFactorIdentifier $secondFactorIdentifier, + public VettingType $vettingType, + public CommonName $commonName, + public Email $email, + public Locale $preferredLocale, ) { parent::__construct($identityId, $targetInstitution); - $this->targetNameId = $targetNameId; - $this->secondFactorId = $secondFactorId; - $this->newSecondFactorId = $newSecondFactorId; - $this->secondFactorType = $secondFactorType; - $this->secondFactorIdentifier = $secondFactorIdentifier; - $this->vettingType = $vettingType; - $this->commonName = $commonName; - $this->email = $email; - $this->preferredLocale = $preferredLocale; } public function getAuditLogMetadata(): Metadata @@ -168,6 +119,8 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! + * + * @return array */ public function serialize(): array { @@ -208,6 +161,9 @@ public function obtainUserData(): array return array_merge($serializedPublicUserData, $serializedSensitiveUserData); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedToEvent.php b/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedToEvent.php index c3159993d..c4d042990 100644 --- a/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedToEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedToEvent.php @@ -34,6 +34,9 @@ */ class SecondFactorMigratedToEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'identity_id', 'identity_institution', @@ -44,50 +47,19 @@ class SecondFactorMigratedToEvent extends IdentityEvent implements Forgettable, 'second_factor_identifier', ]; - /** - * @var Institution - */ - public Institution $targetInstitution; - - /** - * @var SecondFactorId - */ - public SecondFactorId $secondFactorId; - - /** - * @var SecondFactorId - */ - public SecondFactorId $targetSecondFactorId; - - /** - * @var SecondFactorType - */ - public SecondFactorType $secondFactorType; - - /** - * @var SecondFactorIdentifier - */ - public SecondFactorIdentifier $secondFactorIdentifier; - /** * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function __construct( IdentityId $identityId, Institution $institution, - Institution $targetInstitution, - SecondFactorId $secondFactorId, - SecondFactorId $targetSecondFactorId, - SecondFactorType $secondFactorType, - SecondFactorIdentifier $secondFactorIdentifier, + public Institution $targetInstitution, + public SecondFactorId $secondFactorId, + public SecondFactorId $targetSecondFactorId, + public SecondFactorType $secondFactorType, + public SecondFactorIdentifier $secondFactorIdentifier, ) { parent::__construct($identityId, $institution); - - $this->secondFactorId = $secondFactorId; - $this->targetSecondFactorId = $targetSecondFactorId; - $this->secondFactorType = $secondFactorType; - $this->secondFactorIdentifier = $secondFactorIdentifier; - $this->targetInstitution = $targetInstitution; } public function getAuditLogMetadata(): Metadata @@ -118,6 +90,8 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! + * + * @return array */ public function serialize(): array { @@ -149,6 +123,9 @@ public function obtainUserData(): array return array_merge($serializedPublicUserData, $serializedSensitiveUserData); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php b/src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php index add677c7f..3a98fbe7d 100644 --- a/src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php @@ -31,6 +31,9 @@ abstract class SecondFactorRevokedEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'identity_id', 'identity_institution', @@ -39,33 +42,14 @@ abstract class SecondFactorRevokedEvent extends IdentityEvent implements Forgett 'second_factor_identifier', ]; - /** - * @var SecondFactorId - */ - public SecondFactorId $secondFactorId; - - /** - * @var SecondFactorType - */ - public SecondFactorType $secondFactorType; - - /** - * @var SecondFactorIdentifier - */ - public SecondFactorIdentifier $secondFactorIdentifier; - final public function __construct( IdentityId $identityId, Institution $identityInstitution, - SecondFactorId $secondFactorId, - SecondFactorType $secondFactorType, - SecondFactorIdentifier $secondFactorIdentifier, + public SecondFactorId $secondFactorId, + public SecondFactorType $secondFactorType, + public SecondFactorIdentifier $secondFactorIdentifier, ) { parent::__construct($identityId, $identityInstitution); - - $this->secondFactorId = $secondFactorId; - $this->secondFactorType = $secondFactorType; - $this->secondFactorIdentifier = $secondFactorIdentifier; } public function getAuditLogMetadata(): Metadata @@ -124,6 +108,9 @@ public function obtainUserData(): array return array_merge($serializedPublicUserData, $serializedSensitiveUserData); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php b/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php index 5ed1ac3f7..fefdb55e4 100644 --- a/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php @@ -40,6 +40,9 @@ */ class SecondFactorVettedEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'identity_id', 'name_id', @@ -53,68 +56,25 @@ class SecondFactorVettedEvent extends IdentityEvent implements Forgettable, Righ 'vetting_type', ]; - /** - * @var NameId - */ - public NameId $nameId; - - /** - * @var SecondFactorId - */ - public SecondFactorId $secondFactorId; - - /** - * @var SecondFactorType - */ - public SecondFactorType $secondFactorType; - - /** - * @var SecondFactorIdentifier - */ - public SecondFactorIdentifier $secondFactorIdentifier; - - /** - * @var CommonName - */ - public CommonName $commonName; - - /** - * @var Email - */ - public Email $email; - - /** - * @var Locale Eg. "en_GB" - */ - public Locale $preferredLocale; - - public ?VettingType $vettingType; - /** * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function __construct( IdentityId $identityId, - NameId $nameId, + public NameId $nameId, Institution $institution, - SecondFactorId $secondFactorId, - SecondFactorType $secondFactorType, - SecondFactorIdentifier $secondFactorIdentifier, - CommonName $commonName, - Email $email, - Locale $preferredLocale, - VettingType $vettingType, + public SecondFactorId $secondFactorId, + public SecondFactorType $secondFactorType, + public SecondFactorIdentifier $secondFactorIdentifier, + public CommonName $commonName, + public Email $email, + /** + * @var Locale Eg. "en_GB" + */ + public Locale $preferredLocale, + public ?VettingType $vettingType, ) { parent::__construct($identityId, $institution); - - $this->nameId = $nameId; - $this->secondFactorId = $secondFactorId; - $this->secondFactorType = $secondFactorType; - $this->secondFactorIdentifier = $secondFactorIdentifier; - $this->commonName = $commonName; - $this->email = $email; - $this->preferredLocale = $preferredLocale; - $this->vettingType = $vettingType; } public function getAuditLogMetadata(): Metadata @@ -149,6 +109,8 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! + * + * @return array */ public function serialize(): array { @@ -186,6 +148,9 @@ public function obtainUserData(): array return array_merge($serializedPublicUserData, $serializedSensitiveUserData); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php b/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php index 058b6334e..a3c1a776b 100644 --- a/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php +++ b/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php @@ -43,6 +43,9 @@ class SecondFactorVettedWithoutTokenProofOfPossession extends IdentityEvent impl Forgettable, RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'identity_id', 'name_id', @@ -56,73 +59,30 @@ class SecondFactorVettedWithoutTokenProofOfPossession extends IdentityEvent impl 'vetting_type', ]; - /** - * @var NameId - */ - public NameId $nameId; - - /** - * @var SecondFactorId - */ - public SecondFactorId $secondFactorId; - - /** - * @var SecondFactorType - */ - public SecondFactorType $secondFactorType; - - /** - * @var SecondFactorIdentifier - */ - public SecondFactorIdentifier $secondFactorIdentifier; - /** * @var DocumentNumber */ public DocumentNumber $documentNumber; - /** - * @var CommonName - */ - public CommonName $commonName; - - /** - * @var Email - */ - public Email $email; - - /** - * @var Locale Eg. "en_GB" - */ - public Locale $preferredLocale; - - public ?VettingType $vettingType; - /** * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function __construct( IdentityId $identityId, - NameId $nameId, + public NameId $nameId, Institution $institution, - SecondFactorId $secondFactorId, - SecondFactorType $secondFactorType, - SecondFactorIdentifier $secondFactorIdentifier, - CommonName $commonName, - Email $email, - Locale $preferredLocale, - VettingType $vettingType, + public SecondFactorId $secondFactorId, + public SecondFactorType $secondFactorType, + public SecondFactorIdentifier $secondFactorIdentifier, + public CommonName $commonName, + public Email $email, + /** + * @var Locale Eg. "en_GB" + */ + public Locale $preferredLocale, + public ?VettingType $vettingType, ) { parent::__construct($identityId, $institution); - - $this->nameId = $nameId; - $this->secondFactorId = $secondFactorId; - $this->secondFactorType = $secondFactorType; - $this->secondFactorIdentifier = $secondFactorIdentifier; - $this->commonName = $commonName; - $this->email = $email; - $this->preferredLocale = $preferredLocale; - $this->vettingType = $vettingType; } public function getAuditLogMetadata(): Metadata @@ -157,6 +117,8 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! + * + * @return array */ public function serialize(): array { @@ -194,6 +156,9 @@ public function obtainUserData(): array return array_merge($serializedPublicUserData, $serializedSensitiveUserData); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenAndVerifiedEvent.php b/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenAndVerifiedEvent.php index 4d0c689e9..96fb8ff3a 100644 --- a/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenAndVerifiedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenAndVerifiedEvent.php @@ -40,6 +40,9 @@ class U2fDevicePossessionProvenAndVerifiedEvent extends IdentityEvent implements PossessionProvenAndVerified, RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'identity_id', 'identity_institution', @@ -52,36 +55,6 @@ class U2fDevicePossessionProvenAndVerifiedEvent extends IdentityEvent implements 'common_name', ]; - /** - * @var SecondFactorId - */ - public SecondFactorId $secondFactorId; - - /** - * @var U2fKeyHandle - */ - public U2fKeyHandle $keyHandle; - - /** - * @var CommonName - */ - public CommonName $commonName; - - /** - * @var Email - */ - public Email $email; - - /** - * @var Locale Eg. "en_GB" - */ - public Locale $preferredLocale; - - /** - * @var DateTime - */ - public DateTime $registrationRequestedAt; - /** * @param IdentityId $identityId * @param Institution $identityInstitution @@ -89,29 +62,22 @@ class U2fDevicePossessionProvenAndVerifiedEvent extends IdentityEvent implements * @param U2fKeyHandle $keyHandle * @param CommonName $commonName * @param Email $email - * @param Locale $locale + * @param Locale $preferredLocale * @param DateTime $registrationRequestedAt * @param string $registrationCode */ public function __construct( IdentityId $identityId, Institution $identityInstitution, - SecondFactorId $secondFactorId, - U2fKeyHandle $keyHandle, - CommonName $commonName, - Email $email, - Locale $locale, - DateTime $registrationRequestedAt, + public SecondFactorId $secondFactorId, + public U2fKeyHandle $keyHandle, + public CommonName $commonName, + public Email $email, + public Locale $preferredLocale, + public DateTime $registrationRequestedAt, public string $registrationCode, ) { parent::__construct($identityId, $identityInstitution); - - $this->secondFactorId = $secondFactorId; - $this->keyHandle = $keyHandle; - $this->commonName = $commonName; - $this->email = $email; - $this->preferredLocale = $locale; - $this->registrationRequestedAt = $registrationRequestedAt; } public function getAuditLogMetadata(): Metadata @@ -148,6 +114,8 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! + * + * @return array */ public function serialize(): array { @@ -185,6 +153,9 @@ public function obtainUserData(): array return array_merge($serializedPublicUserData, $serializedSensitiveUserData); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php b/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php index e137c3aeb..b5475b8c2 100644 --- a/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php @@ -37,6 +37,9 @@ */ class U2fDevicePossessionProvenEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'identity_id', 'identity_institution', @@ -48,36 +51,6 @@ class U2fDevicePossessionProvenEvent extends IdentityEvent implements Forgettabl 'common_name', ]; - /** - * @var SecondFactorId - */ - public SecondFactorId $secondFactorId; - - /** - * @var U2fKeyHandle - */ - public U2fKeyHandle $keyHandle; - - /** - * @var EmailVerificationWindow - */ - public EmailVerificationWindow $emailVerificationWindow; - - /** - * @var CommonName - */ - public CommonName $commonName; - - /** - * @var Email - */ - public Email $email; - - /** - * @var Locale Eg. "en_GB" - */ - public Locale $preferredLocale; - /** * @param IdentityId $identityId * @param Institution $identityInstitution @@ -95,23 +68,16 @@ class U2fDevicePossessionProvenEvent extends IdentityEvent implements Forgettabl public function __construct( IdentityId $identityId, Institution $identityInstitution, - SecondFactorId $secondFactorId, - U2fKeyHandle $keyHandle, + public SecondFactorId $secondFactorId, + public U2fKeyHandle $keyHandle, public bool $emailVerificationRequired, - EmailVerificationWindow $emailVerificationWindow, + public EmailVerificationWindow $emailVerificationWindow, public string $emailVerificationNonce, - CommonName $commonName, - Email $email, - Locale $preferredLocale, + public CommonName $commonName, + public Email $email, + public Locale $preferredLocale, ) { parent::__construct($identityId, $identityInstitution); - - $this->secondFactorId = $secondFactorId; - $this->keyHandle = $keyHandle; - $this->emailVerificationWindow = $emailVerificationWindow; - $this->commonName = $commonName; - $this->email = $email; - $this->preferredLocale = $preferredLocale; } public function getAuditLogMetadata(): Metadata @@ -148,6 +114,8 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! + * + * @return array */ public function serialize(): array { @@ -186,6 +154,9 @@ public function obtainUserData(): array return array_merge($serializedPublicUserData, $serializedSensitiveUserData); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/VettedSecondFactorsAllRevokedEvent.php b/src/Surfnet/Stepup/Identity/Event/VettedSecondFactorsAllRevokedEvent.php index ae10e81be..c475589b8 100644 --- a/src/Surfnet/Stepup/Identity/Event/VettedSecondFactorsAllRevokedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/VettedSecondFactorsAllRevokedEvent.php @@ -25,6 +25,9 @@ class VettedSecondFactorsAllRevokedEvent extends IdentityEvent implements RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'identity_id', 'identity_institution', @@ -70,6 +73,9 @@ public function obtainUserData(): array return $this->serialize(); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/VettingTypeHintsSavedEvent.php b/src/Surfnet/Stepup/Identity/Event/VettingTypeHintsSavedEvent.php index 6a06de510..d46ff8d1d 100644 --- a/src/Surfnet/Stepup/Identity/Event/VettingTypeHintsSavedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/VettingTypeHintsSavedEvent.php @@ -26,6 +26,9 @@ class VettingTypeHintsSavedEvent extends IdentityEvent implements RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'identity_id', 'identity_institution', @@ -33,25 +36,13 @@ class VettingTypeHintsSavedEvent extends IdentityEvent implements RightToObtainD 'institution', ]; - /** - * @var VettingTypeHintCollection - */ - public VettingTypeHintCollection $hints; - - /** - * @var Institution - */ - public Institution $institution; - public function __construct( IdentityId $identityId, Institution $identityInstitution, - VettingTypeHintCollection $hints, - Institution $institution, + public VettingTypeHintCollection $hints, + public Institution $institution, ) { parent::__construct($identityId, $identityInstitution); - $this->hints = $hints; - $this->institution = $institution; } public function getAuditLogMetadata(): Metadata @@ -68,6 +59,9 @@ public function obtainUserData(): array return $this->serialize(); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/WhitelistCreatedEvent.php b/src/Surfnet/Stepup/Identity/Event/WhitelistCreatedEvent.php index 16a7a1634..2feb528e9 100644 --- a/src/Surfnet/Stepup/Identity/Event/WhitelistCreatedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/WhitelistCreatedEvent.php @@ -22,14 +22,8 @@ class WhitelistCreatedEvent implements WhitelistEvent { - /** - * @var InstitutionCollection - */ - public InstitutionCollection $whitelistedInstitutions; - - public function __construct(InstitutionCollection $institutionCollection) + public function __construct(public InstitutionCollection $whitelistedInstitutions) { - $this->whitelistedInstitutions = $institutionCollection; } /** @@ -43,6 +37,8 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! + * + * @return array */ public function serialize(): array { diff --git a/src/Surfnet/Stepup/Identity/Event/WhitelistReplacedEvent.php b/src/Surfnet/Stepup/Identity/Event/WhitelistReplacedEvent.php index 4f5a2e3f1..1c5918295 100644 --- a/src/Surfnet/Stepup/Identity/Event/WhitelistReplacedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/WhitelistReplacedEvent.php @@ -22,14 +22,8 @@ class WhitelistReplacedEvent implements WhitelistEvent { - /** - * @var InstitutionCollection - */ - public InstitutionCollection $whitelistedInstitutions; - - public function __construct(InstitutionCollection $whitelistedInstitutions) + public function __construct(public InstitutionCollection $whitelistedInstitutions) { - $this->whitelistedInstitutions = $whitelistedInstitutions; } /** @@ -44,6 +38,8 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! + * + * @return array */ public function serialize(): array { diff --git a/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenAndVerifiedEvent.php b/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenAndVerifiedEvent.php index ddfbed24b..aca867439 100644 --- a/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenAndVerifiedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenAndVerifiedEvent.php @@ -37,6 +37,9 @@ class YubikeyPossessionProvenAndVerifiedEvent extends IdentityEvent implements PossessionProvenAndVerified, RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'identity_id', 'identity_institution', @@ -49,38 +52,6 @@ class YubikeyPossessionProvenAndVerifiedEvent extends IdentityEvent implements 'common_name', ]; - /** - * @var SecondFactorId - */ - public SecondFactorId $secondFactorId; - - /** - * The Yubikey's public ID. - * - * @var YubikeyPublicId - */ - public YubikeyPublicId $yubikeyPublicId; - - /** - * @var CommonName - */ - public CommonName $commonName; - - /** - * @var Email - */ - public Email $email; - - /** - * @var Locale Eg. "en_GB" - */ - public Locale $preferredLocale; - - /** - * @var DateTime - */ - public DateTime $registrationRequestedAt; - /** * @param IdentityId $identityId * @param Institution $institution @@ -88,29 +59,25 @@ class YubikeyPossessionProvenAndVerifiedEvent extends IdentityEvent implements * @param YubikeyPublicId $yubikeyPublicId * @param CommonName $commonName * @param Email $email - * @param Locale $locale + * @param Locale $preferredLocale * @param DateTime $registrationRequestedAt * @param string $registrationCode */ public function __construct( IdentityId $identityId, Institution $institution, - SecondFactorId $secondFactorId, - YubikeyPublicId $yubikeyPublicId, - CommonName $commonName, - Email $email, - Locale $locale, - DateTime $registrationRequestedAt, + public SecondFactorId $secondFactorId, + /** + * The Yubikey's public ID. + */ + public YubikeyPublicId $yubikeyPublicId, + public CommonName $commonName, + public Email $email, + public Locale $preferredLocale, + public DateTime $registrationRequestedAt, public string $registrationCode, ) { parent::__construct($identityId, $institution); - - $this->secondFactorId = $secondFactorId; - $this->yubikeyPublicId = $yubikeyPublicId; - $this->commonName = $commonName; - $this->email = $email; - $this->preferredLocale = $locale; - $this->registrationRequestedAt = $registrationRequestedAt; } public function getAuditLogMetadata(): Metadata @@ -147,6 +114,8 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! + * + * @return array */ public function serialize(): array { @@ -185,6 +154,9 @@ public function obtainUserData(): array return array_merge($serializedPublicUserData, $serializedSensitiveUserData); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenEvent.php b/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenEvent.php index e9046f985..8eee90db7 100644 --- a/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenEvent.php @@ -35,6 +35,9 @@ class YubikeyPossessionProvenEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'identity_id', 'identity_institution', @@ -46,66 +49,33 @@ class YubikeyPossessionProvenEvent extends IdentityEvent implements Forgettable, 'common_name', ]; - /** - * @var SecondFactorId - */ - public SecondFactorId $secondFactorId; - - /** - * The Yubikey's public ID. - * - * @var YubikeyPublicId - */ - public YubikeyPublicId $yubikeyPublicId; - /** * @var DateTime */ public DateTime $emailVerificationRequestedAt; - /** - * @var EmailVerificationWindow - */ - public EmailVerificationWindow $emailVerificationWindow; - - /** - * @var CommonName - */ - public CommonName $commonName; - - /** - * @var Email - */ - public Email $email; - - /** - * @var Locale Eg. "en_GB" - */ - public Locale $preferredLocale; - /** * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function __construct( IdentityId $identityId, Institution $institution, - SecondFactorId $secondFactorId, - YubikeyPublicId $yubikeyPublicId, + public SecondFactorId $secondFactorId, + /** + * The Yubikey's public ID. + */ + public YubikeyPublicId $yubikeyPublicId, public bool $emailVerificationRequired, - EmailVerificationWindow $emailVerificationWindow, + public EmailVerificationWindow $emailVerificationWindow, public string $emailVerificationNonce, - CommonName $commonName, - Email $email, - Locale $preferredLocale, + public CommonName $commonName, + public Email $email, + /** + * @var Locale Eg. "en_GB" + */ + public Locale $preferredLocale, ) { parent::__construct($identityId, $institution); - - $this->secondFactorId = $secondFactorId; - $this->yubikeyPublicId = $yubikeyPublicId; - $this->emailVerificationWindow = $emailVerificationWindow; - $this->commonName = $commonName; - $this->email = $email; - $this->preferredLocale = $preferredLocale; } public function getAuditLogMetadata(): Metadata @@ -142,6 +112,8 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! + * + * @return array */ public function serialize(): array { @@ -180,6 +152,9 @@ public function obtainUserData(): array return array_merge($serializedPublicUserData, $serializedSensitiveUserData); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Event/YubikeySecondFactorBootstrappedEvent.php b/src/Surfnet/Stepup/Identity/Event/YubikeySecondFactorBootstrappedEvent.php index e986550a7..b9f147d0b 100644 --- a/src/Surfnet/Stepup/Identity/Event/YubikeySecondFactorBootstrappedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/YubikeySecondFactorBootstrappedEvent.php @@ -36,6 +36,9 @@ final class YubikeySecondFactorBootstrappedEvent extends IdentityEvent implement Forgettable, RightToObtainDataInterface { + /** + * @var string[] + */ private array $allowlist = [ 'identity_id', 'name_id', @@ -81,6 +84,8 @@ public function getAuditLogMetadata(): Metadata /** * The data ending up in the event_stream, be careful not to include sensitive data here! + * + * @return array */ public function serialize(): array { @@ -131,6 +136,9 @@ public function obtainUserData(): array return array_merge($serializedPublicUserData, $serializedSensitiveUserData); } + /** + * @return string[] + */ public function getAllowlist(): array { return $this->allowlist; diff --git a/src/Surfnet/Stepup/Identity/Identity.php b/src/Surfnet/Stepup/Identity/Identity.php index 8f6dfed00..561751ff2 100644 --- a/src/Surfnet/Stepup/Identity/Identity.php +++ b/src/Surfnet/Stepup/Identity/Identity.php @@ -368,7 +368,7 @@ public function provePossessionOfGssf( GssfId $gssfId, bool $emailVerificationRequired, EmailVerificationWindow $emailVerificationWindow, - $maxNumberOfTokens, + int $maxNumberOfTokens, ): void { $this->assertNotForgotten(); $this->assertUserMayAddSecondFactor($maxNumberOfTokens); @@ -417,7 +417,7 @@ public function provePossessionOfU2fDevice( U2fKeyHandle $keyHandle, bool $emailVerificationRequired, EmailVerificationWindow $emailVerificationWindow, - $maxNumberOfTokens, + int $maxNumberOfTokens, ): void { $this->assertNotForgotten(); $this->assertUserMayAddSecondFactor($maxNumberOfTokens); @@ -510,7 +510,7 @@ public function vetSecondFactor( ); $registrantsSecondFactor = $registrant->getVerifiedSecondFactor($registrantsSecondFactorId); - if ($registrantsSecondFactor === null) { + if (!$registrantsSecondFactor instanceof \Surfnet\Stepup\Identity\Entity\VerifiedSecondFactor) { throw new DomainException( sprintf('Registrant second factor with ID %s does not exist', $registrantsSecondFactorId), ); @@ -1460,7 +1460,7 @@ private function assertNotForgotten(): void /** * @throws DomainException */ - private function assertUserMayAddSecondFactor($maxNumberOfTokens): void + private function assertUserMayAddSecondFactor(int $maxNumberOfTokens): void { if (count($this->unverifiedSecondFactors) + count($this->verifiedSecondFactors) + diff --git a/src/Surfnet/Stepup/Identity/Value/CommonName.php b/src/Surfnet/Stepup/Identity/Value/CommonName.php index c6aa01297..bb0c46a77 100644 --- a/src/Surfnet/Stepup/Identity/Value/CommonName.php +++ b/src/Surfnet/Stepup/Identity/Value/CommonName.php @@ -36,12 +36,9 @@ public static function unknown(): self return new self('—'); } - /** - * @param string $commonName - */ public function __construct(string $commonName) { - if (!is_string($commonName) || trim($commonName) === '') { + if (trim($commonName) === '') { throw InvalidArgumentException::invalidType('non-empty string', 'commonName', $commonName); } diff --git a/src/Surfnet/Stepup/Identity/Value/ContactInformation.php b/src/Surfnet/Stepup/Identity/Value/ContactInformation.php index d8e762e99..33906678d 100644 --- a/src/Surfnet/Stepup/Identity/Value/ContactInformation.php +++ b/src/Surfnet/Stepup/Identity/Value/ContactInformation.php @@ -28,9 +28,6 @@ final class ContactInformation implements JsonSerializable, Stringable { private readonly string $contactInformation; - /** - * @param string $contactInformation - */ public function __construct(string $contactInformation) { $this->contactInformation = trim($contactInformation); diff --git a/src/Surfnet/Stepup/Identity/Value/Email.php b/src/Surfnet/Stepup/Identity/Value/Email.php index 0c96c80a6..ab9930f29 100644 --- a/src/Surfnet/Stepup/Identity/Value/Email.php +++ b/src/Surfnet/Stepup/Identity/Value/Email.php @@ -36,12 +36,9 @@ public static function unknown(): self return new self('unknown@domain.invalid'); } - /** - * @param string $email - */ public function __construct(string $email) { - if (!is_string($email) || trim($email) === '') { + if (trim($email) === '') { throw InvalidArgumentException::invalidType('non-empty string', 'email', $email); } diff --git a/src/Surfnet/Stepup/Identity/Value/GssfId.php b/src/Surfnet/Stepup/Identity/Value/GssfId.php index 00d434a10..7a403d0c6 100644 --- a/src/Surfnet/Stepup/Identity/Value/GssfId.php +++ b/src/Surfnet/Stepup/Identity/Value/GssfId.php @@ -29,9 +29,9 @@ public static function unknown(): static return new self('—'); } - public function __construct($gssfId) + public function __construct(string $gssfId) { - if (!is_string($gssfId) || trim($gssfId) === '') { + if (trim($gssfId) === '') { throw InvalidArgumentException::invalidType('non-empty string', 'gssfId', $gssfId); } diff --git a/src/Surfnet/Stepup/Identity/Value/IdentityId.php b/src/Surfnet/Stepup/Identity/Value/IdentityId.php index 3da3b04f4..068c45344 100644 --- a/src/Surfnet/Stepup/Identity/Value/IdentityId.php +++ b/src/Surfnet/Stepup/Identity/Value/IdentityId.php @@ -26,12 +26,8 @@ final class IdentityId implements Id, JsonSerializable { private readonly string $value; - public function __construct($value) + public function __construct(string $value) { - if (!is_string($value)) { - throw InvalidArgumentException::invalidType('string', 'value', $value); - } - $this->value = $value; } diff --git a/src/Surfnet/Stepup/Identity/Value/Institution.php b/src/Surfnet/Stepup/Identity/Value/Institution.php index f824cd4fa..d85786d1f 100644 --- a/src/Surfnet/Stepup/Identity/Value/Institution.php +++ b/src/Surfnet/Stepup/Identity/Value/Institution.php @@ -33,7 +33,7 @@ final class Institution implements JsonSerializable, Stringable */ public function __construct(string $institution) { - if (!is_string($institution) || trim($institution) === '') { + if (trim($institution) === '') { throw InvalidArgumentException::invalidType('non-empty string', 'institution', $institution); } diff --git a/src/Surfnet/Stepup/Identity/Value/Locale.php b/src/Surfnet/Stepup/Identity/Value/Locale.php index 7c0f57d12..349dc60f2 100644 --- a/src/Surfnet/Stepup/Identity/Value/Locale.php +++ b/src/Surfnet/Stepup/Identity/Value/Locale.php @@ -22,20 +22,10 @@ use Stringable; use Surfnet\Stepup\Exception\InvalidArgumentException; -final class Locale implements JsonSerializable, Stringable +final readonly class Locale implements JsonSerializable, Stringable { - private readonly string $locale; - - /** - * @param string $locale - */ - public function __construct(string $locale) + public function __construct(private string $locale) { - if (!is_string($locale)) { - throw InvalidArgumentException::invalidType('string', 'locale', $locale); - } - - $this->locale = $locale; } public function equals(Locale $other): bool diff --git a/src/Surfnet/Stepup/Identity/Value/Location.php b/src/Surfnet/Stepup/Identity/Value/Location.php index bce97e6d7..97540db66 100644 --- a/src/Surfnet/Stepup/Identity/Value/Location.php +++ b/src/Surfnet/Stepup/Identity/Value/Location.php @@ -28,9 +28,6 @@ final class Location implements JsonSerializable, Stringable { private readonly string $location; - /** - * @param string $location - */ public function __construct(string $location) { $this->location = trim($location); diff --git a/src/Surfnet/Stepup/Identity/Value/NameId.php b/src/Surfnet/Stepup/Identity/Value/NameId.php index 84859431d..c2953c70a 100644 --- a/src/Surfnet/Stepup/Identity/Value/NameId.php +++ b/src/Surfnet/Stepup/Identity/Value/NameId.php @@ -37,12 +37,8 @@ final class NameId implements JsonSerializable, Stringable private readonly string $value; - public function __construct($value) + public function __construct(string $value) { - if (!is_string($value)) { - throw InvalidArgumentException::invalidType('string', 'value', $value); - } - if (strlen($value) > self::MAX_LENGTH) { throw new InvalidArgumentException( 'Invalid argument type: maximum length for nameId exceeds configured length of ' . self::MAX_LENGTH, @@ -60,9 +56,9 @@ public function getNameId(): string return $this->value; } - public function equals($other): bool + public function equals(NameId $other): bool { - return $this == $other; + return $this === $other; } public function __toString(): string diff --git a/src/Surfnet/Stepup/Identity/Value/PhoneNumber.php b/src/Surfnet/Stepup/Identity/Value/PhoneNumber.php index 6608ce7d9..2a2ec9142 100644 --- a/src/Surfnet/Stepup/Identity/Value/PhoneNumber.php +++ b/src/Surfnet/Stepup/Identity/Value/PhoneNumber.php @@ -29,12 +29,8 @@ public static function unknown(): static return new self('+0 (0) 000000000'); } - public function __construct($phoneNumber) + public function __construct(string $phoneNumber) { - if (!is_string($phoneNumber)) { - throw InvalidArgumentException::invalidType('string', 'value', $phoneNumber); - } - if (!preg_match('~^\+[\d\s]+ \(0\) \d+$~', $phoneNumber)) { throw new InvalidArgumentException( sprintf( @@ -53,7 +49,7 @@ public function getValue(): string return $this->phoneNumber; } - public function equals(mixed $other): bool + public function equals(RecoveryTokenIdentifier|SecondFactorIdentifier $other): bool { return $other instanceof self && $this->phoneNumber === $other->phoneNumber; } diff --git a/src/Surfnet/Stepup/Identity/Value/RecoveryTokenId.php b/src/Surfnet/Stepup/Identity/Value/RecoveryTokenId.php index 90ad910fc..c8c9a94e1 100644 --- a/src/Surfnet/Stepup/Identity/Value/RecoveryTokenId.php +++ b/src/Surfnet/Stepup/Identity/Value/RecoveryTokenId.php @@ -25,12 +25,8 @@ final class RecoveryTokenId implements Id { private readonly string $value; - public function __construct($value) + public function __construct(string $value) { - if (!is_string($value)) { - throw InvalidArgumentException::invalidType('string', 'value', $value); - } - $this->value = $value; } diff --git a/src/Surfnet/Stepup/Identity/Value/RecoveryTokenIdentifier.php b/src/Surfnet/Stepup/Identity/Value/RecoveryTokenIdentifier.php index d202bc570..446576219 100644 --- a/src/Surfnet/Stepup/Identity/Value/RecoveryTokenIdentifier.php +++ b/src/Surfnet/Stepup/Identity/Value/RecoveryTokenIdentifier.php @@ -22,11 +22,11 @@ interface RecoveryTokenIdentifier extends JsonSerializable { - public static function unknown(); + public static function unknown(): RecoveryTokenIdentifier; - public function getValue(); + public function getValue(): string; - public function equals($other): bool; + public function equals(RecoveryTokenIdentifier $other): bool; - public function __toString(); + public function __toString(): string; } diff --git a/src/Surfnet/Stepup/Identity/Value/RecoveryTokenType.php b/src/Surfnet/Stepup/Identity/Value/RecoveryTokenType.php index dc3437dd9..b3f544fe7 100644 --- a/src/Surfnet/Stepup/Identity/Value/RecoveryTokenType.php +++ b/src/Surfnet/Stepup/Identity/Value/RecoveryTokenType.php @@ -28,14 +28,8 @@ final class RecoveryTokenType implements Stringable private readonly string $type; - public function __construct($type) + public function __construct(string $type) { - if (!is_string($type)) { - throw new InvalidArgumentException( - sprintf('The RecoveryTokenType must be of type string, %s given', gettype($type)), - ); - } - if (!in_array($type, [self::TYPE_SMS, self::TYPE_SAFE_STORE])) { throw new InvalidArgumentException('The RecoveryTokenType must be one of "sms" or "safe-store".'); } diff --git a/src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php b/src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php index 25d8b2bdf..15e2872ed 100644 --- a/src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php +++ b/src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php @@ -24,13 +24,13 @@ use Stringable; use Surfnet\Stepup\Exception\InvalidArgumentException; -final class RegistrationAuthorityRole implements SerializableInterface, Stringable +final readonly class RegistrationAuthorityRole implements SerializableInterface, Stringable { public const ROLE_RA = 1; public const ROLE_RAA = 2; public const ROLE_SRAA = 3; - public function __construct(private readonly int $role) + public function __construct(private int $role) { if (!in_array($role, [self::ROLE_RA, self::ROLE_RAA, self::ROLE_SRAA])) { throw new InvalidArgumentException( diff --git a/src/Surfnet/Stepup/Identity/Value/SafeStore.php b/src/Surfnet/Stepup/Identity/Value/SafeStore.php index a3c8fbee2..962287eb9 100644 --- a/src/Surfnet/Stepup/Identity/Value/SafeStore.php +++ b/src/Surfnet/Stepup/Identity/Value/SafeStore.php @@ -43,7 +43,7 @@ public function getValue(): string return $this->secret->getSecret(); } - public function equals($other): bool + public function equals(RecoveryTokenIdentifier $other): bool { return $other instanceof self && $other->getValue() === $this->getValue(); } diff --git a/src/Surfnet/Stepup/Identity/Value/SecondFactorId.php b/src/Surfnet/Stepup/Identity/Value/SecondFactorId.php index 023158b17..985439c40 100644 --- a/src/Surfnet/Stepup/Identity/Value/SecondFactorId.php +++ b/src/Surfnet/Stepup/Identity/Value/SecondFactorId.php @@ -25,12 +25,8 @@ final class SecondFactorId implements Id { private readonly string $value; - public function __construct($value) + public function __construct(string $value) { - if (!is_string($value)) { - throw InvalidArgumentException::invalidType('string', 'value', $value); - } - $this->value = $value; } diff --git a/src/Surfnet/Stepup/Identity/Value/SecondFactorIdentifier.php b/src/Surfnet/Stepup/Identity/Value/SecondFactorIdentifier.php index 65c8557be..8294e46b6 100644 --- a/src/Surfnet/Stepup/Identity/Value/SecondFactorIdentifier.php +++ b/src/Surfnet/Stepup/Identity/Value/SecondFactorIdentifier.php @@ -35,7 +35,6 @@ public static function unknown(): static; public function getValue(): string; /** - * @param self $other * @return bool */ public function equals(SecondFactorIdentifier $other): bool; diff --git a/src/Surfnet/Stepup/Identity/Value/StepupProvider.php b/src/Surfnet/Stepup/Identity/Value/StepupProvider.php index 6cbab7517..f4a1a098f 100644 --- a/src/Surfnet/Stepup/Identity/Value/StepupProvider.php +++ b/src/Surfnet/Stepup/Identity/Value/StepupProvider.php @@ -25,9 +25,9 @@ final class StepupProvider implements Stringable { private readonly string $provider; - public function __construct($provider) + public function __construct(string $provider) { - if (!is_string($provider) || trim($provider) === '') { + if (trim($provider) === '') { throw InvalidArgumentException::invalidType('non-empty string', 'provider', $provider); } diff --git a/src/Surfnet/Stepup/Identity/Value/TimeFrame.php b/src/Surfnet/Stepup/Identity/Value/TimeFrame.php index 62994a3a3..c5dc70759 100644 --- a/src/Surfnet/Stepup/Identity/Value/TimeFrame.php +++ b/src/Surfnet/Stepup/Identity/Value/TimeFrame.php @@ -33,14 +33,13 @@ final private function __construct(private DateInterval $timeFrame) } /** - * @param int $seconds * @return TimeFrame * @throws Exception * @throws Exception */ public static function ofSeconds(int $seconds): TimeFrame { - if (!is_int($seconds) || $seconds < 1) { + if ($seconds < 1) { throw InvalidArgumentException::invalidType('positive integer', 'seconds', $seconds); } diff --git a/src/Surfnet/Stepup/Identity/Value/U2fKeyHandle.php b/src/Surfnet/Stepup/Identity/Value/U2fKeyHandle.php index a88b8ada9..280316dc8 100644 --- a/src/Surfnet/Stepup/Identity/Value/U2fKeyHandle.php +++ b/src/Surfnet/Stepup/Identity/Value/U2fKeyHandle.php @@ -37,18 +37,14 @@ public static function unknown(): static return new self(self::UNKNOWN); } - public function __construct($value) + public function __construct(string $value) { if ($value === self::UNKNOWN) { $this->value = $value; return; } - if (!is_string($value)) { - throw InvalidArgumentException::invalidType('string', 'value', $value); - } - - if (empty($value)) { + if ($value === '' || $value === '0') { throw new InvalidArgumentException('Invalid Argument, parameter "value" may not be an empty string'); } diff --git a/src/Surfnet/Stepup/Identity/Value/VettingTypeHint.php b/src/Surfnet/Stepup/Identity/Value/VettingTypeHint.php index 90a84434c..f5e672f04 100644 --- a/src/Surfnet/Stepup/Identity/Value/VettingTypeHint.php +++ b/src/Surfnet/Stepup/Identity/Value/VettingTypeHint.php @@ -20,7 +20,7 @@ use JsonSerializable; -class VettingTypeHint implements JsonSerializable +class VettingTypeHint implements JsonSerializable, \Stringable { public function __construct( private readonly string $locale, diff --git a/src/Surfnet/Stepup/Identity/Value/YubikeyPublicId.php b/src/Surfnet/Stepup/Identity/Value/YubikeyPublicId.php index 5d62301f0..c3465d051 100644 --- a/src/Surfnet/Stepup/Identity/Value/YubikeyPublicId.php +++ b/src/Surfnet/Stepup/Identity/Value/YubikeyPublicId.php @@ -31,17 +31,13 @@ public static function unknown(): static return new self(self::UNKNOWN); } - public function __construct($value) + public function __construct(string $value) { if ($value === self::UNKNOWN) { $this->value = $value; return; } - if (!is_string($value)) { - throw InvalidArgumentException::invalidType('string', 'value', $value); - } - // Numeric IDs must be left-padded with zeroes until eight characters. Longer IDs, up to twenty characters, may // not be padded. if (!preg_match('~^\d{8,20}$~', $value)) { diff --git a/src/Surfnet/Stepup/Tests/Configuration/InstitutionConfigurationTest.php b/src/Surfnet/Stepup/Tests/Configuration/InstitutionConfigurationTest.php index 8d2e22099..b7c81746d 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/InstitutionConfigurationTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/InstitutionConfigurationTest.php @@ -66,7 +66,7 @@ public function use_ra_locations_option_is_set_to_false_by_default_upon_creation $selectRaaOption = InstitutionAuthorizationOption::getDefault(InstitutionRole::selectRaa()); $this->scenario - ->when(fn() => InstitutionConfiguration::create( + ->when(fn(): \Surfnet\Stepup\Configuration\InstitutionConfiguration => InstitutionConfiguration::create( $institutionConfigurationId, $institution, ))->then([ @@ -124,7 +124,7 @@ public function show_raa_contact_information_option_is_set_to_true_by_default_up $selectRaaOption = InstitutionAuthorizationOption::getDefault(InstitutionRole::selectRaa()); $this->scenario - ->when(fn() => InstitutionConfiguration::create( + ->when(fn(): \Surfnet\Stepup\Configuration\InstitutionConfiguration => InstitutionConfiguration::create( $institutionConfigurationId, $institution, ))->then([ diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/AllowedSecondFactorListTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/AllowedSecondFactorListTest.php index 115931adf..2d4873afa 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/AllowedSecondFactorListTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/AllowedSecondFactorListTest.php @@ -32,7 +32,7 @@ class AllowedSecondFactorListTest extends TestCase * @test * @group domain */ - public function an_allowed_second_factor_list_deduplicates_its_second_factors_upon_creation() + public function an_allowed_second_factor_list_deduplicates_its_second_factors_upon_creation(): void { $allowedSecondFactorList = AllowedSecondFactorList::ofTypes([ new SecondFactorType('sms'), @@ -53,7 +53,7 @@ public function an_allowed_second_factor_list_deduplicates_its_second_factors_up * @dataProvider availableSecondFactorTypeProvider * @param $availableSecondFactorType */ - public function a_blank_allowed_second_factor_list_allows_all_second_factors($availableSecondFactorType) + public function a_blank_allowed_second_factor_list_allows_all_second_factors(\Surfnet\StepupBundle\Value\SecondFactorType $availableSecondFactorType): void { $allowedSecondFactorList = AllowedSecondFactorList::blank(); @@ -66,7 +66,7 @@ public function a_blank_allowed_second_factor_list_allows_all_second_factors($av * @test * @group domain */ - public function an_allowed_second_factor_list_contains_a_given_second_factor() + public function an_allowed_second_factor_list_contains_a_given_second_factor(): void { $allowedSecondFactorList = AllowedSecondFactorList::ofTypes([new SecondFactorType('sms')]); $allowedSecondFactor = new SecondFactorType('sms'); @@ -83,7 +83,7 @@ public function an_allowed_second_factor_list_contains_a_given_second_factor() * @test * @group domain */ - public function an_allowed_second_factor_list_does_not_contain_a_given_second_factor() + public function an_allowed_second_factor_list_does_not_contain_a_given_second_factor(): void { $allowedSecondFactorList = AllowedSecondFactorList::ofTypes([new SecondFactorType('sms')]); $allowedSecondFactor = new SecondFactorType('yubikey'); @@ -100,7 +100,7 @@ public function an_allowed_second_factor_list_does_not_contain_a_given_second_fa * @test * @group domain */ - public function an_allowed_second_factor_list_contains_the_given_second_factors() + public function an_allowed_second_factor_list_contains_the_given_second_factors(): void { $secondFactorTypes = [ new SecondFactorType('sms'), @@ -118,7 +118,7 @@ public function an_allowed_second_factor_list_contains_the_given_second_factors( * @test * @group domain */ - public function a_second_factor_on_the_allowed_second_factor_list_is_allowed() + public function a_second_factor_on_the_allowed_second_factor_list_is_allowed(): void { $allowedSecondFactorList = AllowedSecondFactorList::ofTypes([new SecondFactorType('sms')]); $allowedSecondFactor = new SecondFactorType('sms'); @@ -135,7 +135,7 @@ public function a_second_factor_on_the_allowed_second_factor_list_is_allowed() * @test * @group domain */ - public function a_second_factor_not_on_the_allowed_second_factor_list_is_not_allowed() + public function a_second_factor_not_on_the_allowed_second_factor_list_is_not_allowed(): void { $allowedSecondFactorList = AllowedSecondFactorList::ofTypes([new SecondFactorType('sms')]); $disallowedSecondFactor = new SecondFactorType('yubikey'); @@ -159,7 +159,7 @@ public function a_second_factor_not_on_the_allowed_second_factor_list_is_not_all public function allowed_second_factor_lists_with_different_elements_are_not_considered_equal( array $firstList, array $secondList, - ) { + ): void { $base = AllowedSecondFactorList::ofTypes($firstList); $other = AllowedSecondFactorList::ofTypes($secondList); @@ -177,7 +177,7 @@ public function allowed_second_factor_lists_with_different_elements_are_not_cons public function allowed_second_factor_lists_with_the_same_elements_are_considered_equal( array $firstList, array $secondList, - ) { + ): void { $base = AllowedSecondFactorList::ofTypes($firstList); $other = AllowedSecondFactorList::ofTypes($secondList); @@ -235,7 +235,7 @@ public function availableSecondFactorTypeProvider(): array 'tiqr' => ['loa' => 3], ]); $secondFactorTypes = array_map( - fn($availableSecondFactorType) => [new SecondFactorType($availableSecondFactorType)], + fn($availableSecondFactorType): array => [new SecondFactorType($availableSecondFactorType)], $service->getAvailableSecondFactorTypes(), ); diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionSetTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionSetTest.php index 5032d0559..2a749c131 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionSetTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionSetTest.php @@ -1,5 +1,7 @@ expectException(InvalidArgumentException::class); - - new ShowRaaContactInformationOption($nonBooleanProvider); - } - /** * @test * @group domain @@ -82,15 +68,4 @@ public function default_value_is_true(): void $this->assertTrue($default->equals($true)); } - - public function nonBooleanProvider(): array - { - return [ - 'string' => [''], - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], - ]; - } } diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/UseRaLocationsOptionTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/UseRaLocationsOptionTest.php index 45b825098..f6f5fa259 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/UseRaLocationsOptionTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/UseRaLocationsOptionTest.php @@ -28,19 +28,6 @@ class UseRaLocationsOptionTest extends TestCase { use MockeryPHPUnitIntegration; - /** - * @test - * @group domain - * @group institution-configuration-option - * @dataProvider nonBooleanProvider - */ - public function use_ra_locations_option_can_only_be_boolean(string|int|float|StdClass|array $nonBooleanProvider,): void - { - $this->expectException(InvalidArgumentException::class); - - new UseRaLocationsOption($nonBooleanProvider); - } - /** * @test * @group domain @@ -80,16 +67,5 @@ public function default_value_is_false(): void $false = new UseRaLocationsOption(false); $this->assertTrue($default->equals($false)); - } - - public function nonBooleanProvider(): array - { - return [ - 'string' => [''], - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], - ]; - } + } } diff --git a/src/Surfnet/Stepup/Tests/Helper/JsonHelperTest.php b/src/Surfnet/Stepup/Tests/Helper/JsonHelperTest.php index f60ae4497..6d7f1b128 100644 --- a/src/Surfnet/Stepup/Tests/Helper/JsonHelperTest.php +++ b/src/Surfnet/Stepup/Tests/Helper/JsonHelperTest.php @@ -29,19 +29,6 @@ class JsonHelperTest extends TestCase { use MockeryPHPUnitIntegration; - /** - * @test - * @group json - * - * @dataProvider nonStringProvider - */ - public function json_helper_can_only_decode_strings(bool|int|float|StdClass|array $nonString): void - { - $this->expectException(InvalidArgumentException::class); - - JsonHelper::decode($nonString); - } - /** * @test * @group json diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Filter/InstitutionAuthorizationRepositoryFilter.php b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Filter/InstitutionAuthorizationRepositoryFilter.php index b3b8aa860..ff2968c9b 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Filter/InstitutionAuthorizationRepositoryFilter.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Filter/InstitutionAuthorizationRepositoryFilter.php @@ -23,15 +23,11 @@ class InstitutionAuthorizationRepositoryFilter { - /** - * @param string $institutionField - * @param string $authorizationAlias - */ public function filter( - QueryBuilder $queryBuilder, + QueryBuilder $queryBuilder, InstitutionAuthorizationContextInterface $authorizationContext, - $institutionField, - $authorizationAlias, + string $institutionField, + string $authorizationAlias, ): void { // If actor is SRAA we don't need filtering if ($authorizationContext->isActorSraa()) { @@ -56,12 +52,7 @@ public function filter( $queryBuilder->setParameter($parameter, $values); } - /** - * @param $authorizationAlias - * @param $name - * @return string - */ - private function getParameterName($authorizationAlias, string $name): string + private function getParameterName(string $authorizationAlias, string $name): string { return "{$authorizationAlias}_{$name}"; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/AuthorizationService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/AuthorizationService.php index 0b3b96314..d5e5e0bd9 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/AuthorizationService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/AuthorizationService.php @@ -88,7 +88,7 @@ public function assertRegistrationOfSelfAssertedTokensIsAllowed(IdentityId $iden // Only allow self-asserted token (SAT) if the user does not have a token yet, or the first // registered token was a SAT. - $hadOtherTokenType = $options->possessedSelfAssertedToken === false && $options->possessedToken === true; + $hadOtherTokenType = $options->possessedSelfAssertedToken === false && $options->possessedToken; if ($hadOtherTokenType) { return $this->deny( 'Identity never possessed a self-asserted token, but did/does possess one of the other types', diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/CommandAuthorizationService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/CommandAuthorizationService.php index 728ca994d..86f2f087f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/CommandAuthorizationService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/CommandAuthorizationService.php @@ -264,7 +264,7 @@ private function isSraa(IdentityId $actorId = null): bool $registrationAuthorityCredentials = $this->identityService->findRegistrationAuthorityCredentialsOf( $actorId->getIdentityId(), ); - if (!$registrationAuthorityCredentials) { + if (!$registrationAuthorityCredentials instanceof \Surfnet\StepupMiddleware\ApiBundle\Identity\Value\RegistrationAuthorityCredentials) { return false; } return $registrationAuthorityCredentials->isSraa(); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionAuthorizationContextInterface.php b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionAuthorizationContextInterface.php index aaf7870bd..73919157f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionAuthorizationContextInterface.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionAuthorizationContextInterface.php @@ -36,10 +36,10 @@ interface InstitutionAuthorizationContextInterface /** * @return InstitutionCollection */ - public function getInstitutions(); + public function getInstitutions(): InstitutionCollection; /** * @return bool */ - public function isActorSraa(); + public function isActorSraa(): bool; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionRoleSet.php b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionRoleSet.php index 98125f2dd..023139a2e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionRoleSet.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionRoleSet.php @@ -42,7 +42,7 @@ public function __construct(array $institutionRoles) $this->institutionRoles = $institutionRoles; } - public function getRoles() + public function getRoles(): array { return $this->institutionRoles; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionRoleSetInterface.php b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionRoleSetInterface.php index 380c70286..b4898fb17 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionRoleSetInterface.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionRoleSetInterface.php @@ -20,5 +20,5 @@ interface InstitutionRoleSetInterface { - public function getRoles(); + public function getRoles(): array; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/AllowedSecondFactor.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/AllowedSecondFactor.php index a9de9890d..4e94c5d1f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/AllowedSecondFactor.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/AllowedSecondFactor.php @@ -32,7 +32,7 @@ class AllowedSecondFactor */ #[ORM\Id] #[ORM\Column(type: 'stepup_configuration_institution')] - public $institution; + public Institution $institution; /** * @@ -40,7 +40,7 @@ class AllowedSecondFactor */ #[ORM\Id] #[ORM\Column(type: 'stepup_second_factor_type')] - public $secondFactorType; + public SecondFactorType $secondFactorType; private function __construct() { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/ConfiguredInstitution.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/ConfiguredInstitution.php index 1f30e0e10..5f6187205 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/ConfiguredInstitution.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/ConfiguredInstitution.php @@ -31,7 +31,7 @@ class ConfiguredInstitution */ #[ORM\Id] #[ORM\Column(type: 'stepup_configuration_institution')] - public $institution; + public Institution $institution; public static function createFrom(Institution $institution): self { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/InstitutionAuthorization.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/InstitutionAuthorization.php index 65c0d5904..fc33dbb34 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/InstitutionAuthorization.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/InstitutionAuthorization.php @@ -34,7 +34,7 @@ class InstitutionAuthorization */ #[ORM\Id] #[ORM\Column(type: 'stepup_configuration_institution')] - public $institution; + public Institution $institution; /** * @@ -42,7 +42,7 @@ class InstitutionAuthorization */ #[ORM\Id] #[ORM\Column(type: 'stepup_configuration_institution')] - public $institutionRelation; + public Institution $institutionRelation; /** * @@ -50,7 +50,7 @@ class InstitutionAuthorization */ #[ORM\Id] #[ORM\Column(type: 'stepup_institution_role', length: 10)] - public $institutionRole; + public InstitutionRole $institutionRole; /** * @return InstitutionAuthorization diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/InstitutionConfigurationOptions.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/InstitutionConfigurationOptions.php index f0c89b3f8..92684aef5 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/InstitutionConfigurationOptions.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/InstitutionConfigurationOptions.php @@ -38,49 +38,49 @@ class InstitutionConfigurationOptions */ #[ORM\Id] #[ORM\Column(type: 'stepup_configuration_institution')] - public $institution; + public Institution $institution; /** * @var UseRaLocationsOption */ #[ORM\Column(type: 'stepup_use_ra_locations_option')] - public $useRaLocationsOption; + public UseRaLocationsOption $useRaLocationsOption; /** * @var ShowRaaContactInformationOption */ #[ORM\Column(type: 'stepup_show_raa_contact_information_option')] - public $showRaaContactInformationOption; + public ShowRaaContactInformationOption $showRaaContactInformationOption; /** * @var VerifyEmailOption */ #[ORM\Column(type: 'stepup_verify_email_option', options: ['default' => 1])] - public $verifyEmailOption; + public VerifyEmailOption $verifyEmailOption; /** * @var SelfVetOption */ #[ORM\Column(type: 'stepup_self_vet_option', options: ['default' => 0])] - public $selfVetOption; + public SelfVetOption $selfVetOption; /** * @var SsoOn2FaOption */ #[ORM\Column(type: 'stepup_sso_on_2fa_option', options: ['default' => 0])] - public $ssoOn2faOption; + public SsoOn2faOption $ssoOn2faOption; /** * @var SelfAssertedTokensOption */ #[ORM\Column(type: 'stepup_self_asserted_tokens_option', options: ['default' => 0])] - public $selfAssertedTokensOption; + public SelfAssertedTokensOption $selfAssertedTokensOption; /** * @var NumberOfTokensPerIdentityOption */ #[ORM\Column(type: 'stepup_number_of_tokens_per_identity_option', options: ['default' => 0])] - public $numberOfTokensPerIdentityOption; + public NumberOfTokensPerIdentityOption $numberOfTokensPerIdentityOption; public static function create( Institution $institution, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/RaLocation.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/RaLocation.php index b25d4e62f..a8379d948 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/RaLocation.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/RaLocation.php @@ -38,43 +38,39 @@ class RaLocation implements JsonSerializable */ #[ORM\Id] #[ORM\Column(length: 36)] - public $id; + public string $id; /** * @var Institution */ #[ORM\Column(type: 'stepup_configuration_institution')] - public $institution; + public Institution $institution; /** * @var RaLocationName */ #[ORM\Column(type: 'stepup_ra_location_name')] - public $name; + public RaLocationName $name; /** * @var Location */ #[ORM\Column(type: 'stepup_configuration_location')] - public $location; + public Location $location; /** * @var ContactInformation */ #[ORM\Column(type: 'stepup_configuration_contact_information')] - public $contactInformation; + public ContactInformation $contactInformation; public static function create( - $id, + string $id, Institution $institution, RaLocationName $name, Location $location, ContactInformation $contactInformation, ): self { - if (!is_string($id)) { - throw InvalidArgumentException::invalidType('string', 'id', $id); - } - $raLocation = new self; $raLocation->id = $id; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Query/RaLocationQuery.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Query/RaLocationQuery.php index 7fe232ee3..3550805e7 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Query/RaLocationQuery.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Query/RaLocationQuery.php @@ -25,15 +25,15 @@ final class RaLocationQuery /** * @var string|Institution */ - public $institution; + public string|Institution $institution; /** * @var string */ - public $orderBy = 'name'; + public string $orderBy = 'name'; /** * @var string */ - public $orderDirection = 'asc'; + public string $orderDirection = 'asc'; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/AllowedSecondFactorRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/AllowedSecondFactorRepository.php index 3e00a2817..384fedc02 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/AllowedSecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/AllowedSecondFactorRepository.php @@ -23,6 +23,9 @@ use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity\AllowedSecondFactor; +/** + * @extends ServiceEntityRepository + */ final class AllowedSecondFactorRepository extends ServiceEntityRepository { public function __construct(ManagerRegistry $registry) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/ConfiguredInstitutionRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/ConfiguredInstitutionRepository.php index 5860f1336..4acf92683 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/ConfiguredInstitutionRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/ConfiguredInstitutionRepository.php @@ -23,6 +23,9 @@ use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity\ConfiguredInstitution; +/** + * @extends ServiceEntityRepository + */ class ConfiguredInstitutionRepository extends ServiceEntityRepository { public function __construct(ManagerRegistry $registry) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionAuthorizationRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionAuthorizationRepository.php index ac0ebf9f2..3c6b875f6 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionAuthorizationRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionAuthorizationRepository.php @@ -27,6 +27,9 @@ use Surfnet\Stepup\Configuration\Value\InstitutionRole; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity\InstitutionAuthorization; +/** + * @extends ServiceEntityRepository + */ class InstitutionAuthorizationRepository extends ServiceEntityRepository { public function __construct(ManagerRegistry $registry) @@ -94,9 +97,6 @@ public function saveInstitutionOption( $this->save($institution, $institutionOption->getInstitutionRole(), $institutionAuthorizations); } - /** - * @throws OptimisticLockException - */ public function clearInstitutionOption(Institution $institution): void { $entityManager = $this->getEntityManager(); @@ -133,7 +133,6 @@ public function setDefaultInstitutionOption(Institution $institution): void /** * @param InstitutionAuthorization[] $institutionAuthorizations - * @throws OptimisticLockException */ private function save(Institution $institution, InstitutionRole $role, array $institutionAuthorizations): void { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionConfigurationOptionsRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionConfigurationOptionsRepository.php index ba9f5b9d7..bb8f422ad 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionConfigurationOptionsRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionConfigurationOptionsRepository.php @@ -24,6 +24,9 @@ use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity\InstitutionConfigurationOptions; +/** + * @extends ServiceEntityRepository + */ class InstitutionConfigurationOptionsRepository extends ServiceEntityRepository { public function __construct(ManagerRegistry $registry) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/RaLocationRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/RaLocationRepository.php index 924a31fad..8b8d77f75 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/RaLocationRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/RaLocationRepository.php @@ -26,6 +26,9 @@ use Surfnet\StepupMiddleware\ApiBundle\Configuration\Query\RaLocationQuery; use Surfnet\StepupMiddleware\ApiBundle\Exception\RuntimeException; +/** + * @extends ServiceEntityRepository + */ class RaLocationRepository extends ServiceEntityRepository { public function __construct(ManagerRegistry $registry) @@ -36,7 +39,7 @@ public function __construct(ManagerRegistry $registry) /** * @return null|RaLocation[] */ - public function search(RaLocationQuery $query) + public function search(RaLocationQuery $query): ?array { if (!in_array($query->orderBy, ['name', 'location', 'contact_information'])) { throw new RuntimeException(sprintf('Unknown order by column "%s"', $query->orderBy)); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/AllowedSecondFactorListService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/AllowedSecondFactorListService.php index 0f9bfb775..91b6c92ea 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/AllowedSecondFactorListService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/AllowedSecondFactorListService.php @@ -33,7 +33,7 @@ public function __construct( public function getAllowedSecondFactorListFor(Institution $institution): AllowedSecondFactorList { $allowedSecondFactors = array_map( - fn(AllowedSecondFactor $allowedSecondFactor) => $allowedSecondFactor->secondFactorType, + fn(AllowedSecondFactor $allowedSecondFactor): \Surfnet\StepupBundle\Value\SecondFactorType => $allowedSecondFactor->secondFactorType, $this->allowedSecondFactorRepository->getAllowedSecondFactorsFor($institution), ); @@ -43,7 +43,7 @@ public function getAllowedSecondFactorListFor(Institution $institution): Allowed /** * @return AllowedSecondFactorMap */ - public function getAllowedSecondFactorMap() + public function getAllowedSecondFactorMap(): AllowedSecondFactorMap { return AllowedSecondFactorMap::from($this->allowedSecondFactorRepository->findAll()); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/AllowedSecondFactorMap.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/AllowedSecondFactorMap.php index 72eb0a104..8aeac28bc 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/AllowedSecondFactorMap.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/AllowedSecondFactorMap.php @@ -37,7 +37,7 @@ private function __construct() * @param AllowedSecondFactor[] $allowedSecondFactors * @return AllowedSecondFactorMap */ - public static function from($allowedSecondFactors): self + public static function from(array $allowedSecondFactors): self { $allowedSecondFactorMap = new self(); foreach ($allowedSecondFactors as $allowedSecondFactor) { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionAuthorizationService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionAuthorizationService.php index 750f50df4..3a1b973c9 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionAuthorizationService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionAuthorizationService.php @@ -49,7 +49,7 @@ public function findAuthorizationsByRoleFor( /** * @return InstitutionAuthorizationOptionMap */ - public function findAuthorizationsFor(Institution $institution) + public function findAuthorizationsFor(Institution $institution): InstitutionAuthorizationOptionMap { $authorizations = $this->repository->findAuthorizationOptionsForInstitution($institution); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionConfigurationOptionsService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionConfigurationOptionsService.php index 43a925138..b06d9686a 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionConfigurationOptionsService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionConfigurationOptionsService.php @@ -44,7 +44,7 @@ public function findAllInstitutionConfigurationOptions(): array /** * @return InstitutionConfigurationOptions|null */ - public function findInstitutionConfigurationOptionsFor(Institution $institution) + public function findInstitutionConfigurationOptionsFor(Institution $institution): ?InstitutionConfigurationOptions { return $this->repository->findConfigurationOptionsFor($institution); } @@ -57,11 +57,11 @@ public function findInstitutionConfigurationOptionsFor(Institution $institution) * * @return int */ - public function getMaxNumberOfTokensFor(Institution $institution) + public function getMaxNumberOfTokensFor(Institution $institution): int { $configuration = $this->findInstitutionConfigurationOptionsFor($institution); - if ($configuration !== null && $configuration->numberOfTokensPerIdentityOption->isEnabled()) { + if ($configuration instanceof \Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity\InstitutionConfigurationOptions && $configuration->numberOfTokensPerIdentityOption->isEnabled()) { return $configuration->numberOfTokensPerIdentityOption->getNumberOfTokensPerIdentity(); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/RaLocationService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/RaLocationService.php index 0100df773..1705d4b88 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/RaLocationService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/RaLocationService.php @@ -45,7 +45,7 @@ public function findByRaLocationId(RaLocationId $raLocationId): ?RaLocation /** - * @return RaLocation[] + * @return RaLocation[]|null */ public function listRaLocationsFor(Institution $institution): ?array { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuditLogController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuditLogController.php index 0a29858e7..7b13b7a9d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuditLogController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuditLogController.php @@ -34,7 +34,7 @@ public function __construct( ) { } - public function secondFactorAuditLog(Request $request, Institution $institution) + public function secondFactorAuditLog(Request $request, Institution $institution): JsonCollectionResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuthorizationController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuthorizationController.php index 54e65638c..003b4a559 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuthorizationController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuthorizationController.php @@ -30,7 +30,7 @@ public function __construct( ) { } - public function mayRegisterSelfAssertedTokens(string $identityId) + public function mayRegisterSelfAssertedTokens(string $identityId): JsonAuthorizationResponse { $decision = $this->authorizationService->assertRegistrationOfSelfAssertedTokensIsAllowed( new IdentityId($identityId), @@ -38,13 +38,13 @@ public function mayRegisterSelfAssertedTokens(string $identityId) return JsonAuthorizationResponse::from($decision); } - public function mayRegisterRecoveryTokens(string $identityId) + public function mayRegisterRecoveryTokens(string $identityId): JsonAuthorizationResponse { $decision = $this->authorizationService->assertRecoveryTokensAreAllowed(new IdentityId($identityId)); return JsonAuthorizationResponse::from($decision); } - public function maySelfVetSelfAssertedToken(string $identityId) + public function maySelfVetSelfAssertedToken(string $identityId): JsonAuthorizationResponse { $decision = $this->authorizationService->assertSelfVetUsingSelfAssertedTokenIsAllowed( new IdentityId($identityId), diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/DeprovisionController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/DeprovisionController.php index d3f2dd77d..fd827869d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/DeprovisionController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/DeprovisionController.php @@ -47,7 +47,6 @@ public function deprovision(string $collabPersonId): JsonResponse // just so the deprovision run does not end prematurely. At this point, no other domain exceptions // are thrown. $userData = []; - $errors = []; } catch (Exception $e) { $userData = []; $errors = [$e->getMessage()]; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php index a231c531a..b84e47489 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php @@ -36,7 +36,7 @@ public function __construct( ) { } - public function get($id): JsonResponse + public function get(string $id): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); @@ -49,7 +49,7 @@ public function get($id): JsonResponse return new JsonResponse($identity); } - public function collection(Request $request, Institution $institution) + public function collection(Request $request, Institution $institution): JsonCollectionResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); @@ -65,10 +65,7 @@ public function collection(Request $request, Institution $institution) return JsonCollectionResponse::fromPaginator($paginator); } - /** - * @param string $identityId - */ - public function getRegistrationAuthorityCredentials($identityId): JsonResponse + public function getRegistrationAuthorityCredentials(string $identityId): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); @@ -76,7 +73,7 @@ public function getRegistrationAuthorityCredentials($identityId): JsonResponse $credentials = $identityService->findRegistrationAuthorityCredentialsOf($identityId); - if (!$credentials) { + if (!$credentials instanceof \Surfnet\StepupMiddleware\ApiBundle\Identity\Value\RegistrationAuthorityCredentials) { return new JsonNotFoundResponse(); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/InstitutionConfigurationOptionsController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/InstitutionConfigurationOptionsController.php index 13dc93ff9..bcdc90f6f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/InstitutionConfigurationOptionsController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/InstitutionConfigurationOptionsController.php @@ -36,7 +36,7 @@ public function __construct( ) { } - public function getForInstitution($institutionName): JsonResponse + public function getForInstitution(string $institutionName): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_SS', 'ROLE_RA', 'ROLE_READ']); @@ -50,7 +50,7 @@ public function getForInstitution($institutionName): JsonResponse ->allowedSecondFactorListService ->getAllowedSecondFactorListFor($institution); - if ($institutionConfigurationOptions === null) { + if (!$institutionConfigurationOptions instanceof \Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity\InstitutionConfigurationOptions) { throw new NotFoundHttpException( sprintf('No institution configuration options found for institution "%s"', $institution), ); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ProfileController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ProfileController.php index 83a1f9b51..0a2c6e401 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ProfileController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ProfileController.php @@ -33,7 +33,7 @@ public function __construct( ) { } - public function get(Request $request, $identityId): JsonResponse + public function get(Request $request, string $identityId): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php index 5395e29af..06adaead9 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php @@ -41,7 +41,7 @@ public function __construct( /** * @return JsonCollectionResponse */ - public function search(Request $request) + public function search(Request $request): JsonCollectionResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php index c13c40e05..fccbd478e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php @@ -38,7 +38,7 @@ public function __construct( ) { } - public function get(Request $request, $identityId): JsonResponse + public function get(Request $request, string $identityId): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); @@ -56,7 +56,7 @@ public function get(Request $request, $identityId): JsonResponse $authorizationContext, ); - if ($raListing === null) { + if (!$raListing instanceof \Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\RaListing) { throw new NotFoundHttpException(sprintf("RaListing '%s' does not exist", $identityId)); } @@ -66,7 +66,7 @@ public function get(Request $request, $identityId): JsonResponse /** * @return JsonCollectionResponse */ - public function search(Request $request) + public function search(Request $request): JsonCollectionResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php index a2615fdf5..3cba5462d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php @@ -36,7 +36,7 @@ public function __construct( ) { } - public function collection(Request $request) + public function collection(Request $request): JsonCollectionResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php index 36c68c3b1..de32a08c2 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php @@ -45,7 +45,7 @@ public function __construct( ) { } - public function get($id): JsonResponse + public function get(string $id): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); $this->logger->info(sprintf('Received request to get recovery token: %s', $id)); @@ -58,7 +58,7 @@ public function get($id): JsonResponse return new JsonResponse($recoveryToken); } - public function collection(Request $request) + public function collection(Request $request): JsonCollectionResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); $this->logger->info( diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/SraaController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/SraaController.php index 6d5b60853..8bebfb399 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/SraaController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/SraaController.php @@ -33,15 +33,14 @@ public function __construct(private readonly SraaService $sraaService) /** * @param string $nameId injected by symfony from the request - * @return JsonNotFoundResponse|JsonResponse */ - public function get($nameId): JsonResponse + public function get(string $nameId): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); $sraa = $this->sraaService->findByNameId(new NameId($nameId)); - if (!$sraa) { + if (!$sraa instanceof \Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Sraa) { return new JsonNotFoundResponse(); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php index c4f37f3d1..23247b188 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php @@ -35,7 +35,7 @@ public function __construct( ) { } - public function get($id): JsonResponse + public function get(string $id): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); @@ -48,7 +48,7 @@ public function get($id): JsonResponse return new JsonResponse($secondFactor); } - public function collection(Request $request) + public function collection(Request $request): JsonCollectionResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VerifiedSecondFactorController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VerifiedSecondFactorController.php index c6d4c7510..66c32cf3b 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VerifiedSecondFactorController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VerifiedSecondFactorController.php @@ -46,7 +46,7 @@ public function __construct( ) { } - public function get($id): JsonResponse + public function get(string $id): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); @@ -59,7 +59,7 @@ public function get($id): JsonResponse return new JsonResponse($secondFactor); } - public function collection(Request $request) + public function collection(Request $request): JsonCollectionResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); @@ -87,7 +87,7 @@ public function collection(Request $request) return JsonCollectionResponse::fromPaginator($paginator); } - public function collectionOfIdentity(Request $request) + public function collectionOfIdentity(Request $request): JsonCollectionResponse { $this->denyAccessUnlessGranted(['ROLE_SS', 'ROLE_READ']); $query = new VerifiedSecondFactorOfIdentityQuery(); @@ -100,7 +100,7 @@ public function collectionOfIdentity(Request $request) return JsonCollectionResponse::fromPaginator($paginator); } - public function getCanSkipProvePossession($id): JsonResponse + public function getCanSkipProvePossession(string $id): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php index 0b1aaf8a6..1f31f9aa3 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php @@ -35,7 +35,7 @@ public function __construct( ) { } - public function get($id): JsonResponse + public function get(string $id): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); @@ -48,7 +48,7 @@ public function get($id): JsonResponse return new JsonResponse($secondFactor); } - public function collection(Request $request) + public function collection(Request $request): JsonCollectionResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettingTypeHintController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettingTypeHintController.php index 4eae40def..e01f3ebb1 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettingTypeHintController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettingTypeHintController.php @@ -34,7 +34,7 @@ public function __construct( ) { } - public function get($institution): JsonResponse + public function get(string $institution): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); $this->logger->info(sprintf('Received request to get a vetting type hint for institution: %s', $institution)); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/DependencyInjection/Configuration.php b/src/Surfnet/StepupMiddleware/ApiBundle/DependencyInjection/Configuration.php index e8d1e0b26..77012057c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/DependencyInjection/Configuration.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/DependencyInjection/Configuration.php @@ -33,7 +33,7 @@ public function getConfigTreeBuilder(): TreeBuilder ->scalarNode('http_basic_realm') ->defaultValue('Secure Gateway API') ->validate() - ->ifTrue(fn($realm): bool => !is_string($realm) || empty($realm)) + ->ifTrue(fn($realm): bool => !is_string($realm) || ($realm === '' || $realm === '0')) ->thenInvalid("Invalid HTTP Basic realm '%s'. Must be string and non-empty.") ->end() ->end() diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/AuthorityRoleType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/AuthorityRoleType.php index 9bd69398d..db0b778e6 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/AuthorityRoleType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/AuthorityRoleType.php @@ -43,7 +43,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string { if (is_null($value)) { - return $value; + return null; } return (string)$value; @@ -52,7 +52,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str public function convertToPHPValue($value, AbstractPlatform $platform): ?AuthorityRole { if (is_null($value)) { - return $value; + return null; } try { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/CommonNameType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/CommonNameType.php index 46d32d1bd..5d6f0a290 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/CommonNameType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/CommonNameType.php @@ -40,7 +40,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string { if (is_null($value)) { - return $value; + return null; } return (string)$value; @@ -49,7 +49,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str public function convertToPHPValue($value, AbstractPlatform $platform): ?CommonName { if (is_null($value)) { - return $value; + return null; } try { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationContactInformationType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationContactInformationType.php index 08fc37f3b..ef3167b99 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationContactInformationType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationContactInformationType.php @@ -61,7 +61,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): mixe public function convertToPHPValue($value, AbstractPlatform $platform): ?ContactInformation { if (is_null($value)) { - return $value; + return null; } try { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationInstitutionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationInstitutionType.php index 71ad6605e..af3c2f0a7 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationInstitutionType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationInstitutionType.php @@ -39,7 +39,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st public function convertToDatabaseValue($value, AbstractPlatform $platform): mixed { if (is_null($value)) { - return $value; + return null; } if (!$value instanceof Institution) { @@ -58,7 +58,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): mixe public function convertToPHPValue($value, AbstractPlatform $platform): ?Institution { if (is_null($value)) { - return $value; + return null; } try { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationLocationType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationLocationType.php index e7fb2b65f..55f0324f1 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationLocationType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationLocationType.php @@ -42,7 +42,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st public function convertToDatabaseValue($value, AbstractPlatform $platform): mixed { if (is_null($value)) { - return $value; + return null; } if (!$value instanceof Location) { @@ -61,7 +61,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): mixe public function convertToPHPValue($value, AbstractPlatform $platform): ?Location { if (is_null($value)) { - return $value; + return null; } try { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ContactInformationType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ContactInformationType.php index 00ab5cf24..d9b399dab 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ContactInformationType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ContactInformationType.php @@ -42,7 +42,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st public function convertToDatabaseValue($value, AbstractPlatform $platform): mixed { if (is_null($value)) { - return $value; + return null; } return (string)$value; @@ -51,7 +51,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): mixe public function convertToPHPValue($value, AbstractPlatform $platform): ?ContactInformation { if (is_null($value)) { - return $value; + return null; } try { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DateTimeType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DateTimeType.php index dfd3be74b..0457837a5 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DateTimeType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DateTimeType.php @@ -60,7 +60,7 @@ public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform) public function convertToPHPValue(mixed $value, AbstractPlatform $platform): ?DateTime { if (is_null($value)) { - return $value; + return null; } $dateTime = CoreDateTime::createFromFormat( diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/EmailType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/EmailType.php index ce935f4c9..90e3b1ac7 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/EmailType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/EmailType.php @@ -39,7 +39,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string { if (is_null($value)) { - return $value; + return null; } return (string)$value; @@ -48,7 +48,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str public function convertToPHPValue($value, AbstractPlatform $platform): ?Email { if (is_null($value)) { - return $value; + return null; } try { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionRoleType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionRoleType.php index 4fc263f81..2630e86be 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionRoleType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionRoleType.php @@ -39,7 +39,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st public function convertToDatabaseValue($value, AbstractPlatform $platform): mixed { if (is_null($value)) { - return $value; + return null; } if (!$value instanceof InstitutionRole) { @@ -58,7 +58,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): mixe public function convertToPHPValue($value, AbstractPlatform $platform): ?InstitutionRole { if (is_null($value)) { - return $value; + return null; } try { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionType.php index c90021a23..d4570b01c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionType.php @@ -39,7 +39,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string { if (is_null($value)) { - return $value; + return null; } return (string)$value; @@ -48,7 +48,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str public function convertToPHPValue($value, AbstractPlatform $platform): ?Institution { if (is_null($value)) { - return $value; + return null; } try { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/LocaleType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/LocaleType.php index 055b1e90a..a46588ecf 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/LocaleType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/LocaleType.php @@ -42,7 +42,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string { if (is_null($value)) { - return $value; + return null; } return (string)$value; @@ -51,7 +51,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str public function convertToPHPValue($value, AbstractPlatform $platform): ?Locale { if (is_null($value)) { - return $value; + return null; } try { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/LocationType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/LocationType.php index f19297148..1a4bfe8a7 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/LocationType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/LocationType.php @@ -42,7 +42,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string { if (is_null($value)) { - return $value; + return null; } return (string)$value; @@ -51,7 +51,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str public function convertToPHPValue($value, AbstractPlatform $platform): ?Location { if (is_null($value)) { - return $value; + return null; } try { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NameIdType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NameIdType.php index 869d80250..83c31c081 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NameIdType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NameIdType.php @@ -39,7 +39,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string { if (is_null($value)) { - return $value; + return null; } return (string)$value; @@ -48,7 +48,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str public function convertToPHPValue($value, AbstractPlatform $platform): ?NameId { if (is_null($value)) { - return $value; + return null; } try { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NumberOfTokensPerIdentityType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NumberOfTokensPerIdentityType.php index 1faced276..91d0c4de8 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NumberOfTokensPerIdentityType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NumberOfTokensPerIdentityType.php @@ -39,7 +39,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st public function convertToDatabaseValue($value, AbstractPlatform $platform): mixed { if (is_null($value)) { - return $value; + return null; } if (!$value instanceof NumberOfTokensPerIdentityOption) { @@ -59,7 +59,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): mixe public function convertToPHPValue($value, AbstractPlatform $platform): ?NumberOfTokensPerIdentityOption { if (is_null($value)) { - return $value; + return null; } try { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RaLocationNameType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RaLocationNameType.php index f7ef6b22e..bdc0efdcc 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RaLocationNameType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RaLocationNameType.php @@ -39,7 +39,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st public function convertToDatabaseValue($value, AbstractPlatform $platform): mixed { if (is_null($value)) { - return $value; + return null; } if (!$value instanceof RaLocationName) { @@ -58,7 +58,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): mixe public function convertToPHPValue($value, AbstractPlatform $platform): ?RaLocationName { if (is_null($value)) { - return $value; + return null; } try { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorTypeType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorTypeType.php index 07e97e32a..f6507e266 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorTypeType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorTypeType.php @@ -39,7 +39,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string { if (is_null($value)) { - return $value; + return null; } return (string)$value; @@ -48,7 +48,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str public function convertToPHPValue($value, AbstractPlatform $platform): ?SecondFactorType { if (is_null($value)) { - return $value; + return null; } try { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SelfAssertedTokensOptionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SelfAssertedTokensOptionType.php index 9279bed32..b6297d277 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SelfAssertedTokensOptionType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SelfAssertedTokensOptionType.php @@ -36,10 +36,10 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st return $platform->getIntegerTypeDeclarationSQL($column); } - public function convertToDatabaseValue($value, AbstractPlatform $platform): ?int + public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): ?int { if (is_null($value)) { - return $value; + return null; } if (!$value instanceof SelfAssertedTokensOption) { @@ -59,7 +59,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?int public function convertToPHPValue($value, AbstractPlatform $platform): ?SelfAssertedTokensOption { if (is_null($value)) { - return $value; + return null; } try { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SelfVetOptionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SelfVetOptionType.php index 05cf575b7..ba8006124 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SelfVetOptionType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SelfVetOptionType.php @@ -36,10 +36,10 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st return $platform->getIntegerTypeDeclarationSQL($column); } - public function convertToDatabaseValue($value, AbstractPlatform $platform): ?int + public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): ?int { if (is_null($value)) { - return $value; + return null; } if (!$value instanceof SelfVetOption) { @@ -59,7 +59,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?int public function convertToPHPValue($value, AbstractPlatform $platform): ?SelfVetOption { if (is_null($value)) { - return $value; + return null; } try { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ShowRaaContactInformationOptionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ShowRaaContactInformationOptionType.php index 81fe0a979..263320b61 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ShowRaaContactInformationOptionType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ShowRaaContactInformationOptionType.php @@ -36,10 +36,10 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st return $platform->getBooleanTypeDeclarationSQL($column); } - public function convertToDatabaseValue($value, AbstractPlatform $platform): ?int + public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): ?int { if (is_null($value)) { - return $value; + return null; } if (!$value instanceof ShowRaaContactInformationOption) { @@ -58,7 +58,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?int public function convertToPHPValue($value, AbstractPlatform $platform): ?ShowRaaContactInformationOption { if (is_null($value)) { - return $value; + return null; } try { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SsoOn2faOptionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SsoOn2faOptionType.php index 36dad55b7..dcac72b54 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SsoOn2faOptionType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SsoOn2faOptionType.php @@ -36,10 +36,10 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st return $platform->getIntegerTypeDeclarationSQL($column); } - public function convertToDatabaseValue($value, AbstractPlatform $platform): ?int + public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): ?int { if (is_null($value)) { - return $value; + return null; } if (!$value instanceof SsoOn2faOption) { @@ -59,7 +59,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?int public function convertToPHPValue($value, AbstractPlatform $platform): ?SsoOn2faOption { if (is_null($value)) { - return $value; + return null; } try { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/UseRaLocationsOptionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/UseRaLocationsOptionType.php index ff4775de2..b4473bde8 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/UseRaLocationsOptionType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/UseRaLocationsOptionType.php @@ -36,10 +36,10 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st return $platform->getBooleanTypeDeclarationSQL($column); } - public function convertToDatabaseValue($value, AbstractPlatform $platform): ?int + public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): ?int { if (is_null($value)) { - return $value; + return null; } if (!$value instanceof UseRaLocationsOption) { @@ -58,7 +58,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?int public function convertToPHPValue($value, AbstractPlatform $platform): ?UseRaLocationsOption { if (is_null($value)) { - return $value; + return null; } try { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VerifyEmailOptionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VerifyEmailOptionType.php index f833de453..ef7fa4a3d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VerifyEmailOptionType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VerifyEmailOptionType.php @@ -36,10 +36,10 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st return $platform->getBooleanTypeDeclarationSQL($column); } - public function convertToDatabaseValue($value, AbstractPlatform $platform): ?int + public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): ?int { if (is_null($value)) { - return $value; + return null; } if (!$value instanceof VerifyEmailOption) { @@ -58,7 +58,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?int public function convertToPHPValue($value, AbstractPlatform $platform): ?VerifyEmailOption { if (is_null($value)) { - return $value; + return null; } try { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/EventListener/ExceptionListener.php b/src/Surfnet/StepupMiddleware/ApiBundle/EventListener/ExceptionListener.php index df2fb4e40..bcbdba467 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/EventListener/ExceptionListener.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/EventListener/ExceptionListener.php @@ -45,7 +45,7 @@ public function onKernelException(ExceptionEvent $event): void $this->logException($throwable); - if ($throwable instanceof HttpExceptionInterface && $throwable instanceof Throwable) { + if ($throwable instanceof HttpExceptionInterface) { $statusCode = $throwable->getStatusCode(); $headers = $throwable->getHeaders(); } else { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/AuditLogEntry.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/AuditLogEntry.php index 7a98eb9aa..561bc86b1 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/AuditLogEntry.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/AuditLogEntry.php @@ -121,13 +121,13 @@ class AuditLogEntry implements JsonSerializable public string $id; #[ORM\Column(length: 36, nullable: true)] - public ?string $actorId; + public ?string $actorId = null; #[ORM\Column(type: 'stepup_common_name', nullable: true)] - public CommonName $actorCommonName; + public ?CommonName $actorCommonName = null; #[ORM\Column(type: 'institution', nullable: true)] - public ?Institution $actorInstitution; + public ?Institution $actorInstitution = null; /** * Only in certain situations will this field be filled, It represents the RA institution the @@ -135,7 +135,7 @@ class AuditLogEntry implements JsonSerializable * institution-a. The actual institution John is appointed RA for is stored in this field. */ #[ORM\Column(length: 255, nullable: true)] - public ?string $raInstitution; + public ?string $raInstitution = null; #[ORM\Column(length: 36)] public string $identityId; @@ -144,19 +144,19 @@ class AuditLogEntry implements JsonSerializable public Institution $identityInstitution; #[ORM\Column(length: 36, nullable: true)] - public ?string $secondFactorId; + public ?string $secondFactorId = null; #[ORM\Column(length: 255, nullable: true)] - public string $secondFactorIdentifier; + public ?string $secondFactorIdentifier = null; #[ORM\Column(length: 36, nullable: true)] - public ?string $secondFactorType; + public ?string $secondFactorType = null; #[ORM\Column(length: 255, nullable: true)] - public string $recoveryTokenIdentifier; + public ?string $recoveryTokenIdentifier; #[ORM\Column(length: 36, nullable: true)] - public ?string $recoveryTokenType; + public ?string $recoveryTokenType = null; #[ORM\Column(length: 255)] public string $event; @@ -168,7 +168,7 @@ public function jsonSerialize(): array { return [ 'actor_id' => $this->actorId, - 'actor_institution' => $this->actorInstitution ? (string)$this->actorInstitution : null, + 'actor_institution' => $this->actorInstitution instanceof \Surfnet\Stepup\Identity\Value\Institution ? (string)$this->actorInstitution : null, 'actor_common_name' => $this->actorCommonName, 'identity_id' => $this->identityId, 'identity_institution' => (string)$this->identityInstitution, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Identity.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Identity.php index 57cfbd94b..cf89dd2ce 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Identity.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Identity.php @@ -52,7 +52,7 @@ class Identity implements JsonSerializable #[ORM\Column(type: 'stepup_locale')] public Locale $preferredLocale; - public ?bool $possessedSelfAssertedToken; + public ?bool $possessedSelfAssertedToken = null; public static function create( string $id, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaListing.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaListing.php index 75c5cbabe..3848c981c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaListing.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaListing.php @@ -94,7 +94,7 @@ class RaListing implements JsonSerializable public ContactInformation $contactInformation; public static function create( - $identityId, + string $identityId, Institution $institution, CommonName $commonName, Email $email, @@ -103,10 +103,6 @@ public static function create( ContactInformation $contactInformation, Institution $raInstitution, ): self { - if (!is_string($identityId)) { - throw InvalidArgumentException::invalidType('string', 'id', $identityId); - } - $entry = new self(); $entry->identityId = $identityId; $entry->institution = $institution; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaSecondFactor.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaSecondFactor.php index ac0a833db..e3142f912 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaSecondFactor.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaSecondFactor.php @@ -40,49 +40,12 @@ #[ORM\Entity(repositoryClass: RaSecondFactorRepository::class)] class RaSecondFactor implements JsonSerializable { - /** - * @var Institution - */ - #[ORM\Column(type: 'institution')] - public Institution $institution; - - /** - * The name of the registrant. - * - * - * @var CommonName - */ - #[ORM\Column(type: 'stepup_common_name')] - public CommonName $name; - - /** - * The e-mail of the registrant. - * - * - * @var Email - */ - #[ORM\Column(type: 'stepup_email')] - public Email $email; - - /** - * @var DocumentNumber - */ - #[ORM\Column(type: 'stepup_document_number', nullable: true)] - public ?DocumentNumber $documentNumber; - /** * @var SecondFactorStatus */ #[ORM\Column(type: 'stepup_second_factor_status')] public SecondFactorStatus $status; - /** - * @param string $id - * @param string $type - * @param string $secondFactorId - * @param string $identityId - * @param DocumentNumber|null $documentNumber - */ public function __construct( #[ORM\Id] #[ORM\Column(length: 36)] @@ -93,15 +56,21 @@ public function __construct( public string $secondFactorId, #[ORM\Column(length: 36)] public string $identityId, - Institution $institution, - CommonName $name, - Email $email, - DocumentNumber $documentNumber = null, + #[ORM\Column(type: 'institution')] + public Institution $institution, + /** + * The name of the registrant. + */ + #[ORM\Column(type: 'stepup_common_name')] + public CommonName $name, + /** + * The e-mail of the registrant. + */ + #[ORM\Column(type: 'stepup_email')] + public Email $email, + #[ORM\Column(type: 'stepup_document_number', nullable: true)] + public ?DocumentNumber $documentNumber = null, ) { - $this->institution = $institution; - $this->name = $name; - $this->email = $email; - $this->documentNumber = $documentNumber; $this->status = SecondFactorStatus::unverified(); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/SecondFactorRevocation.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/SecondFactorRevocation.php index ad0a00935..404c091f9 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/SecondFactorRevocation.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/SecondFactorRevocation.php @@ -45,7 +45,7 @@ class SecondFactorRevocation * @var string|null */ #[ORM\Column(length: 36, nullable: true)] - public ?string $secondFactorType; + public ?string $secondFactorType = null; /** * @var string diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettedSecondFactor.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettedSecondFactor.php index f3ea7d99b..2ddb0cf64 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettedSecondFactor.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettedSecondFactor.php @@ -43,11 +43,11 @@ class VettedSecondFactor implements JsonSerializable public string $secondFactorIdentifier; #[ORM\Column(length: 255, nullable: true)] - public ?string $vettingType; + public ?string $vettingType = null; public function isEqual(VettedSecondFactor $vettedSecondFactor): bool { - return $vettedSecondFactor->type == $this->type && $vettedSecondFactor->secondFactorIdentifier == $this->secondFactorIdentifier; + return $vettedSecondFactor->type === $this->type && $vettedSecondFactor->secondFactorIdentifier === $this->secondFactorIdentifier; } public function vettingType(): string diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/AuditLogProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/AuditLogProjector.php index 73babc76e..e22f7c590 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/AuditLogProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/AuditLogProjector.php @@ -29,6 +29,7 @@ use Surfnet\Stepup\Identity\Event\IdentityForgottenEvent; use Surfnet\Stepup\Identity\Event\RecoveryTokenRevokedEvent; use Surfnet\Stepup\Identity\Value\CommonName; +use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\Stepup\Identity\Value\RecoveryTokenIdentifierFactory; use Surfnet\Stepup\Identity\Value\RecoveryTokenType; use Surfnet\Stepup\Identity\Value\VettingType; @@ -99,7 +100,7 @@ private function applyAuditableEvent(AuditableEvent $event, DomainMessage $domai $this->augmentActorCommonName($entry, $auditLogMetadata); if (isset($metadata['actorInstitution'])) { - $entry->actorInstitution = $metadata['actorInstitution']; + $entry->actorInstitution = new Institution($metadata['actorInstitution']); } $entry->identityId = (string)$auditLogMetadata->identityId; @@ -107,11 +108,11 @@ private function applyAuditableEvent(AuditableEvent $event, DomainMessage $domai $entry->event = $event::class; $entry->recordedOn = new DateTime(new CoreDateTime($domainMessage->getRecordedOn()->toString())); - if ($auditLogMetadata->secondFactorId) { + if ($auditLogMetadata->secondFactorId instanceof \Surfnet\Stepup\Identity\Value\SecondFactorId) { $entry->secondFactorId = (string)$auditLogMetadata->secondFactorId; } - if ($auditLogMetadata->secondFactorType) { + if ($auditLogMetadata->secondFactorType instanceof \Surfnet\StepupBundle\Value\SecondFactorType) { $entry->secondFactorType = (string)$auditLogMetadata->secondFactorType; } @@ -122,15 +123,15 @@ private function applyAuditableEvent(AuditableEvent $event, DomainMessage $domai $entry->recoveryTokenIdentifier = (string)$auditLogMetadata->recoveryTokenId; } - if ($auditLogMetadata->recoveryTokenType) { + if ($auditLogMetadata->recoveryTokenType instanceof \Surfnet\Stepup\Identity\Value\RecoveryTokenType) { $entry->recoveryTokenType = (string)$auditLogMetadata->recoveryTokenType; } - if ($auditLogMetadata->secondFactorIdentifier) { + if ($auditLogMetadata->secondFactorIdentifier instanceof \Surfnet\Stepup\Identity\Value\SecondFactorIdentifier) { $entry->secondFactorIdentifier = (string)$auditLogMetadata->secondFactorIdentifier; } - if ($auditLogMetadata->raInstitution) { + if ($auditLogMetadata->raInstitution instanceof \Surfnet\Stepup\Identity\Value\Institution) { $entry->raInstitution = (string)$auditLogMetadata->raInstitution; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaListingProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaListingProjector.php index 51b74d97d..e5eeb4af9 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaListingProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaListingProjector.php @@ -94,7 +94,7 @@ public function applyRegistrationAuthorityInformationAmendedForInstitutionEvent( $event->raInstitution, ); - if (!$raListing) { + if (!$raListing instanceof \Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\RaListing) { throw new RuntimeException( "Tried to amend an RaListing's registration authority location and contact information, " . "but the listing could not be found", @@ -198,7 +198,7 @@ public function applyRegistrationAuthorityInformationAmendedEvent( $event->identityInstitution, ); - if (!$raListing) { + if (!$raListing instanceof \Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\RaListing) { throw new RuntimeException( "Tried to amend an RaListing's registration authority location and contact information, " . "but the listing could not be found", diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaSecondFactorProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaSecondFactorProjector.php index f53847231..5aaa351d7 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaSecondFactorProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaSecondFactorProjector.php @@ -219,7 +219,6 @@ public function applyU2fDevicePossessionProvenAndVerifiedEvent(U2fDevicePossessi } /** - * @param string $secondFactorIdentifier * @param SecondFactorStatus|null $status * @param DocumentNumber|null $documentNumber */ diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php index 42e5c64f0..b78b993a5 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php @@ -182,7 +182,7 @@ public function applySecondFactorVettedEvent(SecondFactorVettedEvent $event): vo // In case the vetting type is unknown (for example when no event replay was performed) // fall back to the unknown vetting type. $vettingType = $event->vettingType; - if (!$vettingType) { + if (!$vettingType instanceof \Surfnet\Stepup\Identity\Value\VettingType) { $vettingType = new UnknownVettingType(); } $vetted->vettingType = $vettingType->type(); @@ -221,7 +221,7 @@ public function applySecondFactorVettedWithoutTokenProofOfPossession( $vettingType = $event->vettingType; // In case the vetting type is unknown (for example when no event replay was performed) // fall back to the unknown vetting type. - if (!$vettingType) { + if (!$vettingType instanceof \Surfnet\Stepup\Identity\Value\VettingType) { $vettingType = new UnknownVettingType(); } $vetted->vettingType = $vettingType->type(); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/UnverifiedSecondFactorQuery.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/UnverifiedSecondFactorQuery.php index 5bbc0a001..45d7327fb 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/UnverifiedSecondFactorQuery.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/UnverifiedSecondFactorQuery.php @@ -27,5 +27,5 @@ class UnverifiedSecondFactorQuery extends AbstractQuery /** * @var string|null */ - public ?string $verificationNonce; + public ?string $verificationNonce = null; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuditLogRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuditLogRepository.php index 53ce97c6c..4b8d03466 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuditLogRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuditLogRepository.php @@ -57,6 +57,9 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\AuditLogEntry; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\SecondFactorAuditLogQuery; +/** + * @extends ServiceEntityRepository + */ class AuditLogRepository extends ServiceEntityRepository { public function __construct(ManagerRegistry $registry) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php index f61331e7b..c141be035 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php @@ -37,6 +37,7 @@ /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + * @extends ServiceEntityRepository */ class AuthorizationRepository extends ServiceEntityRepository { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php index 00861a154..761da538e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php @@ -28,6 +28,9 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Identity; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\IdentityQuery; +/** + * @extends ServiceEntityRepository + */ class IdentityRepository extends ServiceEntityRepository { public function __construct( @@ -65,19 +68,19 @@ public function createSearchQuery( ->setParameter('institution', $query->institution); } - if ($query->nameId) { + if ($query->nameId !== '' && $query->nameId !== '0') { $queryBuilder ->andWhere('i.nameId = :nameId') ->setParameter('nameId', $query->nameId); } - if ($query->email) { + if ($query->email !== '' && $query->email !== '0') { $queryBuilder ->andWhere('i.email LIKE :email') ->setParameter('email', sprintf('%%%s%%', $query->email)); } - if ($query->commonName) { + if ($query->commonName !== '' && $query->commonName !== '0') { $queryBuilder ->andWhere('i.commonName LIKE :commonName') ->setParameter('commonName', sprintf('%%%s%%', $query->commonName)); @@ -137,26 +140,4 @@ public function findOneByNameId(string $nameId): ?Identity { return $this->findOneBy(['nameId' => $nameId]); } - - public function removeByIdentityId(IdentityId $identityId): void - { - $this->getEntityManager()->createQueryBuilder() - ->delete($this->getEntityName(), 'i') - ->where('i.id = :identityId') - ->setParameter('identityId', $identityId->getIdentityId()) - ->getQuery() - ->execute(); - } - - /** - * @return ArrayCollection|Identity[] - */ - public function findByInstitution(Institution $institution): ArrayCollection|array - { - return $this->createQueryBuilder('i') - ->where('i.institution = :institution') - ->setParameter('institution', $institution->getInstitution()) - ->getQuery() - ->getResult(); - } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentitySelfAssertedTokenOptionsRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentitySelfAssertedTokenOptionsRepository.php index a6009de88..94bd56bb0 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentitySelfAssertedTokenOptionsRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentitySelfAssertedTokenOptionsRepository.php @@ -22,6 +22,9 @@ use Doctrine\Persistence\ManagerRegistry; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\IdentitySelfAssertedTokenOptions; +/** + * @extends ServiceEntityRepository + */ class IdentitySelfAssertedTokenOptionsRepository extends ServiceEntityRepository { public function __construct( diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/InstitutionListingRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/InstitutionListingRepository.php index 38459867e..909decef4 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/InstitutionListingRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/InstitutionListingRepository.php @@ -21,11 +21,13 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Persistence\ManagerRegistry; use Surfnet\Stepup\Identity\Value\Institution; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Identity; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\InstitutionListing; /** * @deprecated This could probably be removed and is only used in migrations * @see app/DoctrineMigrations/Version20160719090052.php#L51 + * @extends ServiceEntityRepository */ class InstitutionListingRepository extends ServiceEntityRepository { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaCandidateRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaCandidateRepository.php index a9c9fed07..47576a71b 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaCandidateRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaCandidateRepository.php @@ -35,6 +35,7 @@ /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) * @SuppressWarnings(PHPMD.TooManyPublicMethods) + * @extends ServiceEntityRepository */ class RaCandidateRepository extends ServiceEntityRepository { @@ -69,19 +70,19 @@ public function createSearchQuery(RaCandidateQuery $query): Query ->setParameter('institution', $query->institution); } - if ($query->commonName) { + if ($query->commonName !== '' && $query->commonName !== '0') { $queryBuilder ->andWhere('i.commonName LIKE :commonName') ->setParameter('commonName', sprintf('%%%s%%', $query->commonName)); } - if ($query->email) { + if ($query->email !== '' && $query->email !== '0') { $queryBuilder ->andWhere('i.email LIKE :email') ->setParameter('email', sprintf('%%%s%%', $query->email)); } - if (!empty($query->secondFactorTypes)) { + if (isset($query->secondFactorTypes) && $query->secondFactorTypes !== []) { $queryBuilder ->andWhere('vsf.type IN (:secondFactorTypes)') ->setParameter('secondFactorTypes', $query->secondFactorTypes); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php index 80740d199..8515f6056 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php @@ -32,6 +32,7 @@ /** * @SuppressWarnings(PHPMD.TooManyPublicMethods) + * @extends ServiceEntityRepository */ class RaListingRepository extends ServiceEntityRepository { @@ -112,7 +113,7 @@ public function createSearchQuery(RaListingQuery $query): Query ->setParameter('institution', $query->institution); } - if ($query->identityId) { + if ($query->identityId instanceof IdentityId) { $queryBuilder ->andWhere('r.identityId = :identityId') ->setParameter('identityId', (string)$query->identityId); @@ -153,7 +154,7 @@ public function createSearchQuery(RaListingQuery $query): Query 'iac', ); - if (!$query->orderBy) { + if ($query->orderBy === '' || $query->orderBy === '0') { return $queryBuilder->getQuery(); } @@ -187,6 +188,9 @@ public function createOptionsQuery(RaListingQuery $query): Query return $queryBuilder->getQuery(); } + /** + * @return ArrayCollection + */ public function listRasFor(Institution $raInstitution): ArrayCollection { $listings = $this->createQueryBuilder('rl') diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php index e9bd671dc..2d2b57a8d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaSecondFactorRepository.php @@ -30,6 +30,9 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\RaSecondFactorQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Value\SecondFactorStatus; +/** + * @extends ServiceEntityRepository + */ class RaSecondFactorRepository extends ServiceEntityRepository { public function __construct( @@ -48,7 +51,6 @@ public function find(mixed $id, $lockMode = null, $lockVersion = null): ?RaSecon } /** - * @param string $identityId * @return RaSecondFactor[] */ public function findByIdentityId(string $identityId): array @@ -58,7 +60,6 @@ public function findByIdentityId(string $identityId): array /** - * @param string $institution * @return RaSecondFactor[] */ public function findByInstitution(string $institution): array diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RecoveryTokenRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RecoveryTokenRepository.php index 9923a9a25..6f4b1ea9a 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RecoveryTokenRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RecoveryTokenRepository.php @@ -30,6 +30,9 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\RecoveryTokenQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Value\RecoveryTokenStatus; +/** + * @extends ServiceEntityRepository + */ class RecoveryTokenRepository extends ServiceEntityRepository { public function __construct( @@ -60,7 +63,7 @@ public function createSearchQuery(RecoveryTokenQuery $query): Query { $queryBuilder = $this->createQueryBuilder('rt'); - if ($query->authorizationContext) { + if ($query->authorizationContext instanceof \Surfnet\StepupMiddleware\ApiBundle\Authorization\Value\InstitutionAuthorizationContextInterface) { // Modify query to filter on authorization context // We want to list all recovery tokens of the institution we are RA for. $this->authorizationRepositoryFilter->filter( @@ -70,7 +73,7 @@ public function createSearchQuery(RecoveryTokenQuery $query): Query 'iac', ); } - if ($query->identityId) { + if ($query->identityId instanceof \Surfnet\Stepup\Identity\Value\IdentityId) { $queryBuilder ->andWhere('rt.identityId = :identityId') ->setParameter('identityId', $query->identityId); @@ -136,7 +139,7 @@ public function createOptionsQuery(RecoveryTokenQuery $query): Query ->select('sf.institution') ->groupBy('sf.institution'); - if ($query->authorizationContext) { + if ($query->authorizationContext instanceof \Surfnet\StepupMiddleware\ApiBundle\Authorization\Value\InstitutionAuthorizationContextInterface) { // Modify query to filter on authorization context // We want to list all second factors of the institution we are RA for. $this->authorizationRepositoryFilter->filter( diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SecondFactorRevocationRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SecondFactorRevocationRepository.php index 28eaecd44..6bc37cca7 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SecondFactorRevocationRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SecondFactorRevocationRepository.php @@ -22,6 +22,9 @@ use Doctrine\Persistence\ManagerRegistry; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\SecondFactorRevocation; +/** + * @extends ServiceEntityRepository + */ class SecondFactorRevocationRepository extends ServiceEntityRepository { public function __construct(ManagerRegistry $registry) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php index 9ceaf764c..847ceeebb 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php @@ -24,6 +24,9 @@ use Surfnet\StepupMiddleware\ApiBundle\Exception\InvalidArgumentException; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Sraa; +/** + * @extends ServiceEntityRepository + */ class SraaRepository extends ServiceEntityRepository { public function __construct(ManagerRegistry $registry) @@ -83,10 +86,7 @@ public function saveAll(array $sraaList): void $entityManager->flush(); } - /** - * @return null|Sraa - */ - public function findByNameId(NameId $nameId): ?object + public function findByNameId(NameId $nameId): ?Sraa { return $this->findOneBy(['nameId' => (string)$nameId]); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/UnverifiedSecondFactorRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/UnverifiedSecondFactorRepository.php index 1c39b1df8..e95c72ecf 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/UnverifiedSecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/UnverifiedSecondFactorRepository.php @@ -25,6 +25,9 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\UnverifiedSecondFactor; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\UnverifiedSecondFactorQuery; +/** + * @extends ServiceEntityRepository + */ class UnverifiedSecondFactorRepository extends ServiceEntityRepository { public function __construct(ManagerRegistry $registry) @@ -47,7 +50,7 @@ public function createSearchQuery(UnverifiedSecondFactorQuery $query): Query { $queryBuilder = $this->createQueryBuilder('sf'); - if ($query->identityId) { + if ($query->identityId instanceof \Surfnet\Stepup\Identity\Value\IdentityId) { $queryBuilder ->andWhere('sf.identityId = :identityId') ->setParameter('identityId', (string)$query->identityId); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VerifiedSecondFactorRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VerifiedSecondFactorRepository.php index 00d395564..5d3dd5f19 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VerifiedSecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VerifiedSecondFactorRepository.php @@ -28,6 +28,9 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\VerifiedSecondFactorOfIdentityQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\VerifiedSecondFactorQuery; +/** + * @extends ServiceEntityRepository + */ class VerifiedSecondFactorRepository extends ServiceEntityRepository { public function __construct( @@ -72,13 +75,13 @@ public function createSearchQuery(VerifiedSecondFactorQuery $query): Query { $queryBuilder = $this->createQueryBuilder('sf'); - if ($query->identityId) { + if ($query->identityId instanceof \Surfnet\Stepup\Identity\Value\IdentityId) { $queryBuilder ->andWhere('sf.identityId = :identityId') ->setParameter('identityId', (string)$query->identityId); } - if ($query->secondFactorId) { + if ($query->secondFactorId instanceof \Surfnet\Stepup\Identity\Value\SecondFactorId) { $queryBuilder ->andWhere('sf.id = :secondFactorId') ->setParameter('secondFactorId', (string)$query->secondFactorId); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettedSecondFactorRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettedSecondFactorRepository.php index cc5ea423f..ef86bb5d1 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettedSecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettedSecondFactorRepository.php @@ -25,6 +25,9 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\VettedSecondFactor; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\VettedSecondFactorQuery; +/** + * @extends ServiceEntityRepository + */ class VettedSecondFactorRepository extends ServiceEntityRepository { public function __construct(ManagerRegistry $registry) @@ -44,7 +47,7 @@ public function createSearchQuery(VettedSecondFactorQuery $query): Query { $queryBuilder = $this->createQueryBuilder('sf'); - if ($query->identityId) { + if ($query->identityId instanceof \Surfnet\Stepup\Identity\Value\IdentityId) { $queryBuilder ->andWhere('sf.identityId = :identityId') ->setParameter('identityId', (string)$query->identityId); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettingTypeHintRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettingTypeHintRepository.php index e48f6eec3..a28dbc8a9 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettingTypeHintRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VettingTypeHintRepository.php @@ -22,6 +22,9 @@ use Doctrine\Persistence\ManagerRegistry; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\VettingTypeHint; +/** + * @extends ServiceEntityRepository + */ class VettingTypeHintRepository extends ServiceEntityRepository { public function __construct(ManagerRegistry $registry) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php index 7f8ca425f..5c6f67d69 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php @@ -24,6 +24,9 @@ use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\WhitelistEntry; +/** + * @extends ServiceEntityRepository + */ class WhitelistEntryRepository extends ServiceEntityRepository { public function __construct(ManagerRegistry $registry) @@ -85,7 +88,7 @@ public function remove(array $whitelistEntries): void $entityManager->flush(); } - public function hasEntryFor(mixed $institution): bool + public function hasEntryFor(string $institution): bool { $count = $this->createQueryBuilder('w') ->select('COUNT(w.institution)') @@ -98,7 +101,7 @@ public function hasEntryFor(mixed $institution): bool } /** - * @return ArrayCollection + * @return ArrayCollection */ public function getAll(): ArrayCollection { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AbstractSearchService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AbstractSearchService.php index add967864..eea808ed4 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AbstractSearchService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AbstractSearchService.php @@ -28,7 +28,7 @@ class AbstractSearchService { protected function createPaginatorFrom( - $doctrineQuery, + QueryBuilder|Query $doctrineQuery, AbstractQuery $query, bool $fetchCollection = true, ): Pagerfanta { @@ -54,6 +54,9 @@ protected function createPaginatorFrom( return $paginator; } + /** + * @return array> + */ protected function getFilteredQueryOptions(Query $doctrineQuery): array { $filters = []; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AuditLogService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AuditLogService.php index f6e39abb4..e520657c1 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AuditLogService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AuditLogService.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Service; use Pagerfanta\Pagerfanta; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\AuditLogEntry; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\SecondFactorAuditLogQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\AuditLogRepository; @@ -29,7 +30,7 @@ public function __construct(private readonly AuditLogRepository $repository) } /** - * @return Pagerfanta + * @return Pagerfanta */ public function searchSecondFactorAuditLog(SecondFactorAuditLogQuery $query): Pagerfanta { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/IdentityService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/IdentityService.php index 86785487d..82d01a89a 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/IdentityService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/IdentityService.php @@ -46,15 +46,14 @@ public function __construct( ) { } - /** - * @param string $id - * @return Identity|null - */ - public function find(mixed $id): ?Identity + public function find(string $id): ?Identity { return $this->repository->find($id); } + /** + * @return Pagerfanta + */ public function search(IdentityQuery $query): Pagerfanta { $searchQuery = $this->repository->createSearchQuery($query); @@ -109,9 +108,6 @@ public function findRegistrationAuthorityCredentialsByNameIdAndInstitution( return $this->findRegistrationAuthorityCredentialsByIdentity($identity); } - /** - * @return null|RegistrationAuthorityCredentials - */ private function findRegistrationAuthorityCredentialsByIdentity(Identity $identity): ?RegistrationAuthorityCredentials { $raListing = $this->raListingRepository->findByIdentityId(new IdentityId($identity->id)); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/ProfileService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/ProfileService.php index cfe3b5908..570fb68b5 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/ProfileService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/ProfileService.php @@ -45,9 +45,6 @@ public function __construct( * Profile. Its possible to retrieve profile data for a non RA user, in that case no authorization data is set * on the profile. The same goes for the SRAA user. As that user is allowed all authorizations for all institutions. * An additional isSraa flag is set to true for these administrators. - * - * @param string $identityId - * @return Profile|null */ public function createProfile(string $identityId): ?Profile { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaCandidateService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaCandidateService.php index 48b0f05a3..3fdd6d16f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaCandidateService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaCandidateService.php @@ -21,6 +21,7 @@ use Pagerfanta\Pagerfanta; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Authorization\Value\InstitutionAuthorizationContext; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\RaCandidate; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\RaCandidateQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RaCandidateRepository; @@ -31,7 +32,7 @@ public function __construct(private readonly RaCandidateRepository $raCandidateR } /** - * @return Pagerfanta + * @return Pagerfanta */ public function search(RaCandidateQuery $query): Pagerfanta { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaListingService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaListingService.php index 902d3c134..705828d56 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaListingService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaListingService.php @@ -50,7 +50,7 @@ public function findByIdentityIdAndRaInstitutionWithContext( } /** - * @return Pagerfanta + * @return Pagerfanta */ public function search(RaListingQuery $query): Pagerfanta { @@ -60,7 +60,7 @@ public function search(RaListingQuery $query): Pagerfanta } /** - * @return array + * @return array> */ public function getFilterOptions(RaListingQuery $query): array { @@ -75,7 +75,7 @@ public function listRegistrationAuthoritiesFor(Institution $institution): array $raListings = $this->raListingRepository->listRasFor($institution); return $raListings - ->map(fn(RaListing $raListing) => RegistrationAuthorityCredentials::fromRaListing($raListing)) + ->map(fn(RaListing $raListing): \Surfnet\StepupMiddleware\ApiBundle\Identity\Value\RegistrationAuthorityCredentials => RegistrationAuthorityCredentials::fromRaListing($raListing)) ->toArray(); } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaSecondFactorService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaSecondFactorService.php index f58423391..1de65395c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaSecondFactorService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaSecondFactorService.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Service; use Pagerfanta\Pagerfanta; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\RaSecondFactor; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\RaSecondFactorQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RaSecondFactorRepository; @@ -29,7 +30,7 @@ public function __construct(private readonly RaSecondFactorRepository $repositor } /** - * @return Pagerfanta + * @return Pagerfanta */ public function search(RaSecondFactorQuery $query): Pagerfanta { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RecoveryTokenService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RecoveryTokenService.php index 3a3760e9b..6ddfdeaea 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RecoveryTokenService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RecoveryTokenService.php @@ -33,6 +33,9 @@ public function __construct(private readonly RecoveryTokenRepository $recoveryTo { } + /** + * @return Pagerfanta + */ public function search(RecoveryTokenQuery $query): Pagerfanta { $doctrineQuery = $this->recoveryTokenRepository->createSearchQuery($query); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SecondFactorService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SecondFactorService.php index cb2372df8..8ae2f6ae3 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SecondFactorService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SecondFactorService.php @@ -46,7 +46,7 @@ public function __construct( } /** - * @return Pagerfanta + * @return Pagerfanta */ public function searchUnverifiedSecondFactors(UnverifiedSecondFactorQuery $query): Pagerfanta { @@ -56,7 +56,7 @@ public function searchUnverifiedSecondFactors(UnverifiedSecondFactorQuery $query } /** - * @return Pagerfanta + * @return Pagerfanta */ public function searchVerifiedSecondFactors(VerifiedSecondFactorQuery $query): Pagerfanta { @@ -67,7 +67,7 @@ public function searchVerifiedSecondFactors(VerifiedSecondFactorQuery $query): P /** - * @return Pagerfanta + * @return Pagerfanta */ public function searchVerifiedSecondFactorsOfIdentity(VerifiedSecondFactorOfIdentityQuery $query): Pagerfanta { @@ -77,7 +77,7 @@ public function searchVerifiedSecondFactorsOfIdentity(VerifiedSecondFactorOfIden } /** - * @return Pagerfanta + * @return Pagerfanta */ public function searchVettedSecondFactors(VettedSecondFactorQuery $query): Pagerfanta { @@ -86,27 +86,16 @@ public function searchVettedSecondFactors(VettedSecondFactorQuery $query): Pager return $this->createPaginatorFrom($doctrineQuery, $query); } - /** - * @return null|UnverifiedSecondFactor - */ public function findUnverified(SecondFactorId $id): ?UnverifiedSecondFactor { return $this->unverifiedRepository->find($id); } - - /** - * @return null|VerifiedSecondFactor - */ public function findVerified(SecondFactorId $id): ?VerifiedSecondFactor { return $this->verifiedRepository->find($id); } - - /** - * @return null|VettedSecondFactor - */ public function findVetted(SecondFactorId $id): ?VettedSecondFactor { return $this->vettedRepository->find($id); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SraaService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SraaService.php index 6a924103d..5ab04a439 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SraaService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SraaService.php @@ -28,9 +28,6 @@ public function __construct(private readonly SraaRepository $sraaRepository) { } - /** - * @return Sraa|null - */ public function findByNameId(NameId $nameId): ?Sraa { return $this->sraaRepository->findByNameId($nameId); @@ -44,9 +41,6 @@ public function findAll(): array return $this->sraaRepository->findAll(); } - /** - * @return bool - */ public function contains(NameId $nameId): bool { return $this->sraaRepository->contains($nameId); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/WhitelistService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/WhitelistService.php index 966deb0e4..ce2fd5af6 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/WhitelistService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/WhitelistService.php @@ -18,6 +18,8 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Service; +use Doctrine\Common\Collections\ArrayCollection; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\WhitelistEntry; use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\WhitelistEntryRepository; class WhitelistService @@ -26,12 +28,15 @@ public function __construct(private readonly WhitelistEntryRepository $whitelist { } - public function isWhitelisted($institution): bool + public function isWhitelisted(string $institution): bool { return $this->whitelistEntryRepository->hasEntryFor($institution); } - public function getAllEntries(): \Doctrine\Common\Collections\ArrayCollection + /** + * @return ArrayCollection + */ + public function getAllEntries(): ArrayCollection { return $this->whitelistEntryRepository->getAll(); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Specification/SpecificationInterface.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Specification/SpecificationInterface.php index 5d7900c57..d21ac121d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Specification/SpecificationInterface.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Specification/SpecificationInterface.php @@ -22,8 +22,5 @@ interface SpecificationInterface { - /** - * @return mixed - */ public function apply(EntityRepository $entityRepository): mixed; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorityRole.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorityRole.php index 6b3ff1ad1..c707a387b 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorityRole.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorityRole.php @@ -32,9 +32,9 @@ class AuthorityRole implements Stringable /** * @var string */ - private string $role; + private readonly string $role; - public function __construct($role) + public function __construct(string $role) { if (!in_array($role, [self::ROLE_RA, self::ROLE_RAA, self::ROLE_SRAA])) { throw InvalidArgumentException::invalidType( diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/Profile.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/Profile.php index 4b92abc0b..78eb988bd 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/Profile.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/Profile.php @@ -23,10 +23,7 @@ class Profile implements JsonSerializable { - /** - * - * @param bool $isSraa - */ + public function __construct( private readonly Identity $identity, private readonly AuthorizedInstitutionCollection $authorizedInstitutionCollection, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RegistrationAuthorityCredentials.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RegistrationAuthorityCredentials.php index 620c02113..38dee1844 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RegistrationAuthorityCredentials.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RegistrationAuthorityCredentials.php @@ -34,9 +34,9 @@ class RegistrationAuthorityCredentials implements JsonSerializable private CommonName $commonName; - private ?Location $location; + private ?Location $location = null; - private ?ContactInformation $contactInformation; + private ?ContactInformation $contactInformation = null; private function __construct( private readonly string $identityId, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/SecondFactorStatus.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/SecondFactorStatus.php index 3588cd1bc..63f66c185 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/SecondFactorStatus.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/SecondFactorStatus.php @@ -20,7 +20,7 @@ use Stringable; -final class SecondFactorStatus implements Stringable +final readonly class SecondFactorStatus implements Stringable { public static function unverified(): self { @@ -48,7 +48,6 @@ public static function forgotten(): self } /** - * @param string $status * @return bool */ public static function isValidStatus(string $status): bool @@ -56,9 +55,6 @@ public static function isValidStatus(string $status): bool return in_array($status, ['unverified', 'verified', 'vetted', 'revoked', 'forgotten', true]); } - /** - * @param string $status - */ private function __construct(private string $status) { } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/VerifiedTokenInformation.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/VerifiedTokenInformation.php index 89cb3210c..15bea2d24 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/VerifiedTokenInformation.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/VerifiedTokenInformation.php @@ -18,30 +18,22 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Identity\Value; +use Surfnet\Stepup\DateTime\DateTime; +use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Identity; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\VerifiedSecondFactor; class VerifiedTokenInformation { - /** - * @param $email - * @param $tokenId - * @param $tokenType - * @param $commonName - * @param $requestedAt - * @param $preferredLocale - * @param $institution - * @param $registrationCode - */ public function __construct( - private $email, - private $tokenId, - private $tokenType, - private $commonName, - private $requestedAt, - private $preferredLocale, - private $institution, - private $registrationCode, + private readonly string $email, + private readonly string $tokenId, + private readonly string $tokenType, + private readonly string $commonName, + private readonly DateTime $requestedAt, + private readonly string $preferredLocale, + private readonly Institution $institution, + private readonly string $registrationCode, ) { } @@ -59,42 +51,42 @@ public static function fromEntity(VerifiedSecondFactor $token, Identity $identit ); } - public function getEmail() + public function getEmail(): string { return $this->email; } - public function getTokenId() + public function getTokenId(): string { return $this->tokenId; } - public function getTokenType() + public function getTokenType(): string { return $this->tokenType; } - public function getCommonName() + public function getCommonName(): string { return $this->commonName; } - public function getRequestedAt() + public function getRequestedAt(): DateTime { return $this->requestedAt; } - public function getPreferredLocale() + public function getPreferredLocale(): string { return $this->preferredLocale; } - public function getInstitution() + public function getInstitution(): Institution { return $this->institution; } - public function getRegistrationCode() + public function getRegistrationCode(): string { return $this->registrationCode; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionParamConverter.php b/src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionParamConverter.php index 380fe1185..55de2c5e7 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionParamConverter.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionParamConverter.php @@ -43,7 +43,7 @@ public function supports(ParamConverter $configuration): bool /** * @return string */ - private function getInstitutionFromRequest(Request $request) + private function getInstitutionFromRequest(Request $request): string { $institution = $request->attributes->get(self::INSTITUTION); $request->attributes->remove(self::INSTITUTION); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/projection.yml b/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/projection.yml index 0727dd4b0..1fc45e6a6 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/projection.yml +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/projection.yml @@ -49,7 +49,7 @@ services: surfnet_stepup_middleware_api.projector.recovery_token: class: Surfnet\StepupMiddleware\ApiBundle\Identity\Projector\RecoveryTokenProjector arguments: - - "@Surfnet\\StepupMiddleware\\ApiBundle\\Identity\\Repository\\RecoveryTokenRepository" + - '@Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RecoveryTokenRepository' tags: [ { name: event_bus.event_listener, disable_for_replay: false } ] surfnet_stepup_middleware_api.projector.vetting_type_hint: diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonCollectionResponse.php b/src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonCollectionResponse.php index deac4f0ff..385b887ca 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonCollectionResponse.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonCollectionResponse.php @@ -23,7 +23,7 @@ class JsonCollectionResponse extends JsonResponse { - public static function fromPaginator(Pagerfanta $paginator, $filters = []): self + public static function fromPaginator(Pagerfanta $paginator, array $filters = []): self { return new self( $paginator->getNbResults(), @@ -35,15 +35,7 @@ public static function fromPaginator(Pagerfanta $paginator, $filters = []): self ); } - /** - * @param int $totalItems - * @param int $page - * @param int $pageSize - * @param array $collection - * @param array $headers - * @param array $filters - */ - public function __construct($totalItems, $page, $pageSize, array $collection, array $headers = [], $filters = []) + public function __construct(int $totalItems, int $page, int $pageSize, array $collection, array $headers = [], array $filters = []) { $data = [ 'collection' => ['total_items' => $totalItems, 'page' => $page, 'page_size' => $pageSize], diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Security/Http/EntryPoint/JsonBasicAuthenticationEntryPoint.php b/src/Surfnet/StepupMiddleware/ApiBundle/Security/Http/EntryPoint/JsonBasicAuthenticationEntryPoint.php index 961111ef4..692fd8063 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Security/Http/EntryPoint/JsonBasicAuthenticationEntryPoint.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Security/Http/EntryPoint/JsonBasicAuthenticationEntryPoint.php @@ -29,7 +29,7 @@ */ class JsonBasicAuthenticationEntryPoint implements AuthenticationEntryPointInterface { - public function __construct(private $realmName) + public function __construct(private string $realmName) { } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationContextServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationContextServiceTest.php index 09ab832cb..1c798a628 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationContextServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationContextServiceTest.php @@ -46,24 +46,13 @@ class AuthorizationContextServiceTest extends TestCase private AuthorizationContextService $service; - /** - * @var IdentityService|MockInterface - */ - private $identityService; + private IdentityService&MockInterface $identityService; - /** - * @var SraaService|MockInterface - */ - private $sraaService; + private SraaService&MockInterface $sraaService; - /** - * @var AuthorizationRepository|MockInterface - */ - private $authorizationRepository; - /** - * @var MockInterface|ConfiguredInstitutionRepository - */ - private $institutionRepo; + private AuthorizationRepository&MockInterface $authorizationRepository; + + private MockInterface|ConfiguredInstitutionRepository $institutionRepo; public function setUp(): void { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationServiceTest.php index 46a2e78b4..85df68298 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationServiceTest.php @@ -20,6 +20,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Mockery as m; +use Mockery\MockInterface; use Pagerfanta\Pagerfanta; use PHPUnit\Framework\TestCase; use Surfnet\Stepup\Configuration\Value\SelfAssertedTokensOption; @@ -40,29 +41,14 @@ class AuthorizationServiceTest extends TestCase { use m\Adapter\Phpunit\MockeryPHPUnitIntegration; - /** - * @var m\MockInterface|IdentityService - */ - private $identityService; - - /** - * @var m\MockInterface|InstitutionConfigurationOptionsService - */ - private $institutionConfigurationService; - - /** - * @var m\MockInterface|SecondFactorService - */ - private $secondFactorService; - - /** - * @var m\MockInterface|RecoveryTokenService - */ - private $recoveryTokenService; - - /** - * @var AuthorizationService - */ + private MockInterface&IdentityService $identityService; + + private MockInterface&InstitutionConfigurationOptionsService $institutionConfigurationService; + + private MockInterface&SecondFactorService $secondFactorService; + + private MockInterface&RecoveryTokenService $recoveryTokenService; + private AuthorizationService $service; protected function setUp(): void diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php index 294913a12..96482961e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php @@ -140,7 +140,7 @@ public function test_shared_ra_and_ss_commands_are_correctly_authorized(): void * @test * @dataProvider availableCommands */ - public function a_sraa_should_be_able_to_execute_all_commands($file, Command $command): void + public function a_sraa_should_be_able_to_execute_all_commands(string $file, Command $command): void { $this->assertInstanceOf(Command::class, $command); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationServiceTest.php index f49a56fe3..712974d06 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationServiceTest.php @@ -20,7 +20,7 @@ use Mockery as m; use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; -use Mockery\Mock; +use Mockery\MockInterface; use PHPUnit\Framework\TestCase as TestCase; use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\Stepup\Configuration\Value\InstitutionRole; @@ -31,15 +31,10 @@ class InstitutionAuthorizationServiceTest extends TestCase { use MockeryPHPUnitIntegration; - /** - * @var InstitutionAuthorizationService - */ + private InstitutionAuthorizationService $service; - /** - * @var InstitutionAuthorizationRepository|Mock - */ - private $repository; + private InstitutionAuthorizationRepository&MockInterface $repository; public function setUp(): void { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionConfigurationOptionsServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionConfigurationOptionsServiceTest.php index b52f02e8c..caed99a9a 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionConfigurationOptionsServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionConfigurationOptionsServiceTest.php @@ -109,7 +109,7 @@ public function test_nullable_tokens_per_identity_options_in_institution_configu $this->assertEquals($expectedNumberOfTokens, $numberOfTokens); } - private function buildConfigurationOption(int $expectedNumberOfTokens) + private function buildConfigurationOption(int $expectedNumberOfTokens): InstitutionConfigurationOptions&MockInterface { $numberOfTokensOptionMock = m::mock(NumberOfTokensPerIdentityOption::class); $numberOfTokensOptionMock diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationContactInformationTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationContactInformationTypeTest.php index dbb5fa8dd..cf8276298 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationContactInformationTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationContactInformationTypeTest.php @@ -55,9 +55,8 @@ public function setUp(): void * @group doctrine * * @dataProvider \Surfnet\StepupMiddleware\ApiBundle\Tests\TestDataProvider::notNull - * @param $incorrectValue */ - public function a_value_can_only_be_converted_to_sql_if_it_is_contact_information_or_null($incorrectValue): void + public function a_value_can_only_be_converted_to_sql_if_it_is_contact_information_or_null(mixed $incorrectValue): void { $this->expectException(ConversionException::class); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationInstitutionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationInstitutionTypeTest.php index 0ff23bd14..6eceb3e08 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationInstitutionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationInstitutionTypeTest.php @@ -66,9 +66,8 @@ public function a_null_value_remains_null_in_to_sql_conversion(): void * @group doctrine * * @dataProvider \Surfnet\StepupMiddleware\ApiBundle\Tests\TestDataProvider::notNull - * @param $incorrectValue */ - public function a_value_can_only_be_converted_to_sql_if_it_is_an_institution_or_null($incorrectValue): void + public function a_value_can_only_be_converted_to_sql_if_it_is_an_institution_or_null(mixed $incorrectValue): void { $this->expectException(ConversionException::class); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationLocationTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationLocationTypeTest.php index 9a75ed0ff..2e6cb23b6 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationLocationTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ConfigurationLocationTypeTest.php @@ -68,9 +68,8 @@ public function a_null_value_remains_null_in_to_sql_conversion(): void * @group doctrine * * @dataProvider \Surfnet\StepupMiddleware\ApiBundle\Tests\TestDataProvider::notNull - * @param $incorrectValue */ - public function a_value_can_only_be_converted_to_sql_if_it_is_a_location_or_null($incorrectValue): void + public function a_value_can_only_be_converted_to_sql_if_it_is_a_location_or_null(mixed $incorrectValue): void { $this->expectException(ConversionException::class); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DocumentNumberTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DocumentNumberTypeTest.php index 269546c2a..33ddfb91b 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DocumentNumberTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DocumentNumberTypeTest.php @@ -95,9 +95,8 @@ public function a_null_value_remains_null_when_converting_from_db_to_php_value() * @group doctrine * * @dataProvider \Surfnet\StepupMiddleware\ApiBundle\Tests\TestDataProvider::notNull - * @param $incorrectValue */ - public function a_value_can_only_be_converted_to_sql_if_it_is_a_document_number_or_null($incorrectValue): void + public function a_value_can_only_be_converted_to_sql_if_it_is_a_document_number_or_null(mixed $incorrectValue): void { $this->expectException(ConversionException::class); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NumberOfTokensPerIdentityTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NumberOfTokensPerIdentityTypeTest.php index 8199614fc..ef7bd8bc2 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NumberOfTokensPerIdentityTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/NumberOfTokensPerIdentityTypeTest.php @@ -67,9 +67,8 @@ public function a_null_value_remains_null_in_to_sql_conversion(): void * @group doctrine * * @dataProvider \Surfnet\StepupMiddleware\ApiBundle\Tests\TestDataProvider::notNull - * @param $incorrectValue */ - public function a_value_can_only_be_converted_to_sql_if_it_is_an_option_type_or_null($incorrectValue): void + public function a_value_can_only_be_converted_to_sql_if_it_is_an_option_type_or_null(mixed $incorrectValue): void { $this->expectException(ConversionException::class); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RaLocationNameTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RaLocationNameTypeTest.php index e05128fe9..cfdb117de 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RaLocationNameTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RaLocationNameTypeTest.php @@ -82,9 +82,8 @@ public function a_non_null_value_is_converted_to_the_correct_format(): void * @group doctrine * * @dataProvider \Surfnet\StepupMiddleware\ApiBundle\Tests\TestDataProvider::notNull - * @param $incorrectValue */ - public function a_value_can_only_be_converted_to_sql_if_it_is_an_ra_location_or_null($incorrectValue): void + public function a_value_can_only_be_converted_to_sql_if_it_is_an_ra_location_or_null(mixed $incorrectValue): void { $this->expectException(ConversionException::class); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SelfVetOptionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SelfVetOptionTypeTest.php index 0e3fa9571..33bf62589 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SelfVetOptionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SelfVetOptionTypeTest.php @@ -40,7 +40,7 @@ public static function setUpBeforeClass(): void { Type::addType( SelfVetOptionType::NAME, - \Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\SelfVetOptionType::class, + SelfVetOptionType::class, ); } @@ -67,9 +67,8 @@ public function a_null_value_remains_null_in_to_sql_conversion(): void * @group doctrine * * @dataProvider \Surfnet\StepupMiddleware\ApiBundle\Tests\TestDataProvider::notNull - * @param $incorrectValue */ - public function a_value_can_only_be_converted_to_sql_if_it_is_an_option_type_or_null($incorrectValue): void + public function a_value_can_only_be_converted_to_sql_if_it_is_an_option_type_or_null(mixed $incorrectValue): void { $this->expectException(ConversionException::class); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ShowRaaContactInformationOptionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ShowRaaContactInformationOptionTypeTest.php index 2e494ff83..1466d15cf 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ShowRaaContactInformationOptionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/ShowRaaContactInformationOptionTypeTest.php @@ -68,10 +68,9 @@ public function a_null_value_remains_null_in_to_sql_conversion(): void * @group doctrine * * @dataProvider \Surfnet\StepupMiddleware\ApiBundle\Tests\TestDataProvider::notNull - * @param $incorrectValue */ public function a_value_can_only_be_converted_to_sql_if_it_is_a_show_raa_contact_information_option_or_null( - $incorrectValue, + mixed $incorrectValue, ): void { $this->expectException(ConversionException::class); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/UseRaLocationsOptionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/UseRaLocationsOptionTypeTest.php index aa35e5b0e..4e7462fcb 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/UseRaLocationsOptionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/UseRaLocationsOptionTypeTest.php @@ -67,9 +67,8 @@ public function a_null_value_remains_null_in_to_sql_conversion(): void * @group doctrine * * @dataProvider \Surfnet\StepupMiddleware\ApiBundle\Tests\TestDataProvider::notNull - * @param $incorrectValue */ - public function a_value_can_only_be_converted_to_sql_if_it_is_a_use_ra_locations_option_or_null($incorrectValue,): void + public function a_value_can_only_be_converted_to_sql_if_it_is_a_use_ra_locations_option_or_null(mixed $incorrectValue,): void { $this->expectException(ConversionException::class); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/VerifyEmailOptionTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/VerifyEmailOptionTypeTest.php index 987336b6d..367fe53d4 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/VerifyEmailOptionTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/VerifyEmailOptionTypeTest.php @@ -66,9 +66,8 @@ public function a_null_value_remains_null_in_to_sql_conversion(): void * @group doctrine * * @dataProvider \Surfnet\StepupMiddleware\ApiBundle\Tests\TestDataProvider::notNull - * @param $incorrectValue */ - public function a_value_can_only_be_converted_to_sql_if_it_is_an_option_type_or_null($incorrectValue): void + public function a_value_can_only_be_converted_to_sql_if_it_is_an_option_type_or_null(mixed $incorrectValue): void { $this->expectException(ConversionException::class); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/AuditLogProjectorTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/AuditLogProjectorTest.php index 872b910c0..1a6590498 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/AuditLogProjectorTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/AuditLogProjectorTest.php @@ -128,7 +128,7 @@ public function auditable_events(): array new SecondFactorId('ijkl'), new SecondFactorType('yubikey'), new YubikeyPublicId('99992222'), - self::$actorCommonName, + new CommonName(self::$actorCommonName), ), ], ]; @@ -187,7 +187,7 @@ private function createExpectedAuditLogEntry( SecondFactorId $secondFactorId = null, SecondFactorType $secondFactorType = null, ?YubikeyPublicId $secondFactorIdentifier = null, - $actorCommonName = null, + ?CommonName $actorCommonName = null, ): AuditLogEntry { $entry = new AuditLogEntry(); $entry->actorId = $actorId instanceof IdentityId ? $actorId : null; @@ -207,7 +207,7 @@ private function createExpectedAuditLogEntry( /** * @return MatcherAbstract */ - private function spy(mixed &$spy) + private function spy(mixed &$spy): MatcherAbstract { return m::on( function ($value) use (&$spy): bool { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Value/AuthorizedInstitutionCollectionTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Value/AuthorizedInstitutionCollectionTest.php index 5e8552627..16edab40d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Value/AuthorizedInstitutionCollectionTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Value/AuthorizedInstitutionCollectionTest.php @@ -68,6 +68,9 @@ public function retrieve_institutions_only_raa(): void $this->assertEquals('raa', $collection->getAuthorizations()['b'][0]); } + /** + * @param string[] $institutions + */ private function buildInstitutionCollection(array $institutions): InstitutionCollection { $institutionList = []; @@ -77,7 +80,7 @@ private function buildInstitutionCollection(array $institutions): InstitutionCol return new InstitutionCollection($institutionList); } - private function buildInstitution($name): Institution + private function buildInstitution(string $name): Institution { return new Institution($name); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php index 9a6e6ecbe..12331883f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php @@ -40,9 +40,8 @@ class CommandParamConverterTest extends TestCase * @test * @group api-bundle * @dataProvider invalidCommandJsonStructures - * @param string $commandJson */ - public function it_validates_the_command_structure($commandJson): void + public function it_validates_the_command_structure(string $commandJson): void { $this->expectException(BadCommandRequestException::class); @@ -62,9 +61,8 @@ public function it_validates_the_command_structure($commandJson): void * @test * @group api-bundle * @dataProvider convertibleCommandNames - * @param string $expectedCommandClass */ - public function it_can_convert_command_name_notation($expectedCommandClass, string $commandName): void + public function it_can_convert_command_name_notation(string $expectedCommandClass, string $commandName): void { $command = ['command' => ['name' => $commandName, 'uuid' => 'abcdef', 'payload' => new stdClass]]; @@ -189,7 +187,7 @@ public function convertibleCommandNames(): array /** * @return MatcherAbstract */ - private function spy(mixed &$spy) + private function spy(mixed &$spy): MatcherAbstract { return m::on( function ($value) use (&$spy): bool { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php index 35da5e046..5649a960e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php @@ -80,7 +80,7 @@ public function an_institution_is_set_as_attribute(): void $this->assertTrue($this->request->attributes->get('institution')->equals($equal)); } - private function mockQuery(bool|string $returnValue) + private function mockQuery(bool|string $returnValue): ParameterBag&MockInterface { $query = m::mock(ParameterBag::class); $query diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Service/DeprovisionServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Service/DeprovisionServiceTest.php index 7d37d865a..7cd181948 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Service/DeprovisionServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Service/DeprovisionServiceTest.php @@ -20,6 +20,7 @@ use Mockery as m; use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; +use Mockery\MockInterface; use PHPUnit\Framework\TestCase; use Psr\Log\LoggerInterface; use Surfnet\Stepup\Identity\EventSourcing\IdentityRepository; @@ -34,25 +35,13 @@ class DeprovisionServiceTest extends TestCase { use MockeryPHPUnitIntegration; - /** - * @var DeprovisionService - */ private DeprovisionService $deprovisionService; - /** - * @var m\LegacyMockInterface|m\MockInterface|Pipeline - */ - private $pipeline; + private MockInterface&Pipeline $pipeline; - /** - * @var m\LegacyMockInterface|m\MockInterface|ApiIdentityRepository - */ - private $apiRepo; + private MockInterface&ApiIdentityRepository $apiRepo; - /** - * @var m\LegacyMockInterface|m\MockInterface|IdentityRepository - */ - private $eventRepo; + private MockInterface&IdentityRepository $eventRepo; protected function setUp(): void { @@ -100,7 +89,6 @@ public function test_it_can_return_data(): void $data = $this->deprovisionService->readUserData('urn:collab:person:example.com:maynard_keenan'); - $this->assertTrue(is_array($data)); $this->assertEquals($data['status'], 'OK'); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/TestDataProvider.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/TestDataProvider.php index b8848eb4d..cdcb23745 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/TestDataProvider.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/TestDataProvider.php @@ -22,6 +22,9 @@ final class TestDataProvider { + /** + * @return array + */ public static function notNull(): array { return [ diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/Metadata.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/Metadata.php index c1e39f8df..6aacdff2b 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/Metadata.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/Metadata.php @@ -28,11 +28,11 @@ final class Metadata */ #[Assert\Type(type: 'string')] #[Assert\Regex(pattern: '~^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$~i')] - public ?string $actorId; + public ?string $actorId = null; /** * @var string|null */ #[Assert\Type(type: 'string')] - public ?string $actorInstitution; + public ?string $actorInstitution = null; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/ReconfigureInstitutionConfigurationOptionsCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/ReconfigureInstitutionConfigurationOptionsCommand.php index da41ba590..af4b27463 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/ReconfigureInstitutionConfigurationOptionsCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/ReconfigureInstitutionConfigurationOptionsCommand.php @@ -57,35 +57,35 @@ final class ReconfigureInstitutionConfigurationOptionsCommand extends AbstractCo public int $numberOfTokensPerIdentityOption; #[Assert\NotNull] - public $allowedSecondFactors; + public array $allowedSecondFactors; /** * @var array|null */ - public ?array $useRaOption; + public ?array $useRaOption = null; /** * @var array|null */ - public ?array $useRaaOption; + public ?array $useRaaOption = null; /** * @var array|null */ - public ?array $selectRaaOption; + public ?array $selectRaaOption = null; /** * @var bool|null */ - public ?bool $selfVetOption; + public ?bool $selfVetOption = null; /** * @var bool|null */ - public ?bool $selfAssertedTokensOption; + public ?bool $selfAssertedTokensOption = null; /** * @var bool|null */ - public ?bool $ssoOn2faOption; + public ?bool $ssoOn2faOption = null; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/ConfigurationCommandHandler.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/ConfigurationCommandHandler.php index 57a64f9d6..5704c91ce 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/ConfigurationCommandHandler.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/ConfigurationCommandHandler.php @@ -34,7 +34,7 @@ public function __construct( public function handleUpdateConfigurationCommand(UpdateConfigurationCommand $command): void { $configuration = $this->getConfiguration(); - if (!$configuration) { + if (!$configuration instanceof \Surfnet\Stepup\Configuration\Configuration) { $configuration = Configuration::create(); } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/Configuration.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/Configuration.php index b0019bee2..31c6012b9 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/Configuration.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/Configuration.php @@ -62,14 +62,14 @@ public function getConfigTreeBuilder(): TreeBuilder ->scalarNode('name') ->isRequired() ->validate() - ->ifTrue(fn($name): bool => !is_string($name) || empty($name)) + ->ifTrue(fn($name): bool => !is_string($name) || ($name === '' || $name === '0')) ->thenInvalid("E-mail sender name must be non-empty string, got '%s'") ->end() ->end() ->scalarNode('email') ->isRequired() ->validate() - ->ifTrue(fn($name): bool => !is_string($name) || empty($name)) + ->ifTrue(fn($name): bool => !is_string($name) || ($name === '' || $name === '0')) ->thenInvalid("E-mail sender e-mail must be non-empty string, got '%s'") ->end() ->end() diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Dto/VettingLocation.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Dto/VettingLocation.php index e3acc33d9..d55dc8fc3 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Dto/VettingLocation.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Dto/VettingLocation.php @@ -20,11 +20,6 @@ class VettingLocation { - /** - * @param string $name - * @param string $location - * @param string $contactInformation - */ public function __construct(public string $name, public string $location, public string $contactInformation) { } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php index 47e24d705..910e77220 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php @@ -26,7 +26,6 @@ use Surfnet\StepupMiddleware\CommandHandlingBundle\Exception\Exception; use Throwable; - class BufferedEventBus implements EventBusInterface { /** @@ -103,7 +102,7 @@ public function flush(): void unset($buffer); // if during the handling of events new events have been queued, we need to flush them - if (!empty($this->buffer)) { + if ($this->buffer !== []) { $this->flush(); } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventSourcing/MetadataEnrichingEventStreamDecorator.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventSourcing/MetadataEnrichingEventStreamDecorator.php index 15d3f0ed7..e3e1848e0 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventSourcing/MetadataEnrichingEventStreamDecorator.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventSourcing/MetadataEnrichingEventStreamDecorator.php @@ -34,8 +34,8 @@ public function setMetadata(Metadata $metadata = null): void } public function decorateForWrite( - $aggregateType, - $aggregateIdentifier, + string $aggregateType, + string $aggregateIdentifier, DomainEventStream $eventStream, ): DomainEventStream { if (!$this->metadata instanceof Metadata) { diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Exception/SecondFactorNotAllowedException.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Exception/SecondFactorNotAllowedException.php index c85f0eb47..2b2564231 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Exception/SecondFactorNotAllowedException.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Exception/SecondFactorNotAllowedException.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Exception; use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\Exception\ProcessingAbortedException; +use Throwable; class SecondFactorNotAllowedException extends RuntimeException implements ProcessingAbortedException { @@ -35,7 +36,7 @@ public function getErrors(): array return $this->errors; } - public function __construct($message = "", $code = 0, Exception $previous = null) + public function __construct(string $message = "", int $code = 0, Throwable $previous = null) { parent::__construct($message, $code, $previous); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/Exception/DuplicateIdentityException.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/Exception/DuplicateIdentityException.php index 1716f2637..6521d1ba5 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/Exception/DuplicateIdentityException.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/Exception/DuplicateIdentityException.php @@ -17,14 +17,14 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\CommandHandler\Exception; -use Exception; use RuntimeException; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\Stepup\Identity\Value\NameId; +use Throwable; final class DuplicateIdentityException extends RuntimeException { - public function __construct($message = "", $code = 0, Exception $previous = null) + public function __construct(string $message = "", int $code = 0, Throwable $previous = null) { parent::__construct($message, $code, $previous); } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/IdentityCommandHandler.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/IdentityCommandHandler.php index 3bc442271..96b28f315 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/IdentityCommandHandler.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/IdentityCommandHandler.php @@ -370,7 +370,7 @@ public function handleSelfVetSecondFactorCommand(SelfVetSecondFactorCommand $com // @todo remove this BC construct once we drop BC support for SelfService 3.5 if ($command->authoringSecondFactorIdentifier) { $loaIdentifier = $command->authoringSecondFactorIdentifier; - } elseif ($command->authoringSecondFactorLoa) { + } elseif ($command->authoringSecondFactorLoa !== '' && $command->authoringSecondFactorLoa !== '0') { $loaIdentifier = $command->authoringSecondFactorLoa; } if (!$loaIdentifier) { @@ -538,7 +538,7 @@ private function emailVerificationIsRequired(IdentityApi $identity): bool $configuration = $this->institutionConfigurationOptionsService ->findInstitutionConfigurationOptionsFor($institution); - if ($configuration === null) { + if (!$configuration instanceof \Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity\InstitutionConfigurationOptions) { return true; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/RegistrationAuthorityCommandHandler.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/RegistrationAuthorityCommandHandler.php index 6b13d8e67..9b8f57818 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/RegistrationAuthorityCommandHandler.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/RegistrationAuthorityCommandHandler.php @@ -126,8 +126,6 @@ public function handleSaveVettingTypeHintCommand(SaveVettingTypeHintCommand $com } /** - * @param string $role - * @param string $commandId * @return RegistrationAuthorityRole */ private function assertValidRoleAndConvertIfValid(string $role, string $commandId): RegistrationAuthorityRole diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/EmailVerificationMailService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/EmailVerificationMailService.php index 76deea6b9..8db83e1a3 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/EmailVerificationMailService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/EmailVerificationMailService.php @@ -30,8 +30,6 @@ final class EmailVerificationMailService { - private TranslatorInterface $translator; - private readonly string $emailVerificationUrlTemplate; /** @@ -40,7 +38,7 @@ final class EmailVerificationMailService public function __construct( private readonly Mailer $mailer, private readonly Sender $sender, - TranslatorInterface $translator, + private readonly TranslatorInterface $translator, string $emailVerificationUrlTemplate, private readonly EmailTemplateService $emailTemplateService, private readonly string $fallbackLocale, @@ -50,7 +48,6 @@ public function __construct( $emailVerificationUrlTemplate, 'Email verification URL template "%s" expected to be string, type %s given', ); - $this->translator = $translator; $this->emailVerificationUrlTemplate = $emailVerificationUrlTemplate; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RecoveryTokenMailService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RecoveryTokenMailService.php index b0eec1904..cb5a8e77a 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RecoveryTokenMailService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RecoveryTokenMailService.php @@ -38,24 +38,18 @@ */ class RecoveryTokenMailService { - /** - * @var TranslatorInterface - */ - private TranslatorInterface $translator; - private readonly string $fallbackLocale; public function __construct( private readonly Mailer $mailer, private readonly Sender $sender, - TranslatorInterface $translator, + private readonly TranslatorInterface $translator, private readonly EmailTemplateService $emailTemplateService, string $fallbackLocale, private readonly string $selfServiceUrl, private readonly LoggerInterface $logger, ) { Assertion::string($fallbackLocale, 'Fallback locale "%s" expected to be string, type %s given'); - $this->translator = $translator; $this->fallbackLocale = $fallbackLocale; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php index 37fadf041..9a839df00 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php @@ -42,13 +42,6 @@ */ class RegistrationMailService { - public InstitutionConfigurationOptionsService $institutionConfigurationOptionsService; - - /** - * @var TranslatorInterface - */ - private TranslatorInterface $translator; - private readonly string $fallbackLocale; /** @@ -57,11 +50,11 @@ class RegistrationMailService public function __construct( private readonly Mailer $mailer, private readonly Sender $sender, - TranslatorInterface $translator, + private readonly TranslatorInterface $translator, private readonly EmailTemplateService $emailTemplateService, string $fallbackLocale, private readonly string $selfServiceUrl, - InstitutionConfigurationOptionsService $institutionConfigurationOptionsService, + public InstitutionConfigurationOptionsService $institutionConfigurationOptionsService, private readonly IdentityService $identityService, private readonly SecondFactorService $secondFactorService, private readonly RaLocationService $raLocationsService, @@ -69,9 +62,7 @@ public function __construct( private readonly LoggerInterface $logger, ) { Assertion::string($fallbackLocale, 'Fallback locale "%s" expected to be string, type %s given'); - $this->translator = $translator; $this->fallbackLocale = $fallbackLocale; - $this->institutionConfigurationOptionsService = $institutionConfigurationOptionsService; } public function send(string $identityId, string $secondFactorId): void diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorRevocationMailService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorRevocationMailService.php index 0e556393b..3d6e0f53e 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorRevocationMailService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorRevocationMailService.php @@ -39,11 +39,6 @@ */ final class SecondFactorRevocationMailService { - /** - * @var TranslatorInterface - */ - private TranslatorInterface $translator; - private readonly string $fallbackLocale; private readonly string $selfServiceUrl; @@ -54,7 +49,7 @@ final class SecondFactorRevocationMailService public function __construct( private readonly Mailer $mailer, private readonly Sender $sender, - TranslatorInterface $translator, + private readonly TranslatorInterface $translator, private readonly EmailTemplateService $emailTemplateService, string $fallbackLocale, string $selfServiceUrl, @@ -62,7 +57,6 @@ public function __construct( ) { Assertion::string($fallbackLocale, 'Fallback locale "%s" expected to be string, type %s given'); Assertion::string($selfServiceUrl, 'Self Service URL "%s" expected to be string, type %s given'); - $this->translator = $translator; $this->fallbackLocale = $fallbackLocale; $this->selfServiceUrl = $selfServiceUrl; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorVettedMailService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorVettedMailService.php index 815f5f8e0..71838fe31 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorVettedMailService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorVettedMailService.php @@ -32,11 +32,6 @@ final class SecondFactorVettedMailService { - /** - * @var TranslatorInterface - */ - private TranslatorInterface $translator; - private readonly string $fallbackLocale; /** @@ -45,13 +40,12 @@ final class SecondFactorVettedMailService public function __construct( private readonly Mailer $mailer, private readonly Sender $sender, - TranslatorInterface $translator, + private readonly TranslatorInterface $translator, private readonly EmailTemplateService $emailTemplateService, string $fallbackLocale, private readonly string $selfServiceUrl, ) { Assertion::string($fallbackLocale, 'Fallback locale "%s" expected to be string, type %s given'); - $this->translator = $translator; $this->fallbackLocale = $fallbackLocale; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Exception/InvalidCommandException.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Exception/InvalidCommandException.php index b05321c92..ba291b5bd 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Exception/InvalidCommandException.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Exception/InvalidCommandException.php @@ -18,10 +18,10 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\Exception; -use Exception; use RuntimeException; use Symfony\Component\Validator\ConstraintViolationInterface; use Symfony\Component\Validator\ConstraintViolationListInterface; +use Throwable; class InvalidCommandException extends RuntimeException implements ProcessingAbortedException { @@ -35,7 +35,7 @@ public static function createFromViolations(ConstraintViolationListInterface $vi return new self(self::mapViolationsToErrorStrings($violations)); } - public function __construct(array $errors, $code = 0, Exception $previous = null) + public function __construct(array $errors, int $code = 0, ?Throwable $previous = null) { parent::__construct(sprintf('Command is invalid: %s', implode('; ', $errors)), $code, $previous); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/EmailVerificationEmailProcessor.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/EmailVerificationEmailProcessor.php index f39bcd505..ec16bed91 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/EmailVerificationEmailProcessor.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Processor/EmailVerificationEmailProcessor.php @@ -33,7 +33,7 @@ public function __construct( public function handlePhonePossessionProvenEvent(PhonePossessionProvenEvent $event): void { - if ($event->emailVerificationRequired !== false) { + if ($event->emailVerificationRequired) { $this->emailVerificationMailService->sendEmailVerificationEmail( (string)$event->preferredLocale, (string)$event->commonName, @@ -45,7 +45,7 @@ public function handlePhonePossessionProvenEvent(PhonePossessionProvenEvent $eve public function handleYubikeyPossessionProvenEvent(YubikeyPossessionProvenEvent $event): void { - if ($event->emailVerificationRequired !== false) { + if ($event->emailVerificationRequired) { $this->emailVerificationMailService->sendEmailVerificationEmail( (string)$event->preferredLocale, (string)$event->commonName, @@ -57,7 +57,7 @@ public function handleYubikeyPossessionProvenEvent(YubikeyPossessionProvenEvent public function handleGssfPossessionProvenEvent(GssfPossessionProvenEvent $event): void { - if ($event->emailVerificationRequired !== false) { + if ($event->emailVerificationRequired) { $this->emailVerificationMailService->sendEmailVerificationEmail( (string)$event->preferredLocale, (string)$event->commonName, diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessage.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessage.php index 8d0b5e31c..bcb2df9f5 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessage.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessage.php @@ -26,16 +26,9 @@ class SensitiveDataMessage { private readonly IdentityId $identityId; - private readonly int $playhead; - - public function __construct(IdentityId $identityId, int $playhead, private SensitiveData $sensitiveData) + public function __construct(IdentityId $identityId, private readonly int $playhead, private SensitiveData $sensitiveData) { - if (!is_int($playhead)) { - throw InvalidArgumentException::invalidType('int', 'playhead', $playhead); - } - $this->identityId = new IdentityId($identityId); - $this->playhead = $playhead; } /** diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessageStream.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessageStream.php index d61b41f25..d5a21794b 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessageStream.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessageStream.php @@ -26,6 +26,9 @@ use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Exception\SensitiveDataApplicationException; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Forgettable; +/** + * @implements IteratorAggregate + */ class SensitiveDataMessageStream implements IteratorAggregate { /** diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/InstitutionConfigurationCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/InstitutionConfigurationCommandHandlerTest.php index 56aa5d90b..aa4915d56 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/InstitutionConfigurationCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/InstitutionConfigurationCommandHandlerTest.php @@ -215,7 +215,7 @@ public function institution_configuration_options_are_not_changed_if_their_given $command->showRaaContactInformationOption = $showRaaContactInformationOption->isEnabled(); $command->verifyEmailOption = $verifyEmailOption->isEnabled(); $command->selfVetOption = $selfVetOption->isEnabled(); - $command->allowedSecondFactors = $selfAssertedTokensOption->isEnabled(); + $command->selfAssertedTokensOption = $selfAssertedTokensOption->isEnabled(); $command->numberOfTokensPerIdentityOption = $numberOfTokensPerIdentityOption->getNumberOfTokensPerIdentity(); $command->useRaOption = $useRaOption->jsonSerialize(); $command->useRaaOption = $useRaaOption->jsonSerialize(); @@ -291,7 +291,7 @@ public function use_ra_locations_option_is_changed_if_its_given_value_is_differe $command->showRaaContactInformationOption = $showRaaContactInformationOption->isEnabled(); $command->verifyEmailOption = $verifyEmailOption->isEnabled(); $command->selfVetOption = $selfVetOption->isEnabled(); - $command->allowedSecondFactors = $selfAssertedTokensOption->isEnabled(); + $command->selfAssertedTokensOption = $selfAssertedTokensOption->isEnabled(); $command->numberOfTokensPerIdentityOption = $numberOfTokensPerIdentityOption->getNumberOfTokensPerIdentity(); $command->useRaOption = $useRaOption->jsonSerialize(); $command->useRaaOption = $useRaaOption->jsonSerialize(); @@ -372,7 +372,7 @@ public function show_raa_contact_information_option_is_changed_if_its_given_valu $command->useRaLocationsOption = $useRaLocationsOption->isEnabled(); $command->verifyEmailOption = $verifyEmailOption->isEnabled(); $command->selfVetOption = $selfVetOption->isEnabled(); - $command->allowedSecondFactors = $selfAssertedTokensOption->isEnabled(); + $command->selfAssertedTokensOption = $selfAssertedTokensOption->isEnabled(); $command->numberOfTokensPerIdentityOption = $numberOfTokensPerIdentityOption->getNumberOfTokensPerIdentity(); $command->allowedSecondFactors = []; @@ -455,7 +455,7 @@ public function allowed_second_factor_list_is_changed_if_its_values_are_differen $command->showRaaContactInformationOption = $showRaaContactInformationOption->isEnabled(); $command->verifyEmailOption = $verifyEmailOption->isEnabled(); $command->selfVetOption = $selfVetOption->isEnabled(); - $command->allowedSecondFactors = $selfAssertedTokensOption->isEnabled(); + $command->selfAssertedTokensOption = $selfAssertedTokensOption->isEnabled(); $command->numberOfTokensPerIdentityOption = $numberOfTokensPerIdentityOption->getNumberOfTokensPerIdentity(); $command->allowedSecondFactors = $secondFactorsToAllow; @@ -537,7 +537,7 @@ public function allowed_second_factor_list_is_not_changed_if_its_values_are_the_ $command->showRaaContactInformationOption = $showRaaContactInformationOption->isEnabled(); $command->verifyEmailOption = $verifyEmailOption->isEnabled(); $command->selfVetOption = $selfVetOption->isEnabled(); - $command->allowedSecondFactors = $selfAssertedTokensOption->isEnabled(); + $command->selfAssertedTokensOption = $selfAssertedTokensOption->isEnabled(); $command->numberOfTokensPerIdentityOption = $numberOfTokensPerIdentityOption->getNumberOfTokensPerIdentity(); $command->allowedSecondFactors = $secondFactorsToAllow; @@ -975,7 +975,7 @@ public function the_self_vet_option_can_be_changed(): void $command->showRaaContactInformationOption = $showRaaContactInformationOption->isEnabled(); $command->verifyEmailOption = $verifyEmailOption->isEnabled(); $command->selfVetOption = $newSelfVetOption->isEnabled(); - $command->allowedSecondFactors = $selfAssertedTokensOption->isEnabled(); + $command->selfAssertedTokensOption = $selfAssertedTokensOption->isEnabled(); $command->numberOfTokensPerIdentityOption = $numberOfTokensPerIdentityOption->getNumberOfTokensPerIdentity(); $command->allowedSecondFactors = []; diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcher.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcher.php index 7c12ca630..7e4d28679 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcher.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcher.php @@ -23,17 +23,12 @@ final class HasInstitutionMatcher extends MatcherAbstract { - public function __construct($expected) + public function __construct(string $expected) { - if (!is_string($expected)) { - throw new RuntimeException( - sprintf('In order to use the %s, a string should be given.', self::class), - ); - } parent::__construct($expected); } - public function match(&$actual): bool + public function match(mixed &$actual): bool { if (!is_object($actual)) { return false; diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcherTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcherTest.php index daf0896d5..b19a6bcb4 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcherTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcherTest.php @@ -25,25 +25,12 @@ use Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\Mockery\TestObjects\ObjectWithInstitutionAccessor; use Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\Mockery\TestObjects\ObjectWithInstitutionProperty; use Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\Mockery\TestObjects\ObjectWithoutInstitutionPropertyAndAccessor; +use TypeError; class HasInstitutionMatcherTest extends TestCase { use MockeryPHPUnitIntegration; - /** - * @test - * @group mockery - * @group institution - * - * @dataProvider nonStringProvider - */ - public function has_institution_matcher_only_matches_against_strings(bool|int|float|stdClass|array|null $nonString,): void - { - $this->expectException(RuntimeException::class); - - $hasInstitutionMatcher = new HasInstitutionMatcher($nonString); - } - /** * @test * @group mockery diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/TestObjects/ObjectWithInstitutionAccessor.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/TestObjects/ObjectWithInstitutionAccessor.php index 7814c8a28..f6dea7f94 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/TestObjects/ObjectWithInstitutionAccessor.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/TestObjects/ObjectWithInstitutionAccessor.php @@ -20,11 +20,11 @@ final class ObjectWithInstitutionAccessor { - public function __construct(private $institution) + public function __construct(private string $institution) { } - public function getInstitution() + public function getInstitution(): string { return $this->institution; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/TestObjects/ObjectWithInstitutionProperty.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/TestObjects/ObjectWithInstitutionProperty.php index 251d50130..a2ec7b381 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/TestObjects/ObjectWithInstitutionProperty.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/TestObjects/ObjectWithInstitutionProperty.php @@ -20,7 +20,7 @@ final class ObjectWithInstitutionProperty { - public function __construct(public $institution) + public function __construct(public string $institution) { } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Value/Institution.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Value/Institution.php index 787dd9234..4b7838dc7 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Value/Institution.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Value/Institution.php @@ -30,7 +30,7 @@ final class Institution implements Stringable */ public function __construct(string $institution) { - if (!is_string($institution) || trim($institution) === '') { + if (trim($institution) === '') { throw InvalidArgumentException::invalidType('non-empty string', 'institution', $institution); } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Value/Sender.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Value/Sender.php index f87244419..02f4f1753 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Value/Sender.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Value/Sender.php @@ -23,27 +23,15 @@ class Sender implements Stringable { - private readonly string $name; - private readonly string $email; - public function __construct(string $name, string $email) + public function __construct(private readonly string $name, string $email) { - if (!is_string($name)) { - throw InvalidArgumentException::invalidType('string', 'name', $name); - } - - if (!is_string($email)) { - throw InvalidArgumentException::invalidType('string', 'email', $name); - } - if (!filter_var($email, FILTER_VALIDATE_EMAIL)) { throw new InvalidArgumentException( sprintf("Invalid argument type: expected e-mail address for 'email', got '%s'", $email), ); } - - $this->name = $name; $this->email = $email; } diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/InstitutionConfiguration.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/InstitutionConfiguration.php index 580cb3883..5385f9bdd 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/InstitutionConfiguration.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/InstitutionConfiguration.php @@ -20,28 +20,23 @@ namespace Surfnet\StepupMiddleware\GatewayBundle\Entity; +use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Mapping as ORM; use Surfnet\StepupMiddleware\GatewayBundle\Repository\InstitutionConfigurationRepository; #[ORM\Entity(repositoryClass: InstitutionConfigurationRepository::class)] class InstitutionConfiguration { - /** - * @var string - */ - #[ORM\Id] - #[ORM\Column(length: 200)] - public $institution; - - /** - * @var bool is the SSO on 2FA feature enabled? - */ - #[ORM\Column(type: 'boolean')] - public $ssoOn2faEnabled; - - public function __construct(string $institution, bool $ssoOn2faEnabled) + public function __construct( + #[ORM\Id] + #[ORM\Column(length: 200)] + public string $institution, + /** + * @var bool is the SSO on 2FA feature enabled? + */ + #[ORM\Column(type: 'boolean')] + public bool $ssoOn2faEnabled + ) { - $this->institution = $institution; - $this->ssoOn2faEnabled = $ssoOn2faEnabled; } } diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntity.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntity.php index 923cae629..a8246af82 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntity.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntity.php @@ -37,7 +37,7 @@ class SamlEntity */ #[ORM\Id] #[ORM\Column(length: 36)] - public $id; + public string $id; private function __construct( #[ORM\Column] @@ -51,19 +51,17 @@ private function __construct( } /** - * @param string $entityId * @return SamlEntity */ - public static function createServiceProvider($entityId, array $configuration): self + public static function createServiceProvider(string $entityId, array $configuration): self { return new self($entityId, self::TYPE_SP, json_encode($configuration)); } /** - * @param string $entityId * @return SamlEntity */ - public static function createIdentityProvider($entityId, array $configuration): self + public static function createIdentityProvider(string $entityId, array $configuration): self { return new self($entityId, self::TYPE_IDP, json_encode($configuration)); } diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntityRepository.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntityRepository.php index 0801062e0..f1d5938f7 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntityRepository.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntityRepository.php @@ -20,6 +20,9 @@ use Doctrine\ORM\EntityRepository; +/** + * @extends EntityRepository + */ class SamlEntityRepository extends EntityRepository { /** @@ -64,10 +67,8 @@ private function replaceAllOfType(string $type, array $newSamlEntities): void /** * Remove all configured SamlEntities of a specific type - * - * @param string $type */ - private function removeAllOfType($type): void + private function removeAllOfType(string $type): void { $this ->getEntityManager() diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/SecondFactorProjector.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/SecondFactorProjector.php index 2a39787af..738e2bad8 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/SecondFactorProjector.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/SecondFactorProjector.php @@ -108,7 +108,7 @@ private function isIdentityVetted(VettingType $vettingType): bool return $vettingType->type() !== VettingType::TYPE_SELF_ASSERTED_REGISTRATION; } - protected function applyVettedSecondFactorRevokedEvent(VettedSecondFactorRevokedEvent $event) + protected function applyVettedSecondFactorRevokedEvent(VettedSecondFactorRevokedEvent $event): void { $secondFactor = $this->repository->findOneBySecondFactorId($event->secondFactorId); @@ -126,7 +126,8 @@ protected function applyVettedSecondFactorRevokedEvent(VettedSecondFactorRevoked protected function applyCompliedWithVettedSecondFactorRevocationEvent( CompliedWithVettedSecondFactorRevocationEvent $event, - ) { + ): void + { $secondFactor = $this->repository->findOneBySecondFactorId($event->secondFactorId); if ($secondFactor === null) { @@ -141,7 +142,7 @@ protected function applyCompliedWithVettedSecondFactorRevocationEvent( $this->repository->remove($secondFactor); } - protected function applyLocalePreferenceExpressedEvent(LocalePreferenceExpressedEvent $event) + protected function applyLocalePreferenceExpressedEvent(LocalePreferenceExpressedEvent $event): void { $secondFactors = $this->repository->findByIdentityId($event->identityId); @@ -151,7 +152,7 @@ protected function applyLocalePreferenceExpressedEvent(LocalePreferenceExpressed } } - protected function applyIdentityForgottenEvent(IdentityForgottenEvent $event) + protected function applyIdentityForgottenEvent(IdentityForgottenEvent $event): void { $this->repository->removeByIdentityId($event->identityId); } diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/WhitelistProjector.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/WhitelistProjector.php index 79e8d51b1..8c9bd5838 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/WhitelistProjector.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/WhitelistProjector.php @@ -32,7 +32,7 @@ public function __construct(private readonly WhitelistEntryRepository $whitelist { } - protected function applyWhitelistCreatedEvent(WhitelistCreatedEvent $event) + protected function applyWhitelistCreatedEvent(WhitelistCreatedEvent $event): void { $whitelistEntries = []; foreach ($event->whitelistedInstitutions as $institution) { @@ -42,7 +42,7 @@ protected function applyWhitelistCreatedEvent(WhitelistCreatedEvent $event) $this->whitelistEntryRepository->saveEntries($whitelistEntries); } - protected function applyWhitelistReplacedEvent(WhitelistReplacedEvent $event) + protected function applyWhitelistReplacedEvent(WhitelistReplacedEvent $event): void { $this->whitelistEntryRepository->removeAll(); @@ -54,7 +54,7 @@ protected function applyWhitelistReplacedEvent(WhitelistReplacedEvent $event) $this->whitelistEntryRepository->saveEntries($whitelistEntries); } - protected function applyInstitutionsAddedToWhitelistEvent(InstitutionsAddedToWhitelistEvent $event) + protected function applyInstitutionsAddedToWhitelistEvent(InstitutionsAddedToWhitelistEvent $event): void { $whitelistEntries = []; foreach ($event->addedInstitutions as $institution) { @@ -64,7 +64,7 @@ protected function applyInstitutionsAddedToWhitelistEvent(InstitutionsAddedToWhi $this->whitelistEntryRepository->saveEntries($whitelistEntries); } - protected function applyInstitutionsRemovedFromWhitelistEvent(InstitutionsRemovedFromWhitelistEvent $event) + protected function applyInstitutionsRemovedFromWhitelistEvent(InstitutionsRemovedFromWhitelistEvent $event): void { $institutions = []; foreach ($event->removedInstitutions as $institution) { diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/InstitutionConfigurationRepository.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/InstitutionConfigurationRepository.php index 361998209..51f3a9409 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/InstitutionConfigurationRepository.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/InstitutionConfigurationRepository.php @@ -23,6 +23,9 @@ use Doctrine\ORM\EntityRepository; use Surfnet\StepupMiddleware\GatewayBundle\Entity\InstitutionConfiguration; +/** + * @extends EntityRepository + */ class InstitutionConfigurationRepository extends EntityRepository { public function findByInstitution(string $institution): ?InstitutionConfiguration diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/SecondFactorRepository.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/SecondFactorRepository.php index a49c47817..ca0ab2592 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/SecondFactorRepository.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/SecondFactorRepository.php @@ -23,10 +23,11 @@ use Surfnet\Stepup\Identity\Value\SecondFactorId; use Surfnet\StepupMiddleware\GatewayBundle\Entity\SecondFactor; +/** + * @extends EntityRepository + */ class SecondFactorRepository extends EntityRepository { - public $_entityName; - public function save(SecondFactor $secondFactor): void { $this->getEntityManager()->persist($secondFactor); diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/WhitelistEntryRepository.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/WhitelistEntryRepository.php index 54f33d9a3..37d44bb31 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/WhitelistEntryRepository.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/WhitelistEntryRepository.php @@ -22,13 +22,16 @@ use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\StepupMiddleware\GatewayBundle\Entity\WhitelistEntry; +/** + * @extends EntityRepository + */ class WhitelistEntryRepository extends EntityRepository { /** * @param Institution[] $institutions - * @return array + * @return WhitelistEntry[] */ - public function findEntriesByInstitutions(array $institutions) + public function findEntriesByInstitutions(array $institutions): array { $qb = $this->createQueryBuilder('w'); diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Tests/Projector/InstitutionConfigurationProjectorTest.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Tests/Projector/InstitutionConfigurationProjectorTest.php index fa7527130..497b3a3e6 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Tests/Projector/InstitutionConfigurationProjectorTest.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Tests/Projector/InstitutionConfigurationProjectorTest.php @@ -22,6 +22,7 @@ use Mockery as m; use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; +use Mockery\MockInterface; use PHPUnit\Framework\TestCase; use Ramsey\Uuid\Uuid; use Surfnet\Stepup\Configuration\Event\SsoOn2faOptionChangedEvent; @@ -38,7 +39,7 @@ class InstitutionConfigurationProjectorTest extends TestCase private InstitutionConfigurationProjector $projector; - private $repository; + private InstitutionConfigurationRepository&MockInterface $repository; protected function setUp(): void { @@ -58,7 +59,7 @@ public function test_create_row_when_non_existent(): void $this->repository->shouldReceive('findByInstitution')->with('institution-a.nl')->andReturn(null); $this->repository->shouldReceive('save')->withArgs( fn(InstitutionConfiguration $configuration, - ): bool => $configuration->institution === 'institution-a.nl' && $configuration->ssoOn2faEnabled === true, + ): bool => $configuration->institution === 'institution-a.nl' && $configuration->ssoOn2faEnabled, ); $this->projector->applySsoOn2faOptionChangedEvent($event); @@ -76,7 +77,7 @@ public function test_updates_existing_row(): void $this->repository->shouldReceive('findByInstitution')->with('institution-a.nl')->andReturn($configuration); $this->repository->shouldReceive('save')->withArgs( fn(InstitutionConfiguration $configuration, - ): bool => $configuration->institution === 'institution-a.nl' && $configuration->ssoOn2faEnabled === true, + ): bool => $configuration->institution === 'institution-a.nl' && $configuration->ssoOn2faEnabled, ); $this->projector->applySsoOn2faOptionChangedEvent($event); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Entity/EmailTemplate.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Entity/EmailTemplate.php index 8bdaba73b..be7f9d4b6 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Entity/EmailTemplate.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Entity/EmailTemplate.php @@ -36,21 +36,21 @@ class EmailTemplate * @var string */ #[ORM\Column] - private $name; + private string $name; /** * @var string */ #[ORM\Column] - private $locale; + private string $locale; /** * @var string */ #[ORM\Column(type: 'text')] - private $htmlContent; + private string $htmlContent; - public static function create($name, $locale, $htmlContent): self + public static function create(string $name, string $locale, string $htmlContent): self { $self = new self(); $self->id = (string)Uuid::uuid4(); @@ -73,7 +73,7 @@ public function getId(): string /** * @return string */ - public function getName() + public function getName(): string { return $this->name; } @@ -81,7 +81,7 @@ public function getName() /** * @return string */ - public function getLocale() + public function getLocale(): string { return $this->locale; } @@ -89,7 +89,7 @@ public function getLocale() /** * @return string */ - public function getHtmlContent() + public function getHtmlContent(): string { return $this->htmlContent; } diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Repository/EmailTemplateRepository.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Repository/EmailTemplateRepository.php index 1ebe15f50..c21759d3d 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Repository/EmailTemplateRepository.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Repository/EmailTemplateRepository.php @@ -22,6 +22,9 @@ use Doctrine\Persistence\ManagerRegistry; use Surfnet\StepupMiddleware\ManagementBundle\Configuration\Entity\EmailTemplate; +/** + * @extends ServiceEntityRepository + */ final class EmailTemplateRepository extends ServiceEntityRepository { public function __construct(ManagerRegistry $registry) @@ -35,7 +38,7 @@ public function __construct(ManagerRegistry $registry) * @param string $fallbackLocale * @return EmailTemplate|null */ - public function findOneByName(mixed $name, mixed $preferredLocale, mixed $fallbackLocale) + public function findOneByName(mixed $name, mixed $preferredLocale, mixed $fallbackLocale): ?EmailTemplate { return $this ->createQueryBuilder('tpl') diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Service/EmailTemplateService.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Service/EmailTemplateService.php index 0eb2fa7c3..30b5cd606 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Service/EmailTemplateService.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Service/EmailTemplateService.php @@ -45,7 +45,7 @@ public function findByName(string $name, string $preferredLocale, string $fallba throw new RuntimeException($e->getMessage(), 0, $e); } - if (!$emailTemplateEntity) { + if (!$emailTemplateEntity instanceof \Surfnet\StepupMiddleware\ManagementBundle\Configuration\Entity\EmailTemplate) { return null; } diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php index f1bd3941e..02154fb27 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php @@ -34,7 +34,7 @@ public function __construct( ) { } - public function update(Request $request) + public function update(Request $request): JsonResponse { $command = new UpdateConfigurationCommand(); $command->UUID = (string)Uuid::uuid4(); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php index 9c3556499..2e0e78ca5 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php @@ -47,7 +47,7 @@ public function __construct( ) { } - public function forgetIdentity(Request $request) + public function forgetIdentity(Request $request): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_MANAGEMENT']); @@ -92,7 +92,7 @@ private function assertMayForget(NameId $nameId, Institution $institution): void $credentials = $this->identityService->findRegistrationAuthorityCredentialsByNameIdAndInstitution($nameId, $institution); - if ($credentials === null) { + if (!$credentials instanceof \Surfnet\StepupMiddleware\ApiBundle\Identity\Value\RegistrationAuthorityCredentials) { return; } diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php index 132de9931..abf2f8e19 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php @@ -48,7 +48,7 @@ public function __construct( ) { } - public function replaceWhitelist(Request $request) + public function replaceWhitelist(Request $request): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_MANAGEMENT']); @@ -59,7 +59,7 @@ public function replaceWhitelist(Request $request) return $this->handleCommand($request, $command); } - public function addToWhitelist(Request $request) + public function addToWhitelist(Request $request): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_MANAGEMENT']); @@ -70,7 +70,7 @@ public function addToWhitelist(Request $request) return $this->handleCommand($request, $command); } - public function removeFromWhitelist(Request $request) + public function removeFromWhitelist(Request $request): JsonResponse { $this->denyAccessUnlessGranted(['ROLE_MANAGEMENT']); @@ -111,7 +111,7 @@ private function handleCommand(Request $request, AbstractCommand $command): Json /** * @return array */ - private function getInstitutionsFromBody(Request $request) + private function getInstitutionsFromBody(Request $request): array { $decoded = JsonHelper::decode($request->getContent()); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Exception/UnknownDBALConnectionException.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Exception/UnknownDBALConnectionException.php index 9b4a7f1df..ca4ea355f 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Exception/UnknownDBALConnectionException.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Exception/UnknownDBALConnectionException.php @@ -22,7 +22,7 @@ final class UnknownDBALConnectionException extends DomainException { - public function __construct($connectionName) + public function __construct(string $connectionName) { parent::__construct(sprintf('DBAL Connection "%s" does not exist', $connectionName)); } diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Resources/config/services.yml b/src/Surfnet/StepupMiddleware/ManagementBundle/Resources/config/services.yml index 4215a7ed5..968106cb9 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Resources/config/services.yml +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Resources/config/services.yml @@ -18,9 +18,6 @@ services: Surfnet\StepupMiddleware\ManagementBundle\Service\DBALConnectionHelper: "@surfnet_stepup_middleware_management.dbal_connection_helper" Surfnet\StepupMiddleware\ManagementBundle\Validator\EmailTemplatesConfigurationValidator: "@surfnet_stepup_middleware_management.validator.email_templates_configuration" - - Liip\FunctionalTestBundle\Validator\DataCollectingValidator: '@validator' - surfnet_stepup_middleware_management.validator.configuration: class: Surfnet\StepupMiddleware\ManagementBundle\Validator\ConfigurationStructureValidator arguments: diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Service/DBALConnectionHelper.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Service/DBALConnectionHelper.php index 26118013f..253cb5d06 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Service/DBALConnectionHelper.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Service/DBALConnectionHelper.php @@ -74,10 +74,9 @@ public function rollBack(): void } /** - * @param string $connectionName * @return Connection */ - public function getConnection($connectionName) + public function getConnection(string $connectionName): Connection { if (!is_string($connectionName)) { throw InvalidArgumentException::invalidType('string', 'connectionName', $connectionName); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php index e64be1f4d..3af35eae3 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php @@ -34,12 +34,12 @@ class ConfigurationControllerTest extends WebTestCase /** * @var string */ - private $password; + private string|array|bool|int|null|float|\UnitEnum $password; /** * @var string */ - private $passwordRo; + private string|array|bool|int|null|float|\UnitEnum $passwordRo; private ORMSqliteDatabaseTool $databaseTool; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php index c8fa63ef6..4cbf1df5b 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php @@ -34,12 +34,12 @@ class InstitutionConfigurationControllerTest extends WebTestCase /** * @var string */ - private $password; + private string|array|bool|int|null|float|\UnitEnum $password; /** * @var string */ - private $passwordRo; + private string|array|bool|int|null|float|\UnitEnum $passwordRo; private ORMSqliteDatabaseTool $databaseTool; @@ -153,7 +153,6 @@ public function requests_with_invalid_content_are_bad_requests(): void * @group management * * @dataProvider invalidHttpMethodProvider - * @param $invalidHttpMethod */ public function only_post_and_get_requests_are_accepted(string $invalidHttpMethod): void { diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ConfigurationValidationTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ConfigurationValidationTest.php index d622f73e1..922067a6e 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ConfigurationValidationTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ConfigurationValidationTest.php @@ -57,10 +57,8 @@ public function invalidConfigurations(): array * @test * @group command-handler * @dataProvider invalidConfigurations - * @param array $configuration - * @param string $expectedPropertyPath */ - public function it_rejects_invalid_configuration($configuration, $expectedPropertyPath): void + public function it_rejects_invalid_configuration(array $configuration, string $expectedPropertyPath): void { $builder = m::mock(ConstraintViolationBuilderInterface::class); $builder->shouldReceive('addViolation')->with()->once(); @@ -90,7 +88,7 @@ public function it_rejects_invalid_configuration($configuration, $expectedProper /** * @return MatcherAbstract */ - private function spy(mixed &$spy) + private function spy(mixed &$spy): MatcherAbstract { return m::on( function ($value) use (&$spy): bool { diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ReconfigureInstitutionRequestValidatorTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ReconfigureInstitutionRequestValidatorTest.php index 7dfae19b4..39e5e4e5b 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ReconfigureInstitutionRequestValidatorTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ReconfigureInstitutionRequestValidatorTest.php @@ -62,12 +62,10 @@ public function invalidReconfigureInstitutionRequests(): array * @test * @group validator * @dataProvider invalidReconfigureInstitutionRequests - * @param array $reconfigureRequest - * @param string $expectedPropertyPath */ public function it_rejects_invalid_configuration( - $reconfigureRequest, - $expectedPropertyPath, + array $reconfigureRequest, + string $expectedPropertyPath, string $expectErrorMessageToContain, ): void { $existingInstitution = ConfiguredInstitution::createFrom(new Institution('surfnet.nl')); @@ -259,7 +257,7 @@ public function valid_reconfigure_institution_requests_do_not_cause_any_violatio /** * @return MatcherAbstract */ - private function spy(mixed &$spy) + private function spy(mixed &$spy): MatcherAbstract { return Mockery::on( function ($value) use (&$spy): bool { diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Assert.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Assert.php index 96adb9048..319029029 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Assert.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Assert.php @@ -22,7 +22,11 @@ final class Assert { - public static function keysMatch(array $value, array $keys, $message = null, $propertyPath = null): void + /** + * @param array $value + * @param array $keys + */ + public static function keysMatch(array $value, array $keys, ?string $message = null, ?string $propertyPath = null): void { $keysOfValue = array_keys($value); $extraKeys = array_diff($keysOfValue, $keys); @@ -45,8 +49,8 @@ public static function requiredAndOptionalOptions( array $value, array $required, array $optional, - $message = null, - $propertyPath = null, + ?string $message = null, + ?string $propertyPath = null, ): void { // Filter out the optional items from the value array $requiredValueSet = array_diff_key($value, array_flip($optional)); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationStructureValidator.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationStructureValidator.php index 2af9aa23d..9d9d38cb3 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationStructureValidator.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationStructureValidator.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ManagementBundle\Validator; use Assert\Assertion; +use Assert\AssertionFailedException; use Assert\InvalidArgumentException as AssertionException; use InvalidArgumentException as CoreInvalidArgumentException; use Surfnet\Stepup\Helper\JsonHelper; @@ -26,6 +27,7 @@ use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\ConstraintValidator; use Symfony\Component\Validator\Violation\ConstraintViolationBuilder; +use TypeError; /** * Once the Assert 2.0 library has been built this should be converted to the lazy assertions so we can report @@ -39,7 +41,7 @@ public function __construct( ) { } - public function validate($value, Constraint $constraint): void + public function validate(mixed $value, Constraint $constraint): void { /** @var ConstraintViolationBuilder|false $violation */ $violation = false; @@ -51,7 +53,7 @@ public function validate($value, Constraint $constraint): void // method is not in the interface yet, but the old method is deprecated. $violation = $this->context->buildViolation($exception->getMessage()); $violation->atPath($exception->getPropertyPath()); - } catch (CoreInvalidArgumentException $exception) { + } catch (CoreInvalidArgumentException|TypeError $exception) { $violation = $this->context->buildViolation($exception->getMessage()); } @@ -61,15 +63,13 @@ public function validate($value, Constraint $constraint): void } } - private function decodeJson($rawValue) + private function decodeJson(string $rawValue): mixed { return JsonHelper::decode($rawValue); } - public function validateRoot($configuration): void + public function validateRoot(array $configuration): void { - Assertion::isArray($configuration, 'Invalid body structure, must be an object', '(root)'); - $acceptedProperties = ['gateway', 'sraa', 'email_templates']; StepupAssert::keysMatch( $configuration, @@ -107,6 +107,10 @@ private function validateSraaConfiguration(array $configuration, string $propert } } + /** + * @param array $configuration + * @throws AssertionFailedException + */ private function validateEmailTemplatesConfiguration(array $configuration, string $propertyPath): void { Assertion::isArray( diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationValidatorInterface.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationValidatorInterface.php index 2a2549395..c85b43277 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationValidatorInterface.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationValidatorInterface.php @@ -23,9 +23,8 @@ interface ConfigurationValidatorInterface { /** - * @param string $propertyPath - * @return void + * @param array $configuration * @throws InvalidArgumentException */ - public function validate(array $configuration, $propertyPath); + public function validate(array $configuration, string $propertyPath): void; } diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Constraints/HasValidConfigurationStructure.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Constraints/HasValidConfigurationStructure.php index e1da93fae..e045881f7 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Constraints/HasValidConfigurationStructure.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Constraints/HasValidConfigurationStructure.php @@ -25,7 +25,7 @@ */ class HasValidConfigurationStructure extends Constraint { - public $message = 'Invalid Configuration Structure'; + public string $message = 'Invalid Configuration Structure'; public function validatedBy(): string { diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Constraints/ValidReconfigureInstitutionsRequest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Constraints/ValidReconfigureInstitutionsRequest.php index 6df2381fd..263432e17 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Constraints/ValidReconfigureInstitutionsRequest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Constraints/ValidReconfigureInstitutionsRequest.php @@ -22,7 +22,7 @@ class ValidReconfigureInstitutionsRequest extends Constraint { - public $message = 'Invalid Reconfigure InstitutionConfiguration Structure'; + public string $message = 'Invalid Reconfigure InstitutionConfiguration Structure'; public function validatedBy(): string { diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/EmailTemplatesConfigurationValidator.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/EmailTemplatesConfigurationValidator.php index 0655fd118..aed37eb04 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/EmailTemplatesConfigurationValidator.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/EmailTemplatesConfigurationValidator.php @@ -38,7 +38,11 @@ public function __construct($requiredLocale) $this->requiredLocale = $requiredLocale; } - public function validate(array $configuration, $propertyPath): void + /** + * @param array $configuration + * @throws \Assert\AssertionFailedException + */ + public function validate(array $configuration, string $propertyPath): void { $templateNames = [ 'confirm_email', diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/GatewayConfigurationValidator.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/GatewayConfigurationValidator.php index 2e7ee62b2..f590135d5 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/GatewayConfigurationValidator.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/GatewayConfigurationValidator.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ManagementBundle\Validator; use Assert\Assertion; +use Assert\AssertionFailedException; use Surfnet\StepupMiddleware\ManagementBundle\Validator\Assert as StepupAssert; class GatewayConfigurationValidator implements ConfigurationValidatorInterface @@ -30,36 +31,33 @@ public function __construct( } /** - * @param array $gatewayConfiguration - * @param string $propertyPath + * @param array $configuration */ - public function validate(array $gatewayConfiguration, $propertyPath): void + public function validate(array $configuration, string $propertyPath): void { StepupAssert::keysMatch( - $gatewayConfiguration, + $configuration, ['service_providers', 'identity_providers'], "Expected properties 'service_providers' and 'identity_providers'", $propertyPath, ); $this->validateIdentityProviders( - $gatewayConfiguration['identity_providers'], + $configuration['identity_providers'], $propertyPath . '.identity_providers', ); $this->validateServiceProviders( - $gatewayConfiguration['service_providers'], + $configuration['service_providers'], $propertyPath . '.service_providers', ); } - private function validateIdentityProviders($identityProviders, string $propertyPath): void + /** + * @param array> $identityProviders + * @throws AssertionFailedException + */ + private function validateIdentityProviders(array $identityProviders, string $propertyPath): void { - Assertion::isArray( - $identityProviders, - 'identity_providers must have an array of identity provider configurations as value', - $propertyPath, - ); - foreach ($identityProviders as $index => $identityProvider) { $path = $propertyPath . '[' . $index . ']'; Assertion::isArray($identityProvider, 'Identity provider must be an object', $path); @@ -68,13 +66,12 @@ private function validateIdentityProviders($identityProviders, string $propertyP } } - private function validateServiceProviders($serviceProviders, string $propertyPath): void + /** + * @param array> $serviceProviders + * @throws AssertionFailedException + */ + private function validateServiceProviders(array $serviceProviders, string $propertyPath): void { - Assertion::isArray( - $serviceProviders, - 'service_providers must have an array of service provider configurations as value', - $propertyPath, - ); Assertion::true( count($serviceProviders) >= 1, 'at least one service_provider must be configured', diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/IdentityProviderConfigurationValidator.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/IdentityProviderConfigurationValidator.php index b4ba68525..223127820 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/IdentityProviderConfigurationValidator.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/IdentityProviderConfigurationValidator.php @@ -23,10 +23,11 @@ class IdentityProviderConfigurationValidator implements ConfigurationValidatorInterface { - public function validate(array $configuration, $propertyPath): void + /** + * @param array $configuration + */ + public function validate(array $configuration, string $propertyPath): void { - Assertion::isArray($configuration, 'invalid configuration format, must be an object', $propertyPath); - $requiredProperties = [ 'entity_id', 'loa', diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php index 53f54ecaa..1e954214d 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php @@ -52,7 +52,7 @@ public function __construct( ) { } - public function validate($value, Constraint $constraint): void + public function validate(mixed $value, Constraint $constraint): void { /** @var ConstraintViolationBuilder|false $violation */ $violation = false; @@ -197,14 +197,14 @@ public function validateInstitutionConfigurationOptions(array $options, string $ * * @return string[] */ - private function getConfiguredInstitutions() + private function getConfiguredInstitutions(): array { if ($this->configuredInstitutions !== null && $this->configuredInstitutions !== []) { return $this->configuredInstitutions; } $this->configuredInstitutions = array_map( - fn(ConfiguredInstitution $configuredInstitution) => $configuredInstitution->institution->getInstitution(), + fn(ConfiguredInstitution $configuredInstitution): string => $configuredInstitution->institution->getInstitution(), $this->configuredInstitutionsService->getAll(), ); @@ -216,7 +216,7 @@ private function getConfiguredInstitutions() * * @return string[] */ - private function getWhitelistedInstitutions() + private function getWhitelistedInstitutions(): array { if ($this->whitelistedInstitutions !== null && $this->whitelistedInstitutions !== []) { return $this->whitelistedInstitutions; @@ -232,10 +232,10 @@ private function getWhitelistedInstitutions() /** * @param string[] $institutions - * @param $configuredInstitutions + * @param string[] $configuredInstitutions * @return string[] */ - public function determineNonExistentInstitutions(array $institutions, $configuredInstitutions): array + public function determineNonExistentInstitutions(array $institutions, array $configuredInstitutions): array { $normalizedConfiguredInstitutions = array_map( fn($institution): string => strtolower((string)$institution), @@ -258,9 +258,6 @@ function ($institution) use ($normalizedConfiguredInstitutions): bool { * - The optional options should contain whitelisted institutions * - Or be empty * - * @param $authorizationSettings - * @param $institution - * @param $propertyPath * @throws AssertionFailedException */ private function validateAuthorizationSettings( diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php index 188f8fae9..3da30b8a0 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php @@ -23,10 +23,11 @@ class ServiceProviderConfigurationValidator implements ConfigurationValidatorInterface { - public function validate(array $configuration, $propertyPath): void + /** + * @param array $configuration + */ + public function validate(array $configuration, string $propertyPath): void { - Assertion::isArray($configuration, 'invalid configuration format, must be an object', $propertyPath); - $requiredProperties = [ 'entity_id', 'public_key', @@ -108,10 +109,7 @@ private function validateBooleanValue(array $configuration, string $name, string Assertion::boolean($configuration[$name], 'value must be a boolean', $propertyPath . '.' . $name); } - /** - * @param string $propertyPath - */ - private function validateAssertionConsumerUrls(array $configuration, $propertyPath): void + private function validateAssertionConsumerUrls(array $configuration, string $propertyPath): void { $value = $configuration['acs']; $propertyPath .= '.acs'; @@ -143,10 +141,7 @@ private function validateLoaDefinition(array $configuration, string $propertyPat ); } - /** - * @param string $propertyPath - */ - private function validateListOfNameIdPatterns(array $configuration, string $name, $propertyPath): void + private function validateListOfNameIdPatterns(array $configuration, string $name, string $propertyPath): void { $value = $configuration[$name]; $propertyPath = $propertyPath . '.' . $name; @@ -165,7 +160,6 @@ private function validateListOfNameIdPatterns(array $configuration, string $name * 'My.Institution' => 'loa2', // invalid * ] * - * @param $propertyPath */ private function assertValidInstitutionIdentifiers( array $spLoaConfiguration, diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php index f4e95ad3b..66a6e148b 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php @@ -124,7 +124,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int /** * @return string */ - private function createIdentity(NameId $targetNameId, Identity $sourceIdentity, InputInterface $input) + private function createIdentity(NameId $targetNameId, Identity $sourceIdentity, InputInterface $input): string { $newInstitution = $input->getArgument('target-institution'); $newEmail = $input->getArgument('email'); @@ -148,7 +148,7 @@ private function createIdentity(NameId $targetNameId, Identity $sourceIdentity, private function tokenExists(array $targetSecondFactors, VettedSecondFactor $sourceSecondFactor): bool { foreach ($targetSecondFactors as $secondFactor) { - if ($secondFactor->isEqual($secondFactor)) { + if ($secondFactor->isEqual($sourceSecondFactor)) { return true; } } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplaySpecificEventsCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplaySpecificEventsCommand.php index d439d0eb2..316bb3a64 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplaySpecificEventsCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplaySpecificEventsCommand.php @@ -72,7 +72,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int if ($input->getOption(self::OPTION_LIST_EVENTS)) { $output->writeln('The following events can be replayed:'); - $output->writeln(empty($availableEvents) ? 'None.' : $availableEvents); + $output->writeln($availableEvents === [] ? 'None.' : $availableEvents); return 0; } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php index 76cb29d92..139c50a06 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php @@ -23,6 +23,7 @@ use Broadway\Domain\DomainMessage; use Broadway\Serializer\SimpleInterfaceSerializer; use Doctrine\DBAL\Connection; +use Doctrine\DBAL\Exception; use Doctrine\DBAL\Statement; use PDO; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Forgettable; @@ -72,7 +73,11 @@ public function getFromTill(int $limit, int $offset): DomainEventStream return new DomainEventStream($events); } - public function fetchByEventTypes($eventTypes): DomainEventStream + /** + * @param string[] $eventTypes + * @throws Exception + */ + public function fetchByEventTypes(array $eventTypes): DomainEventStream { $eventTypePlaceholders = implode(', ', array_fill(0, count($eventTypes), '?')); @@ -116,9 +121,9 @@ private function deserializeEvent(array $row): DomainMessage ); } - private function prepareLoadStatement() + private function prepareLoadStatement(): Statement { - if ($this->loadStatement === null) { + if (!$this->loadStatement instanceof Statement) { $query = str_replace( ['%es%', '%sd%'], [$this->eventStreamTableName, $this->sensitiveDataTable], diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/EventCollection.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/EventCollection.php index 0db6c3880..7c826b3fd 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/EventCollection.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/EventCollection.php @@ -23,6 +23,9 @@ use IteratorAggregate; use Surfnet\StepupMiddleware\MiddlewareBundle\Exception\InvalidArgumentException; +/** + * @implements IteratorAggregate + */ final class EventCollection implements IteratorAggregate { /** @@ -30,10 +33,13 @@ final class EventCollection implements IteratorAggregate */ private array $eventNames = []; + /** + * @param string[] $eventNames + */ public function __construct(array $eventNames) { foreach ($eventNames as $eventName) { - if (!is_string($eventName) || empty($eventName)) { + if (!is_string($eventName) || ($eventName === '' || $eventName === '0')) { throw InvalidArgumentException::invalidType('non-empty string', 'eventName', $eventName); } @@ -53,11 +59,14 @@ public function __construct(array $eventNames) /** * @return string[] */ - public function getEventNames() + public function getEventNames(): array { return $this->eventNames; } + /** + * @return string[] + */ public function formatAsEventStreamTypes(): array { return array_map( @@ -66,9 +75,6 @@ public function formatAsEventStreamTypes(): array ); } - /** - * @return EventCollection - */ public function select(array $subset): self { $nonAvailableEventNames = array_diff($subset, $this->eventNames); @@ -85,15 +91,15 @@ public function select(array $subset): self return new self($subset); } - /** - * @param $eventName - * @return bool - */ - public function contains($eventName): bool + + public function contains(string $eventName): bool { return in_array($eventName, $this->eventNames); } + /** + * @return Iterator + */ public function getIterator(): Iterator { return new ArrayIterator($this->eventNames); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/ProjectorCollection.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/ProjectorCollection.php index 452dd3f40..37f28af7e 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/ProjectorCollection.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/ProjectorCollection.php @@ -24,6 +24,9 @@ use IteratorAggregate; use Surfnet\StepupMiddleware\MiddlewareBundle\Exception\InvalidArgumentException; +/** + * @implements IteratorAggregate + */ final class ProjectorCollection implements IteratorAggregate { /** diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Exception/UnknownDBALConnectionException.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Exception/UnknownDBALConnectionException.php index 974a4401a..dbfa99fc0 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Exception/UnknownDBALConnectionException.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Exception/UnknownDBALConnectionException.php @@ -22,7 +22,7 @@ final class UnknownDBALConnectionException extends DomainException { - public function __construct($connectionName) + public function __construct(string $connectionName) { parent::__construct(sprintf('DBAL Connection "%s" does not exist', $connectionName)); } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/InstitutionConfigurationState.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/InstitutionConfigurationState.php index 5782a9e59..1b45df2c9 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/InstitutionConfigurationState.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/InstitutionConfigurationState.php @@ -33,12 +33,12 @@ * @return InstitutionConfigurationState */ public static function load( - $configuredInstitutions, - $institutionConfigurationOptions, - $raLocations, + array $configuredInstitutions, + array $institutionConfigurationOptions, + array $raLocations, ): self { $optionInstitutions = array_map( - fn(InstitutionConfigurationOptions $options) => $options->institution->getInstitution(), + fn(InstitutionConfigurationOptions $options): string => $options->institution->getInstitution(), $institutionConfigurationOptions, ); $mappedConfigurationOptions = array_combine($optionInstitutions, $institutionConfigurationOptions); @@ -89,7 +89,7 @@ private function __construct(private array $mappedInstitutionConfigurations) /** * @return Generator */ - public function inferRemovalCommands() + public function inferRemovalCommands(): Generator { foreach ($this->mappedInstitutionConfigurations as $mappedInstitutionConfiguration) { yield $mappedInstitutionConfiguration->inferRemoveInstitutionConfigurationByIdCommand(); @@ -99,7 +99,7 @@ public function inferRemovalCommands() /** * @return Generator */ - public function inferCreateCommands() + public function inferCreateCommands(): Generator { foreach ($this->mappedInstitutionConfigurations as $mappedInstitutionConfiguration) { yield $mappedInstitutionConfiguration->inferCreateInstitutionConfigurationCommand(); @@ -109,7 +109,7 @@ public function inferCreateCommands() /** * @return Generator */ - public function inferReconfigureCommands() + public function inferReconfigureCommands(): Generator { foreach ($this->mappedInstitutionConfigurations as $mappedInstitutionConfiguration) { yield $mappedInstitutionConfiguration->inferReconfigureInstitutionConfigurationCommand(); @@ -119,7 +119,7 @@ public function inferReconfigureCommands() /** * @return Generator */ - public function inferAddRaLocationCommands() + public function inferAddRaLocationCommands(): Generator { foreach ($this->mappedInstitutionConfigurations as $mappedInstitutionConfiguration) { foreach ($mappedInstitutionConfiguration->inferAddRaLocationCommands() as $command) { diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/BootstrapCommandService.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/BootstrapCommandService.php index 7e0bde2c4..d4ee0a008 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/BootstrapCommandService.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/BootstrapCommandService.php @@ -49,6 +49,9 @@ */ class BootstrapCommandService { + /** + * @var string[] + */ private array $validRegistrationStatuses = ['unverified', 'verified', 'vetted']; public function __construct( @@ -68,10 +71,7 @@ public function setToken(TokenInterface $token): void $this->tokenStorage->setToken($token); } - /** - * @param string $registrationStatus - */ - public function validRegistrationStatus($registrationStatus): void + public function validRegistrationStatus(string $registrationStatus): void { if (!in_array($registrationStatus, $this->validRegistrationStatuses)) { throw new InvalidArgumentException( @@ -84,12 +84,12 @@ public function validRegistrationStatus($registrationStatus): void } } - public function requiresMailVerification(string $institution) + public function requiresMailVerification(string $institution): bool { $configuration = $this->institutionConfigurationRepository->findConfigurationOptionsFor( new ConfigurationInstitution($institution), ); - if ($configuration) { + if ($configuration instanceof \Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity\InstitutionConfigurationOptions) { return $configuration->verifyEmailOption->isEnabled(); } return true; @@ -120,18 +120,12 @@ public function vetSecondFactor( $this->pipeline->process($command); } - /** - * @param $commonName - * @param $email - * @param $preferredLocale - * @return CreateIdentityCommand - */ public function createIdentity( Institution $institution, NameId $nameId, - $commonName, - $email, - $preferredLocale, + string $commonName, + string $email, + string $preferredLocale, ): CreateIdentityCommand { $command = new CreateIdentityCommand(); $command->UUID = (string)Uuid::uuid4(); @@ -147,8 +141,12 @@ public function createIdentity( return $command; } - public function proveGsspPossession($secondFactorId, $identity, $tokenType, $tokenIdentifier): void - { + public function proveGsspPossession( + string $secondFactorId, + Identity $identity, + string $tokenType, + string $tokenIdentifier + ): void { $command = new ProveGssfPossessionCommand(); $command->UUID = (string)Uuid::uuid4(); $command->secondFactorId = $secondFactorId; @@ -159,8 +157,11 @@ public function proveGsspPossession($secondFactorId, $identity, $tokenType, $tok $this->pipeline->process($command); } - public function provePhonePossession($secondFactorId, $identity, $phoneNumber): void - { + public function provePhonePossession( + string $secondFactorId, + Identity $identity, + string $phoneNumber + ): void { $command = new ProvePhonePossessionCommand(); $command->UUID = (string)Uuid::uuid4(); $command->secondFactorId = $secondFactorId; @@ -170,8 +171,11 @@ public function provePhonePossession($secondFactorId, $identity, $phoneNumber): $this->pipeline->process($command); } - public function proveYubikeyPossession($secondFactorId, $identity, $yubikeyPublicId): void - { + public function proveYubikeyPossession( + string $secondFactorId, + Identity $identity, + string $yubikeyPublicId + ): void { $command = new ProveYubikeyPossessionCommand(); $command->UUID = (string)Uuid::uuid4(); $command->secondFactorId = $secondFactorId; @@ -181,8 +185,10 @@ public function proveYubikeyPossession($secondFactorId, $identity, $yubikeyPubli $this->pipeline->process($command); } - public function verifyEmail(Identity $identity, string $tokenType): void - { + public function verifyEmail( + Identity $identity, + string $tokenType + ): void { $unverifiedSecondFactor = $this->unverifiedSecondFactorRepository->findOneBy( ['identityId' => $identity->id, 'type' => $tokenType], ); @@ -210,7 +216,7 @@ public function migrateVettedSecondFactor( $this->pipeline->process($command); } - public function enrichEventMetadata($actorId): void + public function enrichEventMetadata(string $actorId): void { $actor = $this->identityRepository->findOneBy(['id' => $actorId]); @@ -220,17 +226,11 @@ public function enrichEventMetadata($actorId): void $this->enricher->setMetadata($metadata); } - /** - * @return Identity - */ - public function getIdentity(NameId $nameId, Institution $institution) + public function getIdentity(NameId $nameId, Institution $institution): Identity { return $this->identityRepository->findOneByNameIdAndInstitution($nameId, $institution); } - /** - ** @return Identity - */ public function getIdentityByNameId(NameId $nameId): ?Identity { return $this->identityRepository->findOneByNameId($nameId); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/DBALConnectionHelper.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/DBALConnectionHelper.php index 9b6c40399..05e60e10f 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/DBALConnectionHelper.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/DBALConnectionHelper.php @@ -74,15 +74,10 @@ public function rollBack(): void } /** - * @param string $connectionName * @return Connection */ - public function getConnection($connectionName) + public function getConnection(string $connectionName): Connection { - if (!is_string($connectionName)) { - throw InvalidArgumentException::invalidType('string', 'connectionName', $connectionName); - } - if (!array_key_exists($connectionName, $this->connections)) { throw new UnknownDBALConnectionException($connectionName); } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php index 49ba7e401..305ade0de 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php @@ -18,7 +18,6 @@ namespace Surfnet\StepupMiddleware\MiddlewareBundle\Service; -use Broadway\Domain\DomainEventStream; use Broadway\Domain\DomainMessage; use Doctrine\DBAL\Exception\InvalidArgumentException; use Exception; @@ -71,7 +70,7 @@ public function __construct( ); } - public function replayEvents(OutputInterface $output, $increments): void + public function replayEvents(OutputInterface $output, int $increments): void { $preparationProgress = new ProgressBar($output, 3); $preparationProgress->setFormat('event_replay'); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/PastEventsService.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/PastEventsService.php index 3da22acb2..bedf349ca 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/PastEventsService.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/PastEventsService.php @@ -31,7 +31,7 @@ public function __construct(private DBALEventHydrator $eventHydrator) /** * @return DomainEventStream */ - public function findEventsBy(EventCollection $events) + public function findEventsBy(EventCollection $events): DomainEventStream { return $this->eventHydrator->fetchByEventTypes($events->formatAsEventStreamTypes()); } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php index e61bda613..a8f9d296a 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php @@ -19,8 +19,9 @@ namespace Surfnet\StepupMiddleware\MiddlewareBundle\Service; use Assert\Assertion; -use DateTime; use Surfnet\Stepup\Configuration\Value\Institution; +use Surfnet\Stepup\DateTime\DateTime; +use Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity\RaLocation; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Service\InstitutionConfigurationOptionsService; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Service\RaLocationService; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\RaListingService; @@ -39,17 +40,12 @@ */ class VerifiedSecondFactorReminderMailService { - /** - * @var TranslatorInterface - */ - private $translator; - private readonly string $fallbackLocale; public function __construct( private readonly Mailer $mailer, private readonly Sender $sender, - TranslatorInterface $translator, + private readonly TranslatorInterface $translator, private readonly EmailTemplateService $emailTemplateService, private readonly InstitutionConfigurationOptionsService $institutionConfigurationOptionsService, private readonly RaListingService $raListingService, @@ -57,13 +53,15 @@ public function __construct( string $fallbackLocale, ) { Assertion::string($fallbackLocale, 'Fallback locale "%s" expected to be string, type %s given'); - $this->translator = $translator; $this->fallbackLocale = $fallbackLocale; } + /** + * @throws TransportExceptionInterface + */ public function sendReminder(VerifiedTokenInformation $tokenInformation): void { - $institution = new Institution((string)$tokenInformation->getInstitution()); + $institution = new Institution($tokenInformation->getInstitution()); $institutionConfigurationOptions = $this->institutionConfigurationOptionsService ->findInstitutionConfigurationOptionsFor($institution); if ($institutionConfigurationOptions->useRaLocationsOption->isEnabled()) { @@ -105,21 +103,16 @@ public function sendReminder(VerifiedTokenInformation $tokenInformation): void } /** - * @param string $locale - * @param string $commonName - * @param string $email - * @param DateTime $requestedAt - * @param $registrationCode - * @return void + * @param RaLocation[]|null $raLocations * @throws TransportExceptionInterface */ private function sendReminderWithInstitution( - $locale, - $commonName, - $email, - $requestedAt, - $registrationCode, - $raLocations, + string $locale, + string $commonName, + string $email, + DateTime $requestedAt, + string $registrationCode, + ?array $raLocations, ): void { $subject = $this->translator->trans( 'ss.mail.registration_email.subject', @@ -152,12 +145,16 @@ private function sendReminderWithInstitution( $this->mailer->send($email); } + /** + * @param RegistrationAuthorityCredentials[] $ras + * @throws TransportExceptionInterface + */ private function sendReminderWithRas( - $locale, - $commonName, - $email, - $requestedAt, - $registrationCode, + string $locale, + string $commonName, + string $email, + DateTime$requestedAt, + string $registrationCode, array $ras, ): void { $subject = $this->translator->trans( @@ -186,7 +183,7 @@ private function sendReminderWithRas( ->from(new Address($this->sender->getEmail(), $this->sender->getName())) ->to(new Address($email, $commonName)) ->subject($subject) - ->htmlTemplate('SurfnetStepupMiddlewareCommandHandling/SecondFactorMailService/email.html.twig') + ->htmlTemplate('@SurfnetStepupMiddlewareCommandHandling/SecondFactorMailService/email.html.twig') ->context($parameters); $this->mailer->send($email); } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/EventSourcing/EventCollectionTest.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/EventSourcing/EventCollectionTest.php index e1ad14b49..c2a61a62a 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/EventSourcing/EventCollectionTest.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/EventSourcing/EventCollectionTest.php @@ -29,12 +29,12 @@ class EventCollectionTest extends TestCase { use MockeryPHPUnitIntegration; + /** * @test * @group event-replay * * @dataProvider emptyOrNonStringProvider - * @param $emptyOrNonString */ public function an_event_collection_must_be_created_from_an_array_of_non_empty_strings( bool|int|string|stdClass|array|null $emptyOrNonString, @@ -155,6 +155,9 @@ public function events_in_an_event_collection_can_be_formatted_as_event_stream_c ); } + /** + * @return array + */ public function emptyOrNonStringProvider(): array { return [ diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Service/VerifiedSecondFactorReminderServiceTest.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Service/VerifiedSecondFactorReminderServiceTest.php index 2a8d1fb88..dfc16c563 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Service/VerifiedSecondFactorReminderServiceTest.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Service/VerifiedSecondFactorReminderServiceTest.php @@ -40,31 +40,15 @@ class VerifiedSecondFactorReminderServiceTest extends TestCase { use MockeryPHPUnitIntegration; - /** - * @var VerifiedSecondFactorReminderService - */ private VerifiedSecondFactorReminderService $service; - /** - * @var VerifiedSecondFactorReminderMailService|MockInterface + private VerifiedSecondFactorReminderMailService&MockInterface $mailService; - */ - private $mailService; + private LoggerInterface&MockInterface $logger; - /** - * @var LoggerInterface|MockInterface - */ - private $logger; - - /** - * @var VerifiedSecondFactorRepository|MockInterface - */ - private $verifiedSecondFactorRepository; - /** - * @var IdentityRepository|MockInterface - */ - private $identityRepository; + private VerifiedSecondFactorRepository&MockInterface $verifiedSecondFactorRepository; + private IdentityRepository&MockInterface $identityRepository; public function setUp(): void { diff --git a/tests/database/AuthorizationRepositoryMatrixTest.php b/tests/database/AuthorizationRepositoryMatrixTest.php index 94431dd35..08d5245b3 100644 --- a/tests/database/AuthorizationRepositoryMatrixTest.php +++ b/tests/database/AuthorizationRepositoryMatrixTest.php @@ -40,9 +40,9 @@ class AuthorizationRepositoryMatrixTest extends KernelTestCase /** * @var AuthorizationRepository */ - private $authzRepository; + private ?object $authzRepository; - public function authorizationMatrix() + public function authorizationMatrix(): array { $ra = RegistrationAuthorityRole::ra(); $raa = RegistrationAuthorityRole::raa(); @@ -60,7 +60,7 @@ public function authorizationMatrix() ]; } - public function selectRaaMatrix() + public function selectRaaMatrix(): array { $aRaa = new IdentityId('cccfece4-e5e5-40b7-9aa4-a800d7cd3633'); // Raa @ institution A $ghRaa = new IdentityId('02b70719-243f-4c7d-8649-48952a816ddf'); // RAA @ institution H @@ -93,7 +93,7 @@ public function test_get_institutions_for_role_matrix( RegistrationAuthorityRole $requiredRole, IdentityId $identity, array $expectedInstitutions - ) { + ): void { $institutions = $this->authzRepository->getInstitutionsForRole($requiredRole, $identity); $results = $this->flattenInstitutionResults($institutions); @@ -102,8 +102,8 @@ public function test_get_institutions_for_role_matrix( $expectedInstitutions, sprintf( 'The results do not match the expected results. Actual "%s" versus expected: "%s"', - implode($results, ','), - implode($expectedInstitutions, ',') + implode(',', $results), + implode(',', $expectedInstitutions) ) ); } @@ -111,14 +111,17 @@ public function test_get_institutions_for_role_matrix( /** * @dataProvider selectRaaMatrix */ - public function test_select_raa_authorization(IdentityId $identityId, array $expected) + public function test_select_raa_authorization(IdentityId $identityId, array $expected): void { $institutions = $this->authzRepository->getInstitutionsForSelectRaaRole($identityId); $this->assertEquals($expected, $this->flattenInstitutionResults($institutions)); } - private function flattenInstitutionResults(InstitutionCollection $collection) + /** + * @return mixed[] + */ + private function flattenInstitutionResults(InstitutionCollection $collection): array { $institutions = []; /** @var Institution $institution */ From efa0cdc201d4060895b9053d2ee905b4cf752708 Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Tue, 2 Apr 2024 08:38:59 +0200 Subject: [PATCH 44/89] Configure level 9, addding warnings to baseline --- ci/qa/phpstan-baseline.neon | 3668 ++++++++++++++--- docs/postman/2.http | 6 +- .../InstitutionAuthorizationOptionTest.php | 12 - .../Value/InstitutionConfigurationIdTest.php | 6 +- .../Tests/Identity/Value/GssfIdTest.php | 6 +- .../Tests/Identity/Value/PhoneNumberTest.php | 6 +- .../Identity/Value/StepupProviderTest.php | 6 +- .../Entity/ConfiguredInstitution.php | 4 - .../RegistrationAuthorityCredentials.php | 2 + .../Request/CommandParamConverter.php | 2 + .../AuthorizationContextServiceTest.php | 5 +- .../CommandAuthorizationServiceTest.php | 8 + .../Tests/Doctrine/Type/DateTimeTypeTest.php | 7 +- .../ConfiguredInstitutionControllerTest.php | 28 +- .../Tests/Endpoint/SraaControllerTest.php | 23 +- .../Command/UpdateConfigurationCommand.php | 14 +- .../ConfigurationCommandHandler.php | 2 +- .../InstitutionConfigurationProcessor.php | 5 +- .../Resources/config/processors.yml | 2 +- .../ConfigurationCommandHandlerTest.php | 14 +- .../InstitutionConfigurationProcessorTest.php | 30 +- ...tyCommandHandlerSelfAssertedTokensTest.php | 21 +- .../IdentityCommandHandlerTest.php | 4 +- ...egistrationAuthorityCommandHandlerTest.php | 4 +- .../Tests/SensitiveData/SensitiveDataTest.php | 7 +- .../Tests/Value/InstitutionTest.php | 7 +- .../GatewayBundle/Entity/SamlEntity.php | 20 +- .../Controller/ConfigurationController.php | 3 +- .../ConfigurationControllerTest.php | 43 +- ...InstitutionConfigurationControllerTest.php | 51 +- .../Validator/ConfigurationValidationTest.php | 9 +- ...nfigureInstitutionRequestValidatorTest.php | 9 +- ...ilVerifiedSecondFactorRemindersCommand.php | 12 +- .../EventSourcing/DBALEventHydrator.php | 10 +- .../Service/EventStreamReplayer.php | 2 +- .../EventSourcing/EventCollectionTest.php | 2 +- .../MappedInstitutionConfigurationTest.php | 3 + 37 files changed, 3263 insertions(+), 800 deletions(-) diff --git a/ci/qa/phpstan-baseline.neon b/ci/qa/phpstan-baseline.neon index 7d7761515..563d4f2d9 100644 --- a/ci/qa/phpstan-baseline.neon +++ b/ci/qa/phpstan-baseline.neon @@ -1,5 +1,10 @@ parameters: ignoreErrors: + - + message: "#^Cannot call method getParameter\\(\\) on Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\|null\\.$#" + count: 2 + path: ../../src/Surfnet/Migrations/Version20141125173004.php + - message: "#^Method Surfnet\\\\Migrations\\\\Version20141125173004\\:\\:getGatewaySchema\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 @@ -10,6 +15,21 @@ parameters: count: 1 path: ../../src/Surfnet/Migrations/Version20141125173004.php + - + message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, array\\|bool\\|float\\|int\\|string\\|null given\\.$#" + count: 4 + path: ../../src/Surfnet/Migrations/Version20141125173004.php + + - + message: "#^Parameter \\#3 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, array\\|bool\\|float\\|int\\|string\\|null given\\.$#" + count: 2 + path: ../../src/Surfnet/Migrations/Version20141125173004.php + + - + message: "#^Cannot call method getParameter\\(\\) on Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\|null\\.$#" + count: 2 + path: ../../src/Surfnet/Migrations/Version20141209150426.php + - message: "#^Method Surfnet\\\\Migrations\\\\Version20141209150426\\:\\:getGatewaySchema\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 @@ -20,21 +40,96 @@ parameters: count: 1 path: ../../src/Surfnet/Migrations/Version20141209150426.php + - + message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, array\\|bool\\|float\\|int\\|string\\|null given\\.$#" + count: 3 + path: ../../src/Surfnet/Migrations/Version20141209150426.php + + - + message: "#^Parameter \\#3 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, array\\|bool\\|float\\|int\\|string\\|null given\\.$#" + count: 2 + path: ../../src/Surfnet/Migrations/Version20141209150426.php + + - + message: "#^Cannot call method getParameter\\(\\) on Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/Migrations/Version20141210174213.php + - message: "#^Method Surfnet\\\\Migrations\\\\Version20141210174213\\:\\:getGatewaySchema\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 path: ../../src/Surfnet/Migrations/Version20141210174213.php + - + message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, array\\|bool\\|float\\|int\\|string\\|null given\\.$#" + count: 7 + path: ../../src/Surfnet/Migrations/Version20141210174213.php + + - + message: "#^Cannot call method getParameter\\(\\) on Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\|null\\.$#" + count: 2 + path: ../../src/Surfnet/Migrations/Version20150312162849.php + + - + message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, array\\|bool\\|float\\|int\\|string\\|null given\\.$#" + count: 2 + path: ../../src/Surfnet/Migrations/Version20150312162849.php + + - + message: "#^Cannot call method getParameter\\(\\) on Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/Migrations/Version20150508085838.php + + - + message: "#^Method Surfnet\\\\Migrations\\\\Version20150508085838\\:\\:getGatewaySchema\\(\\) should return string but returns array\\|bool\\|float\\|int\\|string\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/Migrations/Version20150508085838.php + + - + message: "#^Cannot call method getParameter\\(\\) on Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/Migrations/Version20150522163053.php + - message: "#^Method Surfnet\\\\Migrations\\\\Version20150522163053\\:\\:getGatewaySchema\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 path: ../../src/Surfnet/Migrations/Version20150522163053.php + - + message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, array\\|bool\\|float\\|int\\|string\\|null given\\.$#" + count: 8 + path: ../../src/Surfnet/Migrations/Version20150522163053.php + + - + message: "#^Cannot call method getParameter\\(\\) on Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/Migrations/Version20150522164907.php + - message: "#^Method Surfnet\\\\Migrations\\\\Version20150522164907\\:\\:getGatewaySchema\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 path: ../../src/Surfnet/Migrations/Version20150522164907.php + - + message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, array\\|bool\\|float\\|int\\|string\\|null given\\.$#" + count: 2 + path: ../../src/Surfnet/Migrations/Version20150522164907.php + + - + message: "#^Cannot call method getParameter\\(\\) on Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/Migrations/Version20150528154959.php + + - + message: "#^Method Surfnet\\\\Migrations\\\\Version20150528154959\\:\\:getGatewaySchema\\(\\) should return string but returns array\\|bool\\|float\\|int\\|string\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/Migrations/Version20150528154959.php + + - + message: "#^Cannot call method getParameter\\(\\) on Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\|null\\.$#" + count: 3 + path: ../../src/Surfnet/Migrations/Version20150615114646.php + - message: "#^Method Surfnet\\\\Migrations\\\\Version20150615114646\\:\\:getGatewaySchema\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 @@ -50,21 +145,151 @@ parameters: count: 1 path: ../../src/Surfnet/Migrations/Version20150615114646.php + - + message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, array\\|bool\\|float\\|int\\|string\\|null given\\.$#" + count: 6 + path: ../../src/Surfnet/Migrations/Version20150615114646.php + + - + message: "#^Parameter \\#3 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, array\\|bool\\|float\\|int\\|string\\|null given\\.$#" + count: 2 + path: ../../src/Surfnet/Migrations/Version20150615114646.php + + - + message: "#^Cannot call method getParameter\\(\\) on Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/Migrations/Version20180131150800.php + + - + message: "#^Method Surfnet\\\\Migrations\\\\Version20180131150800\\:\\:getGatewaySchema\\(\\) should return string but returns array\\|bool\\|float\\|int\\|string\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/Migrations/Version20180131150800.php + + - + message: "#^Cannot call method getParameter\\(\\) on Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/Migrations/Version20200114161618.php + - message: "#^Method Surfnet\\\\Migrations\\\\Version20200114161618\\:\\:getGatewaySchema\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 path: ../../src/Surfnet/Migrations/Version20200114161618.php + - + message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, array\\|bool\\|float\\|int\\|string\\|null given\\.$#" + count: 2 + path: ../../src/Surfnet/Migrations/Version20200114161618.php + + - + message: "#^Cannot access offset 'payload' on mixed\\.$#" + count: 1 + path: ../../src/Surfnet/Migrations/Version20210610131957.php + + - + message: "#^Cannot access offset 'vetting_type' on mixed\\.$#" + count: 1 + path: ../../src/Surfnet/Migrations/Version20210610131957.php + + - + message: "#^Method Surfnet\\\\Migrations\\\\Version20210610131957\\:\\:stripSensitiveData\\(\\) should return string but returns string\\|false\\.$#" + count: 1 + path: ../../src/Surfnet/Migrations/Version20210610131957.php + + - + message: "#^Parameter \\#1 \\$rawPayload of method Surfnet\\\\Migrations\\\\Version20210610131957\\:\\:stripSensitiveData\\(\\) expects string, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/Migrations/Version20210610131957.php + + - + message: "#^Part \\$playhead \\(mixed\\) of encapsed string cannot be cast to string\\.$#" + count: 1 + path: ../../src/Surfnet/Migrations/Version20210610131957.php + + - + message: "#^Part \\$uuid \\(mixed\\) of encapsed string cannot be cast to string\\.$#" + count: 1 + path: ../../src/Surfnet/Migrations/Version20210610131957.php + + - + message: "#^Cannot call method getParameter\\(\\) on Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/Migrations/Version20220519134637.php + - message: "#^Method Surfnet\\\\Migrations\\\\Version20220519134637\\:\\:getGatewaySchema\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 path: ../../src/Surfnet/Migrations/Version20220519134637.php + - + message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, array\\|bool\\|float\\|int\\|string\\|null given\\.$#" + count: 2 + path: ../../src/Surfnet/Migrations/Version20220519134637.php + + - + message: "#^Cannot call method getParameter\\(\\) on Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/Migrations/Version20221102143350.php + - message: "#^Method Surfnet\\\\Migrations\\\\Version20221102143350\\:\\:getGatewaySchema\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 path: ../../src/Surfnet/Migrations/Version20221102143350.php + - + message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, array\\|bool\\|float\\|int\\|string\\|null given\\.$#" + count: 2 + path: ../../src/Surfnet/Migrations/Version20221102143350.php + + - + message: "#^Cannot access offset 'email_templates' on mixed\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Configuration.php + + - + message: "#^Cannot access offset 'gateway' on mixed\\.$#" + count: 2 + path: ../../src/Surfnet/Stepup/Configuration/Configuration.php + + - + message: "#^Cannot access offset 'identity_providers' on mixed\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Configuration.php + + - + message: "#^Cannot access offset 'service_providers' on mixed\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Configuration.php + + - + message: "#^Cannot access offset 'sraa' on mixed\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Configuration.php + + - + message: "#^Parameter \\#2 \\$emailTemplates of class Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\EmailTemplatesUpdatedEvent constructor expects array, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Configuration.php + + - + message: "#^Parameter \\#2 \\$identityProviders of class Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\IdentityProvidersUpdatedEvent constructor expects array, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Configuration.php + + - + message: "#^Parameter \\#2 \\$newConfiguration of class Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\ConfigurationUpdatedEvent constructor expects array, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Configuration.php + + - + message: "#^Parameter \\#2 \\$serviceProviders of class Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\ServiceProvidersUpdatedEvent constructor expects array, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Configuration.php + + - + message: "#^Parameter \\#2 \\$sraaList of class Surfnet\\\\Stepup\\\\Configuration\\\\Event\\\\SraaUpdatedEvent constructor expects array, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/Configuration.php + - message: "#^Property Surfnet\\\\Stepup\\\\Configuration\\\\Configuration\\:\\:\\$configuration type has no value type specified in iterable type array\\.$#" count: 1 @@ -340,6 +565,26 @@ parameters: count: 1 path: ../../src/Surfnet/Stepup/Configuration/Event/VerifyEmailOptionChangedEvent.php + - + message: "#^Cannot call method add\\(\\) on Surfnet\\\\Stepup\\\\Configuration\\\\Value\\\\RaLocationList\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php + + - + message: "#^Cannot call method containsWithId\\(\\) on Surfnet\\\\Stepup\\\\Configuration\\\\Value\\\\RaLocationList\\|null\\.$#" + count: 3 + path: ../../src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php + + - + message: "#^Cannot call method getById\\(\\) on Surfnet\\\\Stepup\\\\Configuration\\\\Value\\\\RaLocationList\\|null\\.$#" + count: 4 + path: ../../src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php + + - + message: "#^Cannot call method removeWithId\\(\\) on Surfnet\\\\Stepup\\\\Configuration\\\\Value\\\\RaLocationList\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php + - message: "#^Method Surfnet\\\\Stepup\\\\Configuration\\\\Value\\\\AllowedSecondFactorList\\:\\:__construct\\(\\) has parameter \\$allowedSecondFactors with no value type specified in iterable type array\\.$#" count: 1 @@ -480,6 +725,16 @@ parameters: count: 1 path: ../../src/Surfnet/Stepup/Identity/Collection/InstitutionCollection.php + - + message: "#^Parameter \\#1 \\$institution of method Surfnet\\\\Stepup\\\\Identity\\\\Collection\\\\InstitutionCollection\\:\\:add\\(\\) expects Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\Institution, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Collection/InstitutionCollection.php + + - + message: "#^Parameter \\#1 \\$institution of method Surfnet\\\\Stepup\\\\Identity\\\\Collection\\\\InstitutionCollection\\:\\:remove\\(\\) expects Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\Institution, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Collection/InstitutionCollection.php + - message: "#^Property Surfnet\\\\Stepup\\\\Identity\\\\Collection\\\\InstitutionCollection\\:\\:\\$elements type has no value type specified in iterable type array\\.$#" count: 1 @@ -511,1487 +766,3617 @@ parameters: path: ../../src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php - - message: "#^Property Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\InstitutionCollection\\:\\:\\$institutions type has no value type specified in iterable type array\\.$#" + message: "#^Cannot cast mixed to string\\.$#" count: 1 path: ../../src/Surfnet/Stepup/Identity/Entity/InstitutionCollection.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\RegistrationAuthorityCollection\\:\\:getValues\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Property Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\InstitutionCollection\\:\\:\\$institutions type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Entity/RegistrationAuthorityCollection.php + path: ../../src/Surfnet/Stepup/Identity/Entity/InstitutionCollection.php - - message: "#^Class Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\SecondFactorCollection extends generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#" - count: 1 - path: ../../src/Surfnet/Stepup/Identity/Entity/SecondFactorCollection.php + message: "#^Cannot call method getId\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Api\\\\Identity\\|null\\.$#" + count: 2 + path: ../../src/Surfnet/Stepup/Identity/Entity/RecoveryToken.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\AppointedAsRaEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php + message: "#^Cannot call method getInstitution\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Api\\\\Identity\\|null\\.$#" + count: 2 + path: ../../src/Surfnet/Stepup/Identity/Entity/RecoveryToken.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\AppointedAsRaEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\RecoveryToken\\:\\:getTokenId\\(\\) should return Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\RecoveryTokenId but returns Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\RecoveryTokenId\\|null\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/RecoveryToken.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\AppointedAsRaEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\RecoveryToken\\:\\:getType\\(\\) should return Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\RecoveryTokenType but returns Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\RecoveryTokenType\\|null\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/RecoveryToken.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\AppointedAsRaForInstitutionEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#3 \\$recoveryTokenId of class Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\CompliedWithRecoveryCodeRevocationEvent constructor expects Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\RecoveryTokenId, Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\RecoveryTokenId\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/RecoveryToken.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\AppointedAsRaForInstitutionEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#3 \\$recoveryTokenId of class Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RecoveryTokenRevokedEvent constructor expects Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\RecoveryTokenId, Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\RecoveryTokenId\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/RecoveryToken.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\AppointedAsRaaEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#4 \\$recoveryTokenType of class Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\CompliedWithRecoveryCodeRevocationEvent constructor expects Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\RecoveryTokenType, Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\RecoveryTokenType\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/RecoveryToken.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\AppointedAsRaaEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#4 \\$recoveryTokenType of class Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RecoveryTokenRevokedEvent constructor expects Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\RecoveryTokenType, Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\RecoveryTokenType\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/RecoveryToken.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\AppointedAsRaaEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\RecoveryTokenCollection\\:\\:first\\(\\) should return Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\RecoveryToken but returns Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\RecoveryToken\\|false\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/RecoveryTokenCollection.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\AppointedAsRaaForInstitutionEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Cannot call method equals\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\RegistrationAuthorityRole\\|null\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/AppointedAsRaaForInstitutionEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/RegistrationAuthority.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\AppointedAsRaaForInstitutionEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\RegistrationAuthorityCollection\\:\\:getValues\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/AppointedAsRaaForInstitutionEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/RegistrationAuthorityCollection.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\CompliedWithRecoveryCodeRevocationEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Class Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\SecondFactorCollection extends generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/SecondFactorCollection.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\CompliedWithRecoveryCodeRevocationEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\SecondFactorCollection\\:\\:getSecondFactorWithHighestLoa\\(\\) should return Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\SecondFactor\\|null but returns mixed\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/SecondFactorCollection.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\CompliedWithRecoveryCodeRevocationEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#2 \\$callback of function array_reduce expects callable\\(mixed, mixed\\)\\: mixed, Closure\\(Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\VettedSecondFactor, Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\VettedSecondFactor\\)\\: Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\VettedSecondFactor given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/SecondFactorCollection.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\CompliedWithRevocationEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Cannot call method getCommonName\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Api\\\\Identity\\|null\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/CompliedWithRevocationEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/UnverifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\CompliedWithRevocationEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Cannot call method getEmail\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Api\\\\Identity\\|null\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/CompliedWithRevocationEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/UnverifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\CompliedWithRevocationEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/CompliedWithRevocationEvent.php + message: "#^Cannot call method getId\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Api\\\\Identity\\|null\\.$#" + count: 3 + path: ../../src/Surfnet/Stepup/Identity/Entity/UnverifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\EmailVerifiedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/EmailVerifiedEvent.php + message: "#^Cannot call method getInstitution\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Api\\\\Identity\\|null\\.$#" + count: 3 + path: ../../src/Surfnet/Stepup/Identity/Entity/UnverifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\EmailVerifiedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Cannot call method getPreferredLocale\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Api\\\\Identity\\|null\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/EmailVerifiedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/UnverifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\GssfPossessionProvenAndVerifiedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Cannot call method isOpen\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\EmailVerificationWindow\\|null\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenAndVerifiedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/UnverifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\GssfPossessionProvenAndVerifiedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\UnverifiedSecondFactor\\:\\:getType\\(\\) should return Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType but returns Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType\\|null\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenAndVerifiedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/UnverifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\GssfPossessionProvenEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$id of static method Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\VerifiedSecondFactor\\:\\:create\\(\\) expects Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SecondFactorId, Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SecondFactorId\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/UnverifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\GssfPossessionProvenEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#2 \\$identity of static method Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\VerifiedSecondFactor\\:\\:create\\(\\) expects Surfnet\\\\Stepup\\\\Identity\\\\Api\\\\Identity, Surfnet\\\\Stepup\\\\Identity\\\\Api\\\\Identity\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/UnverifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityAccreditedAsRaEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#3 \\$secondFactorId of class Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\CompliedWithUnverifiedSecondFactorRevocationEvent constructor expects Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SecondFactorId, Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SecondFactorId\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/UnverifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityAccreditedAsRaEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#3 \\$secondFactorId of class Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\EmailVerifiedEvent constructor expects Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SecondFactorId, Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SecondFactorId\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/UnverifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityAccreditedAsRaEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#3 \\$secondFactorId of class Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\UnverifiedSecondFactorRevokedEvent constructor expects Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SecondFactorId, Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SecondFactorId\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/UnverifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityAccreditedAsRaForInstitutionEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#3 \\$type of static method Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\VerifiedSecondFactor\\:\\:create\\(\\) expects Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType, Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaForInstitutionEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/UnverifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityAccreditedAsRaaEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#4 \\$secondFactorType of class Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\CompliedWithUnverifiedSecondFactorRevocationEvent constructor expects Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType, Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/UnverifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityCreatedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#4 \\$secondFactorType of class Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\EmailVerifiedEvent constructor expects Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType, Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/UnverifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityCreatedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#4 \\$secondFactorType of class Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\UnverifiedSecondFactorRevokedEvent constructor expects Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType, Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/UnverifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityEmailChangedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Cannot call method add\\(\\) on Surfnet\\\\Stepup\\\\DateTime\\\\DateTime\\|null\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/IdentityEmailChangedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityEmailChangedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/IdentityEmailChangedEvent.php + message: "#^Cannot call method getCommonName\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Api\\\\Identity\\|null\\.$#" + count: 2 + path: ../../src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityForgottenEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/IdentityForgottenEvent.php + message: "#^Cannot call method getEmail\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Api\\\\Identity\\|null\\.$#" + count: 2 + path: ../../src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityForgottenEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/IdentityForgottenEvent.php + message: "#^Cannot call method getId\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Api\\\\Identity\\|null\\.$#" + count: 4 + path: ../../src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityRenamedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/IdentityRenamedEvent.php + message: "#^Cannot call method getInstitution\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Api\\\\Identity\\|null\\.$#" + count: 4 + path: ../../src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityRenamedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/IdentityRenamedEvent.php + message: "#^Cannot call method getNameId\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Api\\\\Identity\\|null\\.$#" + count: 2 + path: ../../src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\InstitutionsAddedToWhitelistEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/InstitutionsAddedToWhitelistEvent.php + message: "#^Cannot call method getPreferredLocale\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Api\\\\Identity\\|null\\.$#" + count: 2 + path: ../../src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\InstitutionsRemovedFromWhitelistEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\VerifiedSecondFactor\\:\\:getType\\(\\) should return Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType but returns Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType\\|null\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/InstitutionsRemovedFromWhitelistEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\LocalePreferenceExpressedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$id of static method Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\VettedSecondFactor\\:\\:create\\(\\) expects Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SecondFactorId, Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SecondFactorId\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\LocalePreferenceExpressedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$secondFactorType of method Surfnet\\\\StepupBundle\\\\Service\\\\SecondFactorTypeService\\:\\:getLevel\\(\\) expects Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType, Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\PhonePossessionProvenAndVerifiedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#2 \\$identity of static method Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\VettedSecondFactor\\:\\:create\\(\\) expects Surfnet\\\\Stepup\\\\Identity\\\\Api\\\\Identity, Surfnet\\\\Stepup\\\\Identity\\\\Api\\\\Identity\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenAndVerifiedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\PhonePossessionProvenAndVerifiedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#3 \\$secondFactorId of class Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\CompliedWithVerifiedSecondFactorRevocationEvent constructor expects Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SecondFactorId, Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SecondFactorId\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenAndVerifiedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\PhonePossessionProvenEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#3 \\$secondFactorId of class Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\VerifiedSecondFactorRevokedEvent constructor expects Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SecondFactorId, Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SecondFactorId\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\PhonePossessionProvenEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#3 \\$type of static method Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\VettedSecondFactor\\:\\:create\\(\\) expects Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType, Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\PhoneRecoveryTokenPossessionProvenEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#4 \\$secondFactorId of class Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorVettedEvent constructor expects Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SecondFactorId, Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SecondFactorId\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/PhoneRecoveryTokenPossessionProvenEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\PhoneRecoveryTokenPossessionProvenEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#4 \\$secondFactorId of class Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorVettedWithoutTokenProofOfPossession constructor expects Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SecondFactorId, Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SecondFactorId\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/PhoneRecoveryTokenPossessionProvenEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RecoveryTokenRevokedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#4 \\$secondFactorType of class Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\CompliedWithVerifiedSecondFactorRevocationEvent constructor expects Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType, Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RecoveryTokenRevokedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#4 \\$secondFactorType of class Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\VerifiedSecondFactorRevokedEvent constructor expects Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType, Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RecoveryTokenRevokedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#5 \\$secondFactorType of class Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorVettedEvent constructor expects Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType, Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RegistrationAuthorityInformationAmendedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#5 \\$secondFactorType of class Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorVettedWithoutTokenProofOfPossession constructor expects Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType, Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RegistrationAuthorityInformationAmendedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedEvent.php + message: "#^Cannot call method getId\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Api\\\\Identity\\|null\\.$#" + count: 2 + path: ../../src/Surfnet/Stepup/Identity/Entity/VettedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RegistrationAuthorityInformationAmendedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedEvent.php + message: "#^Cannot call method getInstitution\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Api\\\\Identity\\|null\\.$#" + count: 2 + path: ../../src/Surfnet/Stepup/Identity/Entity/VettedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RegistrationAuthorityInformationAmendedForInstitutionEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\VettedSecondFactor\\:\\:getType\\(\\) should return Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType but returns Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType\\|null\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedForInstitutionEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/VettedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RegistrationAuthorityInformationAmendedForInstitutionEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\VettedSecondFactor\\:\\:vettingType\\(\\) should return Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\VettingType but returns Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\VettingType\\|null\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedForInstitutionEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/VettedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RegistrationAuthorityInformationAmendedForInstitutionEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#3 \\$secondFactorId of class Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\CompliedWithVettedSecondFactorRevocationEvent constructor expects Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SecondFactorId, Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SecondFactorId\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedForInstitutionEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/VettedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RegistrationAuthorityRetractedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#3 \\$secondFactorId of class Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\VettedSecondFactorRevokedEvent constructor expects Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SecondFactorId, Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SecondFactorId\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/VettedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RegistrationAuthorityRetractedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#4 \\$secondFactorType of class Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\CompliedWithVettedSecondFactorRevocationEvent constructor expects Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType, Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/VettedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RegistrationAuthorityRetractedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#4 \\$secondFactorType of class Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\VettedSecondFactorRevokedEvent constructor expects Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType, Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Entity/VettedSecondFactor.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RegistrationAuthorityRetractedForInstitutionEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\AppointedAsRaEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedForInstitutionEvent.php + path: ../../src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RegistrationAuthorityRetractedForInstitutionEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\AppointedAsRaEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedForInstitutionEvent.php + path: ../../src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SafeStoreSecretRecoveryTokenPossessionPromisedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\AppointedAsRaEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SafeStoreSecretRecoveryTokenPossessionPromisedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\AppointedAsRaForInstitutionEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorMigratedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\AppointedAsRaForInstitutionEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorMigratedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\AppointedAsRaaEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorMigratedToEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\AppointedAsRaaEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedToEvent.php + path: ../../src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorMigratedToEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\AppointedAsRaaEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedToEvent.php + path: ../../src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorRevokedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\AppointedAsRaaForInstitutionEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Event/AppointedAsRaaForInstitutionEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorRevokedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\AppointedAsRaaForInstitutionEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Event/AppointedAsRaaForInstitutionEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorRevokedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\CompliedWithRecoveryCodeRevocationEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorVettedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\CompliedWithRecoveryCodeRevocationEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorVettedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\CompliedWithRecoveryCodeRevocationEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorVettedWithoutTokenProofOfPossession\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\CompliedWithRevocationEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php + path: ../../src/Surfnet/Stepup/Identity/Event/CompliedWithRevocationEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorVettedWithoutTokenProofOfPossession\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\CompliedWithRevocationEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php + path: ../../src/Surfnet/Stepup/Identity/Event/CompliedWithRevocationEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\U2fDevicePossessionProvenAndVerifiedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\CompliedWithRevocationEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenAndVerifiedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Event/CompliedWithRevocationEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\U2fDevicePossessionProvenAndVerifiedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\EmailVerifiedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenAndVerifiedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Event/EmailVerifiedEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\U2fDevicePossessionProvenEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\EmailVerifiedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php + path: ../../src/Surfnet/Stepup/Identity/Event/EmailVerifiedEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\U2fDevicePossessionProvenEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\GssfPossessionProvenAndVerifiedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php + path: ../../src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenAndVerifiedEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\VettedSecondFactorsAllRevokedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\GssfPossessionProvenAndVerifiedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/VettedSecondFactorsAllRevokedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenAndVerifiedEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\VettedSecondFactorsAllRevokedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\GssfPossessionProvenEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/VettedSecondFactorsAllRevokedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\VettedSecondFactorsAllRevokedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\GssfPossessionProvenEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/VettedSecondFactorsAllRevokedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\VettingTypeHintsSavedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityAccreditedAsRaEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/VettingTypeHintsSavedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\VettingTypeHintsSavedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityAccreditedAsRaEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/VettingTypeHintsSavedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\VettingTypeHintsSavedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityAccreditedAsRaEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/VettingTypeHintsSavedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\WhitelistCreatedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityAccreditedAsRaForInstitutionEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/WhitelistCreatedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaForInstitutionEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\WhitelistReplacedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityAccreditedAsRaaEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/WhitelistReplacedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\YubikeyPossessionProvenAndVerifiedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$contactInformation of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\ContactInformation constructor expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenAndVerifiedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\YubikeyPossessionProvenAndVerifiedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$data of static method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\RegistrationAuthorityRole\\:\\:deserialize\\(\\) expects array, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenAndVerifiedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\YubikeyPossessionProvenEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$institution of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\Institution constructor expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenEvent.php + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\YubikeyPossessionProvenEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$location of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\Location constructor expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenEvent.php + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\YubikeySecondFactorBootstrappedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$value of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\IdentityId constructor expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/YubikeySecondFactorBootstrappedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\YubikeySecondFactorBootstrappedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$value of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\NameId constructor expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Event/YubikeySecondFactorBootstrappedEvent.php + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\EventSourcing\\\\IdentityRepository\\:\\:obtainInformation\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$contactInformation of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\ContactInformation constructor expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/EventSourcing/IdentityRepository.php + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaForInstitutionEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\EmailVerificationWindow\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$data of static method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\RegistrationAuthorityRole\\:\\:deserialize\\(\\) expects array, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Value/EmailVerificationWindow.php + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaForInstitutionEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\EmailVerificationWindow\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/Stepup/Identity/Value/EmailVerificationWindow.php + message: "#^Parameter \\#1 \\$institution of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\Institution constructor expects string, mixed given\\.$#" + count: 2 + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaForInstitutionEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\OnPremiseVettingType\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$location of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\Location constructor expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Value/OnPremiseVettingType.php + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaForInstitutionEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\OnPremiseVettingType\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$value of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\IdentityId constructor expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Value/OnPremiseVettingType.php + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaForInstitutionEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\RegistrationAuthorityRole\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$value of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\NameId constructor expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaForInstitutionEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\RegistrationAuthorityRole\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityCreatedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SelfAssertedRegistrationVettingType\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityCreatedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Value/SelfAssertedRegistrationVettingType.php + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SelfAssertedRegistrationVettingType\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityEmailChangedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Value/SelfAssertedRegistrationVettingType.php + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityEmailChangedEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SelfVetVettingType\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityEmailChangedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Value/SelfVetVettingType.php + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityEmailChangedEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SelfVetVettingType\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityForgottenEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Value/SelfVetVettingType.php + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityForgottenEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\UnknownVettingType\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityForgottenEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Value/UnknownVettingType.php + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityForgottenEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\VettingTypeFactory\\:\\:fromData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityRenamedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Value/VettingTypeFactory.php + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityRenamedEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\VettingTypeHint\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\IdentityRenamedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Identity/Value/VettingTypeHint.php + path: ../../src/Surfnet/Stepup/Identity/Event/IdentityRenamedEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Event\\\\EventSerializationAndDeserializationTest\\:\\:institutionConfigurationEventsProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\InstitutionsAddedToWhitelistEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Configuration/Event/EventSerializationAndDeserializationTest.php + path: ../../src/Surfnet/Stepup/Identity/Event/InstitutionsAddedToWhitelistEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\AllowedSecondFactorListTest\\:\\:availableSecondFactorTypeProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\InstitutionsRemovedFromWhitelistEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/AllowedSecondFactorListTest.php + path: ../../src/Surfnet/Stepup/Identity/Event/InstitutionsRemovedFromWhitelistEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\AllowedSecondFactorListTest\\:\\:differentAllowedSecondFactorListsProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\LocalePreferenceExpressedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/AllowedSecondFactorListTest.php + path: ../../src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\AllowedSecondFactorListTest\\:\\:sameAllowedSecondFactorListsProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\LocalePreferenceExpressedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/AllowedSecondFactorListTest.php + path: ../../src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\PhonePossessionProvenAndVerifiedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenAndVerifiedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\PhonePossessionProvenAndVerifiedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenAndVerifiedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\PhonePossessionProvenEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\PhonePossessionProvenEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\PhoneRecoveryTokenPossessionProvenEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/PhoneRecoveryTokenPossessionProvenEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\PhoneRecoveryTokenPossessionProvenEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/PhoneRecoveryTokenPossessionProvenEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RecoveryTokenRevokedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RecoveryTokenRevokedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RecoveryTokenRevokedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RegistrationAuthorityInformationAmendedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RegistrationAuthorityInformationAmendedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RegistrationAuthorityInformationAmendedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RegistrationAuthorityInformationAmendedForInstitutionEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedForInstitutionEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RegistrationAuthorityInformationAmendedForInstitutionEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedForInstitutionEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RegistrationAuthorityInformationAmendedForInstitutionEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedForInstitutionEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RegistrationAuthorityRetractedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RegistrationAuthorityRetractedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RegistrationAuthorityRetractedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RegistrationAuthorityRetractedForInstitutionEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedForInstitutionEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\RegistrationAuthorityRetractedForInstitutionEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedForInstitutionEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SafeStoreSecretRecoveryTokenPossessionPromisedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SafeStoreSecretRecoveryTokenPossessionPromisedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php + + - + message: "#^Property Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SafeStoreSecretRecoveryTokenPossessionPromisedEvent\\:\\:\\$secret \\(Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\RecoveryTokenIdentifier\\) does not accept Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\RecoveryTokenIdentifier\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorMigratedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorMigratedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorMigratedToEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedToEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorMigratedToEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedToEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorRevokedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorRevokedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorRevokedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorVettedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorVettedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php + + - + message: "#^Parameter \\#1 \\$vettingType of method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\SensitiveData\\\\SensitiveData\\:\\:withVettingType\\(\\) expects Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\VettingType, Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\VettingType\\|null given\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorVettedWithoutTokenProofOfPossession\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorVettedWithoutTokenProofOfPossession\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php + + - + message: "#^Parameter \\#1 \\$vettingType of method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\SensitiveData\\\\SensitiveData\\:\\:withVettingType\\(\\) expects Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\VettingType, Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\VettingType\\|null given\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\U2fDevicePossessionProvenAndVerifiedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenAndVerifiedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\U2fDevicePossessionProvenAndVerifiedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenAndVerifiedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\U2fDevicePossessionProvenEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\U2fDevicePossessionProvenEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\VettedSecondFactorsAllRevokedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/VettedSecondFactorsAllRevokedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\VettedSecondFactorsAllRevokedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/VettedSecondFactorsAllRevokedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\VettedSecondFactorsAllRevokedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/VettedSecondFactorsAllRevokedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\VettingTypeHintsSavedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/VettingTypeHintsSavedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\VettingTypeHintsSavedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/VettingTypeHintsSavedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\VettingTypeHintsSavedEvent\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/VettingTypeHintsSavedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\WhitelistCreatedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/WhitelistCreatedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\WhitelistReplacedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/WhitelistReplacedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\YubikeyPossessionProvenAndVerifiedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenAndVerifiedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\YubikeyPossessionProvenAndVerifiedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenAndVerifiedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\YubikeyPossessionProvenEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\YubikeyPossessionProvenEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\YubikeySecondFactorBootstrappedEvent\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/YubikeySecondFactorBootstrappedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\YubikeySecondFactorBootstrappedEvent\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Event/YubikeySecondFactorBootstrappedEvent.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\EventSourcing\\\\IdentityRepository\\:\\:obtainInformation\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/EventSourcing/IdentityRepository.php + + - + message: "#^Argument of an invalid type Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\SecondFactorCollection\\|null supplied for foreach, only iterables are supported\\.$#" + count: 8 + path: ../../src/Surfnet/Stepup/Identity/Identity.php + + - + message: "#^Cannot call method asVetted\\(\\) on mixed\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Identity.php + + - + message: "#^Cannot call method complyWithRevocation\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\VettedSecondFactor\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Identity.php + + - + message: "#^Cannot call method count\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\RecoveryTokenCollection\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Identity.php + + - + message: "#^Cannot call method count\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\RegistrationAuthorityCollection\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Identity.php + + - + message: "#^Cannot call method count\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\SecondFactorCollection\\|null\\.$#" + count: 2 + path: ../../src/Surfnet/Stepup/Identity/Identity.php + + - + message: "#^Cannot call method exists\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\RegistrationAuthorityCollection\\|null\\.$#" + count: 3 + path: ../../src/Surfnet/Stepup/Identity/Identity.php + + - + message: "#^Cannot call method first\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\RecoveryTokenCollection\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Identity.php + + - + message: "#^Cannot call method get\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\RecoveryTokenCollection\\|null\\.$#" + count: 3 + path: ../../src/Surfnet/Stepup/Identity/Identity.php + + - + message: "#^Cannot call method get\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\RegistrationAuthorityCollection\\|null\\.$#" + count: 7 + path: ../../src/Surfnet/Stepup/Identity/Identity.php + + - + message: "#^Cannot call method get\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\SecondFactorCollection\\|null\\.$#" + count: 11 + path: ../../src/Surfnet/Stepup/Identity/Identity.php + + - + message: "#^Cannot call method getIdentifier\\(\\) on mixed\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Identity.php + + - + message: "#^Cannot call method getSecondFactorWithHighestLoa\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\SecondFactorCollection\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Identity.php + + - + message: "#^Cannot call method getValues\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\RegistrationAuthorityCollection\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Identity.php + + - + message: "#^Cannot call method getValues\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\SecondFactorCollection\\|null\\.$#" + count: 3 + path: ../../src/Surfnet/Stepup/Identity/Identity.php + + - + message: "#^Cannot call method hasType\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\RecoveryTokenCollection\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Identity.php + + - + message: "#^Cannot call method isEmpty\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\SecondFactorCollection\\|null\\.$#" + count: 2 + path: ../../src/Surfnet/Stepup/Identity/Identity.php + + - + message: "#^Cannot call method remove\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\RecoveryTokenCollection\\|null\\.$#" + count: 2 + path: ../../src/Surfnet/Stepup/Identity/Identity.php + + - + message: "#^Cannot call method remove\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\RegistrationAuthorityCollection\\|null\\.$#" + count: 2 + path: ../../src/Surfnet/Stepup/Identity/Identity.php + + - + message: "#^Cannot call method remove\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\SecondFactorCollection\\|null\\.$#" + count: 9 + path: ../../src/Surfnet/Stepup/Identity/Identity.php + + - + message: "#^Cannot call method revoke\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\VettedSecondFactor\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Identity.php + + - + message: "#^Cannot call method set\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\RecoveryTokenCollection\\|null\\.$#" + count: 2 + path: ../../src/Surfnet/Stepup/Identity/Identity.php + + - + message: "#^Cannot call method set\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\RegistrationAuthorityCollection\\|null\\.$#" + count: 4 + path: ../../src/Surfnet/Stepup/Identity/Identity.php + + - + message: "#^Cannot call method set\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\SecondFactorCollection\\|null\\.$#" + count: 13 + path: ../../src/Surfnet/Stepup/Identity/Identity.php + + - + message: "#^Cannot call method typeAndIdentifierAreEqual\\(\\) on mixed\\.$#" + count: 3 + path: ../../src/Surfnet/Stepup/Identity/Identity.php + + - + message: "#^Cannot call method vet\\(\\) on mixed\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Identity.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Identity\\:\\:getVerifiedSecondFactor\\(\\) should return Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\VerifiedSecondFactor\\|null but returns mixed\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Identity.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Identity\\:\\:getVettedSecondFactorById\\(\\) should return Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\VettedSecondFactor\\|null but returns mixed\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Identity.php + + - + message: "#^Parameter \\#1 \\$value of function count expects array\\|Countable, Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\SecondFactorCollection\\|null given\\.$#" + count: 4 + path: ../../src/Surfnet/Stepup/Identity/Identity.php + + - + message: "#^Parameter \\#1 \\$vettingType of method Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\VerifiedSecondFactor\\:\\:asVetted\\(\\) expects Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\VettingType, Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\VettingType\\|null given\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Identity.php + + - + message: "#^Parameter \\#4 \\$secondFactorId of class Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorMigratedToEvent constructor expects Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SecondFactorId, Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SecondFactorId\\|null given\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Identity.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\EmailVerificationWindow\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Value/EmailVerificationWindow.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\EmailVerificationWindow\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Value/EmailVerificationWindow.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\OnPremiseVettingType\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Value/OnPremiseVettingType.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\OnPremiseVettingType\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Value/OnPremiseVettingType.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\RegistrationAuthorityRole\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\RegistrationAuthorityRole\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SelfAssertedRegistrationVettingType\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Value/SelfAssertedRegistrationVettingType.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SelfAssertedRegistrationVettingType\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Value/SelfAssertedRegistrationVettingType.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SelfVetVettingType\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Value/SelfVetVettingType.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SelfVetVettingType\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Value/SelfVetVettingType.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\UnknownVettingType\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Value/UnknownVettingType.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\VettingTypeFactory\\:\\:fromData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Value/VettingTypeFactory.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\VettingTypeHint\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Value/VettingTypeHint.php + + - + message: "#^Cannot call method addAllFrom\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Collection\\\\InstitutionCollection\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Whitelist.php + + - + message: "#^Cannot call method contains\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Collection\\\\InstitutionCollection\\|null\\.$#" + count: 2 + path: ../../src/Surfnet/Stepup/Identity/Whitelist.php + + - + message: "#^Cannot call method removeAllIn\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Collection\\\\InstitutionCollection\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Identity/Whitelist.php + + - + message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, mixed given\\.$#" + count: 2 + path: ../../src/Surfnet/Stepup/Identity/Whitelist.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Event\\\\EventSerializationAndDeserializationTest\\:\\:institutionConfigurationEventsProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Event/EventSerializationAndDeserializationTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\AllowedSecondFactorListTest\\:\\:availableSecondFactorTypeProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/AllowedSecondFactorListTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\AllowedSecondFactorListTest\\:\\:differentAllowedSecondFactorListsProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/AllowedSecondFactorListTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\AllowedSecondFactorListTest\\:\\:sameAllowedSecondFactorListsProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/AllowedSecondFactorListTest.php + + - + message: "#^Parameter \\#1 \\$other of method Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType\\:\\:equals\\(\\) expects Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/AllowedSecondFactorListTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionAuthorizationOptionTest\\:\\:institutionHasInstitutionProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionAuthorizationOptionTest\\:\\:institutionSetComparisonProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionAuthorizationOptionTest\\:\\:institution_option_instances_can_be_compared\\(\\) has parameter \\$configurationA with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionAuthorizationOptionTest\\:\\:institution_option_instances_can_be_compared\\(\\) has parameter \\$configurationB with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionAuthorizationOptionTest\\:\\:invalidConstructorArgumentsProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionAuthorizationOptionTest\\:\\:the_has_institution_method_should_check_for_institutions\\(\\) has parameter \\$institutionList with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionConfigurationIdTest\\:\\:nonStringOrEmptyStringProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionConfigurationIdTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionRoleTest\\:\\:institutionTypeProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionRoleTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionRoleTest\\:\\:invalidConstructorArgumentsProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionRoleTest.php + + - + message: "#^Parameter \\#1 \\$type of class Surfnet\\\\Stepup\\\\Configuration\\\\Value\\\\InstitutionRole constructor expects string, bool\\|int\\|string given\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionRoleTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionSetTest\\:\\:dirtyInstitutionListProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionSetTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionSetTest\\:\\:factory_method_can_build_from_array_of_string_and_rejects_invalid_types\\(\\) has parameter \\$invalid with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionSetTest.php + + - + message: "#^Parameter \\#1 \\$institutions of static method Surfnet\\\\Stepup\\\\Configuration\\\\Value\\\\InstitutionSet\\:\\:create\\(\\) expects array\\, array\\ given\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionSetTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionTest\\:\\:nonStringOrNonEmptyStringProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\RaLocationIdTest\\:\\:nonStringOrEmptyStringProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\RaLocationListTest\\:\\:getRaLocationsArray\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationListTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\RaLocationNameTest\\:\\:nonStringOrEmptyStringProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationNameTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Helper\\\\JsonHelperTest\\:\\:nonStringProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Helper/JsonHelperTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Helper\\\\UserDataFilterTest\\:\\:test_filtering_is_applied_with_expected_result\\(\\) has parameter \\$expectation with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Helper/UserDataFilterTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Collection\\\\InstitutionCollectionTest\\:\\:getInstitutions\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Collection/InstitutionCollectionTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Entity\\\\ConfigurableSettingsTest\\:\\:localeVerifications\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Entity/ConfigurableSettingsTest.php + + - + message: "#^Cannot call method setSensitiveData\\(\\) on mixed\\.$#" + count: 2 + path: ../../src/Surfnet/Stepup/Tests/Identity/Event/EventSerializationAndDeserializationTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Event\\\\EventSerializationAndDeserializationTest\\:\\:eventProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Event/EventSerializationAndDeserializationTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Event\\\\EventSerializationAndDeserializationTest\\:\\:serializedDataProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Event/EventSerializationAndDeserializationTest.php + + - + message: "#^Parameter \\#1 \\$data of static method Broadway\\\\Serializer\\\\Serializable\\:\\:deserialize\\(\\) expects array, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Event/EventSerializationAndDeserializationTest.php + + - + message: "#^Parameter \\#1 \\$data of static method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\SensitiveData\\\\SensitiveData\\:\\:deserialize\\(\\) expects array, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Event/EventSerializationAndDeserializationTest.php + + - + message: "#^Parameter \\#1 \\$objectOrClass of class ReflectionClass constructor expects class\\-string\\\\|T of object, string given\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Event/ForgettableEventsTest.php + + - + message: "#^Parameter \\#2 \\$array of function array_map expects array, array\\\\|false given\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Event/ForgettableEventsTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Event\\\\WhitelistEventSerializationAndDeserializationTest\\:\\:eventProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Event/WhitelistEventSerializationAndDeserializationTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\CommonNameTest\\:\\:invalidArgumentProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Value/CommonNameTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\DocumentNumberTest\\:\\:invalidArgumentProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Value/DocumentNumberTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\EmailTest\\:\\:invalidArgumentProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Value/EmailTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\EmailTest\\:\\:invalidEmailProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Value/EmailTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\GssfIdTest\\:\\:invalidValueProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Value/GssfIdTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\InstitutionTest\\:\\:invalidValueProviderInvalidString\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Value/InstitutionTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\PhoneNumberTest\\:\\:invalidValueProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Value/PhoneNumberTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\StepupProviderTest\\:\\:invalidValueProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Value/StepupProviderTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\TimeFrameTest\\:\\:invalidValueProviderInt\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Value/TimeFrameTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\YubikeyPublicIdTest\\:\\:invalidFormatProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Value/YubikeyPublicIdTest.php + + - + message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\YubikeyPublicIdTest\\:\\:validFormatProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/Stepup/Tests/Identity/Value/YubikeyPublicIdTest.php + + - + message: "#^Cannot cast mixed to string\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Filter/InstitutionAuthorizationRepositoryFilter.php + + - + message: "#^Cannot call method getIdentityId\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\IdentityId\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Service/CommandAuthorizationService.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Authorization\\\\Value\\\\AuthorizationDecision\\:\\:__construct\\(\\) has parameter \\$errorMessages with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/AuthorizationDecision.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Authorization\\\\Value\\\\AuthorizationDecision\\:\\:denied\\(\\) has parameter \\$messages with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/AuthorizationDecision.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Authorization\\\\Value\\\\AuthorizationDecision\\:\\:getErrorMessages\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/AuthorizationDecision.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Authorization\\\\Value\\\\InstitutionAuthorizationContext\\:\\:getInstitutions\\(\\) should return Surfnet\\\\Stepup\\\\Identity\\\\Collection\\\\InstitutionCollection but returns Surfnet\\\\Stepup\\\\Identity\\\\Collection\\\\InstitutionCollection\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionAuthorizationContext.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Authorization\\\\Value\\\\InstitutionRoleSet\\:\\:__construct\\(\\) has parameter \\$institutionRoles with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionRoleSet.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Authorization\\\\Value\\\\InstitutionRoleSet\\:\\:getRoles\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionRoleSet.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Authorization\\\\Value\\\\InstitutionRoleSetInterface\\:\\:getRoles\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionRoleSetInterface.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Entity\\\\ConfiguredInstitution\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/ConfiguredInstitution.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Entity\\\\RaLocation\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/RaLocation.php + + - + message: "#^Parameter \\#2 \\$secondFactorType of static method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Entity\\\\AllowedSecondFactor\\:\\:createFrom\\(\\) expects Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/AllowedSecondFactorListProjector.php + + - + message: "#^Cannot access property \\$numberOfTokensPerIdentityOption on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Entity\\\\InstitutionConfigurationOptions\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/InstitutionConfigurationOptionsProjector.php + + - + message: "#^Cannot access property \\$selfAssertedTokensOption on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Entity\\\\InstitutionConfigurationOptions\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/InstitutionConfigurationOptionsProjector.php + + - + message: "#^Cannot access property \\$selfVetOption on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Entity\\\\InstitutionConfigurationOptions\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/InstitutionConfigurationOptionsProjector.php + + - + message: "#^Cannot access property \\$showRaaContactInformationOption on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Entity\\\\InstitutionConfigurationOptions\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/InstitutionConfigurationOptionsProjector.php + + - + message: "#^Cannot access property \\$ssoOn2faOption on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Entity\\\\InstitutionConfigurationOptions\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/InstitutionConfigurationOptionsProjector.php + + - + message: "#^Cannot access property \\$useRaLocationsOption on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Entity\\\\InstitutionConfigurationOptions\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/InstitutionConfigurationOptionsProjector.php + + - + message: "#^Cannot access property \\$verifyEmailOption on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Entity\\\\InstitutionConfigurationOptions\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/InstitutionConfigurationOptionsProjector.php + + - + message: "#^Parameter \\#1 \\$institutionConfigurationOptions of method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Repository\\\\InstitutionConfigurationOptionsRepository\\:\\:save\\(\\) expects Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Entity\\\\InstitutionConfigurationOptions, Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Entity\\\\InstitutionConfigurationOptions\\|null given\\.$#" + count: 7 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Projector/InstitutionConfigurationOptionsProjector.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Repository\\\\AllowedSecondFactorRepository\\:\\:getAllowedSecondFactorsFor\\(\\) should return array\\ but returns mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/AllowedSecondFactorRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Repository\\\\InstitutionAuthorizationRepository\\:\\:findAuthorizationOptionsForInstitution\\(\\) should return array\\ but returns mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionAuthorizationRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Repository\\\\InstitutionAuthorizationRepository\\:\\:findAuthorizationOptionsForInstitutionByRole\\(\\) should return array\\ but returns mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionAuthorizationRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Repository\\\\InstitutionAuthorizationRepository\\:\\:findSelectRaasForInstitution\\(\\) should return array\\ but returns mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionAuthorizationRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Repository\\\\InstitutionConfigurationOptionsRepository\\:\\:findConfigurationOptionsFor\\(\\) should return Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Entity\\\\InstitutionConfigurationOptions\\|null but returns mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionConfigurationOptionsRepository.php + + - + message: "#^Cannot call method getInstitution\\(\\) on string\\|Surfnet\\\\Stepup\\\\Configuration\\\\Value\\\\Institution\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/RaLocationRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Repository\\\\RaLocationRepository\\:\\:findByInstitution\\(\\) should return array\\ but returns mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/RaLocationRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Repository\\\\RaLocationRepository\\:\\:findByRaLocationId\\(\\) should return Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Entity\\\\RaLocation\\|null but returns mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/RaLocationRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Repository\\\\RaLocationRepository\\:\\:search\\(\\) should return array\\\\|null but returns mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/RaLocationRepository.php + + - + message: "#^Cannot access an offset on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Entity\\\\AllowedSecondFactor\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/AllowedSecondFactorMap.php + + - + message: "#^Parameter \\#1 \\$allowedSecondFactors of static method Surfnet\\\\Stepup\\\\Configuration\\\\Value\\\\AllowedSecondFactorList\\:\\:ofTypes\\(\\) expects array, Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Entity\\\\AllowedSecondFactor given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/AllowedSecondFactorMap.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Service\\\\InstitutionAuthorizationOptionMap\\:\\:fromInstitutionAuthorizations\\(\\) has parameter \\$institutionAuthorizations with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionAuthorizationOptionMap.php + + - + message: "#^Parameter \\#1 \\$value of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\IdentityId constructor expects string, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuditLogController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\AbstractQuery\\:\\:\\$pageNumber \\(int\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuditLogController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\SecondFactorAuditLogQuery\\:\\:\\$orderBy \\(string\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuditLogController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\SecondFactorAuditLogQuery\\:\\:\\$orderDirection \\(string\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuditLogController.php + + - + message: "#^Access to an undefined property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Command\\\\CreateIdentityCommand\\|Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Command\\\\UpdateIdentityCommand\\:\\:\\$institution\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php + + - + message: "#^Parameter \\#1 \\$value of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\IdentityId constructor expects string, string\\|null given\\.$#" + count: 2 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php + + - + message: "#^Cannot cast mixed to int\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\IdentityQuery\\:\\:\\$commonName \\(string\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\IdentityQuery\\:\\:\\$email \\(string\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\IdentityQuery\\:\\:\\$nameId \\(string\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php + + - + message: "#^Cannot cast mixed to int\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php + + - + message: "#^Parameter \\#1 \\$identityId of method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Service\\\\RaCandidateService\\:\\:findOneByIdentityId\\(\\) expects string, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php + + - + message: "#^Parameter \\#1 \\$value of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\IdentityId constructor expects string, mixed given\\.$#" + count: 2 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php + + - + message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RaCandidateQuery\\:\\:\\$commonName \\(string\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RaCandidateQuery\\:\\:\\$email \\(string\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RaCandidateQuery\\:\\:\\$institution \\(string\\|Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\Institution\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RaCandidateQuery\\:\\:\\$raInstitution \\(string\\|Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\Institution\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RaCandidateQuery\\:\\:\\$secondFactorTypes \\(array\\\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php + + - + message: "#^Cannot cast mixed to int\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php + + - + message: "#^Parameter \\#1 \\$institution of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\Institution constructor expects string, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php + + - + message: "#^Parameter \\#1 \\$value of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\IdentityId constructor expects string, mixed given\\.$#" + count: 3 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RaListingQuery\\:\\:\\$email \\(string\\|null\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RaListingQuery\\:\\:\\$institution \\(string\\|Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\Institution\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RaListingQuery\\:\\:\\$name \\(string\\|null\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RaListingQuery\\:\\:\\$orderBy \\(string\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RaListingQuery\\:\\:\\$orderDirection \\(string\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RaListingQuery\\:\\:\\$raInstitution \\(string\\|null\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RaListingQuery\\:\\:\\$role \\(string\\|null\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php + + - + message: "#^Parameter \\#1 \\$raLocationId of class Surfnet\\\\Stepup\\\\Configuration\\\\Value\\\\RaLocationId constructor expects string, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaLocationController.php + + - + message: "#^Parameter \\#1 \\$value of function count expects array\\|Countable, array\\\\|null given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaLocationController.php + + - + message: "#^Parameter \\#4 \\$collection of class Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Response\\\\JsonCollectionResponse constructor expects array, array\\\\|null given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaLocationController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Query\\\\RaLocationQuery\\:\\:\\$orderBy \\(string\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaLocationController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Query\\\\RaLocationQuery\\:\\:\\$orderDirection \\(string\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaLocationController.php + + - + message: "#^Cannot cast mixed to int\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php + + - + message: "#^Parameter \\#1 \\$value of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\IdentityId constructor expects string, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RaSecondFactorQuery\\:\\:\\$email \\(string\\|null\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RaSecondFactorQuery\\:\\:\\$institution \\(string\\|null\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RaSecondFactorQuery\\:\\:\\$name \\(string\\|null\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RaSecondFactorQuery\\:\\:\\$orderBy \\(string\\|null\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RaSecondFactorQuery\\:\\:\\$orderDirection \\(string\\|null\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RaSecondFactorQuery\\:\\:\\$secondFactorId \\(string\\|null\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RaSecondFactorQuery\\:\\:\\$status \\(string\\|null\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RaSecondFactorQuery\\:\\:\\$type \\(string\\|null\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php + + - + message: "#^Cannot call method getRoles\\(\\) on Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php + + - + message: "#^Cannot cast mixed to int\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php + + - + message: "#^Parameter \\#1 \\$value of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\IdentityId constructor expects string, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php + + - + message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RecoveryTokenQuery\\:\\:\\$email \\(string\\|null\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RecoveryTokenQuery\\:\\:\\$identityId \\(Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\IdentityId\\|null\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RecoveryTokenQuery\\:\\:\\$institution \\(string\\|null\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RecoveryTokenQuery\\:\\:\\$name \\(string\\|null\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RecoveryTokenQuery\\:\\:\\$orderBy \\(string\\|null\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RecoveryTokenQuery\\:\\:\\$orderDirection \\(string\\|null\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RecoveryTokenQuery\\:\\:\\$status \\(string\\|null\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RecoveryTokenQuery\\:\\:\\$type \\(string\\|null\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php + + - + message: "#^Cannot cast mixed to int\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\UnverifiedSecondFactorQuery\\:\\:\\$identityId \\(Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\IdentityId\\|null\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\UnverifiedSecondFactorQuery\\:\\:\\$verificationNonce \\(string\\|null\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php + + - + message: "#^Cannot cast mixed to int\\.$#" + count: 2 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/VerifiedSecondFactorController.php + + - + message: "#^Parameter \\#1 \\$value of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\IdentityId constructor expects string, mixed given\\.$#" + count: 3 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/VerifiedSecondFactorController.php + + - + message: "#^Parameter \\#1 \\$value of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SecondFactorId constructor expects string, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/VerifiedSecondFactorController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\VerifiedSecondFactorQuery\\:\\:\\$registrationCode \\(string\\|null\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/VerifiedSecondFactorController.php + + - + message: "#^Cannot cast mixed to int\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\VettedSecondFactorQuery\\:\\:\\$identityId \\(Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\IdentityId\\|null\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php + + - + message: "#^Cannot cast mixed to string\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/AuthorityRoleType.php + + - + message: "#^Parameter \\#1 \\$role of class Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Value\\\\AuthorityRole constructor expects string, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/AuthorityRoleType.php + + - + message: "#^Cannot cast mixed to string\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/CommonNameType.php + + - + message: "#^Parameter \\#1 \\$commonName of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\CommonName constructor expects string, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/CommonNameType.php + + - + message: "#^Parameter \\#1 \\$contactInformation of class Surfnet\\\\Stepup\\\\Configuration\\\\Value\\\\ContactInformation constructor expects string, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationContactInformationType.php + + - + message: "#^Parameter \\#1 \\$institution of class Surfnet\\\\Stepup\\\\Configuration\\\\Value\\\\Institution constructor expects string, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationInstitutionType.php + + - + message: "#^Parameter \\#1 \\$location of class Surfnet\\\\Stepup\\\\Configuration\\\\Value\\\\Location constructor expects string, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationLocationType.php + + - + message: "#^Cannot cast mixed to string\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ContactInformationType.php + + - + message: "#^Parameter \\#1 \\$contactInformation of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\ContactInformation constructor expects string, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ContactInformationType.php + + - + message: "#^Cannot call method format\\(\\) on mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DateTimeType.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Doctrine\\\\Type\\\\DateTimeType\\:\\:getSQLDeclaration\\(\\) has parameter \\$column with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DateTimeType.php + + - + message: "#^Parameter \\#2 \\$datetime of static method DateTime\\:\\:createFromFormat\\(\\) expects string, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DateTimeType.php + + - + message: "#^Parameter \\#1 \\$documentNumber of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\DocumentNumber constructor expects string, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DocumentNumberType.php + + - + message: "#^Cannot cast mixed to string\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/EmailType.php + + - + message: "#^Parameter \\#1 \\$email of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\Email constructor expects string, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/EmailType.php + + - + message: "#^Parameter \\#1 \\$type of class Surfnet\\\\Stepup\\\\Configuration\\\\Value\\\\InstitutionRole constructor expects string, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionRoleType.php + + - + message: "#^Cannot cast mixed to string\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionType.php + + - + message: "#^Parameter \\#1 \\$institution of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\Institution constructor expects string, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionType.php + + - + message: "#^Cannot cast mixed to string\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/LocaleType.php + + - + message: "#^Parameter \\#1 \\$locale of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\Locale constructor expects string, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/LocaleType.php + + - + message: "#^Cannot cast mixed to string\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/LocationType.php + + - + message: "#^Parameter \\#1 \\$location of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\Location constructor expects string, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/LocationType.php + + - + message: "#^Cannot cast mixed to string\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NameIdType.php + + - + message: "#^Parameter \\#1 \\$value of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\NameId constructor expects string, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NameIdType.php + + - + message: "#^Cannot cast mixed to int\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NumberOfTokensPerIdentityType.php + + - + message: "#^Parameter \\#1 \\$raLocationName of class Surfnet\\\\Stepup\\\\Configuration\\\\Value\\\\RaLocationName constructor expects string, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RaLocationNameType.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Doctrine\\\\Type\\\\SecondFactorStatusType\\:\\:getSQLDeclaration\\(\\) has parameter \\$column with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorStatusType.php + + - + message: "#^Cannot cast mixed to string\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorTypeType.php + + - + message: "#^Parameter \\#1 \\$type of class Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType constructor expects string, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorTypeType.php + + - + message: "#^Cannot cast mixed to string\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VettingTypeHintsType.php + + - + message: "#^Parameter \\#1 \\$data of static method Surfnet\\\\Stepup\\\\Identity\\\\Collection\\\\VettingTypeHintCollection\\:\\:deserialize\\(\\) expects array, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VettingTypeHintsType.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\EventListener\\\\ExceptionListener\\:\\:createJsonErrorResponse\\(\\) has parameter \\$headers with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/EventListener/ExceptionListener.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Exception\\\\BadApiRequestException\\:\\:__construct\\(\\) has parameter \\$errors with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadApiRequestException.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Exception\\\\BadCommandRequestException\\:\\:__construct\\(\\) has parameter \\$errors with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadCommandRequestException.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\AuditLogEntry\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/AuditLogEntry.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\Identity\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Identity.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\IdentitySelfAssertedTokenOptions\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/IdentitySelfAssertedTokenOptions.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\InstitutionListing\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/InstitutionListing.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\RaCandidate\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaCandidate.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\RaListing\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaListing.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\RaSecondFactor\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaSecondFactor.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\RecoveryToken\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RecoveryToken.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\UnverifiedSecondFactor\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/UnverifiedSecondFactor.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\VerifiedSecondFactor\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VerifiedSecondFactor.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\VettedSecondFactor\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettedSecondFactor.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\VettingTypeHint\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettingTypeHint.php + + - + message: "#^Cannot call method getCommonName\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\CommonName\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/AuditLogProjector.php + + - + message: "#^Parameter \\#1 \\$type of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\RecoveryTokenType constructor expects string, string\\|null given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/AuditLogProjector.php + + - + message: "#^Cannot access property \\$commonName on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\Identity\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/IdentityProjector.php + + - + message: "#^Cannot access property \\$email on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\Identity\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/IdentityProjector.php + + - + message: "#^Cannot access property \\$preferredLocale on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\Identity\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/IdentityProjector.php + + - + message: "#^Parameter \\#1 \\$identity of method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\IdentityRepository\\:\\:save\\(\\) expects Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\Identity, Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\Identity\\|null given\\.$#" + count: 3 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/IdentityProjector.php + + - + message: "#^Parameter \\#1 \\$vettingType of method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Projector\\\\IdentityProjector\\:\\:determinePossessionOfSelfAssertedToken\\(\\) expects Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\VettingType, Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\VettingType\\|null given\\.$#" + count: 2 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/IdentityProjector.php + + - + message: "#^Parameter \\#1 \\$vettingType of method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Projector\\\\IdentitySelfAssertedTokenOptionsProjector\\:\\:determinePossessionOfToken\\(\\) expects Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\VettingType, Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\VettingType\\|null given\\.$#" + count: 2 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/IdentitySelfAssertedTokenOptionsProjector.php + + - + message: "#^Cannot access property \\$commonName on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\Identity\\|null\\.$#" + count: 4 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaListingProjector.php + + - + message: "#^Cannot access property \\$email on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\Identity\\|null\\.$#" + count: 4 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaListingProjector.php + + - + message: "#^Cannot access property \\$role on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\RaListing\\|null\\.$#" + count: 2 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaListingProjector.php + + - + message: "#^Parameter \\#1 \\$raListingEntry of method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\RaListingRepository\\:\\:save\\(\\) expects Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\RaListing, Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\RaListing\\|null given\\.$#" + count: 2 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaListingProjector.php + + - + message: "#^Cannot access property \\$documentNumber on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\RaSecondFactor\\|null\\.$#" + count: 3 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaSecondFactorProjector.php + + - + message: "#^Cannot access property \\$id on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\Identity\\|null\\.$#" + count: 2 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaSecondFactorProjector.php + + - + message: "#^Cannot access property \\$institution on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\Identity\\|null\\.$#" + count: 2 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaSecondFactorProjector.php + + - + message: "#^Cannot access property \\$status on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\RaSecondFactor\\|null\\.$#" + count: 4 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaSecondFactorProjector.php + + - + message: "#^Cannot call method getDocumentNumber\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\VettingType\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaSecondFactorProjector.php + + - + message: "#^Parameter \\#1 \\$secondFactor of method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\RaSecondFactorRepository\\:\\:save\\(\\) expects Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\RaSecondFactor, Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\RaSecondFactor\\|null given\\.$#" + count: 3 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaSecondFactorProjector.php + + - + message: "#^Cannot access property \\$status on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\RecoveryToken\\|null\\.$#" + count: 2 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RecoveryTokenProjector.php + + - + message: "#^Parameter \\#1 \\$entry of method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\RecoveryTokenRepository\\:\\:save\\(\\) expects Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\RecoveryToken, Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\RecoveryToken\\|null given\\.$#" + count: 2 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RecoveryTokenProjector.php + + - + message: "#^Cannot access property \\$secondFactorIdentifier on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\UnverifiedSecondFactor\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php + + - + message: "#^Parameter \\#1 \\$secondFactor of method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\UnverifiedSecondFactorRepository\\:\\:remove\\(\\) expects Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\UnverifiedSecondFactor, Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\UnverifiedSecondFactor\\|null given\\.$#" + count: 3 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php + + - + message: "#^Parameter \\#1 \\$secondFactor of method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\VerifiedSecondFactorRepository\\:\\:remove\\(\\) expects Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\VerifiedSecondFactor, Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\VerifiedSecondFactor\\|null given\\.$#" + count: 4 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php + + - + message: "#^Parameter \\#1 \\$secondFactor of method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\VettedSecondFactorRepository\\:\\:remove\\(\\) expects Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\VettedSecondFactor, Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\VettedSecondFactor\\|null given\\.$#" + count: 2 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php + + - + message: "#^Parameter \\#1 \\$institution of static method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\WhitelistEntry\\:\\:createFrom\\(\\) expects Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\Institution, mixed given\\.$#" + count: 3 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/WhitelistProjector.php + + - + message: "#^Parameter \\#1 \\$institutions of method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\WhitelistEntryRepository\\:\\:findEntriesByInstitutions\\(\\) expects array\\, array\\, mixed\\> given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/WhitelistProjector.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\AuditLogRepository\\:\\:findByIdentityId\\(\\) should return array\\ but returns mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuditLogRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\AuditLogRepository\\:\\:findEntriesWhereIdentityIsActorOnly\\(\\) should return array\\ but returns mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuditLogRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\AuditLogRepository\\:\\:saveAll\\(\\) has parameter \\$entries with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuditLogRepository.php + + - + message: "#^Cannot access offset 'institution' on mixed\\.$#" + count: 5 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php + + - + message: "#^Cannot cast mixed to string\\.$#" + count: 3 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\AuthorizationRepository\\:\\:getAllowedIdentityRoles\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\AuthorizationRepository\\:\\:getAllowedInstitutionRoles\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php + + - + message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php + + - + message: "#^Parameter \\#3 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\IdentityRepository\\:\\:findByNameIdsIndexed\\(\\) should return array\\ but returns mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\IdentityRepository\\:\\:findOneByNameIdAndInstitution\\(\\) should return Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\Identity but returns mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\RaCandidateRepository\\:\\:findOneByIdentityId\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaCandidateRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\RaCandidateRepository\\:\\:findOneByIdentityId\\(\\) should return array\\|null but returns mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaCandidateRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\RaListingRepository\\:\\:findByIdentityId\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\RaListingRepository\\:\\:findByIdentityIdAndRaInstitutionWithContext\\(\\) should return Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\RaListing\\|null but returns mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\RaListingRepository\\:\\:listRasFor\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php + + - + message: "#^Parameter \\#1 \\$elements of class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection constructor expects array\\, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\SraaRepository\\:\\:saveAll\\(\\) has parameter \\$sraaList with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\VerifiedSecondFactorRepository\\:\\:findByDate\\(\\) should return array\\ but returns mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/VerifiedSecondFactorRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\WhitelistEntryRepository\\:\\:findEntriesByInstitutions\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\WhitelistEntryRepository\\:\\:findEntriesByInstitutions\\(\\) should return array but returns mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\WhitelistEntryRepository\\:\\:getAll\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php + + - + message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AbstractSearchService.php + + - + message: "#^Cannot cast mixed to string\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AbstractSearchService.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Service\\\\AbstractSearchService\\:\\:createPaginatorFrom\\(\\) return type with generic class Pagerfanta\\\\Pagerfanta does not specify its types\\: T$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AbstractSearchService.php + + - + message: "#^Parameter \\#1 \\$raListings of static method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Value\\\\RegistrationAuthorityCredentials\\:\\:fromRaListings\\(\\) expects array\\, array\\|null given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/IdentityService.php + + - + message: "#^Cannot call method getInstitution\\(\\) on mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaCandidateService.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Service\\\\RaCandidateService\\:\\:findOneByIdentityId\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaCandidateService.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Service\\\\RaCandidateService\\:\\:getFilterOptions\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaCandidateService.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Service\\\\RaCandidateService\\:\\:setUseRaInstitutionsOnRaCandidate\\(\\) has parameter \\$raCandidate with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaCandidateService.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Service\\\\RaCandidateService\\:\\:setUseRaInstitutionsOnRaCandidate\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaCandidateService.php + + - + message: "#^Parameter \\#1 \\$func of method Doctrine\\\\Common\\\\Collections\\\\ArrayCollection\\<\\(int\\|string\\),mixed\\>\\:\\:map\\(\\) expects Closure\\(mixed\\)\\: Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Value\\\\RegistrationAuthorityCredentials, Closure\\(Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\RaListing\\)\\: Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Value\\\\RegistrationAuthorityCredentials given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaListingService.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Service\\\\RaSecondFactorService\\:\\:getFilterOptions\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaSecondFactorService.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Service\\\\RaSecondFactorService\\:\\:searchUnpaginated\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaSecondFactorService.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Service\\\\RaSecondFactorService\\:\\:searchUnpaginated\\(\\) should return array but returns mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaSecondFactorService.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Service\\\\RecoveryTokenService\\:\\:getFilterOptions\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RecoveryTokenService.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Specification\\\\SpecificationInterface\\:\\:apply\\(\\) has parameter \\$entityRepository with generic class Doctrine\\\\ORM\\\\EntityRepository but does not specify its types\\: TEntityClass$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Specification/SpecificationInterface.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Value\\\\AuthorizedInstitutionCollection\\:\\:getAuthorizations\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorizedInstitutionCollection.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Value\\\\Profile\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/Profile.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Value\\\\RegistrationAuthorityCredentials\\:\\:getContactInformation\\(\\) should return string but returns Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\ContactInformation\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RegistrationAuthorityCredentials.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Value\\\\RegistrationAuthorityCredentials\\:\\:getLocation\\(\\) should return string but returns Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\Location\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RegistrationAuthorityCredentials.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Value\\\\RegistrationAuthorityCredentials\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RegistrationAuthorityCredentials.php + + - + message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php + + - + message: "#^Cannot access offset 'command' on mixed\\.$#" + count: 3 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php + + - + message: "#^Cannot access offset 'name' on mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php + + - + message: "#^Cannot access offset 'payload' on mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php + + - + message: "#^Cannot access offset 'uuid' on mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php + + - + message: "#^Cannot cast mixed to string\\.$#" + count: 2 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Command\\\\AbstractCommand\\:\\:\\$UUID \\(string\\) does not accept mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php + + - + message: "#^Cannot access property \\$meta on mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Request/MetadataParamConverter.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Response\\\\JsonAuthorizationResponse\\:\\:__construct\\(\\) has parameter \\$errors with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonAuthorizationResponse.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Response\\\\JsonCollectionResponse\\:\\:__construct\\(\\) has parameter \\$collection with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonCollectionResponse.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Response\\\\JsonCollectionResponse\\:\\:__construct\\(\\) has parameter \\$filters with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonCollectionResponse.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Response\\\\JsonCollectionResponse\\:\\:__construct\\(\\) has parameter \\$headers with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonCollectionResponse.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Response\\\\JsonCollectionResponse\\:\\:fromPaginator\\(\\) has parameter \\$filters with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonCollectionResponse.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Response\\\\JsonCollectionResponse\\:\\:fromPaginator\\(\\) has parameter \\$paginator with generic class Pagerfanta\\\\Pagerfanta but does not specify its types\\: T$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonCollectionResponse.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Response\\\\JsonNotFoundResponse\\:\\:__construct\\(\\) has parameter \\$headers with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonNotFoundResponse.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionAuthorizationOptionTest\\:\\:institutionHasInstitutionProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Service\\\\DeprovisionService\\:\\:readUserData\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Service/DeprovisionService.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionAuthorizationOptionTest\\:\\:institutionSetComparisonProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Service\\\\DeprovisionServiceInterface\\:\\:readUserData\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Service/DeprovisionServiceInterface.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionAuthorizationOptionTest\\:\\:institution_option_instances_can_be_compared\\(\\) has parameter \\$configurationA with no value type specified in iterable type array\\.$#" + message: "#^Cannot call method getValue\\(\\) on Doctrine\\\\ORM\\\\Query\\\\Parameter\\|null\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Filter/InstitutionAuthorizationRepositoryFilterTest.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionAuthorizationOptionTest\\:\\:institution_option_instances_can_be_compared\\(\\) has parameter \\$configurationB with no value type specified in iterable type array\\.$#" + message: "#^Cannot call method getInstitution\\(\\) on mixed\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationContextServiceTest.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionAuthorizationOptionTest\\:\\:invalidConstructorArgumentsProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Configuration\\\\Service\\\\InstitutionAuthorizationServiceTest\\:\\:buildAuthorizations\\(\\) has parameter \\$expectedInstitutions with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationServiceTest.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionAuthorizationOptionTest\\:\\:invalid_types_are_rejected_during_construction\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Doctrine\\\\Type\\\\RecoveryTokenStatusTypeTest\\:\\:invalidDatabaseValues\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RecoveryTokenStatusTypeTest.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionAuthorizationOptionTest\\:\\:the_has_institution_method_should_check_for_institutions\\(\\) has parameter \\$institutionList with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Doctrine\\\\Type\\\\RecoveryTokenStatusTypeTest\\:\\:invalidPhpValues\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RecoveryTokenStatusTypeTest.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionConfigurationIdTest\\:\\:an_institution_configuration_id_cannot_be_created_from_something_other_than_a_string\\(\\) has parameter \\$nonStringOrEmptyString with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Doctrine\\\\Type\\\\RecoveryTokenStatusTypeTest\\:\\:validDatabaseValues\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionConfigurationIdTest.php + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RecoveryTokenStatusTypeTest.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionConfigurationIdTest\\:\\:nonStringOrEmptyStringProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Doctrine\\\\Type\\\\RecoveryTokenStatusTypeTest\\:\\:validPhpValues\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionConfigurationIdTest.php + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RecoveryTokenStatusTypeTest.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionRoleTest\\:\\:institutionTypeProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$other of method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Value\\\\RecoveryTokenStatus\\:\\:equals\\(\\) expects Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Value\\\\RecoveryTokenStatus, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionRoleTest.php + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RecoveryTokenStatusTypeTest.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionRoleTest\\:\\:invalidConstructorArgumentsProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Cannot call method equals\\(\\) on mixed\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionRoleTest.php + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SecondFactorStatusTypeTest.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionSetTest\\:\\:dirtyInstitutionListProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Doctrine\\\\Type\\\\SecondFactorStatusTypeTest\\:\\:invalidDatabaseValues\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionSetTest.php + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SecondFactorStatusTypeTest.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionSetTest\\:\\:factory_method_can_build_from_array_of_string_and_rejects_invalid_types\\(\\) has parameter \\$invalid with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Doctrine\\\\Type\\\\SecondFactorStatusTypeTest\\:\\:invalidPhpValues\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionSetTest.php + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SecondFactorStatusTypeTest.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\InstitutionTest\\:\\:nonStringOrNonEmptyStringProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Doctrine\\\\Type\\\\SecondFactorStatusTypeTest\\:\\:validDatabaseValues\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionTest.php + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SecondFactorStatusTypeTest.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\RaLocationIdTest\\:\\:nonStringOrEmptyStringProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Doctrine\\\\Type\\\\SecondFactorStatusTypeTest\\:\\:validPhpValues\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SecondFactorStatusTypeTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Endpoint\\\\ConfiguredInstitutionControllerTest\\:\\:invalidHttpMethodProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Endpoint\\\\SraaControllerTest\\:\\:invalidHttpMethodProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Identity\\\\Projector\\\\AuditLogProjectorTest\\:\\:auditable_events\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/AuditLogProjectorTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Request\\\\CommandParamConverterTest\\:\\:convertibleCommandNames\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Request\\\\CommandParamConverterTest\\:\\:invalidCommandJsonStructures\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php + + - + message: "#^Cannot call method equals\\(\\) on mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php + + - + message: "#^Property Symfony\\\\Component\\\\HttpFoundation\\\\Request\\:\\:\\$query \\(Symfony\\\\Component\\\\HttpFoundation\\\\InputBag\\\\) does not accept Mockery\\\\MockInterface&Symfony\\\\Component\\\\HttpFoundation\\\\ParameterBag\\.$#" + count: 2 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Configuration\\\\Command\\\\ReconfigureInstitutionConfigurationOptionsCommand\\:\\:\\$allowedSecondFactors type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/ReconfigureInstitutionConfigurationOptionsCommand.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Configuration\\\\Command\\\\ReconfigureInstitutionConfigurationOptionsCommand\\:\\:\\$selectRaaOption type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/ReconfigureInstitutionConfigurationOptionsCommand.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Configuration\\\\Command\\\\ReconfigureInstitutionConfigurationOptionsCommand\\:\\:\\$useRaOption type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/ReconfigureInstitutionConfigurationOptionsCommand.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Configuration\\\\Command\\\\ReconfigureInstitutionConfigurationOptionsCommand\\:\\:\\$useRaaOption type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/ReconfigureInstitutionConfigurationOptionsCommand.php + + - + message: "#^Cannot call method getInstitution\\(\\) on mixed\\.$#" + count: 3 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Processor/InstitutionConfigurationProcessor.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\EventHandling\\\\BufferedEventBus\\:\\:\\$buffer \\(array\\\\) does not accept array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php + + - + message: "#^Strict comparison using \\!\\=\\= between array\\{\\} and array\\{\\} will always evaluate to false\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Command\\\\AddToWhitelistCommand\\:\\:\\$institutionsToBeAdded type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AddToWhitelistCommand.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Command\\\\RemoveFromWhitelistCommand\\:\\:\\$institutionsToBeRemoved type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RemoveFromWhitelistCommand.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Command\\\\ReplaceWhitelistCommand\\:\\:\\$institutions type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ReplaceWhitelistCommand.php + + - + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Command\\\\SaveVettingTypeHintCommand\\:\\:\\$hints type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SaveVettingTypeHintCommand.php + + - + message: "#^Cannot call method getType\\(\\) on Surfnet\\\\Stepup\\\\Identity\\\\Entity\\\\VettedSecondFactor\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/IdentityCommandHandler.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\CommandHandler\\\\WhitelistCommandHandler\\:\\:mapArrayToInstitutions\\(\\) has parameter \\$institutions with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/WhitelistCommandHandler.php + + - + message: "#^Cannot access property \\$htmlContent on Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Configuration\\\\Dto\\\\EmailTemplate\\|null\\.$#" + count: 3 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/EmailVerificationMailService.php + + - + message: "#^Cannot access property \\$htmlContent on Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Configuration\\\\Dto\\\\EmailTemplate\\|null\\.$#" + count: 6 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RecoveryTokenMailService.php + + - + message: "#^Cannot access property \\$commonName on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\Identity\\|null\\.$#" + count: 3 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php + + - + message: "#^Cannot access property \\$email on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\Identity\\|null\\.$#" + count: 3 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php + + - + message: "#^Cannot access property \\$htmlContent on Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Configuration\\\\Dto\\\\EmailTemplate\\|null\\.$#" + count: 6 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php + + - + message: "#^Cannot access property \\$institution on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\Identity\\|null\\.$#" + count: 2 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php + + - + message: "#^Cannot access property \\$preferredLocale on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\Identity\\|null\\.$#" + count: 3 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php + + - + message: "#^Cannot access property \\$registrationCode on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\VerifiedSecondFactor\\|null\\.$#" + count: 3 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php + + - + message: "#^Cannot access property \\$registrationRequestedAt on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\VerifiedSecondFactor\\|null\\.$#" + count: 3 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php + + - + message: "#^Cannot access property \\$showRaaContactInformationOption on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Entity\\\\InstitutionConfigurationOptions\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php + + - + message: "#^Cannot access property \\$useRaLocationsOption on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Entity\\\\InstitutionConfigurationOptions\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Service\\\\RegistrationMailService\\:\\:sendRegistrationEmailWithRaLocations\\(\\) has parameter \\$raLocations with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Service\\\\RegistrationMailService\\:\\:sendRegistrationEmailWithRas\\(\\) has parameter \\$ras with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php + + - + message: "#^Parameter \\#6 \\$raLocations of method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Service\\\\RegistrationMailService\\:\\:sendRegistrationEmailWithRaLocations\\(\\) expects array, array\\\\|null given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php + + - + message: "#^Cannot access property \\$htmlContent on Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Configuration\\\\Dto\\\\EmailTemplate\\|null\\.$#" + count: 2 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorRevocationMailService.php + + - + message: "#^Cannot access property \\$htmlContent on Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Configuration\\\\Dto\\\\EmailTemplate\\|null\\.$#" + count: 3 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorVettedMailService.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Service\\\\VettingTypeHintService\\:\\:__construct\\(\\) has parameter \\$locales with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/VettingTypeHintService.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Service\\\\VettingTypeHintService\\:\\:collectionFrom\\(\\) has parameter \\$hints with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/VettingTypeHintService.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Pipeline\\\\AuthorizingStage\\:\\:clientHasAtLeastOneRole\\(\\) has parameter \\$rolesToCheck with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/AuthorizingStage.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Pipeline\\\\Exception\\\\InvalidCommandException\\:\\:__construct\\(\\) has parameter \\$errors with no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Exception/InvalidCommandException.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Pipeline\\\\Exception\\\\InvalidCommandException\\:\\:mapViolationsToErrorStrings\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Exception/InvalidCommandException.php + + - + message: "#^Cannot call method getIdentityId\\(\\) on Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\SensitiveData\\\\EventSourcing\\\\SensitiveDataMessage\\|null\\.$#" + count: 2 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessageStream.php + + - + message: "#^Cannot call method getSensitiveData\\(\\) on Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\SensitiveData\\\\EventSourcing\\\\SensitiveDataMessage\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessageStream.php + + - + message: "#^Cannot call method getPayload\\(\\) on mixed\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventStore/SensitiveDataEventStoreDecorator.php + + - + message: "#^Parameter \\#1 \\$identityId of class Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\SensitiveData\\\\EventSourcing\\\\SensitiveDataMessage constructor expects Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\IdentityId, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventStore/SensitiveDataEventStoreDecorator.php + + - + message: "#^Parameter \\#1 \\$identityId of method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\SensitiveData\\\\Repository\\\\SensitiveDataMessageRepository\\:\\:findByIdentityId\\(\\) expects Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\IdentityId, mixed given\\.$#" + count: 2 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventStore/SensitiveDataEventStoreDecorator.php + + - + message: "#^Cannot cast mixed to int\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/Repository/SensitiveDataMessageRepository.php + + - + message: "#^Parameter \\#1 \\$data of static method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\SensitiveData\\\\SensitiveData\\:\\:deserialize\\(\\) expects array, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/Repository/SensitiveDataMessageRepository.php + + - + message: "#^Parameter \\#1 \\$json of static method Surfnet\\\\Stepup\\\\Helper\\\\JsonHelper\\:\\:decode\\(\\) expects string, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/Repository/SensitiveDataMessageRepository.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\SensitiveData\\\\RightToObtainDataInterface\\:\\:getAllowlist\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/RightToObtainDataInterface.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\SensitiveData\\\\RightToObtainDataInterface\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationIdTest.php + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/RightToObtainDataInterface.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\RaLocationListTest\\:\\:getRaLocationsArray\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\SensitiveData\\\\SensitiveData\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationListTest.php + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/SensitiveData.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Configuration\\\\Value\\\\RaLocationNameTest\\:\\:nonStringOrEmptyStringProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\SensitiveData\\\\SensitiveData\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Configuration/Value/RaLocationNameTest.php + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/SensitiveData.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Helper\\\\JsonHelperTest\\:\\:nonStringProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$type of static method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\RecoveryTokenIdentifierFactory\\:\\:forType\\(\\) expects Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\RecoveryTokenType, Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\RecoveryTokenType\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Helper/JsonHelperTest.php + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/SensitiveData.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Helper\\\\UserDataFilterTest\\:\\:test_filtering_is_applied_with_expected_result\\(\\) has parameter \\$expectation with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$type of static method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SecondFactorIdentifierFactory\\:\\:forType\\(\\) expects Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType, Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Helper/UserDataFilterTest.php + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/SensitiveData.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Collection\\\\InstitutionCollectionTest\\:\\:getInstitutions\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$type of static method Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\SecondFactorIdentifierFactory\\:\\:unknownForType\\(\\) expects Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType, Surfnet\\\\StepupBundle\\\\Value\\\\SecondFactorType\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Identity/Collection/InstitutionCollectionTest.php + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/SensitiveData.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Entity\\\\ConfigurableSettingsTest\\:\\:localeVerifications\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Configuration\\\\CommandHandler\\\\ConfigurationCommandHandlerTest\\:\\:createConfigurationUpdatedEvents\\(\\) has parameter \\$newConfiguration with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Identity/Entity/ConfigurableSettingsTest.php + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Event\\\\EventSerializationAndDeserializationTest\\:\\:eventProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Configuration\\\\CommandHandler\\\\ConfigurationCommandHandlerTest\\:\\:createConfigurationUpdatedEvents\\(\\) has parameter \\$oldConfiguration with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Identity/Event/EventSerializationAndDeserializationTest.php + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Event\\\\EventSerializationAndDeserializationTest\\:\\:serializedDataProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Configuration\\\\CommandHandler\\\\ConfigurationCommandHandlerTest\\:\\:createConfigurationUpdatedEvents\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Identity/Event/EventSerializationAndDeserializationTest.php + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Event\\\\WhitelistEventSerializationAndDeserializationTest\\:\\:eventProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Configuration\\\\CommandHandler\\\\ConfigurationCommandHandlerTest\\:\\:createUpdateCommand\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Identity/Event/WhitelistEventSerializationAndDeserializationTest.php + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\CommonNameTest\\:\\:invalidArgumentProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Identity\\\\CommandHandler\\\\IdentityCommandHandlerMoveTokenTest\\:\\:setUpInstitutionConfiguration\\(\\) has parameter \\$allowedTokenTypes with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Identity/Value/CommonNameTest.php + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerMoveTokenTest.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\DocumentNumberTest\\:\\:invalidArgumentProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#2 \\$nameId of class Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorVettedEvent constructor expects Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\NameId, Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\NameId\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Identity/Value/DocumentNumberTest.php + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerSelfAssertedTokensTest.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\EmailTest\\:\\:invalidArgumentProvider\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/Stepup/Tests/Identity/Value/EmailTest.php + message: "#^Parameter \\#2 \\$nameId of class Surfnet\\\\Stepup\\\\Identity\\\\Event\\\\SecondFactorVettedWithoutTokenProofOfPossession constructor expects Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\NameId, Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\NameId\\|null given\\.$#" + count: 4 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerSelfAssertedTokensTest.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\EmailTest\\:\\:invalidEmailProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Cannot call method getPayload\\(\\) on mixed\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Identity/Value/EmailTest.php + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityIdEnforcingEventStoreDecorator.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\GssfIdTest\\:\\:a_gssf_id_cannot_be_created_with_anything_but_a_nonempty_string\\(\\) has parameter \\$invalidValue with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Identity\\\\CommandHandler\\\\WhitelistCommandHandlerTest\\:\\:mapStringValuesToInstitutions\\(\\) has parameter \\$institutions with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Identity/Value/GssfIdTest.php + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/WhitelistCommandHandlerTest.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\GssfIdTest\\:\\:invalidValueProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Identity\\\\CommandHandler\\\\WhitelistCommandHandlerTest\\:\\:mapStringValuesToInstitutions\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Identity/Value/GssfIdTest.php + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/WhitelistCommandHandlerTest.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\InstitutionTest\\:\\:invalidValueProviderInvalidString\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Identity/Value/InstitutionTest.php + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcher.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\PhoneNumberTest\\:\\:a_phone_number_cannot_be_created_with_anything_but_a_nonempty_string\\(\\) has parameter \\$invalidValue with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Mockery\\\\HasInstitutionMatcherTest\\:\\:has_institution_matcher_only_matches_objects_against_a_given_institution\\(\\) has parameter \\$nonObject with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Identity/Value/PhoneNumberTest.php + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcherTest.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\PhoneNumberTest\\:\\:invalidValueProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Mockery\\\\HasInstitutionMatcherTest\\:\\:nonObjectProvider\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Identity/Value/PhoneNumberTest.php + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcherTest.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\StepupProviderTest\\:\\:a_stepup_provider_cannot_be_created_with_anything_but_a_nonempty_string\\(\\) has parameter \\$invalidValue with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Mockery\\\\HasInstitutionMatcherTest\\:\\:nonStringProvider\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Identity/Value/StepupProviderTest.php + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcherTest.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\StepupProviderTest\\:\\:invalidValueProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Pipeline\\\\AuthorizingStageTest\\:\\:interfaceToRoleMappingProvider\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Identity/Value/StepupProviderTest.php + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/AuthorizingStageTest.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\TimeFrameTest\\:\\:invalidValueProviderInt\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Cannot access property \\$sensitiveData on mixed\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Identity/Value/TimeFrameTest.php + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/EventSourcing/SensitiveDataMessageStreamTest.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\YubikeyPublicIdTest\\:\\:invalidFormatProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\SensitiveData\\\\EventSourcing\\\\SensitiveDataMessageStreamTest\\:\\:apply\\(\\) has parameter \\$domainMessages with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Identity/Value/YubikeyPublicIdTest.php + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/EventSourcing/SensitiveDataMessageStreamTest.php - - message: "#^Method Surfnet\\\\Stepup\\\\Tests\\\\Identity\\\\Value\\\\YubikeyPublicIdTest\\:\\:validFormatProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\SensitiveData\\\\EventSourcing\\\\SensitiveDataMessageStreamTest\\:\\:apply\\(\\) has parameter \\$sensitiveDataMessages with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/Stepup/Tests/Identity/Value/YubikeyPublicIdTest.php + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/EventSourcing/SensitiveDataMessageStreamTest.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Authorization\\\\Value\\\\AuthorizationDecision\\:\\:__construct\\(\\) has parameter \\$errorMessages with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\SensitiveData\\\\SensitiveDataTest\\:\\:it_serialises_and_deserialises\\(\\) has parameter \\$getterExpectations with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/AuthorizationDecision.php + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/SensitiveDataTest.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Authorization\\\\Value\\\\AuthorizationDecision\\:\\:denied\\(\\) has parameter \\$messages with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\SensitiveData\\\\SensitiveDataTest\\:\\:sensitiveDataToSerialise\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/AuthorizationDecision.php + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/SensitiveDataTest.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Authorization\\\\Value\\\\AuthorizationDecision\\:\\:getErrorMessages\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$data of static method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\SensitiveData\\\\SensitiveData\\:\\:deserialize\\(\\) expects array, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/AuthorizationDecision.php + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/SensitiveDataTest.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Authorization\\\\Value\\\\InstitutionRoleSet\\:\\:__construct\\(\\) has parameter \\$institutionRoles with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Value\\\\InstitutionTest\\:\\:nonStringOrNonEmptyStringProvider\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionRoleSet.php + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Value/InstitutionTest.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Authorization\\\\Value\\\\InstitutionRoleSet\\:\\:getRoles\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\GatewayBundle\\\\Entity\\\\SamlEntity\\:\\:createIdentityProvider\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionRoleSet.php + path: ../../src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntity.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Authorization\\\\Value\\\\InstitutionRoleSetInterface\\:\\:getRoles\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\GatewayBundle\\\\Entity\\\\SamlEntity\\:\\:createServiceProvider\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Authorization/Value/InstitutionRoleSetInterface.php + path: ../../src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntity.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Entity\\\\ConfiguredInstitution\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\GatewayBundle\\\\Entity\\\\SamlEntityRepository\\:\\:replaceAllIdps\\(\\) has parameter \\$newSamlEntities with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/ConfiguredInstitution.php + path: ../../src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntityRepository.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Entity\\\\RaLocation\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\GatewayBundle\\\\Entity\\\\SamlEntityRepository\\:\\:replaceAllOfType\\(\\) has parameter \\$newSamlEntities with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/RaLocation.php + path: ../../src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntityRepository.php - - message: "#^Parameter \\#1 \\$allowedSecondFactors of static method Surfnet\\\\Stepup\\\\Configuration\\\\Value\\\\AllowedSecondFactorList\\:\\:ofTypes\\(\\) expects array, Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Entity\\\\AllowedSecondFactor given\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\GatewayBundle\\\\Entity\\\\SamlEntityRepository\\:\\:replaceAllSps\\(\\) has parameter \\$newSamlEntities with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/AllowedSecondFactorMap.php + path: ../../src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntityRepository.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Service\\\\InstitutionAuthorizationOptionMap\\:\\:fromInstitutionAuthorizations\\(\\) has parameter \\$institutionAuthorizations with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionAuthorizationOptionMap.php + message: "#^Parameter \\#1 \\$vettingType of method Surfnet\\\\StepupMiddleware\\\\GatewayBundle\\\\Projector\\\\SecondFactorProjector\\:\\:isIdentityVetted\\(\\) expects Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\VettingType, Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\VettingType\\|null given\\.$#" + count: 2 + path: ../../src/Surfnet/StepupMiddleware/GatewayBundle/Projector/SecondFactorProjector.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Doctrine\\\\Type\\\\DateTimeType\\:\\:getSQLDeclaration\\(\\) has parameter \\$column with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DateTimeType.php + message: "#^Parameter \\#1 \\$institution of static method Surfnet\\\\StepupMiddleware\\\\GatewayBundle\\\\Entity\\\\WhitelistEntry\\:\\:createFrom\\(\\) expects Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\Institution, mixed given\\.$#" + count: 3 + path: ../../src/Surfnet/StepupMiddleware/GatewayBundle/Projector/WhitelistProjector.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Doctrine\\\\Type\\\\SecondFactorStatusType\\:\\:getSQLDeclaration\\(\\) has parameter \\$column with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$institutions of method Surfnet\\\\StepupMiddleware\\\\GatewayBundle\\\\Repository\\\\WhitelistEntryRepository\\:\\:findEntriesByInstitutions\\(\\) expects array\\, array\\, mixed\\> given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorStatusType.php + path: ../../src/Surfnet/StepupMiddleware/GatewayBundle/Projector/WhitelistProjector.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\EventListener\\\\ExceptionListener\\:\\:createJsonErrorResponse\\(\\) has parameter \\$headers with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\GatewayBundle\\\\Repository\\\\WhitelistEntryRepository\\:\\:findEntriesByInstitutions\\(\\) should return array\\ but returns mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/EventListener/ExceptionListener.php + path: ../../src/Surfnet/StepupMiddleware/GatewayBundle/Repository/WhitelistEntryRepository.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Exception\\\\BadApiRequestException\\:\\:__construct\\(\\) has parameter \\$errors with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Configuration\\\\Entity\\\\EmailTemplate\\:\\:getId\\(\\) should return string but returns string\\|null\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadApiRequestException.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Entity/EmailTemplate.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Exception\\\\BadCommandRequestException\\:\\:__construct\\(\\) has parameter \\$errors with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Configuration\\\\Repository\\\\EmailTemplateRepository\\:\\:findOneByName\\(\\) should return Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Configuration\\\\Entity\\\\EmailTemplate\\|null but returns mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Exception/BadCommandRequestException.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Configuration/Repository/EmailTemplateRepository.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\AuditLogEntry\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/AuditLogEntry.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\Identity\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Cannot access offset 'allow_self_asserted…' on mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/Identity.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\IdentitySelfAssertedTokenOptions\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Cannot access offset 'allowed_second…' on mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/IdentitySelfAssertedTokenOptions.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\InstitutionListing\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Cannot access offset 'number_of_tokens…' on mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/InstitutionListing.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\RaCandidate\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Cannot access offset 'select_raa' on mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaCandidate.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\RaListing\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Cannot access offset 'self_vet' on mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaListing.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\RaSecondFactor\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Cannot access offset 'show_raa_contact…' on mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaSecondFactor.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\RecoveryToken\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Cannot access offset 'sso_on_2fa' on mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RecoveryToken.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\UnverifiedSecondFactor\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Cannot access offset 'use_ra' on mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/UnverifiedSecondFactor.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\VerifiedSecondFactor\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Cannot access offset 'use_ra_locations' on mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VerifiedSecondFactor.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\VettedSecondFactor\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Cannot access offset 'use_raa' on mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettedSecondFactor.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\VettingTypeHint\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Cannot access offset 'verify_email' on mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/VettingTypeHint.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\AuditLogRepository\\:\\:saveAll\\(\\) has parameter \\$entries with no value type specified in iterable type array\\.$#" + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Configuration\\\\Command\\\\ReconfigureInstitutionConfigurationOptionsCommand\\:\\:\\$allowedSecondFactors \\(array\\) does not accept mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuditLogRepository.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\AuthorizationRepository\\:\\:getAllowedIdentityRoles\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Configuration\\\\Command\\\\ReconfigureInstitutionConfigurationOptionsCommand\\:\\:\\$institution \\(string\\) does not accept mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\AuthorizationRepository\\:\\:getAllowedInstitutionRoles\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Configuration\\\\Command\\\\ReconfigureInstitutionConfigurationOptionsCommand\\:\\:\\$numberOfTokensPerIdentityOption \\(int\\) does not accept mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuthorizationRepository.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\RaCandidateRepository\\:\\:findOneByIdentityId\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Configuration\\\\Command\\\\ReconfigureInstitutionConfigurationOptionsCommand\\:\\:\\$selectRaaOption \\(array\\|null\\) does not accept mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaCandidateRepository.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\RaListingRepository\\:\\:findByIdentityId\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Configuration\\\\Command\\\\ReconfigureInstitutionConfigurationOptionsCommand\\:\\:\\$selfAssertedTokensOption \\(bool\\|null\\) does not accept mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\RaListingRepository\\:\\:listRasFor\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#" + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Configuration\\\\Command\\\\ReconfigureInstitutionConfigurationOptionsCommand\\:\\:\\$selfVetOption \\(bool\\|null\\) does not accept mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\SraaRepository\\:\\:saveAll\\(\\) has parameter \\$sraaList with no value type specified in iterable type array\\.$#" + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Configuration\\\\Command\\\\ReconfigureInstitutionConfigurationOptionsCommand\\:\\:\\$showRaaContactInformationOption \\(bool\\) does not accept mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\WhitelistEntryRepository\\:\\:findEntriesByInstitutions\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Configuration\\\\Command\\\\ReconfigureInstitutionConfigurationOptionsCommand\\:\\:\\$ssoOn2faOption \\(bool\\|null\\) does not accept mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\WhitelistEntryRepository\\:\\:getAll\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#" + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Configuration\\\\Command\\\\ReconfigureInstitutionConfigurationOptionsCommand\\:\\:\\$useRaLocationsOption \\(bool\\) does not accept mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Service\\\\AbstractSearchService\\:\\:createPaginatorFrom\\(\\) return type with generic class Pagerfanta\\\\Pagerfanta does not specify its types\\: T$#" + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Configuration\\\\Command\\\\ReconfigureInstitutionConfigurationOptionsCommand\\:\\:\\$useRaOption \\(array\\|null\\) does not accept mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/AbstractSearchService.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Service\\\\RaCandidateService\\:\\:findOneByIdentityId\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Configuration\\\\Command\\\\ReconfigureInstitutionConfigurationOptionsCommand\\:\\:\\$useRaaOption \\(array\\|null\\) does not accept mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaCandidateService.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Service\\\\RaCandidateService\\:\\:getFilterOptions\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Configuration\\\\Command\\\\ReconfigureInstitutionConfigurationOptionsCommand\\:\\:\\$verifyEmailOption \\(bool\\) does not accept mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaCandidateService.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Service\\\\RaCandidateService\\:\\:setUseRaInstitutionsOnRaCandidate\\(\\) has parameter \\$raCandidate with no value type specified in iterable type array\\.$#" + message: "#^Cannot access offset 'institution' on mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaCandidateService.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Service\\\\RaCandidateService\\:\\:setUseRaInstitutionsOnRaCandidate\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Cannot access offset 'name_id' on mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaCandidateService.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Service\\\\RaSecondFactorService\\:\\:getFilterOptions\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$institution of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\Institution constructor expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaSecondFactorService.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Service\\\\RaSecondFactorService\\:\\:searchUnpaginated\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$value of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\NameId constructor expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaSecondFactorService.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Service\\\\RecoveryTokenService\\:\\:getFilterOptions\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Command\\\\ForgetIdentityCommand\\:\\:\\$institution \\(string\\) does not accept mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RecoveryTokenService.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Specification\\\\SpecificationInterface\\:\\:apply\\(\\) has parameter \\$entityRepository with generic class Doctrine\\\\ORM\\\\EntityRepository but does not specify its types\\: TEntityClass$#" + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Command\\\\ForgetIdentityCommand\\:\\:\\$nameId \\(string\\) does not accept mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Specification/SpecificationInterface.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Value\\\\AuthorizedInstitutionCollection\\:\\:getAuthorizations\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Cannot access offset 'institutions' on mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorizedInstitutionCollection.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Value\\\\Profile\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Controller\\\\WhitelistController\\:\\:getInstitutionsFromBody\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/Profile.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Value\\\\RegistrationAuthorityCredentials\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Tests\\\\Controller\\\\ConfigurationControllerTest\\:\\:invalidHttpMethodProvider\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RegistrationAuthorityCredentials.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Response\\\\JsonAuthorizationResponse\\:\\:__construct\\(\\) has parameter \\$errors with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Tests\\\\Controller\\\\InstitutionConfigurationControllerTest\\:\\:invalidHttpMethodProvider\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonAuthorizationResponse.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Response\\\\JsonCollectionResponse\\:\\:__construct\\(\\) has parameter \\$collection with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Tests\\\\Validator\\\\ConfigurationValidationTest\\:\\:it_rejects_invalid_configuration\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonCollectionResponse.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ConfigurationValidationTest.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Response\\\\JsonCollectionResponse\\:\\:__construct\\(\\) has parameter \\$filters with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Tests\\\\Validator\\\\ReconfigureInstitutionRequestValidatorTest\\:\\:it_rejects_invalid_configuration\\(\\) has parameter \\$reconfigureRequest with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonCollectionResponse.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ReconfigureInstitutionRequestValidatorTest.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Response\\\\JsonCollectionResponse\\:\\:__construct\\(\\) has parameter \\$headers with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\Assert\\:\\:keysMatch\\(\\) has parameter \\$keys with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonCollectionResponse.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Assert.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Response\\\\JsonCollectionResponse\\:\\:fromPaginator\\(\\) has parameter \\$filters with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\Assert\\:\\:keysMatch\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonCollectionResponse.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Assert.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Response\\\\JsonCollectionResponse\\:\\:fromPaginator\\(\\) has parameter \\$paginator with generic class Pagerfanta\\\\Pagerfanta but does not specify its types\\: T$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\Assert\\:\\:requiredAndOptionalOptions\\(\\) has parameter \\$optional with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonCollectionResponse.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Assert.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Response\\\\JsonNotFoundResponse\\:\\:__construct\\(\\) has parameter \\$headers with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\Assert\\:\\:requiredAndOptionalOptions\\(\\) has parameter \\$required with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Response/JsonNotFoundResponse.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Assert.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Service\\\\DeprovisionService\\:\\:readUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\Assert\\:\\:requiredAndOptionalOptions\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Service/DeprovisionService.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Assert.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Service\\\\DeprovisionServiceInterface\\:\\:readUserData\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ConfigurationStructureValidator\\:\\:validateGatewayConfiguration\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Service/DeprovisionServiceInterface.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationStructureValidator.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Configuration\\\\Service\\\\InstitutionAuthorizationServiceTest\\:\\:buildAuthorizations\\(\\) has parameter \\$expectedInstitutions with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ConfigurationStructureValidator\\:\\:validateRoot\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Configuration/Service/InstitutionAuthorizationServiceTest.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationStructureValidator.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Doctrine\\\\Type\\\\RecoveryTokenStatusTypeTest\\:\\:invalidDatabaseValues\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ConfigurationStructureValidator\\:\\:validateSraaConfiguration\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RecoveryTokenStatusTypeTest.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationStructureValidator.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Doctrine\\\\Type\\\\RecoveryTokenStatusTypeTest\\:\\:invalidPhpValues\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$configuration of method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ConfigurationStructureValidator\\:\\:validateRoot\\(\\) expects array, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RecoveryTokenStatusTypeTest.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationStructureValidator.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Doctrine\\\\Type\\\\RecoveryTokenStatusTypeTest\\:\\:validDatabaseValues\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$path of method Symfony\\\\Component\\\\Validator\\\\Violation\\\\ConstraintViolationBuilderInterface\\:\\:atPath\\(\\) expects string, string\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RecoveryTokenStatusTypeTest.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationStructureValidator.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Doctrine\\\\Type\\\\RecoveryTokenStatusTypeTest\\:\\:validPhpValues\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$rawValue of method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ConfigurationStructureValidator\\:\\:decodeJson\\(\\) expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/RecoveryTokenStatusTypeTest.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationStructureValidator.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Doctrine\\\\Type\\\\SecondFactorStatusTypeTest\\:\\:invalidDatabaseValues\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$identityProviders of method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\GatewayConfigurationValidator\\:\\:validateIdentityProviders\\(\\) expects array\\\\>, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SecondFactorStatusTypeTest.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/GatewayConfigurationValidator.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Doctrine\\\\Type\\\\SecondFactorStatusTypeTest\\:\\:invalidPhpValues\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$serviceProviders of method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\GatewayConfigurationValidator\\:\\:validateServiceProviders\\(\\) expects array\\\\>, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SecondFactorStatusTypeTest.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/GatewayConfigurationValidator.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Doctrine\\\\Type\\\\SecondFactorStatusTypeTest\\:\\:validDatabaseValues\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\IdentityProviderConfigurationValidator\\:\\:validateBooleanValue\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SecondFactorStatusTypeTest.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/IdentityProviderConfigurationValidator.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Doctrine\\\\Type\\\\SecondFactorStatusTypeTest\\:\\:validPhpValues\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\IdentityProviderConfigurationValidator\\:\\:validateLoaDefinition\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/SecondFactorStatusTypeTest.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/IdentityProviderConfigurationValidator.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Endpoint\\\\ConfiguredInstitutionControllerTest\\:\\:invalidHttpMethodProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\IdentityProviderConfigurationValidator\\:\\:validateStringValue\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/IdentityProviderConfigurationValidator.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Endpoint\\\\SraaControllerTest\\:\\:invalidHttpMethodProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ReconfigureInstitutionRequestValidator\\:\\:validateAuthorizationSettings\\(\\) has parameter \\$authorizationSettings with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Identity\\\\Projector\\\\AuditLogProjectorTest\\:\\:auditable_events\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ReconfigureInstitutionRequestValidator\\:\\:validateInstitutionConfigurationOptions\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/AuditLogProjectorTest.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Request\\\\CommandParamConverterTest\\:\\:convertibleCommandNames\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ReconfigureInstitutionRequestValidator\\:\\:validateInstitutionsExist\\(\\) has parameter \\$institutions with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Request\\\\CommandParamConverterTest\\:\\:invalidCommandJsonStructures\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ReconfigureInstitutionRequestValidator\\:\\:validateRoot\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php - - message: "#^Property Symfony\\\\Component\\\\HttpFoundation\\\\Request\\:\\:\\$query \\(Symfony\\\\Component\\\\HttpFoundation\\\\InputBag\\\\) does not accept Mockery\\\\MockInterface&Symfony\\\\Component\\\\HttpFoundation\\\\ParameterBag\\.$#" - count: 2 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php + message: "#^Parameter \\#1 \\$configuration of method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ReconfigureInstitutionRequestValidator\\:\\:validateRoot\\(\\) expects array, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php - - message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Configuration\\\\Command\\\\ReconfigureInstitutionConfigurationOptionsCommand\\:\\:\\$allowedSecondFactors type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$path of method Symfony\\\\Component\\\\Validator\\\\Violation\\\\ConstraintViolationBuilderInterface\\:\\:atPath\\(\\) expects string, string\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/ReconfigureInstitutionConfigurationOptionsCommand.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php - - message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Configuration\\\\Command\\\\ReconfigureInstitutionConfigurationOptionsCommand\\:\\:\\$selectRaaOption type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ServiceProviderConfigurationValidator\\:\\:assertValidInstitutionIdentifiers\\(\\) has parameter \\$spLoaConfiguration with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/ReconfigureInstitutionConfigurationOptionsCommand.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php - - message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Configuration\\\\Command\\\\ReconfigureInstitutionConfigurationOptionsCommand\\:\\:\\$useRaOption type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ServiceProviderConfigurationValidator\\:\\:validateAssertionConsumerUrls\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/ReconfigureInstitutionConfigurationOptionsCommand.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php - - message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Configuration\\\\Command\\\\ReconfigureInstitutionConfigurationOptionsCommand\\:\\:\\$useRaaOption type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ServiceProviderConfigurationValidator\\:\\:validateBooleanValue\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/ReconfigureInstitutionConfigurationOptionsCommand.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php - - message: "#^Strict comparison using \\!\\=\\= between array\\{\\} and array\\{\\} will always evaluate to false\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ServiceProviderConfigurationValidator\\:\\:validateListOfNameIdPatterns\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php - - message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Command\\\\AddToWhitelistCommand\\:\\:\\$institutionsToBeAdded type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ServiceProviderConfigurationValidator\\:\\:validateLoaDefinition\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/AddToWhitelistCommand.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php - - message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Command\\\\RemoveFromWhitelistCommand\\:\\:\\$institutionsToBeRemoved type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ServiceProviderConfigurationValidator\\:\\:validateStringValue\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/RemoveFromWhitelistCommand.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php - - message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Command\\\\ReplaceWhitelistCommand\\:\\:\\$institutions type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ServiceProviderConfigurationValidator\\:\\:validateStringValues\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/ReplaceWhitelistCommand.php + path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php - - message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Command\\\\SaveVettingTypeHintCommand\\:\\:\\$hints type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$actorId of method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Service\\\\BootstrapCommandService\\:\\:enrichEventMetadata\\(\\) expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/SaveVettingTypeHintCommand.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\CommandHandler\\\\WhitelistCommandHandler\\:\\:mapArrayToInstitutions\\(\\) has parameter \\$institutions with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$institution of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\Institution constructor expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/CommandHandler/WhitelistCommandHandler.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Service\\\\RegistrationMailService\\:\\:sendRegistrationEmailWithRaLocations\\(\\) has parameter \\$raLocations with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$institution of method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Service\\\\BootstrapCommandService\\:\\:requiresMailVerification\\(\\) expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Service\\\\RegistrationMailService\\:\\:sendRegistrationEmailWithRas\\(\\) has parameter \\$ras with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$registrationStatus of method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Service\\\\BootstrapCommandService\\:\\:validRegistrationStatus\\(\\) expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Service\\\\VettingTypeHintService\\:\\:__construct\\(\\) has parameter \\$locales with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$tokenType of method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Service\\\\BootstrapCommandService\\:\\:vetSecondFactor\\(\\) expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/VettingTypeHintService.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Service\\\\VettingTypeHintService\\:\\:collectionFrom\\(\\) has parameter \\$hints with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$value of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\NameId constructor expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/VettingTypeHintService.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Pipeline\\\\AuthorizingStage\\:\\:clientHasAtLeastOneRole\\(\\) has parameter \\$rolesToCheck with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#2 \\$actorId of method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Service\\\\BootstrapCommandService\\:\\:vetSecondFactor\\(\\) expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/AuthorizingStage.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Pipeline\\\\Exception\\\\InvalidCommandException\\:\\:__construct\\(\\) has parameter \\$errors with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Exception/InvalidCommandException.php + message: "#^Parameter \\#2 \\$tokenType of method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Service\\\\BootstrapCommandService\\:\\:verifyEmail\\(\\) expects string, mixed given\\.$#" + count: 2 + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Pipeline\\\\Exception\\\\InvalidCommandException\\:\\:mapViolationsToErrorStrings\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/Exception/InvalidCommandException.php + message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, mixed given\\.$#" + count: 9 + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\SensitiveData\\\\RightToObtainDataInterface\\:\\:getAllowlist\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/RightToObtainDataInterface.php + message: "#^Parameter \\#3 \\$tokenType of method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Service\\\\BootstrapCommandService\\:\\:proveGsspPossession\\(\\) expects string, mixed given\\.$#" + count: 3 + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\SensitiveData\\\\RightToObtainDataInterface\\:\\:obtainUserData\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/RightToObtainDataInterface.php + message: "#^Parameter \\#3 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, mixed given\\.$#" + count: 2 + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\SensitiveData\\\\SensitiveData\\:\\:deserialize\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/SensitiveData.php + message: "#^Parameter \\#4 \\$tokenIdentifier of method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Service\\\\BootstrapCommandService\\:\\:proveGsspPossession\\(\\) expects string, mixed given\\.$#" + count: 3 + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\SensitiveData\\\\SensitiveData\\:\\:serialize\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#5 \\$secondFactorIdentifier of method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Service\\\\BootstrapCommandService\\:\\:vetSecondFactor\\(\\) expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/SensitiveData.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Configuration\\\\CommandHandler\\\\ConfigurationCommandHandlerTest\\:\\:createConfigurationUpdatedEvents\\(\\) has parameter \\$newConfiguration with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$actorId of method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Service\\\\BootstrapCommandService\\:\\:enrichEventMetadata\\(\\) expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Configuration\\\\CommandHandler\\\\ConfigurationCommandHandlerTest\\:\\:createConfigurationUpdatedEvents\\(\\) has parameter \\$oldConfiguration with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$institution of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\Institution constructor expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Configuration\\\\CommandHandler\\\\ConfigurationCommandHandlerTest\\:\\:createConfigurationUpdatedEvents\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$value of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\NameId constructor expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Configuration\\\\CommandHandler\\\\ConfigurationCommandHandlerTest\\:\\:createUpdateCommand\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Identity\\\\CommandHandler\\\\IdentityCommandHandlerMoveTokenTest\\:\\:setUpInstitutionConfiguration\\(\\) has parameter \\$allowedTokenTypes with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#3 \\$commonName of method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Service\\\\BootstrapCommandService\\:\\:createIdentity\\(\\) expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerMoveTokenTest.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Identity\\\\CommandHandler\\\\WhitelistCommandHandlerTest\\:\\:mapStringValuesToInstitutions\\(\\) has parameter \\$institutions with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#4 \\$email of method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Service\\\\BootstrapCommandService\\:\\:createIdentity\\(\\) expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/WhitelistCommandHandlerTest.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Identity\\\\CommandHandler\\\\WhitelistCommandHandlerTest\\:\\:mapStringValuesToInstitutions\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#5 \\$preferredLocale of method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Service\\\\BootstrapCommandService\\:\\:createIdentity\\(\\) expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/WhitelistCommandHandlerTest.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Mockery\\\\HasInstitutionMatcherTest\\:\\:has_institution_matcher_only_matches_objects_against_a_given_institution\\(\\) has parameter \\$nonObject with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$institution of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\Institution constructor expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcherTest.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Mockery\\\\HasInstitutionMatcherTest\\:\\:nonObjectProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$value of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\NameId constructor expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcherTest.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Mockery\\\\HasInstitutionMatcherTest\\:\\:nonStringProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Command\\\\BootstrapIdentityWithYubikeySecondFactorCommand\\:\\:\\$commonName \\(string\\) does not accept mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Mockery/HasInstitutionMatcherTest.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Pipeline\\\\AuthorizingStageTest\\:\\:interfaceToRoleMappingProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Command\\\\BootstrapIdentityWithYubikeySecondFactorCommand\\:\\:\\$email \\(string\\) does not accept mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/AuthorizingStageTest.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\SensitiveData\\\\EventSourcing\\\\SensitiveDataMessageStreamTest\\:\\:apply\\(\\) has parameter \\$domainMessages with no value type specified in iterable type array\\.$#" + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Command\\\\BootstrapIdentityWithYubikeySecondFactorCommand\\:\\:\\$institution \\(string\\) does not accept mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/EventSourcing/SensitiveDataMessageStreamTest.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\SensitiveData\\\\EventSourcing\\\\SensitiveDataMessageStreamTest\\:\\:apply\\(\\) has parameter \\$sensitiveDataMessages with no value type specified in iterable type array\\.$#" + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Command\\\\BootstrapIdentityWithYubikeySecondFactorCommand\\:\\:\\$nameId \\(string\\) does not accept mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/EventSourcing/SensitiveDataMessageStreamTest.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\SensitiveData\\\\SensitiveDataTest\\:\\:it_serialises_and_deserialises\\(\\) has parameter \\$getterExpectations with no value type specified in iterable type array\\.$#" + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Command\\\\BootstrapIdentityWithYubikeySecondFactorCommand\\:\\:\\$preferredLocale \\(string\\) does not accept mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/SensitiveDataTest.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\SensitiveData\\\\SensitiveDataTest\\:\\:sensitiveDataToSerialise\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Command\\\\BootstrapIdentityWithYubikeySecondFactorCommand\\:\\:\\$yubikeyPublicId \\(string\\) does not accept mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/SensitiveDataTest.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Value\\\\InstitutionTest\\:\\:an_institution_cannot_be_created_with_anything_but_a_nonempty_string\\(\\) has parameter \\$invalidValue with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$actorId of method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Service\\\\BootstrapCommandService\\:\\:enrichEventMetadata\\(\\) expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Value/InstitutionTest.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapSmsSecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Value\\\\InstitutionTest\\:\\:nonStringOrNonEmptyStringProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$institution of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\Institution constructor expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Value/InstitutionTest.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapSmsSecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\GatewayBundle\\\\Entity\\\\SamlEntity\\:\\:createIdentityProvider\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$institution of method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Service\\\\BootstrapCommandService\\:\\:requiresMailVerification\\(\\) expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntity.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapSmsSecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\GatewayBundle\\\\Entity\\\\SamlEntity\\:\\:createServiceProvider\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$registrationStatus of method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Service\\\\BootstrapCommandService\\:\\:validRegistrationStatus\\(\\) expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntity.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapSmsSecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\GatewayBundle\\\\Entity\\\\SamlEntityRepository\\:\\:replaceAllIdps\\(\\) has parameter \\$newSamlEntities with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$value of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\NameId constructor expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntityRepository.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapSmsSecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\GatewayBundle\\\\Entity\\\\SamlEntityRepository\\:\\:replaceAllOfType\\(\\) has parameter \\$newSamlEntities with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#2 \\$actorId of method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Service\\\\BootstrapCommandService\\:\\:vetSecondFactor\\(\\) expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntityRepository.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapSmsSecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\GatewayBundle\\\\Entity\\\\SamlEntityRepository\\:\\:replaceAllSps\\(\\) has parameter \\$newSamlEntities with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntityRepository.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapSmsSecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Controller\\\\WhitelistController\\:\\:getInstitutionsFromBody\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php + message: "#^Parameter \\#3 \\$phoneNumber of method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Service\\\\BootstrapCommandService\\:\\:provePhonePossession\\(\\) expects string, mixed given\\.$#" + count: 3 + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapSmsSecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Tests\\\\Controller\\\\ConfigurationControllerTest\\:\\:invalidHttpMethodProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#5 \\$secondFactorIdentifier of method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Service\\\\BootstrapCommandService\\:\\:vetSecondFactor\\(\\) expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapSmsSecondFactorCommand.php - - message: "#^Property Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Tests\\\\Controller\\\\ConfigurationControllerTest\\:\\:\\$password type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$actorId of method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Service\\\\BootstrapCommandService\\:\\:enrichEventMetadata\\(\\) expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapYubikeySecondFactorCommand.php - - message: "#^Property Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Tests\\\\Controller\\\\ConfigurationControllerTest\\:\\:\\$passwordRo type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$institution of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\Institution constructor expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapYubikeySecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Tests\\\\Controller\\\\InstitutionConfigurationControllerTest\\:\\:invalidHttpMethodProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$institution of method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Service\\\\BootstrapCommandService\\:\\:requiresMailVerification\\(\\) expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapYubikeySecondFactorCommand.php - - message: "#^Property Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Tests\\\\Controller\\\\InstitutionConfigurationControllerTest\\:\\:\\$password type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$registrationStatus of method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Service\\\\BootstrapCommandService\\:\\:validRegistrationStatus\\(\\) expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapYubikeySecondFactorCommand.php - - message: "#^Property Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Tests\\\\Controller\\\\InstitutionConfigurationControllerTest\\:\\:\\$passwordRo type has no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$value of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\NameId constructor expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapYubikeySecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Tests\\\\Validator\\\\ConfigurationValidationTest\\:\\:it_rejects_invalid_configuration\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#2 \\$actorId of method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Service\\\\BootstrapCommandService\\:\\:vetSecondFactor\\(\\) expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ConfigurationValidationTest.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapYubikeySecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Tests\\\\Validator\\\\ReconfigureInstitutionRequestValidatorTest\\:\\:it_rejects_invalid_configuration\\(\\) has parameter \\$reconfigureRequest with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ReconfigureInstitutionRequestValidatorTest.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapYubikeySecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\Assert\\:\\:keysMatch\\(\\) has parameter \\$keys with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Assert.php + message: "#^Parameter \\#3 \\$yubikeyPublicId of method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Service\\\\BootstrapCommandService\\:\\:proveYubikeyPossession\\(\\) expects string, mixed given\\.$#" + count: 3 + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapYubikeySecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\Assert\\:\\:keysMatch\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#5 \\$secondFactorIdentifier of method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Service\\\\BootstrapCommandService\\:\\:vetSecondFactor\\(\\) expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Assert.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapYubikeySecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\Assert\\:\\:requiredAndOptionalOptions\\(\\) has parameter \\$optional with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$value of static method Assert\\\\Assertion\\:\\:nullOrDate\\(\\) expects string\\|null, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Assert.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/EmailVerifiedSecondFactorRemindersCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\Assert\\:\\:requiredAndOptionalOptions\\(\\) has parameter \\$required with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#2 \\$datetime of static method DateTime\\:\\:createFromFormat\\(\\) expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Assert.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/EmailVerifiedSecondFactorRemindersCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\Assert\\:\\:requiredAndOptionalOptions\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Assert.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/EmailVerifiedSecondFactorRemindersCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ConfigurationStructureValidator\\:\\:validateGatewayConfiguration\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Identity\\\\Command\\\\SendVerifiedSecondFactorRemindersCommand\\:\\:\\$dryRun \\(bool\\) does not accept mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationStructureValidator.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/EmailVerifiedSecondFactorRemindersCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ConfigurationStructureValidator\\:\\:validateRoot\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationStructureValidator.php + message: "#^Cannot access property \\$id on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\Identity\\|null\\.$#" + count: 2 + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ConfigurationStructureValidator\\:\\:validateSraaConfiguration\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Console\\\\Command\\\\MigrateSecondFactorCommand\\:\\:tokenExists\\(\\) has parameter \\$targetSecondFactors with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ConfigurationStructureValidator.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\IdentityProviderConfigurationValidator\\:\\:validateBooleanValue\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/IdentityProviderConfigurationValidator.php + message: "#^Parameter \\#1 \\$identity of method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Service\\\\BootstrapCommandService\\:\\:getVettedSecondFactorsFromIdentity\\(\\) expects Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\Identity, Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\Identity\\|null given\\.$#" + count: 2 + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\IdentityProviderConfigurationValidator\\:\\:validateLoaDefinition\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$institution of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\Institution constructor expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/IdentityProviderConfigurationValidator.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\IdentityProviderConfigurationValidator\\:\\:validateStringValue\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$sourceIdentity of method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Service\\\\BootstrapCommandService\\:\\:migrateVettedSecondFactor\\(\\) expects Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\Identity, Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\Identity\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/IdentityProviderConfigurationValidator.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ReconfigureInstitutionRequestValidator\\:\\:validateAuthorizationSettings\\(\\) has parameter \\$authorizationSettings with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php + message: "#^Parameter \\#1 \\$value of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\NameId constructor expects string, mixed given\\.$#" + count: 2 + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ReconfigureInstitutionRequestValidator\\:\\:validateInstitutionConfigurationOptions\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#2 \\$sourceIdentity of method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Console\\\\Command\\\\MigrateSecondFactorCommand\\:\\:createIdentity\\(\\) expects Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\Identity, Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\Identity\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ReconfigureInstitutionRequestValidator\\:\\:validateInstitutionsExist\\(\\) has parameter \\$institutions with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#2 \\$targetIdentity of method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Service\\\\BootstrapCommandService\\:\\:migrateVettedSecondFactor\\(\\) expects Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\Identity, Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\Identity\\|null given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ReconfigureInstitutionRequestValidator\\:\\:validateRoot\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#4 \\$email of method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Service\\\\BootstrapCommandService\\:\\:createIdentity\\(\\) expects string, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ServiceProviderConfigurationValidator\\:\\:assertValidInstitutionIdentifiers\\(\\) has parameter \\$spLoaConfiguration with no value type specified in iterable type array\\.$#" + message: "#^Cannot cast mixed to int\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplayEventsCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ServiceProviderConfigurationValidator\\:\\:validateAssertionConsumerUrls\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplayEventsCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ServiceProviderConfigurationValidator\\:\\:validateBooleanValue\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$projector of method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Service\\\\TransactionAwareEventDispatcher\\:\\:registerProjector\\(\\) expects Broadway\\\\EventHandling\\\\EventListener, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplaySpecificEventsCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ServiceProviderConfigurationValidator\\:\\:validateListOfNameIdPatterns\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$projectorNames of method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\EventSourcing\\\\ProjectorCollection\\:\\:selectByNames\\(\\) expects array, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplaySpecificEventsCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ServiceProviderConfigurationValidator\\:\\:validateLoaDefinition\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$subset of method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\EventSourcing\\\\EventCollection\\:\\:select\\(\\) expects array, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplaySpecificEventsCommand.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ServiceProviderConfigurationValidator\\:\\:validateStringValue\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" + message: "#^Cannot cast mixed to int\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ManagementBundle\\\\Validator\\\\ServiceProviderConfigurationValidator\\:\\:validateStringValues\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\EventSourcing\\\\DBALEventHydrator\\:\\:deserializeEvent\\(\\) has parameter \\$row with no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ServiceProviderConfigurationValidator.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Console\\\\Command\\\\MigrateSecondFactorCommand\\:\\:tokenExists\\(\\) has parameter \\$targetSecondFactors with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$data of static method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\SensitiveData\\\\SensitiveData\\:\\:deserialize\\(\\) expects array, mixed given\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/MigrateSecondFactorCommand.php + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\EventSourcing\\\\DBALEventHydrator\\:\\:deserializeEvent\\(\\) has parameter \\$row with no value type specified in iterable type array\\.$#" + message: "#^Parameter \\#1 \\$serializedObject of method Broadway\\\\Serializer\\\\SimpleInterfaceSerializer\\:\\:deserialize\\(\\) expects array, mixed given\\.$#" + count: 2 + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php + + - + message: "#^Parameter \\#3 \\$metadata of class Broadway\\\\Domain\\\\DomainMessage constructor expects Broadway\\\\Domain\\\\Metadata, mixed given\\.$#" count: 1 path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php @@ -2010,16 +4395,61 @@ parameters: count: 1 path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Migrations/InstitutionConfiguration/MappedInstitutionConfiguration.php + - + message: "#^Cannot access property \\$id on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\Identity\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/BootstrapCommandService.php + + - + message: "#^Cannot access property \\$institution on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\Identity\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/BootstrapCommandService.php + + - + message: "#^Cannot access property \\$registrationCode on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\VerifiedSecondFactor\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/BootstrapCommandService.php + + - + message: "#^Cannot access property \\$verificationNonce on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\UnverifiedSecondFactor\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/BootstrapCommandService.php + - message: "#^Parameter \\#2 \\$criteria of method Doctrine\\\\DBAL\\\\Connection\\:\\:delete\\(\\) expects array\\, array\\ given\\.$#" count: 2 path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php + - + message: "#^Argument of an invalid type array\\\\|null supplied for foreach, only iterables are supported\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/ReplayingEventDispatcher.php + + - + message: "#^Parameter \\#1 \\$domainMessage of method Broadway\\\\EventHandling\\\\EventListener\\:\\:handle\\(\\) expects Broadway\\\\Domain\\\\DomainMessage, mixed given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/ReplayingEventDispatcher.php + - message: "#^Method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Service\\\\SecondFactorDisplayNameResolverService\\:\\:__construct\\(\\) has parameter \\$secondFactors with no value type specified in iterable type array\\.$#" count: 1 path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/SecondFactorDisplayNameResolverService.php + - + message: "#^Cannot access property \\$htmlContent on Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Configuration\\\\Dto\\\\EmailTemplate\\|null\\.$#" + count: 2 + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php + + - + message: "#^Cannot access property \\$showRaaContactInformationOption on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Entity\\\\InstitutionConfigurationOptions\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php + + - + message: "#^Cannot access property \\$useRaLocationsOption on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Configuration\\\\Entity\\\\InstitutionConfigurationOptions\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php + - message: "#^Method Surfnet\\\\StepupMiddleware\\\\MiddlewareBundle\\\\Tests\\\\EventSourcing\\\\EventCollectionTest\\:\\:an_event_collection_must_be_created_from_an_array_of_non_empty_strings\\(\\) has parameter \\$emptyOrNonString with no value type specified in iterable type array\\.$#" count: 1 diff --git a/docs/postman/2.http b/docs/postman/2.http index 72f042408..e5fb2fcd6 100644 --- a/docs/postman/2.http +++ b/docs/postman/2.http @@ -126,6 +126,7 @@ Content-Type: application/json POST http://middleware.dev.openconext.local/management/whitelist/add Accept: application/json Content-Type: application/json +Authorization: Basic ra ra_secret { "institutions": [ @@ -193,15 +194,16 @@ Content-Type: application/json ### # @name /management/institution-configuration # GET the institution configuration options -GET http://middleware.stepup.example.com/management/institution-configuration? +GET http://middleware.dev.openconext.local/management/institution-configuration? XDEBUG_SESSION_START=PHPSTORM Accept: application/json Content-Type: application/json +Authorization: Basic ra ra_secret ### # @name /management/institution-configuration # POST the institution configuration options to reconfigure -POST http://middleware.stepup.example.com/management/institution-configuration? +POST http://middleware.dev.openconext.local/management/institution-configuration? XDEBUG_SESSION_START=PHPSTORM Accept: application/json Content-Type: application/json diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php index 1b513f315..0b3351fe5 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionAuthorizationOptionTest.php @@ -111,18 +111,6 @@ public function can_be_retrieved_json_serializable_on_empty_set(): void $this->assertEquals(null, $institutionOption->jsonSerialize()); } - /** - * @test - * @group domain - * @dataProvider invalidConstructorArgumentsProvider - */ - public function invalid_types_are_rejected_during_construction(bool|int|array $arguments): void - { - $this->expectException(InvalidArgumentException::class); - - InstitutionAuthorizationOption::fromInstitutionConfig($this->institutionRole, $arguments); - } - /** * @test * @group domain diff --git a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionConfigurationIdTest.php b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionConfigurationIdTest.php index c8220e100..181b6d41e 100644 --- a/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionConfigurationIdTest.php +++ b/src/Surfnet/Stepup/Tests/Configuration/Value/InstitutionConfigurationIdTest.php @@ -48,7 +48,7 @@ public function two_institution_configuration_ids_created_for_the_different_inst * @dataProvider nonStringOrEmptyStringProvider */ public function an_institution_configuration_id_cannot_be_created_from_something_other_than_a_string( - string|int|float|StdClass|array $nonStringOrEmptyString, + string $nonStringOrEmptyString, ): void { $this->expectException(InvalidArgumentException::class); @@ -125,10 +125,6 @@ public function nonStringOrEmptyStringProvider(): array return [ 'empty string' => [''], 'blank string' => [' '], - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/GssfIdTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/GssfIdTest.php index 5e50dff84..9c8fc1eab 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/GssfIdTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/GssfIdTest.php @@ -34,7 +34,7 @@ class GssfIdTest extends UnitTest * @dataProvider invalidValueProvider */ public function a_gssf_id_cannot_be_created_with_anything_but_a_nonempty_string( - string|int|float|StdClass|array $invalidValue, + string $invalidValue, ): void { $this->expectException(InvalidArgumentException::class); @@ -65,10 +65,6 @@ public function invalidValueProvider(): array return [ 'empty string' => [''], 'blank string' => [' '], - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/PhoneNumberTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/PhoneNumberTest.php index d5aca4494..9b969f12e 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/PhoneNumberTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/PhoneNumberTest.php @@ -34,7 +34,7 @@ class PhoneNumberTest extends UnitTest * @dataProvider invalidValueProvider */ public function a_phone_number_cannot_be_created_with_anything_but_a_nonempty_string( - string|int|float|StdClass|array $invalidValue, + string $invalidValue, ): void { $this->expectException(InvalidArgumentException::class); @@ -65,10 +65,6 @@ public function invalidValueProvider(): array return [ 'empty string' => [''], 'blank string' => [' '], - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/Stepup/Tests/Identity/Value/StepupProviderTest.php b/src/Surfnet/Stepup/Tests/Identity/Value/StepupProviderTest.php index fa53c77ac..f89f665fe 100644 --- a/src/Surfnet/Stepup/Tests/Identity/Value/StepupProviderTest.php +++ b/src/Surfnet/Stepup/Tests/Identity/Value/StepupProviderTest.php @@ -34,7 +34,7 @@ class StepupProviderTest extends UnitTest * @dataProvider invalidValueProvider */ public function a_stepup_provider_cannot_be_created_with_anything_but_a_nonempty_string( - string|int|float|StdClass|array $invalidValue, + string $invalidValue, ): void { $this->expectException(InvalidArgumentException::class); @@ -63,10 +63,6 @@ public function invalidValueProvider(): array return [ 'empty string' => [''], 'blank string' => [' '], - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/ConfiguredInstitution.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/ConfiguredInstitution.php index 5f6187205..d1abfdabb 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/ConfiguredInstitution.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/ConfiguredInstitution.php @@ -25,10 +25,6 @@ #[ORM\Entity(repositoryClass: ConfiguredInstitutionRepository::class)] class ConfiguredInstitution { - /** - * - * @var Institution - */ #[ORM\Id] #[ORM\Column(type: 'stepup_configuration_institution')] public Institution $institution; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RegistrationAuthorityCredentials.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RegistrationAuthorityCredentials.php index 38dee1844..12892943a 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RegistrationAuthorityCredentials.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RegistrationAuthorityCredentials.php @@ -27,6 +27,7 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Identity; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\RaListing; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Sraa; +use function assert; class RegistrationAuthorityCredentials implements JsonSerializable { @@ -62,6 +63,7 @@ public static function fromSraa(Sraa $sraa, Identity $identity): self public static function fromRaListings(array $raListings): self { $raListingCredentials = current($raListings); + assert($raListingCredentials instanceof RaListing, 'The provided raListings are empty'); $isRa = false; $isRaa = false; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php b/src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php index 74690dc45..0047bb9f0 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php @@ -21,6 +21,7 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; use Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\ParamConverterInterface; use Surfnet\StepupMiddleware\ApiBundle\Exception\BadCommandRequestException; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\AbstractCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; use Symfony\Component\HttpFoundation\Request; @@ -40,6 +41,7 @@ public function apply(Request $request, ParamConverter $configuration): bool str_replace('.', '\\', $commandName[2]), ); + /** @var AbstractCommand $command */ $command = new $commandClassName; $command->UUID = $data['command']['uuid']; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationContextServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationContextServiceTest.php index 1c798a628..0e0aaec99 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationContextServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/AuthorizationContextServiceTest.php @@ -22,6 +22,7 @@ use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use Mockery\MockInterface; use PHPUnit\Framework\TestCase; +use Surfnet\Stepup\Configuration\Value\Institution as StepupConfigurationInstitution; use Surfnet\Stepup\Identity\Collection\InstitutionCollection; use Surfnet\Stepup\Identity\Value\CommonName; use Surfnet\Stepup\Identity\Value\Email; @@ -52,7 +53,7 @@ class AuthorizationContextServiceTest extends TestCase private AuthorizationRepository&MockInterface $authorizationRepository; - private MockInterface|ConfiguredInstitutionRepository $institutionRepo; + private MockInterface&ConfiguredInstitutionRepository $institutionRepo; public function setUp(): void { @@ -174,7 +175,7 @@ public function it_can_build_a_context_with_sraa_actor(): void $configuredInstitutions = []; foreach ($institutions as $institution) { $ci = new ConfiguredInstitution(); - $ci->institution = $institution->getInstitution(); + $ci->institution = new StepupConfigurationInstitution($institution->getInstitution()); $configuredInstitutions[] = $ci; } $this->institutionRepo->shouldReceive('findAll')->andReturn($configuredInstitutions); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php index 96482961e..276a28616 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Authorization/Service/CommandAuthorizationServiceTest.php @@ -78,6 +78,8 @@ use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\VerifyEmailCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\VetSecondFactorCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\Command\FixedUuidStubCommand; +use function is_array; +use function is_string; use function property_exists; class CommandAuthorizationServiceTest extends TestCase @@ -483,18 +485,24 @@ public function all_available_commands_should_be_tested(): void public function availableCommands(): array { $rootPath = realpath(__DIR__ . '/../../../../../../../src'); + assert(is_string($rootPath), 'Root path could not be determined correctly'); $basePath = realPath($rootPath . '/Surfnet/StepupMiddleware/CommandHandlingBundle') . '/*'; $commands = []; // get folders $folders = glob($basePath, GLOB_ONLYDIR); + assert(is_array($folders), 'Unable to grab the CommandHandlingBundle folders'); foreach ($folders as $folder) { $commandPath = $folder . '/Command/*Command.php'; $files = glob($commandPath); if ($files === false) { continue; } + assert( + is_array($files), + sprintf('Unable to grab the files from %s with pattern %s', $folder , $commandPath) + ); foreach ($files as $file) { $className = str_replace($rootPath, '', $file); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DateTimeTypeTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DateTimeTypeTest.php index d0dd1ddaf..4bb52952b 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DateTimeTypeTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Doctrine/Type/DateTimeTypeTest.php @@ -27,6 +27,7 @@ use PHPUnit\Framework\TestCase as UnitTest; use Surfnet\Stepup\DateTime\DateTime; use Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\DateTimeType; +use function assert; class DateTimeTypeTest extends UnitTest { @@ -99,9 +100,9 @@ public function a_string_is_converted_to_the_stepup_datetime_object(): void $databaseValue = '2015-02-17 10:48:22'; $actualDateTime = $dateTime->convertToPHPValue($databaseValue, $this->platform); - $expectedDateTime = new DateTime( - CoreDateTime::createFromFormat('Y-m-d H:i:s', $databaseValue, new DateTimeZone('UTC')), - ); + $coreDateTime = CoreDateTime::createFromFormat('Y-m-d H:i:s', $databaseValue, new DateTimeZone('UTC')); + assert($coreDateTime instanceof CoreDateTime, 'Unable to create a DateTime object'); + $expectedDateTime = new DateTime($coreDateTime); $this->assertInstanceOf(DateTime::class, $actualDateTime); $this->assertEquals($expectedDateTime, $actualDateTime); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php index b587bffb2..ca9b22330 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php @@ -26,6 +26,7 @@ use Symfony\Bundle\FrameworkBundle\KernelBrowser; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; use Symfony\Component\HttpFoundation\Response; +use function is_string; class ConfiguredInstitutionControllerTest extends WebTestCase { @@ -51,8 +52,15 @@ public function setUp(): void self::ensureKernelShutdown(); $this->client = static::createClient(); - $this->databaseTool = static::getContainer()->get(ORMSqliteDatabaseTool::class); - $this->databaseTool->setRegistry(static::getContainer()->get(ManagerRegistry::class)); + $tool = static::getContainer()->get(ORMSqliteDatabaseTool::class); + if (!$tool instanceof ORMSqliteDatabaseTool) { + $this->fail('Unable to grab the ORMSqliteDatabaseTool from the container'); + } + $this->databaseTool = $tool; + $registry = static::getContainer()->get(ManagerRegistry::class); + assert($registry instanceof ManagerRegistry, 'ManagerRegistry could not be fetched from the container'); + $this->databaseTool->setRegistry($registry); + $this->databaseTool->setObjectManagerName('middleware'); // Initialises schema. $this->databaseTool->loadFixtures(); @@ -62,6 +70,10 @@ public function setUp(): void $passwordRa = $this->client->getKernel()->getContainer()->getParameter('registration_authority_api_password'); $passwordRo = $this->client->getKernel()->getContainer()->getParameter('readonly_api_password'); + assert(is_string($passwordSs), 'Parameter selfservice_api_password must be of type string'); + assert(is_string($passwordRa), 'Parameter registration_authority_api_password must be of type string'); + assert(is_string($passwordRo), 'Parameter readonly_api_password must be of type string'); + $this->accounts = ['ss' => $passwordSs, 'ra' => $passwordRa, 'apireader' => $passwordRo]; $this->endpoint = '/institution-listing'; @@ -89,7 +101,7 @@ public function only_get_requests_are_accepted(string $invalidHttpMethod): void 'HTTP_ACCEPT' => 'application/json', 'CONTENT_TYPE' => 'application/json', ], - json_encode([]), + '[]', ); $this->assertEquals(Response::HTTP_METHOD_NOT_ALLOWED, $this->client->getResponse()->getStatusCode()); @@ -113,7 +125,7 @@ public function no_access_for_not_allowed_account(string $account): void 'PHP_AUTH_USER' => $account, 'PHP_AUTH_PW' => $this->accounts[$account], ], - json_encode([]), + '[]', ); $this->assertEquals(Response::HTTP_FORBIDDEN, $this->client->getResponse()->getStatusCode()); @@ -136,7 +148,7 @@ public function json_is_returned_from_the_api(): void 'PHP_AUTH_USER' => 'ra', 'PHP_AUTH_PW' => $this->accounts['ra'], ], - json_encode([]), + '[]', ); $this->assertTrue( @@ -165,11 +177,13 @@ public function correct_institutions_are_returned(string $account): void 'PHP_AUTH_USER' => $account, 'PHP_AUTH_PW' => $this->accounts[$account], ], - json_encode([]), + '[]', ); $this->assertEquals(Response::HTTP_OK, $this->client->getResponse()->getStatusCode()); - $response = json_decode($this->client->getResponse()->getContent()); + $content = $this->client->getResponse()->getContent(); + assert(is_string($content), 'Unable to get the Response Content from the browser client'); + $response = json_decode($content); $this->assertEquals([], $response); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php index 56d4d90be..45e2ad78b 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php @@ -27,6 +27,7 @@ use Symfony\Bundle\FrameworkBundle\KernelBrowser; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; use Symfony\Component\HttpFoundation\Response; +use function is_string; class SraaControllerTest extends WebTestCase { @@ -45,7 +46,11 @@ class SraaControllerTest extends WebTestCase public function setUp(): void { - $this->databaseTool = static::getContainer()->get(ORMSqliteDatabaseTool::class); + $tool = static::getContainer()->get(ORMSqliteDatabaseTool::class); + if (!$tool instanceof ORMSqliteDatabaseTool) { + $this->fail('Unable to grab the ORMSqliteDatabaseTool from the container'); + } + $this->databaseTool = $tool; // Initialises schema. $this->databaseTool->loadFixtures([]); // Initialises schema. @@ -55,6 +60,10 @@ public function setUp(): void $passwordRa = $this->client->getKernel()->getContainer()->getParameter('registration_authority_api_password'); $passwordRo = $this->client->getKernel()->getContainer()->getParameter('readonly_api_password'); + assert(is_string($passwordSs)); + assert(is_string($passwordRa)); + assert(is_string($passwordRo)); + $this->accounts = ['ss' => $passwordSs, 'ra' => $passwordRa, 'apireader' => $passwordRo]; $this->endpoint = '/sraa'; @@ -82,7 +91,7 @@ public function only_get_requests_are_accepted(string $invalidHttpMethod): void 'HTTP_ACCEPT' => 'application/json', 'CONTENT_TYPE' => 'application/json', ], - json_encode([]), + '[]', ); $this->assertEquals(Response::HTTP_METHOD_NOT_ALLOWED, $this->client->getResponse()->getStatusCode()); @@ -106,7 +115,7 @@ public function no_access_for_not_allowed_account(string $account): void 'PHP_AUTH_USER' => $account, 'PHP_AUTH_PW' => $this->accounts[$account], ], - json_encode([]), + '[]', ); $this->assertEquals(Response::HTTP_FORBIDDEN, $this->client->getResponse()->getStatusCode()); @@ -129,7 +138,7 @@ public function json_is_returned_from_the_api(): void 'PHP_AUTH_USER' => 'ra', 'PHP_AUTH_PW' => $this->accounts['ra'], ], - json_encode([]), + '[]', ); $this->assertTrue( @@ -158,11 +167,13 @@ public function correct_institutions_are_returned(string $account): void 'PHP_AUTH_USER' => $account, 'PHP_AUTH_PW' => $this->accounts[$account], ], - json_encode([]), + '[]', ); $this->assertEquals(Response::HTTP_OK, $this->client->getResponse()->getStatusCode()); - $response = json_decode($this->client->getResponse()->getContent()); + $content = $this->client->getResponse()->getContent(); + assert(is_string($content), 'Response content must be of type string'); + $response = json_decode($content); $this->assertEquals([], $response); } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/UpdateConfigurationCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/UpdateConfigurationCommand.php index bfff29f15..b123e20e3 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/UpdateConfigurationCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/UpdateConfigurationCommand.php @@ -24,10 +24,12 @@ class UpdateConfigurationCommand extends AbstractCommand implements ManagementExecutable { - /** - * @var string configuration as json as received in the request - * - * @ManagementAssert\HasValidConfigurationStructure - */ - public string $configuration; + + public function __construct( + /** + * @ManagementAssert\HasValidConfigurationStructure + */ + public string $configuration + ) { + } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/ConfigurationCommandHandler.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/ConfigurationCommandHandler.php index 5704c91ce..4b84fdede 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/ConfigurationCommandHandler.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/CommandHandler/ConfigurationCommandHandler.php @@ -34,7 +34,7 @@ public function __construct( public function handleUpdateConfigurationCommand(UpdateConfigurationCommand $command): void { $configuration = $this->getConfiguration(); - if (!$configuration instanceof \Surfnet\Stepup\Configuration\Configuration) { + if (!$configuration instanceof Configuration) { $configuration = Configuration::create(); } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Processor/InstitutionConfigurationProcessor.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Processor/InstitutionConfigurationProcessor.php index bbdeac85a..99d372a7d 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Processor/InstitutionConfigurationProcessor.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Processor/InstitutionConfigurationProcessor.php @@ -27,6 +27,7 @@ use Surfnet\Stepup\Identity\Event\WhitelistReplacedEvent; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Repository\ConfiguredInstitutionRepository; use Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\Command\CreateInstitutionConfigurationCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\Pipeline; use Symfony\Component\DependencyInjection\ContainerInterface; final class InstitutionConfigurationProcessor extends Processor @@ -37,7 +38,7 @@ final class InstitutionConfigurationProcessor extends Processor */ public function __construct( private readonly ConfiguredInstitutionRepository $configuredInstitutionRepository, - private readonly ContainerInterface $container, + private readonly Pipeline $pipeline, ) { } @@ -97,6 +98,6 @@ private function createConfigurationFor(Institution $institution): void $command->UUID = (string)Uuid::uuid4(); $command->institution = $institution->getInstitution(); - $this->container->get('pipeline')->process($command); + $this->pipeline->process($command); } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Resources/config/processors.yml b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Resources/config/processors.yml index 0b3bde601..ef93f73d4 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Resources/config/processors.yml +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Resources/config/processors.yml @@ -100,5 +100,5 @@ services: class: Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\Processor\InstitutionConfigurationProcessor arguments: - "@surfnet_stepup_middleware_api.repository.configured_institution" - - "@service_container" + - "@pipeline" tags: [ { name: event_bus.event_listener, disable_for_replay: true } ] diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php index f09810fae..7e83cc716 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php @@ -23,6 +23,7 @@ use Broadway\EventSourcing\AggregateFactory\PublicConstructorAggregateFactory; use Broadway\EventStore\EventStore as EventStoreInterface; use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; +use RuntimeException; use Surfnet\Stepup\Configuration\Configuration; use Surfnet\Stepup\Configuration\Event\ConfigurationUpdatedEvent; use Surfnet\Stepup\Configuration\Event\EmailTemplatesUpdatedEvent; @@ -34,6 +35,7 @@ use Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\Command\UpdateConfigurationCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\CommandHandler\ConfigurationCommandHandler; use Surfnet\StepupMiddleware\CommandHandlingBundle\Tests\CommandHandlerTest; +use function is_string; final class ConfigurationCommandHandlerTest extends CommandHandlerTest { @@ -147,15 +149,13 @@ protected function createCommandHandler( ); } - /** - * @return UpdateConfigurationCommand - */ private function createUpdateCommand(array $configuration): UpdateConfigurationCommand { - $command = new UpdateConfigurationCommand(); - $command->configuration = json_encode($configuration); - - return $command; + $encodedConfiguration = json_encode($configuration); + if (!is_string($encodedConfiguration)) { + throw new RuntimeException('The configuration could not be json_encoded'); + } + return new UpdateConfigurationCommand($encodedConfiguration); } /** diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/Processor/InstitutionConfigurationProcessorTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/Processor/InstitutionConfigurationProcessorTest.php index 01e34a921..f73c5211f 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/Processor/InstitutionConfigurationProcessorTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/Processor/InstitutionConfigurationProcessorTest.php @@ -79,7 +79,7 @@ public function a_create_institution_configuration_command_is_processed_when_an_ $institutionConfigurationProcessor = new InstitutionConfigurationProcessor( $repositoryMock, - $this->getContainerMock(), + $this->pipelineMock, ); $institutionConfigurationProcessor->handleIdentityCreatedEvent($identityCreatedEvent); @@ -112,7 +112,7 @@ public function no_create_institution_configuration_command_is_processed_when_an $institutionConfigurationProcessor = new InstitutionConfigurationProcessor( $repositoryMock, - $this->getContainerMock(), + $this->pipelineMock, ); $institutionConfigurationProcessor->handleIdentityCreatedEvent($identityCreatedEvent); @@ -153,7 +153,7 @@ public function create_institution_configuration_commands_are_processed_when_a_w $institutionConfigurationProcessor = new InstitutionConfigurationProcessor( $repositoryMock, - $this->getContainerMock(), + $this->pipelineMock, ); $institutionConfigurationProcessor->handleWhitelistCreatedEvent($whitelistCreatedEvent); @@ -198,7 +198,7 @@ public function no_create_institution_configuration_command_is_processed_for_an_ $institutionConfigurationProcessor = new InstitutionConfigurationProcessor( $repositoryMock, - $this->getContainerMock(), + $this->pipelineMock, ); $institutionConfigurationProcessor->handleWhitelistCreatedEvent($whitelistCreatedEvent); @@ -241,7 +241,7 @@ public function create_institution_configuration_commands_are_created_when_a_whi $institutionConfigurationProcessor = new InstitutionConfigurationProcessor( $repositoryMock, - $this->getContainerMock(), + $this->pipelineMock, ); $institutionConfigurationProcessor->handleWhitelistReplacedEvent($whitelistReplacedEvent); @@ -286,7 +286,7 @@ public function no_create_institution_configuration_command_is_processed_for_an_ $institutionConfigurationProcessor = new InstitutionConfigurationProcessor( $repositoryMock, - $this->getContainerMock(), + $this->pipelineMock, ); $institutionConfigurationProcessor->handleWhitelistReplacedEvent($whitelistCreatedEvent); @@ -329,7 +329,7 @@ public function create_institution_configuration_commands_are_created_when_non_c $institutionConfigurationProcessor = new InstitutionConfigurationProcessor( $repositoryMock, - $this->getContainerMock(), + $this->pipelineMock, ); $institutionConfigurationProcessor->handleInstitutionsAddedToWhitelistEvent($institutionsAddedToWhitelistEvent); @@ -374,24 +374,10 @@ public function no_create_institution_configuration_command_is_created_for_an_al $institutionConfigurationProcessor = new InstitutionConfigurationProcessor( $repositoryMock, - $this->getContainerMock(), + $this->pipelineMock, ); $institutionConfigurationProcessor->handleInstitutionsAddedToWhitelistEvent($whitelistCreatedEvent); $this->assertInstanceOf(InstitutionConfigurationProcessor::class, $institutionConfigurationProcessor); } - - /** - * @return ContainerInterface - */ - private function getContainerMock(): ContainerInterface - { - $containerMock = Mockery::mock(ContainerInterface::class); - $containerMock - ->shouldReceive('get') - ->with('pipeline') - ->andReturn($this->pipelineMock); - - return $containerMock; - } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerSelfAssertedTokensTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerSelfAssertedTokensTest.php index b218ad001..37099b9c0 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerSelfAssertedTokensTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerSelfAssertedTokensTest.php @@ -105,34 +105,17 @@ class IdentityCommandHandlerSelfAssertedTokensTest extends CommandHandlerTest private LoaResolutionService&MockInterface $loaResolutionService; - /** - * @var IdentityId - */ private IdentityId $id; - /** - * @var Institution - */ private Institution $institution; - /** - * @var Email - */ private Email $email; - /** - * @var CommonName - */ private CommonName $commonName; - /** - * @var Locale - */ private Locale $preferredLocale; - /** - * @var RecoveryTokenSecretHelper|MockInterface - */ - private RecoveryTokenSecretHelper|MockInterface $recoveryTokenSecretHelper; + + private RecoveryTokenSecretHelper&MockInterface $recoveryTokenSecretHelper; private ?NameId $nameId = null; diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php index 5f0fb6de4..ff7cf5bc5 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php @@ -107,11 +107,11 @@ class IdentityCommandHandlerTest extends CommandHandlerTest private SecondFactorProvePossessionHelper&MockInterface $secondFactorProvePossessionHelper; - private InstitutionConfigurationOptionsService|MockInterface $configService; + private InstitutionConfigurationOptionsService&MockInterface $configService; private LoaResolutionService&MockInterface $loaResolutionService; - private RegistrationMailService|MockInterface $registrationMailService; + private RegistrationMailService&MockInterface $registrationMailService; public function setUp(): void { diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RegistrationAuthorityCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RegistrationAuthorityCommandHandlerTest.php index 17449496a..c990989d0 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RegistrationAuthorityCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RegistrationAuthorityCommandHandlerTest.php @@ -63,9 +63,9 @@ class RegistrationAuthorityCommandHandlerTest extends CommandHandlerTest { - private MockInterface|InstitutionConfigurationRepository $institutionConfigurationRepositoryMock; + private MockInterface&InstitutionConfigurationRepository $institutionConfigurationRepositoryMock; - private MockInterface|InstitutionConfiguration $institutionConfiguration; + private MockInterface&InstitutionConfiguration $institutionConfiguration; /** * Create a command handler for the given scenario test case. diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/SensitiveDataTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/SensitiveDataTest.php index 9e8c5d1b4..8fe429397 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/SensitiveDataTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/SensitiveDataTest.php @@ -29,6 +29,7 @@ use Surfnet\Stepup\Identity\Value\YubikeyPublicId; use Surfnet\StepupBundle\Value\SecondFactorType; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\SensitiveData; +use function is_string; class SensitiveDataTest extends TestCase { @@ -111,7 +112,11 @@ public function it_serialises_and_deserialises( SensitiveData $sensitiveData, array $getterExpectations, ): void { - $sensitiveData = SensitiveData::deserialize(json_decode(json_encode($sensitiveData->serialize()), true)); + $serializedData = json_encode($sensitiveData->serialize()); + if (!is_string($serializedData)) { + $this->fail('Unable to json_encode the serialized sensitive data'); + } + $sensitiveData = SensitiveData::deserialize(json_decode($serializedData, true)); foreach ($getterExpectations as $data => $expectedValue) { $this->assertEquals( diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Value/InstitutionTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Value/InstitutionTest.php index 9d5f0966b..9a0595132 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Value/InstitutionTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Value/InstitutionTest.php @@ -20,7 +20,6 @@ use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use PHPUnit\Framework\TestCase as UnitTest; -use StdClass; use Surfnet\StepupMiddleware\CommandHandlingBundle\Exception\InvalidArgumentException; use Surfnet\StepupMiddleware\CommandHandlingBundle\Value\Institution; @@ -33,7 +32,7 @@ class InstitutionTest extends UnitTest * @dataProvider nonStringOrNonEmptyStringProvider */ public function an_institution_cannot_be_created_with_anything_but_a_nonempty_string( - string|int|float|StdClass|array $invalidValue, + string $invalidValue, ): void { $this->expectException(InvalidArgumentException::class); @@ -60,10 +59,6 @@ public function nonStringOrNonEmptyStringProvider(): array return [ 'empty string' => [''], 'blank string' => [' '], - 'array' => [[]], - 'integer' => [1], - 'float' => [1.2], - 'object' => [new StdClass()], ]; } } diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntity.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntity.php index a8246af82..e31509a93 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntity.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntity.php @@ -20,6 +20,8 @@ use Doctrine\ORM\Mapping as ORM; use Ramsey\Uuid\Uuid; +use Surfnet\StepupMiddleware\GatewayBundle\Exception\RuntimeException; +use function is_string; #[ORM\Table] #[ORM\UniqueConstraint(name: 'unq_saml_entity_entity_id_type', columns: ['entity_id', 'type'])] @@ -50,19 +52,21 @@ private function __construct( $this->id = (string)Uuid::uuid4(); } - /** - * @return SamlEntity - */ public static function createServiceProvider(string $entityId, array $configuration): self { - return new self($entityId, self::TYPE_SP, json_encode($configuration)); + $encodedConfiguration = json_encode($configuration); + if (!is_string($encodedConfiguration)) { + throw new RuntimeException('Unable to json_encode the configuration array in SamlEntity::createServiceProvider'); + } + return new self($entityId, self::TYPE_SP, $encodedConfiguration); } - /** - * @return SamlEntity - */ public static function createIdentityProvider(string $entityId, array $configuration): self { - return new self($entityId, self::TYPE_IDP, json_encode($configuration)); + $encodedConfiguration = json_encode($configuration); + if (!is_string($encodedConfiguration)) { + throw new RuntimeException('Unable to json_encode the configuration array in SamlEntity::createServiceProvider'); + } + return new self($entityId, self::TYPE_IDP, $encodedConfiguration); } } diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php index 02154fb27..5b23a4abb 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php @@ -36,9 +36,8 @@ public function __construct( public function update(Request $request): JsonResponse { - $command = new UpdateConfigurationCommand(); + $command = new UpdateConfigurationCommand($request->getContent()); $command->UUID = (string)Uuid::uuid4(); - $command->configuration = $request->getContent(); return $this->handleCommand($request, $command); } diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php index 3af35eae3..27e344c65 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php @@ -31,28 +31,37 @@ class ConfigurationControllerTest extends WebTestCase private KernelBrowser $client; - /** - * @var string - */ - private string|array|bool|int|null|float|\UnitEnum $password; + private string $password; - /** - * @var string - */ - private string|array|bool|int|null|float|\UnitEnum $passwordRo; + private string $passwordRo; private ORMSqliteDatabaseTool $databaseTool; public function setUp(): void { - $this->databaseTool = static::getContainer()->get(ORMSqliteDatabaseTool::class); + $tool = static::getContainer()->get(ORMSqliteDatabaseTool::class); + if (!$tool instanceof ORMSqliteDatabaseTool) { + $this->fail('Unable to grab the ORMSqliteDatabaseTool from the container'); + } + $this->databaseTool = $tool; // Initialises schema. $this->databaseTool->loadFixtures([]); // Initialises schema. $this->client = static::createClient(); - $this->password = $this->client->getKernel()->getContainer()->getParameter('management_password'); - $this->passwordRo = $this->client->getKernel()->getContainer()->getParameter('readonly_api_password'); + + $managementPassword = $this->client->getKernel()->getContainer()->getParameter('management_password'); + if (!is_string($managementPassword)) { + $this->fail('Unable to grab the management_password parameter from the container'); + } + $this->password = $managementPassword; + + $readOnlyPassword = $this->client->getKernel()->getContainer()->getParameter('readonly_api_password'); + if (!is_string($readOnlyPassword)) { + $this->fail('Unable to grab the readonly_api_password parameter from the container'); + } + $this->passwordRo = $readOnlyPassword; + } public function tearDown(): void @@ -77,13 +86,13 @@ public function requests_with_invalid_content_are_bad_requests(): void 'PHP_AUTH_USER' => 'management', 'PHP_AUTH_PW' => $this->password, ], - json_encode([]), + '[]', ); $this->assertSame( Response::HTTP_BAD_REQUEST, $this->client->getResponse()->getStatusCode(), - $this->client->getResponse()->getContent(), + (string) $this->client->getResponse()->getContent(), ); } @@ -102,7 +111,7 @@ public function authorization_is_required(): void 'HTTP_ACCEPT' => 'application/json', 'CONTENT_TYPE' => 'application/json', ], - json_encode([]), + '[]', ); $this->assertEquals(Response::HTTP_UNAUTHORIZED, $this->client->getResponse()->getStatusCode()); @@ -125,7 +134,7 @@ public function readonly_user_cannot_modify_configuration(): void 'PHP_AUTH_USER' => 'apireader', 'PHP_AUTH_PW' => $this->passwordRo, ], - json_encode([]), + '[]', ); $this->assertEquals(Response::HTTP_FORBIDDEN, $this->client->getResponse()->getStatusCode()); @@ -148,7 +157,7 @@ public function only_post_requests_are_accepted(string $invalidHttpMethod): void 'HTTP_ACCEPT' => 'application/json', 'CONTENT_TYPE' => 'application/json', ], - json_encode([]), + '[]', ); $this->assertEquals(Response::HTTP_METHOD_NOT_ALLOWED, $this->client->getResponse()->getStatusCode()); @@ -171,7 +180,7 @@ public function json_is_returned_from_the_configuration_api(): void 'PHP_AUTH_USER' => 'management', 'PHP_AUTH_PW' => $this->password, ], - json_encode([]), + '[]', ); $this->assertTrue( diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php index 4cbf1df5b..f1c0e831b 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php @@ -24,6 +24,7 @@ use Symfony\Bundle\FrameworkBundle\KernelBrowser; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; use Symfony\Component\HttpFoundation\Response; +use function is_string; class InstitutionConfigurationControllerTest extends WebTestCase { @@ -31,28 +32,36 @@ class InstitutionConfigurationControllerTest extends WebTestCase private KernelBrowser $client; - /** - * @var string - */ - private string|array|bool|int|null|float|\UnitEnum $password; + private string $password; - /** - * @var string - */ - private string|array|bool|int|null|float|\UnitEnum $passwordRo; + private string $passwordRo; private ORMSqliteDatabaseTool $databaseTool; public function setUp(): void { - $this->databaseTool = static::getContainer()->get(ORMSqliteDatabaseTool::class); + $tool = static::getContainer()->get(ORMSqliteDatabaseTool::class); + if (!$tool instanceof ORMSqliteDatabaseTool) { + $this->fail('Unable to grab the ORMSqliteDatabaseTool from the container'); + } + $this->databaseTool = $tool; // Initialises schema. - $this->databaseTool->loadFixtures([]); + $this->databaseTool->loadFixtures(); // Initialises schema. $this->client = static::createClient(); - $this->password = $this->client->getKernel()->getContainer()->getParameter('management_password'); - $this->passwordRo = $this->client->getKernel()->getContainer()->getParameter('readonly_api_password'); + + $managementPassword = $this->client->getKernel()->getContainer()->getParameter('management_password'); + if (!is_string($managementPassword)) { + $this->fail('Unable to grab the management_password parameter from the container'); + } + $this->password = $managementPassword; + + $readOnlyPassword = $this->client->getKernel()->getContainer()->getParameter('readonly_api_password'); + if (!is_string($readOnlyPassword)) { + $this->fail('Unable to grab the readonly_api_password parameter from the container'); + } + $this->passwordRo = $readOnlyPassword; } public function tearDown(): void @@ -75,7 +84,7 @@ public function authorization_is_required_for_reconfiguring_institution_configur 'HTTP_ACCEPT' => 'application/json', 'CONTENT_TYPE' => 'application/json', ], - json_encode([]), + '[]', ); $this->assertEquals(Response::HTTP_UNAUTHORIZED, $this->client->getResponse()->getStatusCode()); @@ -98,7 +107,7 @@ public function readonly_user_cannot_reconfigure_institution_configuration_optio 'PHP_AUTH_USER' => 'apireader', 'PHP_AUTH_PW' => $this->passwordRo, ], - json_encode([]), + '[]', ); $this->assertEquals(Response::HTTP_FORBIDDEN, $this->client->getResponse()->getStatusCode()); @@ -119,7 +128,7 @@ public function authorization_is_required_for_querying_institution_configuration 'HTTP_ACCEPT' => 'application/json', 'CONTENT_TYPE' => 'application/json', ], - json_encode([]), + '[]', ); $this->assertEquals(Response::HTTP_UNAUTHORIZED, $this->client->getResponse()->getStatusCode()); @@ -131,6 +140,10 @@ public function authorization_is_required_for_querying_institution_configuration */ public function requests_with_invalid_content_are_bad_requests(): void { + $content = json_encode(['non-existing.organisation.test' => []]); + if (!is_string($content)) { + $this->fail('Unable to json_encode the content of the request content'); + } $this->client->request( 'POST', '/management/institution-configuration', @@ -142,7 +155,7 @@ public function requests_with_invalid_content_are_bad_requests(): void 'PHP_AUTH_USER' => 'management', 'PHP_AUTH_PW' => $this->password, ], - json_encode(['non-existing.organisation.test' => []]), + $content, ); $this->assertEquals(Response::HTTP_BAD_REQUEST, $this->client->getResponse()->getStatusCode()); @@ -165,7 +178,7 @@ public function only_post_and_get_requests_are_accepted(string $invalidHttpMetho 'HTTP_ACCEPT' => 'application/json', 'CONTENT_TYPE' => 'application/json', ], - json_encode([]), + '[]', ); $this->assertEquals(Response::HTTP_METHOD_NOT_ALLOWED, $this->client->getResponse()->getStatusCode()); @@ -188,7 +201,7 @@ public function a_get_request_without_content_is_valid(): void 'PHP_AUTH_USER' => 'management', 'PHP_AUTH_PW' => $this->password, ], - json_encode([]), + '[]', ); $this->assertEquals(Response::HTTP_OK, $this->client->getResponse()->getStatusCode()); @@ -211,7 +224,7 @@ public function json_is_returned_from_the_institution_configuration_api(): void 'PHP_AUTH_USER' => 'management', 'PHP_AUTH_PW' => $this->password, ], - json_encode([]), + '[]', ); $this->assertTrue( diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ConfigurationValidationTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ConfigurationValidationTest.php index 922067a6e..e9b6d6874 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ConfigurationValidationTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ConfigurationValidationTest.php @@ -22,6 +22,7 @@ use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use Mockery\Matcher\MatcherAbstract; use PHPUnit\Framework\TestCase as TestCase; +use RuntimeException; use Surfnet\StepupMiddleware\ManagementBundle\Validator\ConfigurationStructureValidator; use Surfnet\StepupMiddleware\ManagementBundle\Validator\Constraints\HasValidConfigurationStructure; use Surfnet\StepupMiddleware\ManagementBundle\Validator\EmailTemplatesConfigurationValidator; @@ -41,8 +42,12 @@ final class ConfigurationValidationTest extends TestCase public function invalidConfigurations(): array { $dataSet = []; - - foreach (glob(__DIR__ . '/Fixtures/invalid_configuration/*.php') as $invalidConfiguration) { + $fixtureDir = __DIR__ . '/Fixtures/invalid_configuration/*.php'; + $requestData = glob($fixtureDir); + if ($requestData === false) { + throw new RuntimeException(sprintf('No fixture data found in "%s"', $fixtureDir)); + } + foreach ($requestData as $invalidConfiguration) { $fixture = include $invalidConfiguration; $dataSet[basename($invalidConfiguration)] = [ $fixture['configuration'], diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ReconfigureInstitutionRequestValidatorTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ReconfigureInstitutionRequestValidatorTest.php index 39e5e4e5b..1e656e485 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ReconfigureInstitutionRequestValidatorTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/ReconfigureInstitutionRequestValidatorTest.php @@ -23,6 +23,7 @@ use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use Mockery\Matcher\MatcherAbstract; use PHPUnit\Framework\TestCase; +use RuntimeException; use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\Stepup\Identity\Value\Institution as IdentityInstitution; use Surfnet\StepupBundle\Service\SecondFactorTypeService; @@ -45,8 +46,12 @@ class ReconfigureInstitutionRequestValidatorTest extends TestCase public function invalidReconfigureInstitutionRequests(): array { $dataSet = []; - - foreach (glob(__DIR__ . '/Fixtures/invalid_reconfigure_institution_request/*.php') as $invalidConfiguration) { + $fixtureDir = __DIR__ . '/Fixtures/invalid_reconfigure_institution_request/*.php'; + $requestData = glob($fixtureDir); + if ($requestData === false) { + throw new RuntimeException(sprintf('No fixture data found in "%s"', $fixtureDir)); + } + foreach ($requestData as $invalidConfiguration) { $fixture = include $invalidConfiguration; $dataSet[basename($invalidConfiguration)] = [ $fixture['reconfigureInstitutionRequest'], diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/EmailVerifiedSecondFactorRemindersCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/EmailVerifiedSecondFactorRemindersCommand.php index 65bb0e8fd..9f9b11964 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/EmailVerifiedSecondFactorRemindersCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/EmailVerifiedSecondFactorRemindersCommand.php @@ -86,7 +86,17 @@ protected function execute(InputInterface $input, OutputInterface $output): int $date = new DateTime(); $date->sub(new DateInterval('P7D')); if ($input->hasOption('date') && !is_null($input->getOption('date'))) { - $date = DateTime::createFromFormat('Y-m-d', $input->getOption('date')); + $receivedDate = $input->getOption('date'); + $date = DateTime::createFromFormat('Y-m-d', $receivedDate); + if ($date === false) { + $output->writeln( + sprintf( + 'Error processing the "date" option. Please review the received input: "%s" ', + $receivedDate + ) + ); + return 1; + } } $dryRun = false; diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php index 139c50a06..67702b702 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php @@ -46,14 +46,18 @@ public function __construct( ) { } - public function getCount(): string + public function getCount(): int { $statement = $this->connection->prepare('SELECT COUNT(1) AS cnt FROM ' . $this->eventStreamTableName); $result = $statement->executeQuery(); $row = $result->fetchAssociative(); - return $row['cnt']; + if (!$row) { + return 0; + } + + return (int) $row['cnt']; } public function getFromTill(int $limit, int $offset): DomainEventStream @@ -97,7 +101,7 @@ public function fetchByEventTypes(array $eventTypes): DomainEventStream $results = $statement->executeQuery($eventTypes); $events = []; - foreach ($results->fetchAssociative() as $row) { + foreach ($results->fetchAllAssociative() as $row) { $events[] = $this->deserializeEvent($row); } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php index 305ade0de..72c50cb22 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php @@ -85,7 +85,7 @@ public function replayEvents(OutputInterface $output, int $increments): void $preparationProgress->advance(); $preparationProgress->setMessage('Determining amount of events to replay...'); - $totalEvents = (int) $this->eventHydrator->getCount(); + $totalEvents = $this->eventHydrator->getCount(); $preparationProgress->advance(); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/EventSourcing/EventCollectionTest.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/EventSourcing/EventCollectionTest.php index c2a61a62a..2f20311e5 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/EventSourcing/EventCollectionTest.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/EventSourcing/EventCollectionTest.php @@ -42,7 +42,7 @@ public function an_event_collection_must_be_created_from_an_array_of_non_empty_s $this->expectException(InvalidArgumentException::class); $this->expectExceptionMessage('Invalid argument type: "non-empty string" expected'); - new EventCollection([$emptyOrNonString]); + new EventCollection([$emptyOrNonString]); // @phpstan-ignore-line argument.type: Warning about a faulty constructor argument is exactly what we are testing here } /** diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Migrations/InstitutionConfiguration/MappedInstitutionConfigurationTest.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Migrations/InstitutionConfiguration/MappedInstitutionConfigurationTest.php index c59303552..fa9802a14 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Migrations/InstitutionConfiguration/MappedInstitutionConfigurationTest.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Tests/Migrations/InstitutionConfiguration/MappedInstitutionConfigurationTest.php @@ -200,6 +200,9 @@ public function a_single_ra_location_means_a_single_correct_add_ra_location_comm $this->assertEquals(1, count($commands)); $command = reset($commands); + if (!$command) { + $this->fail('The command should be in the set of commands'); + } $this->assertCommandMatches($command, $institution, $raLocation); } From a6adafc86993a6bfb33096faeebca0151bb0f957 Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Tue, 2 Apr 2024 08:46:17 +0200 Subject: [PATCH 45/89] Address PHP MD issues that were introduced During fixing of PHPStan issues, some additional mess was created. Two of which I ignored for now. But left with some explanation on how to fix them at a later point. --- .../Validator/ReconfigureInstitutionRequestValidator.php | 5 +++-- .../Console/Command/BootstrapGsspSecondFactorCommand.php | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php index 1e954214d..29c5e93c7 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php @@ -33,6 +33,9 @@ use Symfony\Component\Validator\ConstraintValidator; use Symfony\Component\Validator\Violation\ConstraintViolationBuilder; +/** + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) Coupling to assertion classes is rather high, might be a good candidate for refactoring + */ final class ReconfigureInstitutionRequestValidator extends ConstraintValidator { /** @@ -74,7 +77,6 @@ public function validate(mixed $value, Constraint $constraint): void public function validateRoot(array $configuration): void { - Assertion::isArray($configuration, 'Invalid body structure, must be an object', '(root)'); $this->validateInstitutionsExist(array_keys($configuration)); foreach ($configuration as $institution => $options) { @@ -98,7 +100,6 @@ public function validateInstitutionsExist(array $institutions): void public function validateInstitutionConfigurationOptions(array $options, string $institution): void { $propertyPath = sprintf('Institution(%s)', $institution); - Assertion::isArray($options, 'Invalid institution configuration, must be an object', $propertyPath); $requiredOptions = [ 'use_ra_locations', 'show_raa_contact_information', diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php index de18d2685..bc3fb07f8 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php @@ -62,6 +62,9 @@ protected function configure(): void ->addArgument('actor-id', InputArgument::REQUIRED, 'The id of the vetting actor'); } + /** + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) Method length could be reduced by deconstructing the bootstrapping of the required data and the vetting of the GSSP + */ protected function execute(InputInterface $input, OutputInterface $output): int { $registrationStatus = $input->getArgument('registration-status'); From 47983674ed317b25c37a6ee7f5a421304c868304 Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Tue, 2 Apr 2024 09:02:02 +0200 Subject: [PATCH 46/89] Address PHP CS issues that were introduced --- ci/qa/docheader | 5 ++++ ci/qa/phpcbf | 6 +++++ composer.json | 3 +++ ...ewInstitutionConfigurationCreatedEvent.php | 16 +++++++++---- .../Event/RaLocationAddedEvent.php | 10 ++++++-- ...LocationContactInformationChangedEvent.php | 7 ++++-- .../Event/RaLocationRelocatedEvent.php | 7 ++++-- .../Event/RaLocationRenamedEvent.php | 7 ++++-- .../InstitutionConfiguration.php | 18 +++++--------- .../Identity/Entity/RegistrationAuthority.php | 9 ++++--- .../Identity/Event/AppointedAsRaEvent.php | 2 +- .../AppointedAsRaForInstitutionEvent.php | 4 ++-- .../Identity/Event/AppointedAsRaaEvent.php | 2 +- .../AppointedAsRaaForInstitutionEvent.php | 4 ++-- ...ompliedWithRecoveryCodeRevocationEvent.php | 2 +- .../Event/CompliedWithRevocationEvent.php | 2 +- .../Identity/Event/EmailVerifiedEvent.php | 2 +- .../GssfPossessionProvenAndVerifiedEvent.php | 4 ++-- .../Event/GssfPossessionProvenEvent.php | 4 ++-- .../Event/IdentityAccreditedAsRaEvent.php | 2 +- ...ntityAccreditedAsRaForInstitutionEvent.php | 2 +- .../Event/IdentityAccreditedAsRaaEvent.php | 2 +- ...tityAccreditedAsRaaForInstitutionEvent.php | 2 +- .../Identity/Event/IdentityCreatedEvent.php | 4 ++-- .../Event/IdentityEmailChangedEvent.php | 4 ++-- .../Identity/Event/IdentityForgottenEvent.php | 4 ++-- .../Identity/Event/IdentityRenamedEvent.php | 4 ++-- .../InstitutionsAddedToWhitelistEvent.php | 2 +- .../InstitutionsRemovedFromWhitelistEvent.php | 2 +- .../Event/LocalePreferenceExpressedEvent.php | 4 ++-- .../PhonePossessionProvenAndVerifiedEvent.php | 4 ++-- .../Event/PhonePossessionProvenEvent.php | 4 ++-- ...honeRecoveryTokenPossessionProvenEvent.php | 4 ++-- .../Event/RecoveryTokenRevokedEvent.php | 2 +- ...rationAuthorityInformationAmendedEvent.php | 2 +- ...yInformationAmendedForInstitutionEvent.php | 2 +- .../RegistrationAuthorityRetractedEvent.php | 2 +- ...nAuthorityRetractedForInstitutionEvent.php | 4 ++-- ...etRecoveryTokenPossessionPromisedEvent.php | 4 ++-- .../Event/SecondFactorMigratedEvent.php | 4 ++-- .../Event/SecondFactorMigratedToEvent.php | 4 ++-- .../Event/SecondFactorRevokedEvent.php | 2 +- .../Event/SecondFactorVettedEvent.php | 4 ++-- ...torVettedWithoutTokenProofOfPossession.php | 4 ++-- ...DevicePossessionProvenAndVerifiedEvent.php | 4 ++-- .../Event/U2fDevicePossessionProvenEvent.php | 4 ++-- .../VettedSecondFactorsAllRevokedEvent.php | 2 +- .../Event/VettingTypeHintsSavedEvent.php | 2 +- .../Identity/Event/WhitelistCreatedEvent.php | 2 +- .../Identity/Event/WhitelistReplacedEvent.php | 2 +- ...ubikeyPossessionProvenAndVerifiedEvent.php | 4 ++-- .../Event/YubikeyPossessionProvenEvent.php | 4 ++-- .../YubikeySecondFactorBootstrappedEvent.php | 4 ++-- src/Surfnet/Stepup/Identity/Identity.php | 24 +++++++------------ ...InstitutionConfigurationOptionsService.php | 14 ++++------- .../Identity/Entity/AuditLogEntry.php | 2 +- .../Identity/Projector/RaListingProjector.php | 1 - .../Projector/RaSecondFactorProjector.php | 9 +++---- .../Projector/SecondFactorProjector.php | 9 +++---- .../SecondFactorRevocationProjector.php | 6 ++--- .../Repository/AuditLogRepository.php | 9 ++++++- .../Repository/RecoveryTokenRepository.php | 7 +++--- .../Identity/Service/RaListingService.php | 8 ++----- .../Entity/InstitutionConfiguration.php | 3 +-- .../Projector/SecondFactorProjector.php | 3 +-- .../BootstrapGsspSecondFactorCommand.php | 3 ++- ...IdentityWithYubikeySecondFactorCommand.php | 3 ++- .../Console/Command/ReplayEventsCommand.php | 12 +++++----- .../Service/ReplayingEventDispatcher.php | 3 ++- 69 files changed, 176 insertions(+), 160 deletions(-) create mode 100755 ci/qa/docheader create mode 100755 ci/qa/phpcbf diff --git a/ci/qa/docheader b/ci/qa/docheader new file mode 100755 index 000000000..fedbc2e74 --- /dev/null +++ b/ci/qa/docheader @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +cd $(dirname $0)/../../ + +./vendor/bin/docheader --no-ansi check src/ tests/ diff --git a/ci/qa/phpcbf b/ci/qa/phpcbf new file mode 100755 index 000000000..138015bd6 --- /dev/null +++ b/ci/qa/phpcbf @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +cd $(dirname $0)/../../ + +# https://github.com/squizlabs/PHP_CodeSniffer/wiki/Fixing-Errors-Automatically +./vendor/bin/phpcbf --standard=ci/qa/phpcs.xml --extensions=php src $1 diff --git a/composer.json b/composer.json index 446a54242..458927657 100644 --- a/composer.json +++ b/composer.json @@ -90,12 +90,15 @@ "@phpcs", "@phpstan", "@phpcpd", + "@license-headers", "@phpunit" ], "phplint": "./ci/qa/phplint", "phpmd": "./ci/qa/phpmd", + "license-headers": "./ci/qa/docheader", "phpstan": "./ci/qa/phpstan", "phpcs": "./ci/qa/phpcs", + "phpcbf": "./ci/qa/phpcbf", "phpcpd": "./ci/qa/phpcpd", "phpunit": "./ci/qa/phpunit --", diff --git a/src/Surfnet/Stepup/Configuration/Event/NewInstitutionConfigurationCreatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/NewInstitutionConfigurationCreatedEvent.php index d4350ee85..5f13ec8f1 100644 --- a/src/Surfnet/Stepup/Configuration/Event/NewInstitutionConfigurationCreatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/NewInstitutionConfigurationCreatedEvent.php @@ -35,8 +35,17 @@ */ class NewInstitutionConfigurationCreatedEvent implements SerializableInterface { - public function __construct(public InstitutionConfigurationId $institutionConfigurationId, public Institution $institution, public UseRaLocationsOption $useRaLocationsOption, public ShowRaaContactInformationOption $showRaaContactInformationOption, public VerifyEmailOption $verifyEmailOption, public NumberOfTokensPerIdentityOption $numberOfTokensPerIdentityOption, public SsoOn2faOption $ssoOn2faOption, public SelfVetOption $selfVetOption, public SelfAssertedTokensOption $selfAssertedTokensOption) - { + public function __construct( + public InstitutionConfigurationId $institutionConfigurationId, + public Institution $institution, + public UseRaLocationsOption $useRaLocationsOption, + public ShowRaaContactInformationOption $showRaaContactInformationOption, + public VerifyEmailOption $verifyEmailOption, + public NumberOfTokensPerIdentityOption $numberOfTokensPerIdentityOption, + public SsoOn2faOption $ssoOn2faOption, + public SelfVetOption $selfVetOption, + public SelfAssertedTokensOption $selfAssertedTokensOption + ) { } public static function deserialize(array $data): self @@ -80,8 +89,7 @@ public function serialize(): array 'use_ra_locations_option' => $this->useRaLocationsOption->isEnabled(), 'show_raa_contact_information_option' => $this->showRaaContactInformationOption->isEnabled(), 'verify_email_option' => $this->verifyEmailOption->isEnabled(), - 'number_of_tokens_per_identity_option' => $this->numberOfTokensPerIdentityOption->getNumberOfTokensPerIdentity( - ), + 'number_of_tokens_per_identity_option' => $this->numberOfTokensPerIdentityOption->getNumberOfTokensPerIdentity(), 'sso_on_2fa_option' => $this->ssoOn2faOption->isEnabled(), 'self_vet_option' => $this->selfVetOption->isEnabled(), 'self_asserted_tokens_option' => $this->selfAssertedTokensOption->isEnabled(), diff --git a/src/Surfnet/Stepup/Configuration/Event/RaLocationAddedEvent.php b/src/Surfnet/Stepup/Configuration/Event/RaLocationAddedEvent.php index 64627f6d6..0faaeb315 100644 --- a/src/Surfnet/Stepup/Configuration/Event/RaLocationAddedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/RaLocationAddedEvent.php @@ -28,8 +28,14 @@ class RaLocationAddedEvent implements SerializableInterface { - public function __construct(public InstitutionConfigurationId $institutionConfigurationId, public Institution $institution, public RaLocationId $raLocationId, public RaLocationName $raLocationName, public Location $location, public ContactInformation $contactInformation) - { + public function __construct( + public InstitutionConfigurationId $institutionConfigurationId, + public Institution $institution, + public RaLocationId $raLocationId, + public RaLocationName $raLocationName, + public Location $location, + public ContactInformation $contactInformation + ) { } public static function deserialize(array $data): self diff --git a/src/Surfnet/Stepup/Configuration/Event/RaLocationContactInformationChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/RaLocationContactInformationChangedEvent.php index f8179e345..bc102b5af 100644 --- a/src/Surfnet/Stepup/Configuration/Event/RaLocationContactInformationChangedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/RaLocationContactInformationChangedEvent.php @@ -25,8 +25,11 @@ class RaLocationContactInformationChangedEvent implements SerializableInterface { - public function __construct(public InstitutionConfigurationId $institutionConfigurationId, public RaLocationId $raLocationId, public ContactInformation $contactInformation) - { + public function __construct( + public InstitutionConfigurationId $institutionConfigurationId, + public RaLocationId $raLocationId, + public ContactInformation $contactInformation + ) { } public static function deserialize(array $data): self diff --git a/src/Surfnet/Stepup/Configuration/Event/RaLocationRelocatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/RaLocationRelocatedEvent.php index b583e0b35..5aa13e4d6 100644 --- a/src/Surfnet/Stepup/Configuration/Event/RaLocationRelocatedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/RaLocationRelocatedEvent.php @@ -25,8 +25,11 @@ class RaLocationRelocatedEvent implements SerializableInterface { - public function __construct(public InstitutionConfigurationId $institutionConfigurationId, public RaLocationId $raLocationId, public Location $location) - { + public function __construct( + public InstitutionConfigurationId $institutionConfigurationId, + public RaLocationId $raLocationId, + public Location $location + ) { } public static function deserialize(array $data): self diff --git a/src/Surfnet/Stepup/Configuration/Event/RaLocationRenamedEvent.php b/src/Surfnet/Stepup/Configuration/Event/RaLocationRenamedEvent.php index 7fc9a32ba..4c023d18d 100644 --- a/src/Surfnet/Stepup/Configuration/Event/RaLocationRenamedEvent.php +++ b/src/Surfnet/Stepup/Configuration/Event/RaLocationRenamedEvent.php @@ -25,8 +25,11 @@ class RaLocationRenamedEvent implements SerializableInterface { - public function __construct(public InstitutionConfigurationId $institutionConfigurationId, public RaLocationId $raLocationId, public RaLocationName $raLocationName) - { + public function __construct( + public InstitutionConfigurationId $institutionConfigurationId, + public RaLocationId $raLocationId, + public RaLocationName $raLocationName + ) { } public static function deserialize(array $data): self diff --git a/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php b/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php index 1c29b2156..82f7fede0 100644 --- a/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php +++ b/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php @@ -564,43 +564,37 @@ protected function applyUseRaLocationsOptionChangedEvent(UseRaLocationsOptionCha protected function applyShowRaaContactInformationOptionChangedEvent( ShowRaaContactInformationOptionChangedEvent $event, - ): void - { + ): void { $this->showRaaContactInformationOption = $event->showRaaContactInformationOption; } protected function applyVerifyEmailOptionChangedEvent( VerifyEmailOptionChangedEvent $event, - ): void - { + ): void { $this->verifyEmailOption = $event->verifyEmailOption; } protected function applySelfVetOptionChangedEvent( SelfVetOptionChangedEvent $event, - ): void - { + ): void { $this->selfVetOption = $event->selfVetOption; } protected function applySelfAssertedTokensOptionChangedEvent( SelfAssertedTokensOptionChangedEvent $event, - ): void - { + ): void { $this->selfAssertedTokensOption = $event->selfAssertedTokensOption; } protected function applySsoOn2faOptionChangedEvent( SsoOn2faOptionChangedEvent $event, - ): void - { + ): void { $this->ssoOn2faOption = $event->ssoOn2faOption; } protected function applyNumberOfTokensPerIdentityOptionChangedEvent( NumberOfTokensPerIdentityOptionChangedEvent $event, - ): void - { + ): void { $this->numberOfTokensPerIdentityOption = $event->numberOfTokensPerIdentityOption; } diff --git a/src/Surfnet/Stepup/Identity/Entity/RegistrationAuthority.php b/src/Surfnet/Stepup/Identity/Entity/RegistrationAuthority.php index 92bdcf620..aec69096a 100644 --- a/src/Surfnet/Stepup/Identity/Entity/RegistrationAuthority.php +++ b/src/Surfnet/Stepup/Identity/Entity/RegistrationAuthority.php @@ -31,11 +31,14 @@ final class RegistrationAuthority extends SimpleEventSourcedEntity { private ?RegistrationAuthorityRole $role = null; - private ?Location $location = null; // @phpstan-ignore-line PHPStan can not see that this field is written when serialized to the database + // @phpstan-ignore-next-line PHPStan can not see that this field is written when serialized to the database + private ?Location $location = null; - private ?ContactInformation $contactInformation = null; // @phpstan-ignore-line PHPStan can not see that this field is written when serialized to the database + // @phpstan-ignore-next-line PHPStan can not see that this field is written when serialized to the database + private ?ContactInformation $contactInformation = null; - private ?Institution $institution = null; // @phpstan-ignore-line PHPStan can not see that this field is written when serialized to the database + // @phpstan-ignore-next-line PHPStan can not see that this field is written when serialized to the database + private ?Institution $institution = null; public static function accreditWith( RegistrationAuthorityRole $role, diff --git a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php index d9f3bbd73..da4b91d7f 100644 --- a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaEvent.php @@ -30,7 +30,7 @@ class AppointedAsRaEvent extends IdentityEvent implements RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', diff --git a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php index 5bfda2f8f..bacc1789b 100644 --- a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaForInstitutionEvent.php @@ -27,7 +27,7 @@ class AppointedAsRaForInstitutionEvent extends IdentityEvent implements RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', @@ -67,7 +67,7 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! - * + * * @return array */ public function serialize(): array diff --git a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php index 33a8bf8b5..429a16376 100644 --- a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaEvent.php @@ -30,7 +30,7 @@ class AppointedAsRaaEvent extends IdentityEvent implements RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', diff --git a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaForInstitutionEvent.php index 123a0255d..f54123eee 100644 --- a/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/AppointedAsRaaForInstitutionEvent.php @@ -27,7 +27,7 @@ class AppointedAsRaaForInstitutionEvent extends IdentityEvent implements RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', @@ -67,7 +67,7 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! - * + * * @return array */ public function serialize(): array diff --git a/src/Surfnet/Stepup/Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php b/src/Surfnet/Stepup/Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php index 1d19efd39..fff696365 100644 --- a/src/Surfnet/Stepup/Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/CompliedWithRecoveryCodeRevocationEvent.php @@ -28,7 +28,7 @@ class CompliedWithRecoveryCodeRevocationEvent extends IdentityEvent implements RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', diff --git a/src/Surfnet/Stepup/Identity/Event/CompliedWithRevocationEvent.php b/src/Surfnet/Stepup/Identity/Event/CompliedWithRevocationEvent.php index 235161a51..5e3c48419 100644 --- a/src/Surfnet/Stepup/Identity/Event/CompliedWithRevocationEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/CompliedWithRevocationEvent.php @@ -32,7 +32,7 @@ abstract class CompliedWithRevocationEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', diff --git a/src/Surfnet/Stepup/Identity/Event/EmailVerifiedEvent.php b/src/Surfnet/Stepup/Identity/Event/EmailVerifiedEvent.php index e3a0120c1..64d8f6dad 100644 --- a/src/Surfnet/Stepup/Identity/Event/EmailVerifiedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/EmailVerifiedEvent.php @@ -39,7 +39,7 @@ class EmailVerifiedEvent extends IdentityEvent implements RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', diff --git a/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenAndVerifiedEvent.php b/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenAndVerifiedEvent.php index 484d5b2e8..a516cd6a1 100644 --- a/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenAndVerifiedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenAndVerifiedEvent.php @@ -39,7 +39,7 @@ class GssfPossessionProvenAndVerifiedEvent extends IdentityEvent implements RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', @@ -117,7 +117,7 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! - * + * * @return array */ public function serialize(): array diff --git a/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenEvent.php b/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenEvent.php index 6a64ba7f3..63d32f304 100644 --- a/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/GssfPossessionProvenEvent.php @@ -36,7 +36,7 @@ class GssfPossessionProvenEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', @@ -106,7 +106,7 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! - * + * * @return array */ public function serialize(): array diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php index 1df5a9190..8e9d1300a 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaEvent.php @@ -33,7 +33,7 @@ class IdentityAccreditedAsRaEvent extends IdentityEvent implements RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaForInstitutionEvent.php index 71c9b0d03..1edea699e 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaForInstitutionEvent.php @@ -30,7 +30,7 @@ class IdentityAccreditedAsRaForInstitutionEvent extends IdentityEvent implements RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php index c3bfe3f1d..f9738c66c 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaEvent.php @@ -34,7 +34,7 @@ class IdentityAccreditedAsRaaEvent extends IdentityEvent implements RightToObtai { /** @var string[] */ /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaForInstitutionEvent.php index 00ea52dc7..438bc1aa4 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityAccreditedAsRaaForInstitutionEvent.php @@ -31,7 +31,7 @@ class IdentityAccreditedAsRaaForInstitutionEvent extends IdentityEvent implement { /** @var string[] */ /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php index 124f65040..856f8cf4a 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php @@ -32,7 +32,7 @@ class IdentityCreatedEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'id', @@ -77,7 +77,7 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! - * + * * @return array */ public function serialize(): array diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityEmailChangedEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityEmailChangedEvent.php index c55cd923e..ff71f5403 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityEmailChangedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityEmailChangedEvent.php @@ -29,7 +29,7 @@ class IdentityEmailChangedEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'id', @@ -66,7 +66,7 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! - * + * * @return array */ public function serialize(): array diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityForgottenEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityForgottenEvent.php index 552037111..137b3eee6 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityForgottenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityForgottenEvent.php @@ -26,7 +26,7 @@ class IdentityForgottenEvent extends IdentityEvent implements RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', @@ -52,7 +52,7 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! - * + * * @return array */ public function serialize(): array diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityRenamedEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityRenamedEvent.php index 0acfdc71f..00c4aa0b7 100644 --- a/src/Surfnet/Stepup/Identity/Event/IdentityRenamedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/IdentityRenamedEvent.php @@ -29,7 +29,7 @@ class IdentityRenamedEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'id', @@ -66,7 +66,7 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! - * + * * @return array */ public function serialize(): array diff --git a/src/Surfnet/Stepup/Identity/Event/InstitutionsAddedToWhitelistEvent.php b/src/Surfnet/Stepup/Identity/Event/InstitutionsAddedToWhitelistEvent.php index 52f27f3d3..0d6824c42 100644 --- a/src/Surfnet/Stepup/Identity/Event/InstitutionsAddedToWhitelistEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/InstitutionsAddedToWhitelistEvent.php @@ -38,7 +38,7 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! - * + * * @return array */ public function serialize(): array diff --git a/src/Surfnet/Stepup/Identity/Event/InstitutionsRemovedFromWhitelistEvent.php b/src/Surfnet/Stepup/Identity/Event/InstitutionsRemovedFromWhitelistEvent.php index 4457c3446..d32d5a281 100644 --- a/src/Surfnet/Stepup/Identity/Event/InstitutionsRemovedFromWhitelistEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/InstitutionsRemovedFromWhitelistEvent.php @@ -38,7 +38,7 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! - * + * * @return array */ public function serialize(): array diff --git a/src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php b/src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php index 07057161a..a24c6a765 100644 --- a/src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/LocalePreferenceExpressedEvent.php @@ -27,7 +27,7 @@ class LocalePreferenceExpressedEvent extends IdentityEvent implements RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'id', @@ -65,7 +65,7 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! - * + * * @return array */ public function serialize(): array diff --git a/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenAndVerifiedEvent.php b/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenAndVerifiedEvent.php index 9fb8d4a80..1fffea16e 100644 --- a/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenAndVerifiedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenAndVerifiedEvent.php @@ -38,7 +38,7 @@ class PhonePossessionProvenAndVerifiedEvent extends IdentityEvent implements RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', @@ -111,7 +111,7 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! - * + * * @return array */ public function serialize(): array diff --git a/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenEvent.php b/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenEvent.php index 56ae17f69..e2994aef2 100644 --- a/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/PhonePossessionProvenEvent.php @@ -35,7 +35,7 @@ class PhonePossessionProvenEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', @@ -111,7 +111,7 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! - * + * * @return array */ public function serialize(): array diff --git a/src/Surfnet/Stepup/Identity/Event/PhoneRecoveryTokenPossessionProvenEvent.php b/src/Surfnet/Stepup/Identity/Event/PhoneRecoveryTokenPossessionProvenEvent.php index fa27c8dee..4c8d9a283 100644 --- a/src/Surfnet/Stepup/Identity/Event/PhoneRecoveryTokenPossessionProvenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/PhoneRecoveryTokenPossessionProvenEvent.php @@ -40,7 +40,7 @@ class PhoneRecoveryTokenPossessionProvenEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', @@ -91,7 +91,7 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! - * + * * @return array */ public function serialize(): array diff --git a/src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php b/src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php index 074997bf2..19c8592d9 100644 --- a/src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/RecoveryTokenRevokedEvent.php @@ -28,7 +28,7 @@ class RecoveryTokenRevokedEvent extends IdentityEvent implements RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', diff --git a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedEvent.php b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedEvent.php index bab676149..46c013e18 100644 --- a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedEvent.php @@ -32,7 +32,7 @@ class RegistrationAuthorityInformationAmendedEvent extends IdentityEvent implements RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', diff --git a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedForInstitutionEvent.php index 0574df110..887318a3f 100644 --- a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityInformationAmendedForInstitutionEvent.php @@ -30,7 +30,7 @@ class RegistrationAuthorityInformationAmendedForInstitutionEvent extends Identit RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', diff --git a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedEvent.php b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedEvent.php index c7dd0b6d5..e92961302 100644 --- a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedEvent.php @@ -34,7 +34,7 @@ class RegistrationAuthorityRetractedEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', diff --git a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedForInstitutionEvent.php b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedForInstitutionEvent.php index 3cbe8a920..4aeabc5d9 100644 --- a/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedForInstitutionEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/RegistrationAuthorityRetractedForInstitutionEvent.php @@ -33,7 +33,7 @@ class RegistrationAuthorityRetractedForInstitutionEvent extends IdentityEvent im RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', @@ -78,7 +78,7 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! - * + * * @return array */ public function serialize(): array diff --git a/src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php b/src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php index 911a39406..7ec7f3149 100644 --- a/src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SafeStoreSecretRecoveryTokenPossessionPromisedEvent.php @@ -43,7 +43,7 @@ class SafeStoreSecretRecoveryTokenPossessionPromisedEvent extends IdentityEvent RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', @@ -92,7 +92,7 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! - * + * * @return array */ public function serialize(): array diff --git a/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php b/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php index 41350c661..eab9c6949 100644 --- a/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedEvent.php @@ -43,7 +43,7 @@ class SecondFactorMigratedEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', @@ -119,7 +119,7 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! - * + * * @return array */ public function serialize(): array diff --git a/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedToEvent.php b/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedToEvent.php index c4d042990..aaf1caa3c 100644 --- a/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedToEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SecondFactorMigratedToEvent.php @@ -35,7 +35,7 @@ class SecondFactorMigratedToEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', @@ -90,7 +90,7 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! - * + * * @return array */ public function serialize(): array diff --git a/src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php b/src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php index 3a98fbe7d..45bed7e9e 100644 --- a/src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SecondFactorRevokedEvent.php @@ -32,7 +32,7 @@ abstract class SecondFactorRevokedEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', diff --git a/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php b/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php index fefdb55e4..c5e0fd903 100644 --- a/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedEvent.php @@ -41,7 +41,7 @@ class SecondFactorVettedEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', @@ -109,7 +109,7 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! - * + * * @return array */ public function serialize(): array diff --git a/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php b/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php index a3c1a776b..7ad05ede4 100644 --- a/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php +++ b/src/Surfnet/Stepup/Identity/Event/SecondFactorVettedWithoutTokenProofOfPossession.php @@ -44,7 +44,7 @@ class SecondFactorVettedWithoutTokenProofOfPossession extends IdentityEvent impl RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', @@ -117,7 +117,7 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! - * + * * @return array */ public function serialize(): array diff --git a/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenAndVerifiedEvent.php b/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenAndVerifiedEvent.php index 96fb8ff3a..2026408b6 100644 --- a/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenAndVerifiedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenAndVerifiedEvent.php @@ -41,7 +41,7 @@ class U2fDevicePossessionProvenAndVerifiedEvent extends IdentityEvent implements RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', @@ -114,7 +114,7 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! - * + * * @return array */ public function serialize(): array diff --git a/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php b/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php index b5475b8c2..200254f7c 100644 --- a/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php @@ -38,7 +38,7 @@ class U2fDevicePossessionProvenEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', @@ -114,7 +114,7 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! - * + * * @return array */ public function serialize(): array diff --git a/src/Surfnet/Stepup/Identity/Event/VettedSecondFactorsAllRevokedEvent.php b/src/Surfnet/Stepup/Identity/Event/VettedSecondFactorsAllRevokedEvent.php index c475589b8..0debdb176 100644 --- a/src/Surfnet/Stepup/Identity/Event/VettedSecondFactorsAllRevokedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/VettedSecondFactorsAllRevokedEvent.php @@ -26,7 +26,7 @@ class VettedSecondFactorsAllRevokedEvent extends IdentityEvent implements RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', diff --git a/src/Surfnet/Stepup/Identity/Event/VettingTypeHintsSavedEvent.php b/src/Surfnet/Stepup/Identity/Event/VettingTypeHintsSavedEvent.php index d46ff8d1d..842bdc9a4 100644 --- a/src/Surfnet/Stepup/Identity/Event/VettingTypeHintsSavedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/VettingTypeHintsSavedEvent.php @@ -27,7 +27,7 @@ class VettingTypeHintsSavedEvent extends IdentityEvent implements RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', diff --git a/src/Surfnet/Stepup/Identity/Event/WhitelistCreatedEvent.php b/src/Surfnet/Stepup/Identity/Event/WhitelistCreatedEvent.php index 2feb528e9..1dc60b7d4 100644 --- a/src/Surfnet/Stepup/Identity/Event/WhitelistCreatedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/WhitelistCreatedEvent.php @@ -37,7 +37,7 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! - * + * * @return array */ public function serialize(): array diff --git a/src/Surfnet/Stepup/Identity/Event/WhitelistReplacedEvent.php b/src/Surfnet/Stepup/Identity/Event/WhitelistReplacedEvent.php index 1c5918295..74bd0bd93 100644 --- a/src/Surfnet/Stepup/Identity/Event/WhitelistReplacedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/WhitelistReplacedEvent.php @@ -38,7 +38,7 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! - * + * * @return array */ public function serialize(): array diff --git a/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenAndVerifiedEvent.php b/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenAndVerifiedEvent.php index aca867439..c74513f05 100644 --- a/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenAndVerifiedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenAndVerifiedEvent.php @@ -38,7 +38,7 @@ class YubikeyPossessionProvenAndVerifiedEvent extends IdentityEvent implements RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', @@ -114,7 +114,7 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! - * + * * @return array */ public function serialize(): array diff --git a/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenEvent.php b/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenEvent.php index 8eee90db7..31dc8a188 100644 --- a/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/YubikeyPossessionProvenEvent.php @@ -36,7 +36,7 @@ class YubikeyPossessionProvenEvent extends IdentityEvent implements Forgettable, RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', @@ -112,7 +112,7 @@ public static function deserialize(array $data): self /** * The data ending up in the event_stream, be careful not to include sensitive data here! - * + * * @return array */ public function serialize(): array diff --git a/src/Surfnet/Stepup/Identity/Event/YubikeySecondFactorBootstrappedEvent.php b/src/Surfnet/Stepup/Identity/Event/YubikeySecondFactorBootstrappedEvent.php index b9f147d0b..4f629293f 100644 --- a/src/Surfnet/Stepup/Identity/Event/YubikeySecondFactorBootstrappedEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/YubikeySecondFactorBootstrappedEvent.php @@ -37,7 +37,7 @@ final class YubikeySecondFactorBootstrappedEvent extends IdentityEvent implement RightToObtainDataInterface { /** - * @var string[] + * @var string[] */ private array $allowlist = [ 'identity_id', @@ -84,7 +84,7 @@ public function getAuditLogMetadata(): Metadata /** * The data ending up in the event_stream, be careful not to include sensitive data here! - * + * * @return array */ public function serialize(): array diff --git a/src/Surfnet/Stepup/Identity/Identity.php b/src/Surfnet/Stepup/Identity/Identity.php index 561751ff2..f84a0baed 100644 --- a/src/Surfnet/Stepup/Identity/Identity.php +++ b/src/Surfnet/Stepup/Identity/Identity.php @@ -1183,8 +1183,7 @@ protected function applyPhoneRecoveryTokenPossessionProvenEvent(PhoneRecoveryTok protected function applySafeStoreSecretRecoveryTokenPossessionPromisedEvent( SafeStoreSecretRecoveryTokenPossessionPromisedEvent $event, - ): void - { + ): void { $recoveryToken = RecoveryTokenEntity::create($event->recoveryTokenId, RecoveryTokenType::safeStore(), $this); $this->recoveryTokens->set($recoveryToken); @@ -1231,8 +1230,7 @@ protected function applySecondFactorVettedEvent(SecondFactorVettedEvent $event): protected function applySecondFactorVettedWithoutTokenProofOfPossession( SecondFactorVettedWithoutTokenProofOfPossession $event, - ): void - { + ): void { $secondFactorId = (string)$event->secondFactorId; /** @var VerifiedSecondFactor $verified */ @@ -1250,8 +1248,7 @@ protected function applyUnverifiedSecondFactorRevokedEvent(UnverifiedSecondFacto protected function applyCompliedWithUnverifiedSecondFactorRevocationEvent( CompliedWithUnverifiedSecondFactorRevocationEvent $event, - ): void - { + ): void { $this->unverifiedSecondFactors->remove((string)$event->secondFactorId); } @@ -1262,8 +1259,7 @@ protected function applyVerifiedSecondFactorRevokedEvent(VerifiedSecondFactorRev protected function applyCompliedWithVerifiedSecondFactorRevocationEvent( CompliedWithVerifiedSecondFactorRevocationEvent $event, - ): void - { + ): void { $this->verifiedSecondFactors->remove((string)$event->secondFactorId); } @@ -1274,8 +1270,7 @@ protected function applyVettedSecondFactorRevokedEvent(VettedSecondFactorRevoked protected function applyCompliedWithVettedSecondFactorRevocationEvent( CompliedWithVettedSecondFactorRevocationEvent $event, - ): void - { + ): void { $this->vettedSecondFactors->remove((string)$event->secondFactorId); } @@ -1317,8 +1312,7 @@ protected function applyIdentityAccreditedAsRaaForInstitutionEvent(IdentityAccre protected function applyRegistrationAuthorityInformationAmendedForInstitutionEvent( RegistrationAuthorityInformationAmendedForInstitutionEvent $event, - ): void - { + ): void { $this->registrationAuthorities->get($event->raInstitution)->amendInformation( $event->location, $event->contactInformation, @@ -1334,8 +1328,7 @@ protected function applyAppointedAsRaaForInstitutionEvent(AppointedAsRaaForInsti protected function applyRegistrationAuthorityRetractedForInstitutionEvent( RegistrationAuthorityRetractedForInstitutionEvent $event, - ): void - { + ): void { $this->registrationAuthorities->remove($event->raInstitution); } @@ -1415,8 +1408,7 @@ protected function applyAppointedAsRaForInstitutionEvent(AppointedAsRaForInstitu */ protected function applyRegistrationAuthorityInformationAmendedEvent( RegistrationAuthorityInformationAmendedEvent $event, - ): void - { + ): void { $this->registrationAuthorities->get($event->identityInstitution)->amendInformation( $event->location, $event->contactInformation, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionConfigurationOptionsService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionConfigurationOptionsService.php index b06d9686a..71a7ab6d9 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionConfigurationOptionsService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Service/InstitutionConfigurationOptionsService.php @@ -24,12 +24,9 @@ class InstitutionConfigurationOptionsService { - /** - * @param int $numberOfTokensPerIdentity - */ public function __construct( private readonly InstitutionConfigurationOptionsRepository $repository, - private $numberOfTokensPerIdentity, + private int $numberOfTokensPerIdentity, ) { } @@ -41,9 +38,6 @@ public function findAllInstitutionConfigurationOptions(): array return $this->repository->findAll(); } - /** - * @return InstitutionConfigurationOptions|null - */ public function findInstitutionConfigurationOptionsFor(Institution $institution): ?InstitutionConfigurationOptions { return $this->repository->findConfigurationOptionsFor($institution); @@ -54,14 +48,14 @@ public function findInstitutionConfigurationOptionsFor(Institution $institution) * * When the DISABLED value is set on the institution (when no specific configuration was pushed) the application * default is returned. - * - * @return int */ public function getMaxNumberOfTokensFor(Institution $institution): int { $configuration = $this->findInstitutionConfigurationOptionsFor($institution); - if ($configuration instanceof \Surfnet\StepupMiddleware\ApiBundle\Configuration\Entity\InstitutionConfigurationOptions && $configuration->numberOfTokensPerIdentityOption->isEnabled()) { + if ($configuration instanceof InstitutionConfigurationOptions && + $configuration->numberOfTokensPerIdentityOption->isEnabled() + ) { return $configuration->numberOfTokensPerIdentityOption->getNumberOfTokensPerIdentity(); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/AuditLogEntry.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/AuditLogEntry.php index 561bc86b1..f047a96f7 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/AuditLogEntry.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/AuditLogEntry.php @@ -168,7 +168,7 @@ public function jsonSerialize(): array { return [ 'actor_id' => $this->actorId, - 'actor_institution' => $this->actorInstitution instanceof \Surfnet\Stepup\Identity\Value\Institution ? (string)$this->actorInstitution : null, + 'actor_institution' => $this->actorInstitution instanceof Institution ? (string)$this->actorInstitution : null, 'actor_common_name' => $this->actorCommonName, 'identity_id' => $this->identityId, 'identity_institution' => (string)$this->identityInstitution, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaListingProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaListingProjector.php index e5eeb4af9..0fe328319 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaListingProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaListingProjector.php @@ -241,7 +241,6 @@ public function applyAppointedAsRaaEvent(AppointedAsRaaEvent $event): void $listing->role = AuthorityRole::raa(); $this->raListingRepository->save($listing); } - } /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaSecondFactorProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaSecondFactorProjector.php index 5aaa351d7..a9921fd6f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaSecondFactorProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaSecondFactorProjector.php @@ -308,8 +308,7 @@ protected function applyUnverifiedSecondFactorRevokedEvent(UnverifiedSecondFacto protected function applyCompliedWithUnverifiedSecondFactorRevocationEvent( CompliedWithUnverifiedSecondFactorRevocationEvent $event, - ): void - { + ): void { $this->updateStatus($event->secondFactorId, SecondFactorStatus::revoked()); } @@ -320,8 +319,7 @@ protected function applyVerifiedSecondFactorRevokedEvent(VerifiedSecondFactorRev protected function applyCompliedWithVerifiedSecondFactorRevocationEvent( CompliedWithVerifiedSecondFactorRevocationEvent $event, - ): void - { + ): void { $this->updateStatus($event->secondFactorId, SecondFactorStatus::revoked()); } @@ -332,8 +330,7 @@ protected function applyVettedSecondFactorRevokedEvent(VettedSecondFactorRevoked protected function applyCompliedWithVettedSecondFactorRevocationEvent( CompliedWithVettedSecondFactorRevocationEvent $event, - ): void - { + ): void { $this->updateStatus($event->secondFactorId, SecondFactorStatus::revoked()); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php index b78b993a5..355573cb4 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php @@ -239,8 +239,7 @@ protected function applyUnverifiedSecondFactorRevokedEvent(UnverifiedSecondFacto protected function applyCompliedWithUnverifiedSecondFactorRevocationEvent( CompliedWithUnverifiedSecondFactorRevocationEvent $event, - ): void - { + ): void { $this->unverifiedRepository->remove( $this->unverifiedRepository->find($event->secondFactorId->getSecondFactorId()), ); @@ -253,8 +252,7 @@ protected function applyVerifiedSecondFactorRevokedEvent(VerifiedSecondFactorRev protected function applyCompliedWithVerifiedSecondFactorRevocationEvent( CompliedWithVerifiedSecondFactorRevocationEvent $event, - ): void - { + ): void { $this->verifiedRepository->remove($this->verifiedRepository->find($event->secondFactorId->getSecondFactorId())); } @@ -265,8 +263,7 @@ protected function applyVettedSecondFactorRevokedEvent(VettedSecondFactorRevoked protected function applyCompliedWithVettedSecondFactorRevocationEvent( CompliedWithVettedSecondFactorRevocationEvent $event, - ): void - { + ): void { $this->vettedRepository->remove($this->vettedRepository->find($event->secondFactorId->getSecondFactorId())); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorRevocationProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorRevocationProjector.php index 87bd40b68..e5e3047d2 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorRevocationProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorRevocationProjector.php @@ -37,8 +37,7 @@ public function __construct(private readonly SecondFactorRevocationRepository $r protected function applyVettedSecondFactorRevokedEvent( VettedSecondFactorRevokedEvent $event, DomainMessage $domainMessage, - ): void - { + ): void { $revocation = new SecondFactorRevocation(); $revocation->id = (string)Uuid::uuid4(); $revocation->institution = $event->identityInstitution; @@ -52,8 +51,7 @@ protected function applyVettedSecondFactorRevokedEvent( protected function applyCompliedWithVettedSecondFactorRevocationEvent( CompliedWithVettedSecondFactorRevocationEvent $event, DomainMessage $domainMessage, - ): void - { + ): void { $revocation = new SecondFactorRevocation(); $revocation->id = (string)Uuid::uuid4(); $revocation->institution = $event->identityInstitution; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuditLogRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuditLogRepository.php index 4b8d03466..0642c7947 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuditLogRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/AuditLogRepository.php @@ -122,7 +122,14 @@ public function createSecondFactorSearchQuery(SecondFactorAuditLogQuery $query): ->setParameter('secondFactorEvents', self::$secondFactorEvents); match ($query->orderBy) { - 'secondFactorType', 'secondFactorIdentifier', 'recoveryTokenType', 'recoveryTokenIdentifier', 'recordedOn', 'actorCommonName', 'actorInstitution' => $queryBuilder->orderBy( + 'secondFactorType', + 'secondFactorIdentifier', + 'recoveryTokenType', + 'recoveryTokenIdentifier', + 'recordedOn', + 'actorCommonName', + 'actorInstitution' + => $queryBuilder->orderBy( sprintf('al.%s', $query->orderBy), $query->orderDirection === 'desc' ? 'DESC' : 'ASC', ), diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RecoveryTokenRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RecoveryTokenRepository.php index 6f4b1ea9a..e1b7331d7 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RecoveryTokenRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RecoveryTokenRepository.php @@ -24,6 +24,7 @@ use Doctrine\Persistence\ManagerRegistry; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\StepupMiddleware\ApiBundle\Authorization\Filter\InstitutionAuthorizationRepositoryFilter; +use Surfnet\StepupMiddleware\ApiBundle\Authorization\Value\InstitutionAuthorizationContextInterface; use Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\RecoveryTokenStatusType; use Surfnet\StepupMiddleware\ApiBundle\Exception\RuntimeException; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\RecoveryToken; @@ -63,7 +64,7 @@ public function createSearchQuery(RecoveryTokenQuery $query): Query { $queryBuilder = $this->createQueryBuilder('rt'); - if ($query->authorizationContext instanceof \Surfnet\StepupMiddleware\ApiBundle\Authorization\Value\InstitutionAuthorizationContextInterface) { + if ($query->authorizationContext instanceof InstitutionAuthorizationContextInterface) { // Modify query to filter on authorization context // We want to list all recovery tokens of the institution we are RA for. $this->authorizationRepositoryFilter->filter( @@ -73,7 +74,7 @@ public function createSearchQuery(RecoveryTokenQuery $query): Query 'iac', ); } - if ($query->identityId instanceof \Surfnet\Stepup\Identity\Value\IdentityId) { + if ($query->identityId instanceof IdentityId) { $queryBuilder ->andWhere('rt.identityId = :identityId') ->setParameter('identityId', $query->identityId); @@ -139,7 +140,7 @@ public function createOptionsQuery(RecoveryTokenQuery $query): Query ->select('sf.institution') ->groupBy('sf.institution'); - if ($query->authorizationContext instanceof \Surfnet\StepupMiddleware\ApiBundle\Authorization\Value\InstitutionAuthorizationContextInterface) { + if ($query->authorizationContext instanceof InstitutionAuthorizationContextInterface) { // Modify query to filter on authorization context // We want to list all second factors of the institution we are RA for. $this->authorizationRepositoryFilter->filter( diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaListingService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaListingService.php index 705828d56..22f0f58a5 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaListingService.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaListingService.php @@ -33,15 +33,11 @@ public function __construct(private readonly RaListingRepository $raListingRepos { } - /** - * @return null|RaListing - */ public function findByIdentityIdAndRaInstitutionWithContext( IdentityId $identityId, Institution $raInstitution, InstitutionAuthorizationContextInterface $authorizationContext, - ): ?RaListing - { + ): ?RaListing { return $this->raListingRepository->findByIdentityIdAndRaInstitutionWithContext( $identityId, $raInstitution, @@ -75,7 +71,7 @@ public function listRegistrationAuthoritiesFor(Institution $institution): array $raListings = $this->raListingRepository->listRasFor($institution); return $raListings - ->map(fn(RaListing $raListing): \Surfnet\StepupMiddleware\ApiBundle\Identity\Value\RegistrationAuthorityCredentials => RegistrationAuthorityCredentials::fromRaListing($raListing)) + ->map(fn(RaListing $raListing): RegistrationAuthorityCredentials => RegistrationAuthorityCredentials::fromRaListing($raListing)) ->toArray(); } } diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/InstitutionConfiguration.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/InstitutionConfiguration.php index 5385f9bdd..2afca69db 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/InstitutionConfiguration.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/InstitutionConfiguration.php @@ -36,7 +36,6 @@ public function __construct( */ #[ORM\Column(type: 'boolean')] public bool $ssoOn2faEnabled - ) - { + ) { } } diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/SecondFactorProjector.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/SecondFactorProjector.php index 738e2bad8..fd217359c 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/SecondFactorProjector.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Projector/SecondFactorProjector.php @@ -126,8 +126,7 @@ protected function applyVettedSecondFactorRevokedEvent(VettedSecondFactorRevoked protected function applyCompliedWithVettedSecondFactorRevocationEvent( CompliedWithVettedSecondFactorRevocationEvent $event, - ): void - { + ): void { $secondFactor = $this->repository->findOneBySecondFactorId($event->secondFactorId); if ($secondFactor === null) { diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php index bc3fb07f8..c757b4608 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapGsspSecondFactorCommand.php @@ -63,7 +63,8 @@ protected function configure(): void } /** - * @SuppressWarnings(PHPMD.ExcessiveMethodLength) Method length could be reduced by deconstructing the bootstrapping of the required data and the vetting of the GSSP + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) Method length could be reduced by deconstructing the bootstrapping + * of the required data and the vetting of the GSSP */ protected function execute(InputInterface $input, OutputInterface $output): int { diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php index 8e81795a9..8226fc65d 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/BootstrapIdentityWithYubikeySecondFactorCommand.php @@ -23,7 +23,8 @@ use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\Stepup\Identity\Value\NameId; use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\IdentityRepository; -use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\BootstrapIdentityWithYubikeySecondFactorCommand as BootstrapIdentityWithYubikeySecondFactorIdentityCommand; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\BootstrapIdentityWithYubikeySecondFactorCommand + as BootstrapIdentityWithYubikeySecondFactorIdentityCommand; use Surfnet\StepupMiddleware\MiddlewareBundle\Service\TransactionHelper; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplayEventsCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplayEventsCommand.php index 66ade8006..9ffd9648d 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplayEventsCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplayEventsCommand.php @@ -46,12 +46,12 @@ protected function configure(): void { $this ->addOption( - 'increments', - 'i', - InputOption::VALUE_REQUIRED, - 'The amount of events that are replayed at once (repeated until all events are replayed)', - 1000, - ); + 'increments', + 'i', + InputOption::VALUE_REQUIRED, + 'The amount of events that are replayed at once (repeated until all events are replayed)', + 1000, + ); } protected function execute(InputInterface $input, OutputInterface $output): int diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/ReplayingEventDispatcher.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/ReplayingEventDispatcher.php index d3a3355ad..d276232b9 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/ReplayingEventDispatcher.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/ReplayingEventDispatcher.php @@ -33,7 +33,8 @@ public function registerProjector(EventListener $projector): void $this->projectors[] = $projector; } - public function dispatch(DomainEventStream $events): void { + public function dispatch(DomainEventStream $events): void + { foreach ($events as $event) { foreach ($this->projectors as $projector) { $projector->handle($event); From 357a694e7d07af5f7e3e04d01801cb073d0c0e81 Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Tue, 2 Apr 2024 09:51:38 +0200 Subject: [PATCH 47/89] Install and repair document headers --- .docheader | 15 +++++ composer.json | 1 + composer.lock | 60 ++++++++++++++++++- src/Surfnet/DataFixtures/AppFixtures.php | 16 +++++ .../Migrations/Version20141031133057.php | 16 +++++ .../SelfAssertedTokensOptionChangedEvent.php | 2 +- .../Event/SelfVetOptionChangedEvent.php | 2 +- .../Event/SsoOn2faOptionChangedEvent.php | 2 +- .../Configuration/Value/InstitutionRole.php | 3 +- .../Value/SelfAssertedTokensOption.php | 2 +- .../Configuration/Value/SelfVetOption.php | 2 +- .../Configuration/Value/SsoOn2faOption.php | 2 +- .../InstitutionAuthorizationOptionTest.php | 2 +- .../Value/InstitutionRoleTest.php | 4 +- .../MigrateVettedSecondFactorCommand.php | 2 +- ...egisterSelfAssertedSecondFactorCommand.php | 2 +- .../Command/SelfVetSecondFactorCommand.php | 2 +- .../RightToObtainDataInterface.php | 16 +++++ src/Surfnet/StepupMiddleware/Kernel.php | 16 +++++ ...SecondFactorDisplayNameResolverService.php | 2 +- ...ndFactorDisplayNameResolverServiceTest.php | 2 +- tests/bootstrap.php | 16 +++++ 22 files changed, 171 insertions(+), 16 deletions(-) create mode 100644 .docheader diff --git a/.docheader b/.docheader new file mode 100644 index 000000000..a12ddf880 --- /dev/null +++ b/.docheader @@ -0,0 +1,15 @@ +/** + * Copyright %regexp:\d{4}% SURFnet %regexp:(B.V.|bv)% + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ diff --git a/composer.json b/composer.json index 458927657..81a356cd0 100644 --- a/composer.json +++ b/composer.json @@ -62,6 +62,7 @@ "doctrine/data-fixtures": "~1.7", "doctrine/doctrine-fixtures-bundle": "^3.5.1", "liip/test-fixtures-bundle": "^2.7", + "malukenho/docheader": "^1.1", "mockery/mockery": "1.7.x-dev", "moontoast/math": "^1.2", "overtrue/phplint": "*", diff --git a/composer.lock b/composer.lock index e94f081b9..a303ac3fc 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "4681103c3b1b653100a98769264006bb", + "content-hash": "f96114a69480199bd5aa4734329b9506", "packages": [ { "name": "beberlei/assert", @@ -9052,6 +9052,64 @@ }, "time": "2020-07-09T08:09:16+00:00" }, + { + "name": "malukenho/docheader", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/malukenho/docheader.git", + "reference": "263320d434c727a014650239c90240bbe808bd17" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/malukenho/docheader/zipball/263320d434c727a014650239c90240bbe808bd17", + "reference": "263320d434c727a014650239c90240bbe808bd17", + "shasum": "" + }, + "require": { + "php": "^8.0", + "symfony/console": "^4.4 || ^5.4 || ^6.0 || ^7.0", + "symfony/finder": "^4.4 || ^5.4 || ^6.0 || ^7.0" + }, + "require-dev": { + "doctrine/coding-standard": "^9.0", + "mikey179/vfsstream": "^1.6.10", + "phpunit/phpunit": "^9.5", + "vimeo/psalm": "^4.23 || ^5.0" + }, + "bin": [ + "bin/docheader" + ], + "type": "library", + "autoload": { + "psr-4": { + "DocHeader\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jefersson Nathan", + "email": "malukenho.dev@gmail.com" + } + ], + "description": "A small library to check header docs", + "homepage": "https://github.com/malukenho/docheader", + "keywords": [ + "Code style", + "code standard", + "license", + "static analysis" + ], + "support": { + "issues": "https://github.com/malukenho/docheader/issues", + "source": "https://github.com/malukenho/docheader/tree/1.1.0" + }, + "time": "2024-02-05T12:05:53+00:00" + }, { "name": "masterminds/html5", "version": "2.8.1", diff --git a/src/Surfnet/DataFixtures/AppFixtures.php b/src/Surfnet/DataFixtures/AppFixtures.php index 4207c8246..80479f788 100644 --- a/src/Surfnet/DataFixtures/AppFixtures.php +++ b/src/Surfnet/DataFixtures/AppFixtures.php @@ -1,5 +1,21 @@ Date: Tue, 2 Apr 2024 10:53:49 +0200 Subject: [PATCH 48/89] Track ci/qa/phpstan.neon --- ci/qa/phpstan.neon | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 ci/qa/phpstan.neon diff --git a/ci/qa/phpstan.neon b/ci/qa/phpstan.neon new file mode 100644 index 000000000..baa9bb720 --- /dev/null +++ b/ci/qa/phpstan.neon @@ -0,0 +1,10 @@ +includes: + - ./phpstan-baseline.neon + - ../../vendor/phpstan/phpstan-doctrine/extension.neon + - ../../vendor/phpstan/phpstan-mockery/extension.neon + - ../../vendor/phpstan/phpstan-symfony/extension.neon + +parameters: + level: 9 + paths: + - ../../src From 86517767ad9fa2f5ec98fd91299f69785dafee96 Mon Sep 17 00:00:00 2001 From: Thijs Kinkhorst Date: Wed, 17 Apr 2024 14:51:28 +0200 Subject: [PATCH 49/89] Also the /internal/{info,health} paths must be publically available --- config/packages/security.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/packages/security.yaml b/config/packages/security.yaml index b0d7eda47..462653faf 100644 --- a/config/packages/security.yaml +++ b/config/packages/security.yaml @@ -4,7 +4,7 @@ security: pattern: ^/_trans(/|$) security: false monitor: - pattern: ^/(info|health)$ + pattern: ^/(internal/)?(info|health)$ security: false api: http_basic: ~ From 8c2125984ab893e2d5763772e40adaa1d81d5c5b Mon Sep 17 00:00:00 2001 From: Thijs Kinkhorst Date: Mon, 4 Mar 2024 13:08:24 +0100 Subject: [PATCH 50/89] Make expiration date in mail match the one displayed in selfservice. Selfservice renders the date without ->endOfDay(). Adding the endOfDay makes the date wrap to the next day when the timezone modifier is applied. More intricate timezone aware handling of this date is thinkable, but this change at least brings both interfaces to use the same algorithm so the output will be the same. --- .../Identity/Service/RegistrationMailService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php index 9a839df00..5fac5c732 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php @@ -227,6 +227,6 @@ private function getExpirationDateOfRegistration(DateTime $date): DateTime { return $date->add( new DateInterval('P14D'), - )->endOfDay(); + ); } } From 7a61750cfc31677c81a9f95cfa9f84cbfa314b4c Mon Sep 17 00:00:00 2001 From: Bas Date: Thu, 7 Nov 2024 12:46:35 +0100 Subject: [PATCH 51/89] Sync new monolog docker logging setup --- config/packages/dev/monolog.yaml | 19 ------------ config/packages/dev_event_replay/monolog.yaml | 19 ------------ config/packages/monolog.yaml | 30 +++++++++++++++++++ config/packages/prod/monolog.yaml | 13 -------- config/packages/prod/monolog.yaml.docker | 12 -------- .../packages/prod_event_replay/monolog.yaml | 13 -------- config/packages/smoketest/monolog.yaml | 12 -------- .../smoketest_event_replay/monolog.yaml | 19 ------------ config/packages/test/monolog.yaml | 16 ---------- 9 files changed, 30 insertions(+), 123 deletions(-) delete mode 100644 config/packages/dev/monolog.yaml delete mode 100644 config/packages/dev_event_replay/monolog.yaml create mode 100644 config/packages/monolog.yaml delete mode 100644 config/packages/prod/monolog.yaml delete mode 100644 config/packages/prod/monolog.yaml.docker delete mode 100644 config/packages/prod_event_replay/monolog.yaml delete mode 100644 config/packages/smoketest/monolog.yaml delete mode 100644 config/packages/smoketest_event_replay/monolog.yaml delete mode 100644 config/packages/test/monolog.yaml diff --git a/config/packages/dev/monolog.yaml b/config/packages/dev/monolog.yaml deleted file mode 100644 index 918208b8d..000000000 --- a/config/packages/dev/monolog.yaml +++ /dev/null @@ -1,19 +0,0 @@ -monolog: - handlers: - prod-signaler: - type: fingers_crossed - action_level: ERROR - passthru_level: DEBUG # DEV setting: this means that all message of level DEBUG or higher are always logged - #passthru_level: NOTICE # PROD setting this means that all message of level NOTICE or higher are always logged - handler: main_syslog - bubble: true - main_syslog: - type: syslog - ident: stepup-middleware - facility: user - formatter: surfnet_stepup.monolog.json_formatter - main_logfile: - type: stream - handler: logfile - level: NOTICE - path: "%kernel.logs_dir%/%kernel.environment%.log" \ No newline at end of file diff --git a/config/packages/dev_event_replay/monolog.yaml b/config/packages/dev_event_replay/monolog.yaml deleted file mode 100644 index 918208b8d..000000000 --- a/config/packages/dev_event_replay/monolog.yaml +++ /dev/null @@ -1,19 +0,0 @@ -monolog: - handlers: - prod-signaler: - type: fingers_crossed - action_level: ERROR - passthru_level: DEBUG # DEV setting: this means that all message of level DEBUG or higher are always logged - #passthru_level: NOTICE # PROD setting this means that all message of level NOTICE or higher are always logged - handler: main_syslog - bubble: true - main_syslog: - type: syslog - ident: stepup-middleware - facility: user - formatter: surfnet_stepup.monolog.json_formatter - main_logfile: - type: stream - handler: logfile - level: NOTICE - path: "%kernel.logs_dir%/%kernel.environment%.log" \ No newline at end of file diff --git a/config/packages/monolog.yaml b/config/packages/monolog.yaml new file mode 100644 index 000000000..10bca89bc --- /dev/null +++ b/config/packages/monolog.yaml @@ -0,0 +1,30 @@ +monolog: + handlers: + prod-signaler: + type: fingers_crossed + action_level: ERROR + passthru_level: NOTICE # this means that all message of level NOTICE or higher are always logged + handler: main_syslog + bubble: false # if we handle it, nothing else should + channels: [ "!deprecation" ] + main_syslog: + type: stream + path: "php://stderr" + formatter: surfnet_stepup.monolog.json_formatter + channels: [ "!deprecation" ] + +when@dev: &override + monolog: + handlers: + main_syslog: + type: stream + path: php://stderr + level: error + channels: ["!event", "!doctrine", "!deprecation", "!console"] + console: + type: console + process_psr_3_messages: false + channels: ["!event", "!doctrine", "!deprecation", "!console"] +when@test: *override +when@smoketest: *override +when@smoketest_event_replay: *override diff --git a/config/packages/prod/monolog.yaml b/config/packages/prod/monolog.yaml deleted file mode 100644 index 7fcd08ebc..000000000 --- a/config/packages/prod/monolog.yaml +++ /dev/null @@ -1,13 +0,0 @@ -monolog: - handlers: - prod-signaler: - type: fingers_crossed - action_level: ERROR - passthru_level: NOTICE # this means that all message of level NOTICE or higher are always logged - handler: main_syslog - bubble: false # if we handle it, nothing else should - main_syslog: - type: syslog - ident: stepup-middleware - facility: user - formatter: surfnet_stepup.monolog.json_formatter diff --git a/config/packages/prod/monolog.yaml.docker b/config/packages/prod/monolog.yaml.docker deleted file mode 100644 index f1a1e7e91..000000000 --- a/config/packages/prod/monolog.yaml.docker +++ /dev/null @@ -1,12 +0,0 @@ -monolog: - handlers: - prod-signaler: - type: fingers_crossed - action_level: ERROR - passthru_level: NOTICE # this means that all message of level NOTICE or higher are always logged - handler: main_syslog - bubble: false # if we handle it, nothing else should - main_syslog: - type: stream - path: "php://stderr" - formatter: surfnet_stepup.monolog.json_formatter diff --git a/config/packages/prod_event_replay/monolog.yaml b/config/packages/prod_event_replay/monolog.yaml deleted file mode 100644 index 7fcd08ebc..000000000 --- a/config/packages/prod_event_replay/monolog.yaml +++ /dev/null @@ -1,13 +0,0 @@ -monolog: - handlers: - prod-signaler: - type: fingers_crossed - action_level: ERROR - passthru_level: NOTICE # this means that all message of level NOTICE or higher are always logged - handler: main_syslog - bubble: false # if we handle it, nothing else should - main_syslog: - type: syslog - ident: stepup-middleware - facility: user - formatter: surfnet_stepup.monolog.json_formatter diff --git a/config/packages/smoketest/monolog.yaml b/config/packages/smoketest/monolog.yaml deleted file mode 100644 index f1a1e7e91..000000000 --- a/config/packages/smoketest/monolog.yaml +++ /dev/null @@ -1,12 +0,0 @@ -monolog: - handlers: - prod-signaler: - type: fingers_crossed - action_level: ERROR - passthru_level: NOTICE # this means that all message of level NOTICE or higher are always logged - handler: main_syslog - bubble: false # if we handle it, nothing else should - main_syslog: - type: stream - path: "php://stderr" - formatter: surfnet_stepup.monolog.json_formatter diff --git a/config/packages/smoketest_event_replay/monolog.yaml b/config/packages/smoketest_event_replay/monolog.yaml deleted file mode 100644 index 918208b8d..000000000 --- a/config/packages/smoketest_event_replay/monolog.yaml +++ /dev/null @@ -1,19 +0,0 @@ -monolog: - handlers: - prod-signaler: - type: fingers_crossed - action_level: ERROR - passthru_level: DEBUG # DEV setting: this means that all message of level DEBUG or higher are always logged - #passthru_level: NOTICE # PROD setting this means that all message of level NOTICE or higher are always logged - handler: main_syslog - bubble: true - main_syslog: - type: syslog - ident: stepup-middleware - facility: user - formatter: surfnet_stepup.monolog.json_formatter - main_logfile: - type: stream - handler: logfile - level: NOTICE - path: "%kernel.logs_dir%/%kernel.environment%.log" \ No newline at end of file diff --git a/config/packages/test/monolog.yaml b/config/packages/test/monolog.yaml deleted file mode 100644 index 636b38c01..000000000 --- a/config/packages/test/monolog.yaml +++ /dev/null @@ -1,16 +0,0 @@ -monolog: - handlers: - prod-signaler: - type: fingers_crossed - action_level: ERROR - passthru_level: NOTICE # this means that all message of level NOTICE or higher are always logged - handler: main_syslog - bubble: false # if we handle it, nothing else should - main_syslog: - type: stream - path: "php://stderr" - formatter: surfnet_stepup.monolog.json_formatter - console: - type: "null" - main_logfile: - type: "null" From 62f30421c7c60d541bbc72c8d933353d43d9e6af Mon Sep 17 00:00:00 2001 From: Bas Date: Thu, 7 Nov 2024 13:03:25 +0100 Subject: [PATCH 52/89] Sync framework config setup --- config/packages/framework.yaml | 17 +++++++++++++++++ config/packages/smoketest/framework.yaml | 6 ------ .../smoketest_event_replay/framework.yaml | 4 ---- config/packages/test/framework.yaml | 4 ---- 4 files changed, 17 insertions(+), 14 deletions(-) delete mode 100644 config/packages/smoketest/framework.yaml delete mode 100644 config/packages/smoketest_event_replay/framework.yaml delete mode 100644 config/packages/test/framework.yaml diff --git a/config/packages/framework.yaml b/config/packages/framework.yaml index 0623aea2a..3d0071892 100644 --- a/config/packages/framework.yaml +++ b/config/packages/framework.yaml @@ -14,3 +14,20 @@ framework: fragments: false php_errors: log: true + +when@dev: + framework: + router: + strict_requirements: true + profiler: { only_exceptions: false } + +when@smoketest: &testOverride + framework: + test: true + profiler: + collect: false + php_errors: + log: false # prevents user deprecated warnings + +when@test: *testOverride +when@sometest_event_replay: *testOverride \ No newline at end of file diff --git a/config/packages/smoketest/framework.yaml b/config/packages/smoketest/framework.yaml deleted file mode 100644 index 00dcd315f..000000000 --- a/config/packages/smoketest/framework.yaml +++ /dev/null @@ -1,6 +0,0 @@ -framework: - test: true - profiler: - collect: false - php_errors: - log: false # prevents user deprecated warnings diff --git a/config/packages/smoketest_event_replay/framework.yaml b/config/packages/smoketest_event_replay/framework.yaml deleted file mode 100644 index 337675326..000000000 --- a/config/packages/smoketest_event_replay/framework.yaml +++ /dev/null @@ -1,4 +0,0 @@ -framework: - test: ~ - profiler: - collect: false diff --git a/config/packages/test/framework.yaml b/config/packages/test/framework.yaml deleted file mode 100644 index 3b4de93dd..000000000 --- a/config/packages/test/framework.yaml +++ /dev/null @@ -1,4 +0,0 @@ -framework: - test: true - profiler: - collect: false From 02989b045bc031974a0b1597192327d7668e49fd Mon Sep 17 00:00:00 2001 From: Bas Date: Thu, 7 Nov 2024 13:04:07 +0100 Subject: [PATCH 53/89] Force phpunit in test mode by setting env --- ci/qa/phpunit.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/qa/phpunit.xml b/ci/qa/phpunit.xml index 47db5e90b..2815bba19 100644 --- a/ci/qa/phpunit.xml +++ b/ci/qa/phpunit.xml @@ -12,6 +12,7 @@ + From 7a9725f93793b5bb99ed6ea54a0418d5197ffa9a Mon Sep 17 00:00:00 2001 From: Bas Date: Thu, 7 Nov 2024 13:13:52 +0100 Subject: [PATCH 54/89] Fix update configuration command Don't use DI but public param instead in order to run the tests which expect a constructor without parameters. --- .../Configuration/Command/UpdateConfigurationCommand.php | 9 ++------- .../CommandHandler/ConfigurationCommandHandlerTest.php | 4 +++- .../Controller/ConfigurationController.php | 3 ++- .../Constraints/HasValidConfigurationStructure.php | 6 +++--- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/UpdateConfigurationCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/UpdateConfigurationCommand.php index b123e20e3..3551868fe 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/UpdateConfigurationCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/UpdateConfigurationCommand.php @@ -25,11 +25,6 @@ class UpdateConfigurationCommand extends AbstractCommand implements ManagementExecutable { - public function __construct( - /** - * @ManagementAssert\HasValidConfigurationStructure - */ - public string $configuration - ) { - } + #[ManagementAssert\HasValidConfigurationStructure] + public string $configuration; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php index 7e83cc716..4b38f694f 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php @@ -155,7 +155,9 @@ private function createUpdateCommand(array $configuration): UpdateConfigurationC if (!is_string($encodedConfiguration)) { throw new RuntimeException('The configuration could not be json_encoded'); } - return new UpdateConfigurationCommand($encodedConfiguration); + $configuration = new UpdateConfigurationCommand(); + $configuration->configuration = $encodedConfiguration; + return $configuration; } /** diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php index 5b23a4abb..76ad545ea 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php @@ -36,7 +36,8 @@ public function __construct( public function update(Request $request): JsonResponse { - $command = new UpdateConfigurationCommand($request->getContent()); + $command = new UpdateConfigurationCommand(); + $command->configuration = $request->getContent(); $command->UUID = (string)Uuid::uuid4(); return $this->handleCommand($request, $command); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Constraints/HasValidConfigurationStructure.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Constraints/HasValidConfigurationStructure.php index e045881f7..1dc578658 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Constraints/HasValidConfigurationStructure.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Validator/Constraints/HasValidConfigurationStructure.php @@ -1,5 +1,6 @@ Date: Thu, 7 Nov 2024 13:15:02 +0100 Subject: [PATCH 55/89] Fix NameId VO So empty NameId's trigger an exception. --- src/Surfnet/Stepup/Identity/Value/NameId.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Surfnet/Stepup/Identity/Value/NameId.php b/src/Surfnet/Stepup/Identity/Value/NameId.php index c2953c70a..71ad0eafc 100644 --- a/src/Surfnet/Stepup/Identity/Value/NameId.php +++ b/src/Surfnet/Stepup/Identity/Value/NameId.php @@ -39,7 +39,7 @@ final class NameId implements JsonSerializable, Stringable public function __construct(string $value) { - if (strlen($value) > self::MAX_LENGTH) { + if (strlen($value) > self::MAX_LENGTH || strlen($value) === 0) { throw new InvalidArgumentException( 'Invalid argument type: maximum length for nameId exceeds configured length of ' . self::MAX_LENGTH, ); From 358394ab7260adb0115d1706408d1e5964aee1e5 Mon Sep 17 00:00:00 2001 From: Bas Date: Thu, 7 Nov 2024 13:15:32 +0100 Subject: [PATCH 56/89] Fix routes extension Use .yaml instead of .yml so they are loaded. --- config/routes/dev/{routes.yml => routes.yaml} | 0 config/routes/{routes.yml => routes.yaml} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename config/routes/dev/{routes.yml => routes.yaml} (100%) rename config/routes/{routes.yml => routes.yaml} (100%) diff --git a/config/routes/dev/routes.yml b/config/routes/dev/routes.yaml similarity index 100% rename from config/routes/dev/routes.yml rename to config/routes/dev/routes.yaml diff --git a/config/routes/routes.yml b/config/routes/routes.yaml similarity index 100% rename from config/routes/routes.yml rename to config/routes/routes.yaml From 082b0bd33f034171ba0c012b9ce57dcb1bc87eb9 Mon Sep 17 00:00:00 2001 From: Bas Date: Thu, 7 Nov 2024 14:30:53 +0100 Subject: [PATCH 57/89] Remove duplicate composer dependencies --- composer.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/composer.json b/composer.json index 81a356cd0..68a6dfbad 100644 --- a/composer.json +++ b/composer.json @@ -25,12 +25,10 @@ "broadway/event-store-dbal": "^0.6", "doctrine/annotations": "^2.0", "doctrine/doctrine-bundle": "^2.11", - "doctrine/doctrine-fixtures-bundle": "^3.5", "doctrine/doctrine-migrations-bundle": "^3.3", "doctrine/orm": "^3.0", "incenteev/composer-parameter-handler": "~2.0", "jms/translation-bundle": "^2.2", - "liip/test-fixtures-bundle": "^2.7", "nelmio/security-bundle": "^3.1", "openconext/monitor-bundle": "^4.1", "pagerfanta/doctrine-orm-adapter": "*", From c840078241747091b497ebc9919395a3349d7c53 Mon Sep 17 00:00:00 2001 From: Bas Date: Mon, 11 Nov 2024 10:41:42 +0100 Subject: [PATCH 58/89] Add missing migration doc headers --- .../Migrations/Version20141031144721.php | 16 ++++++++++++++++ .../Migrations/Version20141031163549.php | 16 ++++++++++++++++ .../Migrations/Version20141031164140.php | 16 ++++++++++++++++ .../Migrations/Version20141112093720.php | 16 ++++++++++++++++ .../Migrations/Version20141112094457.php | 16 ++++++++++++++++ .../Migrations/Version20141114095245.php | 16 ++++++++++++++++ .../Migrations/Version20141117230116.php | 16 ++++++++++++++++ .../Migrations/Version20141118114026.php | 16 ++++++++++++++++ .../Migrations/Version20141119093423.php | 16 ++++++++++++++++ .../Migrations/Version20141119113444.php | 16 ++++++++++++++++ .../Migrations/Version20141119113553.php | 16 ++++++++++++++++ .../Migrations/Version20141120150430.php | 16 ++++++++++++++++ .../Migrations/Version20141120152310.php | 16 ++++++++++++++++ .../Migrations/Version20141125154133.php | 16 ++++++++++++++++ .../Migrations/Version20141125154214.php | 15 +++++++++++++++ .../Migrations/Version20141125155001.php | 16 ++++++++++++++++ .../Migrations/Version20141128143908.php | 16 ++++++++++++++++ .../Migrations/Version20141128143946.php | 15 +++++++++++++++ .../Migrations/Version20141202121811.php | 16 ++++++++++++++++ .../Migrations/Version20141204140639.php | 16 ++++++++++++++++ .../Migrations/Version20141205112641.php | 16 ++++++++++++++++ .../Migrations/Version20141208121040.php | 16 ++++++++++++++++ .../Migrations/Version20141208162045.php | 16 ++++++++++++++++ .../Migrations/Version20141208172438.php | 16 ++++++++++++++++ .../Migrations/Version20141209150426.php | 15 +++++++++++++++ .../Migrations/Version20141210174213.php | 16 ++++++++++++++++ .../Migrations/Version20141215150518.php | 16 ++++++++++++++++ .../Migrations/Version20150217122017.php | 16 ++++++++++++++++ .../Migrations/Version20150225155343.php | 16 ++++++++++++++++ .../Migrations/Version20150305114932.php | 16 ++++++++++++++++ .../Migrations/Version20150305115030.php | 16 ++++++++++++++++ .../Migrations/Version20150305134846.php | 16 ++++++++++++++++ .../Migrations/Version20150312134629.php | 16 ++++++++++++++++ .../Migrations/Version20150312162849.php | 16 ++++++++++++++++ .../Migrations/Version20150330160809.php | 16 ++++++++++++++++ .../Migrations/Version20150407103950.php | 16 ++++++++++++++++ .../Migrations/Version20150408122247.php | 16 ++++++++++++++++ .../Migrations/Version20150409142404.php | 16 ++++++++++++++++ .../Migrations/Version20150422162952.php | 16 ++++++++++++++++ .../Migrations/Version20150428153351.php | 16 ++++++++++++++++ .../Migrations/Version20150428174400.php | 16 ++++++++++++++++ .../Migrations/Version20150501123735.php | 16 ++++++++++++++++ .../Migrations/Version20150504102420.php | 16 ++++++++++++++++ .../Migrations/Version20150507124421.php | 16 ++++++++++++++++ .../Migrations/Version20150508085838.php | 16 ++++++++++++++++ .../Migrations/Version20150518152006.php | 16 ++++++++++++++++ .../Migrations/Version20150522163053.php | 15 +++++++++++++++ .../Migrations/Version20150522164907.php | 16 ++++++++++++++++ .../Migrations/Version20150526152956.php | 16 ++++++++++++++++ .../Migrations/Version20150528154959.php | 16 ++++++++++++++++ .../Migrations/Version20150601154557.php | 16 ++++++++++++++++ .../Migrations/Version20150601154942.php | 16 ++++++++++++++++ .../Migrations/Version20150604143755.php | 16 ++++++++++++++++ .../Migrations/Version20150604143756.php | 16 ++++++++++++++++ .../Migrations/Version20150604143757.php | 16 ++++++++++++++++ .../Migrations/Version20150604143758.php | 16 ++++++++++++++++ .../Migrations/Version20150611105956.php | 16 ++++++++++++++++ .../Migrations/Version20150611163038.php | 16 ++++++++++++++++ .../Migrations/Version20150615114646.php | 16 ++++++++++++++++ .../Migrations/Version20150617141129.php | 16 ++++++++++++++++ .../Migrations/Version20150618121907.php | 16 ++++++++++++++++ .../Migrations/Version20160219133522.php | 16 ++++++++++++++++ .../Migrations/Version20160607142244.php | 16 ++++++++++++++++ .../Migrations/Version20160617163830.php | 16 ++++++++++++++++ .../Migrations/Version20160620090507.php | 16 ++++++++++++++++ .../Migrations/Version20160620153812.php | 16 ++++++++++++++++ .../Migrations/Version20160621112027.php | 16 ++++++++++++++++ .../Migrations/Version20160622100140.php | 16 ++++++++++++++++ .../Migrations/Version20160622160146.php | 16 ++++++++++++++++ .../Migrations/Version20160719090050.php | 16 ++++++++++++++++ .../Migrations/Version20160719090051.php | 16 ++++++++++++++++ .../Migrations/Version20160719090052.php | 16 ++++++++++++++++ .../Migrations/Version20170210140051.php | 16 ++++++++++++++++ .../Migrations/Version20170216085513.php | 16 ++++++++++++++++ .../Migrations/Version20171113123232.php | 16 ++++++++++++++++ .../Migrations/Version20180116091349.php | 16 ++++++++++++++++ .../Migrations/Version20180131150800.php | 16 ++++++++++++++++ .../Migrations/Version20180330094402.php | 16 ++++++++++++++++ .../Migrations/Version20180409100948.php | 16 ++++++++++++++++ .../Migrations/Version20180926144517.php | 16 ++++++++++++++++ .../Migrations/Version20181001082254.php | 16 ++++++++++++++++ .../Migrations/Version20181023151546.php | 16 ++++++++++++++++ .../Migrations/Version20181101103348.php | 16 ++++++++++++++++ .../Migrations/Version20190211163604.php | 16 ++++++++++++++++ .../Migrations/Version20200114161618.php | 16 ++++++++++++++++ .../Migrations/Version20200416135127.php | 16 ++++++++++++++++ .../Migrations/Version20210308092347.php | 17 +++++++++++++++++ .../Migrations/Version20210610131957.php | 17 +++++++++++++++++ .../Migrations/Version20220519134637.php | 17 +++++++++++++++++ .../Migrations/Version20221102143350.php | 17 +++++++++++++++++ 90 files changed, 1440 insertions(+) diff --git a/src/Surfnet/Migrations/Version20141031144721.php b/src/Surfnet/Migrations/Version20141031144721.php index 1e490ff0d..3e3dd53d9 100644 --- a/src/Surfnet/Migrations/Version20141031144721.php +++ b/src/Surfnet/Migrations/Version20141031144721.php @@ -1,5 +1,21 @@ Date: Mon, 11 Nov 2024 14:48:58 +0100 Subject: [PATCH 59/89] Fix broken tests --- .../Stepup/Configuration/Configuration.php | 2 +- .../Value/AuthorizedInstitutionCollection.php | 10 ++-- .../ConfiguredInstitutionControllerTest.php | 12 +++-- .../Tests/Endpoint/SraaControllerTest.php | 16 +++--- .../Request/InstitutionParamConverterTest.php | 2 +- .../Command/AbstractCommand.php | 2 +- .../Command/UpdateConfigurationCommand.php | 2 +- .../ConfigurationCommandHandlerTest.php | 1 - ...itutionConfigurationCommandHandlerTest.php | 1 - .../EventHandling/BufferedEventBusTest.php | 15 +++--- .../IdentityCommandHandlerTest.php | 42 +++------------- .../RightToBeForgottenCommandHandlerTest.php | 44 +++++----------- .../Entity/SamlEntityRepository.php | 2 +- src/Surfnet/StepupMiddleware/Kernel.php | 5 -- .../ConfigurationControllerTest.php | 13 +++-- ...InstitutionConfigurationControllerTest.php | 15 +++--- .../invalid_configuration/invalid_idps.php | 50 ------------------- .../Fixtures/invalid_configuration/null.php | 22 -------- .../Resources/config/console_commands.yml | 2 +- 19 files changed, 65 insertions(+), 193 deletions(-) delete mode 100644 src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_idps.php delete mode 100644 src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/null.php diff --git a/src/Surfnet/Stepup/Configuration/Configuration.php b/src/Surfnet/Stepup/Configuration/Configuration.php index aa1490cdc..5981eb8bc 100644 --- a/src/Surfnet/Stepup/Configuration/Configuration.php +++ b/src/Surfnet/Stepup/Configuration/Configuration.php @@ -38,7 +38,7 @@ class Configuration extends EventSourcedAggregateRoot implements ConfigurationIn /** * @var array */ - private array $configuration; + private array|null $configuration = null; public static function create(): self { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorizedInstitutionCollection.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorizedInstitutionCollection.php index ea252bff8..eef708ae3 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorizedInstitutionCollection.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/AuthorizedInstitutionCollection.php @@ -44,18 +44,18 @@ public static function from( /** @var string $institution */ foreach ($raInstitutions as $institution) { - $collection->authorizations[$institution][] = AuthorityRole::ROLE_RA; + $collection->authorizations[(string)$institution][] = AuthorityRole::ROLE_RA; } if ($raaInstitutions instanceof InstitutionCollection) { /** @var string $institution */ foreach ($raaInstitutions as $institution) { // Override existing lower role - if (isset($collection->authorizations[$institution]) - && in_array(AuthorityRole::ROLE_RA, $collection->authorizations[$institution]) + if (isset($collection->authorizations[(string)$institution]) + && in_array(AuthorityRole::ROLE_RA, $collection->authorizations[(string)$institution]) ) { - $collection->authorizations[$institution] = []; + $collection->authorizations[(string)$institution] = []; } - $collection->authorizations[$institution][] = AuthorityRole::ROLE_RAA; + $collection->authorizations[(string)$institution][] = AuthorityRole::ROLE_RAA; } } return $collection; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php index ca9b22330..c55d85d92 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php @@ -21,6 +21,7 @@ use Doctrine\Persistence\ManagerRegistry; use Generator; use Liip\TestFixturesBundle\Services\DatabaseToolCollection; +use Liip\TestFixturesBundle\Services\DatabaseTools\AbstractDatabaseTool; use Liip\TestFixturesBundle\Services\DatabaseTools\ORMSqliteDatabaseTool; use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use Symfony\Bundle\FrameworkBundle\KernelBrowser; @@ -44,19 +45,20 @@ class ConfiguredInstitutionControllerTest extends WebTestCase */ private string $endpoint; - private ORMSqliteDatabaseTool $databaseTool; + private AbstractDatabaseTool $databaseTool; public function setUp(): void { self::ensureKernelShutdown(); - $this->client = static::createClient(); - $tool = static::getContainer()->get(ORMSqliteDatabaseTool::class); - if (!$tool instanceof ORMSqliteDatabaseTool) { + $this->client = static::createClient(); + $databaseTool = $this->client->getContainer()->get(DatabaseToolCollection::class); + if (!$databaseTool instanceof DatabaseToolCollection) { $this->fail('Unable to grab the ORMSqliteDatabaseTool from the container'); } - $this->databaseTool = $tool; + $this->databaseTool = $databaseTool->get(); + $registry = static::getContainer()->get(ManagerRegistry::class); assert($registry instanceof ManagerRegistry, 'ManagerRegistry could not be fetched from the container'); $this->databaseTool->setRegistry($registry); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php index 45e2ad78b..0bef81039 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php @@ -20,10 +20,9 @@ use Generator; use Liip\TestFixturesBundle\Services\DatabaseToolCollection; +use Liip\TestFixturesBundle\Services\DatabaseTools\AbstractDatabaseTool; use Liip\TestFixturesBundle\Services\DatabaseTools\ORMSqliteDatabaseTool; -use Liip\TestFixturesBundle\Test\FixturesTrait; use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; -use Symfony\Bundle\FrameworkBundle\Client; use Symfony\Bundle\FrameworkBundle\KernelBrowser; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; use Symfony\Component\HttpFoundation\Response; @@ -42,19 +41,20 @@ class SraaControllerTest extends WebTestCase private string $endpoint; - private ORMSqliteDatabaseTool $databaseTool; + private AbstractDatabaseTool $databaseTool; public function setUp(): void { - $tool = static::getContainer()->get(ORMSqliteDatabaseTool::class); - if (!$tool instanceof ORMSqliteDatabaseTool) { + $this->client = static::createClient(); + $databaseTool = $this->client->getContainer()->get(DatabaseToolCollection::class); + if (!$databaseTool instanceof DatabaseToolCollection) { $this->fail('Unable to grab the ORMSqliteDatabaseTool from the container'); } - $this->databaseTool = $tool; + $this->databaseTool = $databaseTool->get(); + // Initialises schema. $this->databaseTool->loadFixtures([]); - // Initialises schema. - $this->client = static::createClient(); + $passwordSs = $this->client->getKernel()->getContainer()->getParameter('selfservice_api_password'); $passwordRa = $this->client->getKernel()->getContainer()->getParameter('registration_authority_api_password'); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php index 5649a960e..1edd322f8 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php @@ -86,7 +86,7 @@ private function mockQuery(bool|string $returnValue): ParameterBag&MockInterface $query ->shouldReceive('get') ->once() - ->with('institution', false) + ->with('institution') ->andReturn($returnValue); return $query; diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/AbstractCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/AbstractCommand.php index 214817674..71cb57a87 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/AbstractCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Command/AbstractCommand.php @@ -33,7 +33,7 @@ abstract class AbstractCommand implements Command #[Assert\NotBlank] #[Assert\Type(type: 'string')] #[Assert\Regex(pattern: '~^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$~i')] - public string $UUID; + public string $UUID = ""; public function __toString(): string { diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/UpdateConfigurationCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/UpdateConfigurationCommand.php index 3551868fe..19694ca35 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/UpdateConfigurationCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Command/UpdateConfigurationCommand.php @@ -26,5 +26,5 @@ class UpdateConfigurationCommand extends AbstractCommand implements ManagementEx { #[ManagementAssert\HasValidConfigurationStructure] - public string $configuration; + public string $configuration = ""; } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php index 4b38f694f..3c900aeb1 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/ConfigurationCommandHandlerTest.php @@ -39,7 +39,6 @@ final class ConfigurationCommandHandlerTest extends CommandHandlerTest { - use MockeryPHPUnitIntegration; /** * Shorthand for fixed Configuration ID. diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/InstitutionConfigurationCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/InstitutionConfigurationCommandHandlerTest.php index aa4915d56..24d519d96 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/InstitutionConfigurationCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Configuration/CommandHandler/InstitutionConfigurationCommandHandlerTest.php @@ -68,7 +68,6 @@ class InstitutionConfigurationCommandHandlerTest extends CommandHandlerTest { - use MockeryPHPUnitIntegration; /** * @test diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/BufferedEventBusTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/BufferedEventBusTest.php index 2ea525393..b6ef9e995 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/BufferedEventBusTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/EventHandling/BufferedEventBusTest.php @@ -42,9 +42,8 @@ public function it_buffers_events(): void { $event = $this->createDummyDomainMessage(null); /** @var EventListener&MockInterface $listener */ - $listener = m::mock(EventListener::class) - ->shouldNotHaveReceived('handle') - ->getMock(); + $listener = m::mock(EventListener::class); + $listener->shouldNotHaveReceived('handle'); $bus = new BufferedEventBus($this->getDummyEntityManager()); $bus->subscribe($listener); @@ -63,9 +62,8 @@ public function it_flushes_events(): void { $event = $this->createDummyDomainMessage(null); /** @var EventListener&MockInterface $listener */ - $listener = m::mock(EventListener::class) - ->shouldReceive('handle')->once()->with($event) - ->getMock(); + $listener = m::mock(EventListener::class); + $listener->shouldReceive('handle')->once()->with($event); $bus = new BufferedEventBus($this->getDummyEntityManager()); $bus->subscribe($listener); @@ -86,9 +84,8 @@ public function flushing_succesfully_empties_the_buffer_to_prevent_flushing_the_ { $event = $this->createDummyDomainMessage(null); /** @var EventListener&MockInterface $listener */ - $listener = m::mock(EventListener::class) - ->shouldReceive('handle')->once()->with($event) - ->getMock(); + $listener = m::mock(EventListener::class); + $listener->shouldReceive('handle')->once()->with($event); $bus = new BufferedEventBus($this->getDummyEntityManager()); $bus->subscribe($listener); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php index ff7cf5bc5..3ed084f64 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php @@ -64,6 +64,8 @@ use Surfnet\Stepup\Identity\Value\TimeFrame; use Surfnet\Stepup\Identity\Value\U2fKeyHandle; use Surfnet\Stepup\Identity\Value\YubikeyPublicId; +use Surfnet\Stepup\Token\TokenGenerator; +use Surfnet\StepupBundle\Security\OtpGenerator; use Surfnet\StepupBundle\Service\LoaResolutionService; use Surfnet\StepupBundle\Service\SecondFactorTypeService; use Surfnet\StepupBundle\Value\Loa; @@ -243,9 +245,7 @@ public function a_yubikey_possession_can_be_proven(): void { DateTimeHelper::setCurrentTime(new DateTime(new CoreDateTime('@12345'))); - m::mock('alias:Surfnet\StepupBundle\Security\OtpGenerator') - ->shouldReceive('generate')->once()->andReturn('regcode'); - m::mock('alias:Surfnet\Stepup\Token\TokenGenerator') + m::mock('alias:'.TokenGenerator::class) ->shouldReceive('generateNonce')->once()->andReturn('nonce'); $id = new IdentityId(self::uuid()); @@ -309,11 +309,6 @@ public function a_yubikey_possession_cannot_be_proven_if_the_second_factor_is_no { DateTimeHelper::setCurrentTime(new DateTime(new CoreDateTime('@12345'))); - m::mock('alias:Surfnet\StepupBundle\Security\OtpGenerator') - ->shouldReceive('generate')->once()->andReturn('regcode'); - m::mock('alias:Surfnet\Stepup\Token\TokenGenerator') - ->shouldReceive('generateNonce')->once()->andReturn('nonce'); - $id = new IdentityId(self::uuid()); $institution = new Institution('A Corp.'); $nameId = new NameId(md5(__METHOD__)); @@ -420,9 +415,7 @@ public function a_phone_possession_can_be_proven(): void { DateTimeHelper::setCurrentTime(new DateTime(new CoreDateTime('@12345'))); - m::mock('alias:Surfnet\StepupBundle\Security\OtpGenerator') - ->shouldReceive('generate')->once()->andReturn('regcode'); - m::mock('alias:Surfnet\Stepup\Token\TokenGenerator') + m::mock('alias:'.TokenGenerator::class) ->shouldReceive('generateNonce')->once()->andReturn('nonce'); $id = new IdentityId(self::uuid()); @@ -486,11 +479,6 @@ public function a_phone_possession_cannot_be_proven_if_the_second_factor_is_not_ { DateTimeHelper::setCurrentTime(new DateTime(new CoreDateTime('@12345'))); - m::mock('alias:Surfnet\StepupBundle\Security\OtpGenerator') - ->shouldReceive('generate')->once()->andReturn('regcode'); - m::mock('alias:Surfnet\Stepup\Token\TokenGenerator') - ->shouldReceive('generateNonce')->once()->andReturn('nonce'); - $id = new IdentityId(self::uuid()); $institution = new Institution('A Corp.'); $nameId = new NameId(md5(__METHOD__)); @@ -537,11 +525,8 @@ public function a_gssf_possession_can_be_proven(): void { DateTimeHelper::setCurrentTime(new DateTime(new CoreDateTime('@12345'))); - m::mock('alias:Surfnet\StepupBundle\Security\OtpGenerator') - ->shouldReceive('generate')->once()->andReturn('regcode'); - $nonce = 'nonce'; - m::mock('alias:Surfnet\Stepup\Token\TokenGenerator') + m::mock('alias:'.TokenGenerator::class) ->shouldReceive('generateNonce')->once()->andReturn($nonce); $identityId = new IdentityId(self::uuid()); @@ -617,13 +602,6 @@ public function a_gssf_possession_can_not_be_proven_if_the_second_factor_is_not_ { DateTimeHelper::setCurrentTime(new DateTime(new CoreDateTime('@12345'))); - m::mock('alias:Surfnet\StepupBundle\Security\OtpGenerator') - ->shouldReceive('generate')->once()->andReturn('regcode'); - - $nonce = 'nonce'; - m::mock('alias:Surfnet\Stepup\Token\TokenGenerator') - ->shouldReceive('generateNonce')->once()->andReturn($nonce); - $identityId = new IdentityId(self::uuid()); $institution = new Institution('Surfnet'); $nameId = new NameId(md5(__METHOD__)); @@ -672,9 +650,7 @@ public function a_u2f_device_possession_can_be_proven(): void { DateTimeHelper::setCurrentTime(new DateTime(new CoreDateTime('@12345'))); - m::mock('alias:Surfnet\StepupBundle\Security\OtpGenerator') - ->shouldReceive('generate')->once()->andReturn('regcode'); - m::mock('alias:Surfnet\Stepup\Token\TokenGenerator') + m::mock('alias:'.TokenGenerator::class) ->shouldReceive('generateNonce')->once()->andReturn('nonce'); $id = new IdentityId(self::uuid()); @@ -738,11 +714,6 @@ public function a_u2f_device_possession_cannot_be_proven_if_the_second_factor_is { DateTimeHelper::setCurrentTime(new DateTime(new CoreDateTime('@12345'))); - m::mock('alias:Surfnet\StepupBundle\Security\OtpGenerator') - ->shouldReceive('generate')->once()->andReturn('regcode'); - m::mock('alias:Surfnet\Stepup\Token\TokenGenerator') - ->shouldReceive('generateNonce')->once()->andReturn('nonce'); - $id = new IdentityId(self::uuid()); $institution = new Institution('A Corp.'); $nameId = new NameId(md5(__METHOD__)); @@ -1329,6 +1300,7 @@ public function a_second_factor_cannot_be_vetted_without_a_secure_enough_vetted_ $command->secondFactorIdentifier = '00028278'; $command->documentNumber = 'NH9392'; $command->identityVerified = true; + $command->provePossessionSkipped = false; $authorityId = new IdentityId($command->authorityId); $authorityInstitution = new Institution('Wazoo'); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RightToBeForgottenCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RightToBeForgottenCommandHandlerTest.php index 5594f4902..a24314892 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RightToBeForgottenCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RightToBeForgottenCommandHandlerTest.php @@ -45,6 +45,7 @@ use Surfnet\Stepup\Identity\Value\RegistrationAuthorityRole; use Surfnet\Stepup\Identity\Value\SecondFactorId; use Surfnet\Stepup\Identity\Value\YubikeyPublicId; +use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Identity; use Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\SraaRepository; use Surfnet\StepupMiddleware\CommandHandlingBundle\Exception\RuntimeException; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\ForgetIdentityCommand; @@ -113,7 +114,7 @@ public function an_identity_can_be_forgotten(): void ->shouldReceive('findOneByNameIdAndInstitution') ->once() ->with(Matchers::equalTo($nameId), Matchers::equalTo($institution)) - ->andReturn((object)['id' => $identityId->getIdentityId()]); + ->andReturn($this->createIdentity($identityId->getIdentityId())); $this->sensitiveDataService ->shouldReceive('forgetSensitiveData') @@ -175,12 +176,7 @@ public function an_identity_may_not_be_forgotten_twice(): void ->shouldReceive('findOneByNameIdAndInstitution') ->once() ->with(Matchers::equalTo($nameId), Matchers::equalTo($institution)) - ->andReturn((object)['id' => $identityId->getIdentityId()]); - - $this->sensitiveDataService - ->shouldReceive('forgetSensitiveData') - ->once() - ->with(Matchers::equalTo($identityId)); + ->andReturn($this->createIdentity($identityId->getIdentityId())); $this->sraaRepository->shouldReceive('contains')->once()->with(Matchers::equalTo($nameId))->andReturn(false); @@ -235,12 +231,7 @@ public function an_ra_cannot_be_forgotten(): void ->shouldReceive('findOneByNameIdAndInstitution') ->once() ->with(Matchers::equalTo($nameId), Matchers::equalTo($institution)) - ->andReturn((object)['id' => $identityId->getIdentityId()]); - - $this->sensitiveDataService - ->shouldReceive('forgetSensitiveData') - ->once() - ->with(Matchers::equalTo($identityId)); + ->andReturn($this->createIdentity($identityId->getIdentityId())); $this->sraaRepository->shouldReceive('contains')->once()->with(Matchers::equalTo($nameId))->andReturn(false); @@ -302,12 +293,7 @@ public function an_raa_cannot_be_forgotten(): void ->shouldReceive('findOneByNameIdAndInstitution') ->once() ->with(Matchers::equalTo($nameId), Matchers::equalTo($institution)) - ->andReturn((object)['id' => $identityId->getIdentityId()]); - - $this->sensitiveDataService - ->shouldReceive('forgetSensitiveData') - ->once() - ->with(Matchers::equalTo($identityId)); + ->andReturn($this->createIdentity($identityId->getIdentityId())); $this->sraaRepository->shouldReceive('contains')->once()->with(Matchers::equalTo($nameId))->andReturn(false); @@ -354,7 +340,7 @@ public function an_raa_cannot_be_forgotten(): void * @group command-handler * @group sensitive-data */ - public function an_sraa_cannae_be_forgotten(): void + public function an_sraa_cannot_be_forgotten(): void { $this->expectExceptionMessage("Cannot forget an identity that is currently accredited as an SRAA"); $this->expectException(RuntimeException::class); @@ -366,17 +352,6 @@ public function an_sraa_cannae_be_forgotten(): void $email = new Email('e.kuopio@hy.fi'); $locale = new Locale('fi_FI'); - $this->apiIdentityRepository - ->shouldReceive('findOneByNameIdAndInstitution') - ->once() - ->with(Matchers::equalTo($nameId), Matchers::equalTo($institution)) - ->andReturn((object)['id' => $identityId->getIdentityId()]); - - $this->sensitiveDataService - ->shouldReceive('forgetSensitiveData') - ->once() - ->with(Matchers::equalTo($identityId)); - $this->sraaRepository->shouldReceive('contains')->once()->with(Matchers::equalTo($nameId))->andReturn(true); $command = new ForgetIdentityCommand(); @@ -407,4 +382,11 @@ public function an_sraa_cannae_be_forgotten(): void ]) ->when($command); } + + private function createIdentity(string $identityId): Identity + { + $identity = new Identity(); + $identity->id = $identityId; + return $identity; + } } diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntityRepository.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntityRepository.php index f1d5938f7..5f9a83492 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntityRepository.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntityRepository.php @@ -73,7 +73,7 @@ private function removeAllOfType(string $type): void $this ->getEntityManager() ->createQuery( - 'DELETE FROM SurfnetStepupMiddlewareGatewayBundle:SamlEntity se WHERE se.type = :type', + 'DELETE FROM Surfnet\StepupMiddleware\GatewayBundle\Entity\SamlEntity se WHERE se.type = :type', ) ->execute(['type' => $type]); } diff --git a/src/Surfnet/StepupMiddleware/Kernel.php b/src/Surfnet/StepupMiddleware/Kernel.php index 3446340f3..388440656 100644 --- a/src/Surfnet/StepupMiddleware/Kernel.php +++ b/src/Surfnet/StepupMiddleware/Kernel.php @@ -19,12 +19,7 @@ namespace Surfnet\StepupMiddleware; use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait; -use Symfony\Component\Config\Loader\LoaderInterface; -use Symfony\Component\Config\Resource\FileResource; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Kernel as BaseKernel; -use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator; -use const PHP_VERSION_ID; class Kernel extends BaseKernel { diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php index 27e344c65..3ca1fd63c 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ManagementBundle\Tests\Controller; use Liip\TestFixturesBundle\Services\DatabaseToolCollection; +use Liip\TestFixturesBundle\Services\DatabaseTools\AbstractDatabaseTool; use Liip\TestFixturesBundle\Services\DatabaseTools\ORMSqliteDatabaseTool; use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use Symfony\Bundle\FrameworkBundle\KernelBrowser; @@ -35,20 +36,18 @@ class ConfigurationControllerTest extends WebTestCase private string $passwordRo; - private ORMSqliteDatabaseTool $databaseTool; + private AbstractDatabaseTool $databaseTool; public function setUp(): void { - $tool = static::getContainer()->get(ORMSqliteDatabaseTool::class); - if (!$tool instanceof ORMSqliteDatabaseTool) { + $this->client = static::createClient(); + $databaseTool = $this->client->getContainer()->get(DatabaseToolCollection::class); + if (!$databaseTool instanceof DatabaseToolCollection) { $this->fail('Unable to grab the ORMSqliteDatabaseTool from the container'); } - $this->databaseTool = $tool; - + $this->databaseTool = $databaseTool->get(); // Initialises schema. $this->databaseTool->loadFixtures([]); - // Initialises schema. - $this->client = static::createClient(); $managementPassword = $this->client->getKernel()->getContainer()->getParameter('management_password'); if (!is_string($managementPassword)) { diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php index f1c0e831b..427124229 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ManagementBundle\Tests\Controller; use Liip\TestFixturesBundle\Services\DatabaseToolCollection; +use Liip\TestFixturesBundle\Services\DatabaseTools\AbstractDatabaseTool; use Liip\TestFixturesBundle\Services\DatabaseTools\ORMSqliteDatabaseTool; use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use Symfony\Bundle\FrameworkBundle\KernelBrowser; @@ -36,20 +37,18 @@ class InstitutionConfigurationControllerTest extends WebTestCase private string $passwordRo; - private ORMSqliteDatabaseTool $databaseTool; + private AbstractDatabaseTool $databaseTool; public function setUp(): void { - $tool = static::getContainer()->get(ORMSqliteDatabaseTool::class); - if (!$tool instanceof ORMSqliteDatabaseTool) { + $this->client = static::createClient(); + $databaseTool = $this->client->getContainer()->get(DatabaseToolCollection::class); + if (!$databaseTool instanceof DatabaseToolCollection) { $this->fail('Unable to grab the ORMSqliteDatabaseTool from the container'); } - $this->databaseTool = $tool; - + $this->databaseTool = $databaseTool->get(); // Initialises schema. - $this->databaseTool->loadFixtures(); - // Initialises schema. - $this->client = static::createClient(); + $this->databaseTool->loadFixtures([]); $managementPassword = $this->client->getKernel()->getContainer()->getParameter('management_password'); if (!is_string($managementPassword)) { diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_idps.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_idps.php deleted file mode 100644 index 4d54571d7..000000000 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_idps.php +++ /dev/null @@ -1,50 +0,0 @@ - 'gateway.identity_providers', - 'configuration' => [ - 'gateway' => [ - 'identity_providers' => 9, - 'service_providers' => [ - [ - "entity_id" => "https://entity.tld/id", - "public_key" => "MIIE...", - "acs" => ["https://entity.tld/consume-assertion"], - "loa" => [ - "__default__" => "https://entity.tld/authentication/loa2", - ], - "second_factor_only" => false, - "second_factor_only_nameid_patterns" => [], - "assertion_encryption_enabled" => false, - "blacklisted_encryption_algorithms" => [], - ], - ], - ], - 'sraa' => ['20394-4320423-439248324'], - 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], - 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], - 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], - 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - ], - ], -]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/null.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/null.php deleted file mode 100644 index 4acd4e5ab..000000000 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/null.php +++ /dev/null @@ -1,22 +0,0 @@ - '(root)', - 'configuration' => null, -]; diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Resources/config/console_commands.yml b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Resources/config/console_commands.yml index 64629028d..a3cf334cf 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Resources/config/console_commands.yml +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Resources/config/console_commands.yml @@ -30,7 +30,7 @@ services: - { name: 'console.command', command: 'middleware:event:replay' } arguments: - "@middleware.event_replay.event_stream_replayer" - - "%app_env%" + - '%env(APP_ENV)%' Surfnet\StepupMiddleware\MiddlewareBundle\Console\Command\BootstrapIdentityWithYubikeySecondFactorCommand: tags: From cacf2a882e8541c7f13f067e87c03c77902efea5 Mon Sep 17 00:00:00 2001 From: Bas Date: Mon, 11 Nov 2024 14:49:36 +0100 Subject: [PATCH 60/89] Fix deprecations while fixing broken tests --- config/openconext/parameters.yaml.dist | 2 +- .../MiddlewareBundle/Service/DBALConnectionHelper.php | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/config/openconext/parameters.yaml.dist b/config/openconext/parameters.yaml.dist index a54d3723a..5d5a233a6 100644 --- a/config/openconext/parameters.yaml.dist +++ b/config/openconext/parameters.yaml.dist @@ -18,7 +18,7 @@ parameters: # The database server version is used in the dbal configuration and is required to prevent issues when the database # connection is booted. See https://github.com/doctrine/DoctrineBundle/issues/351 for more details on this. # Also see: https://symfony.com/doc/current/reference/configuration/doctrine.html#doctrine-dbal-configuration - database_server_version: mariadb-10.0.38 + database_server_version: 10.0.38-MariaDB database_middleware_name: middleware database_middleware_user: middleware_user database_middleware_password: middleware_secret diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/DBALConnectionHelper.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/DBALConnectionHelper.php index 05e60e10f..a2abed8a6 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/DBALConnectionHelper.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/DBALConnectionHelper.php @@ -38,6 +38,13 @@ public function __construct(array $connections) if (!$connection instanceof Connection) { throw InvalidArgumentException::invalidType(Connection::class, 'connection', $connection); } + if (!$connection->getDatabasePlatform()->supportsSavepoints()) { + throw new InvalidArgumentException(sprintf( + "Connection for database '%s' does not support nested savepoints", + $connection->getDatabase() + )); + } + $connection->setNestTransactionsWithSavepoints(true); } $this->connections = $connections; From 42abdeff463e64bcf5b704bb319337c0a1d50261 Mon Sep 17 00:00:00 2001 From: Bas Date: Mon, 11 Nov 2024 16:03:55 +0100 Subject: [PATCH 61/89] Fix role authentication deprecated or logic --- config/packages/framework.yaml | 2 + .../Controller/AbstractController.php | 41 +++++++++++++++++++ .../Controller/AuditLogController.php | 4 +- .../Controller/AuthorizationController.php | 2 +- .../Controller/CommandController.php | 4 +- .../ConfiguredInstitutionController.php | 4 +- .../Controller/DeprovisionController.php | 6 +-- .../Controller/IdentityController.php | 8 ++-- ...titutionConfigurationOptionsController.php | 4 +- .../Controller/ProfileController.php | 4 +- .../Controller/RaCandidateController.php | 6 +-- .../ApiBundle/Controller/RaController.php | 4 +- .../Controller/RaListingController.php | 6 +-- .../Controller/RaLocationController.php | 6 +-- .../Controller/RaSecondFactorController.php | 6 +-- .../Controller/RecoveryTokenController.php | 6 +-- .../ApiBundle/Controller/SraaController.php | 6 +-- .../UnverifiedSecondFactorController.php | 6 +-- .../VerifiedSecondFactorController.php | 10 ++--- .../VettedSecondFactorController.php | 6 +-- .../Controller/VettingTypeHintController.php | 4 +- .../Controller/ConfigurationController.php | 2 + .../InstitutionConfigurationController.php | 4 +- .../RightToBeForgottenController.php | 2 +- .../Controller/WhitelistController.php | 6 +-- 25 files changed, 102 insertions(+), 57 deletions(-) create mode 100644 src/Surfnet/StepupMiddleware/ApiBundle/Controller/AbstractController.php diff --git a/config/packages/framework.yaml b/config/packages/framework.yaml index 3d0071892..2627cc5e7 100644 --- a/config/packages/framework.yaml +++ b/config/packages/framework.yaml @@ -28,6 +28,8 @@ when@smoketest: &testOverride collect: false php_errors: log: false # prevents user deprecated warnings + session: + storage_factory_id: session.storage.factory.mock_file when@test: *testOverride when@sometest_event_replay: *testOverride \ No newline at end of file diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AbstractController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AbstractController.php new file mode 100644 index 000000000..05a29358a --- /dev/null +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AbstractController.php @@ -0,0 +1,41 @@ +isGranted($role, $subject)) { + return; + } + } + + throw $this->createAccessDeniedException($message); + } + parent::denyAccessUnlessGranted($attribute, $subject, $message); + } +} diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuditLogController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuditLogController.php index 7b13b7a9d..05c3875eb 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuditLogController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuditLogController.php @@ -24,7 +24,7 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\SecondFactorAuditLogQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\AuditLogService; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonCollectionResponse; -use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Surfnet\StepupMiddleware\ApiBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; final class AuditLogController extends AbstractController @@ -36,7 +36,7 @@ public function __construct( public function secondFactorAuditLog(Request $request, Institution $institution): JsonCollectionResponse { - $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); + $this->denyAccessUnlessGrantedOneOff(['ROLE_RA', 'ROLE_READ']); $identityId = $request->get('identityId'); if (empty($identityId)) { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuthorizationController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuthorizationController.php index 003b4a559..dd824d7c6 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuthorizationController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/AuthorizationController.php @@ -21,7 +21,7 @@ use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\StepupMiddleware\ApiBundle\Authorization\Service\AuthorizationService; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonAuthorizationResponse; -use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Surfnet\StepupMiddleware\ApiBundle\Controller\AbstractController; class AuthorizationController extends AbstractController { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php index 26fc80e3f..82616a76f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php @@ -31,7 +31,7 @@ use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\CreateIdentityCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Command\UpdateIdentityCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\TransactionAwarePipeline; -use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Surfnet\StepupMiddleware\ApiBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; @@ -54,7 +54,7 @@ public function __construct( public function handle(AbstractCommand $command, Metadata $metadata, Request $request): JsonResponse { - $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS']); + $this->denyAccessUnlessGrantedOneOff(['ROLE_RA', 'ROLE_SS']); $this->logger->notice(sprintf('Received request to process Command "%s"', $command)); $this->metadataEnricher->setMetadata($metadata); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ConfiguredInstitutionController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ConfiguredInstitutionController.php index f1243c34e..ad5cd715a 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ConfiguredInstitutionController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ConfiguredInstitutionController.php @@ -19,7 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Controller; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Service\ConfiguredInstitutionService; -use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Surfnet\StepupMiddleware\ApiBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; class ConfiguredInstitutionController extends AbstractController @@ -31,7 +31,7 @@ public function __construct( public function collection(): JsonResponse { - $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); + $this->denyAccessUnlessGrantedOneOff(['ROLE_RA', 'ROLE_READ']); $allListings = $this->configuredInstitutionService->getAllAsInstitution(); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/DeprovisionController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/DeprovisionController.php index fd827869d..08db563fe 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/DeprovisionController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/DeprovisionController.php @@ -22,7 +22,7 @@ use Surfnet\Stepup\Exception\DomainException; use Surfnet\Stepup\Helper\UserDataFormatterInterface; use Surfnet\StepupMiddleware\ApiBundle\Service\DeprovisionServiceInterface; -use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Surfnet\StepupMiddleware\ApiBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; class DeprovisionController extends AbstractController @@ -35,7 +35,7 @@ public function __construct( public function deprovision(string $collabPersonId): JsonResponse { - $this->denyAccessUnlessGranted(['ROLE_DEPROVISION']); + $this->denyAccessUnlessGrantedOneOff(['ROLE_DEPROVISION']); $errors = []; try { $userData = $this->deprovisionService->readUserData($collabPersonId); @@ -56,7 +56,7 @@ public function deprovision(string $collabPersonId): JsonResponse public function dryRun(string $collabPersonId): JsonResponse { - $this->denyAccessUnlessGranted(['ROLE_DEPROVISION']); + $this->denyAccessUnlessGrantedOneOff(['ROLE_DEPROVISION']); $errors = []; try { $userData = $this->deprovisionService->readUserData($collabPersonId); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php index b84e47489..d4691875c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php @@ -24,7 +24,7 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\IdentityService; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonCollectionResponse; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonNotFoundResponse; -use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Surfnet\StepupMiddleware\ApiBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; @@ -38,7 +38,7 @@ public function __construct( public function get(string $id): JsonResponse { - $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); + $this->denyAccessUnlessGrantedOneOff(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); $identity = $this->identityService->find($id); @@ -51,7 +51,7 @@ public function get(string $id): JsonResponse public function collection(Request $request, Institution $institution): JsonCollectionResponse { - $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); + $this->denyAccessUnlessGrantedOneOff(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); $query = new IdentityQuery(); $query->institution = $institution; @@ -67,7 +67,7 @@ public function collection(Request $request, Institution $institution): JsonColl public function getRegistrationAuthorityCredentials(string $identityId): JsonResponse { - $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); + $this->denyAccessUnlessGrantedOneOff(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); $identityService = $this->identityService; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/InstitutionConfigurationOptionsController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/InstitutionConfigurationOptionsController.php index bcdc90f6f..c4976bff0 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/InstitutionConfigurationOptionsController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/InstitutionConfigurationOptionsController.php @@ -23,7 +23,7 @@ use Surfnet\StepupMiddleware\ApiBundle\Configuration\Service\AllowedSecondFactorListService; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Service\InstitutionAuthorizationService; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Service\InstitutionConfigurationOptionsService; -use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Surfnet\StepupMiddleware\ApiBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; @@ -38,7 +38,7 @@ public function __construct( public function getForInstitution(string $institutionName): JsonResponse { - $this->denyAccessUnlessGranted(['ROLE_SS', 'ROLE_RA', 'ROLE_READ']); + $this->denyAccessUnlessGrantedOneOff(['ROLE_SS', 'ROLE_RA', 'ROLE_READ']); $institution = new Institution($institutionName); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ProfileController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ProfileController.php index 0a2c6e401..9ec1a7629 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ProfileController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/ProfileController.php @@ -20,7 +20,7 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\ProfileService; use Surfnet\StepupMiddleware\ApiBundle\Identity\Value\Profile; -use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Surfnet\StepupMiddleware\ApiBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; @@ -35,7 +35,7 @@ public function __construct( public function get(Request $request, string $identityId): JsonResponse { - $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); + $this->denyAccessUnlessGrantedOneOff(['ROLE_RA', 'ROLE_READ']); // Is the actor allowed to view the profile page? $actorId = $request->get('actorId'); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php index 06adaead9..4d34013e6 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php @@ -24,7 +24,7 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\RaCandidateQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\RaCandidateService; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonCollectionResponse; -use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Surfnet\StepupMiddleware\ApiBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; @@ -43,7 +43,7 @@ public function __construct( */ public function search(Request $request): JsonCollectionResponse { - $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); + $this->denyAccessUnlessGrantedOneOff(['ROLE_RA', 'ROLE_READ']); $actorId = new IdentityId($request->get('actorId')); @@ -71,7 +71,7 @@ public function search(Request $request): JsonCollectionResponse */ public function get(Request $request): JsonResponse { - $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); + $this->denyAccessUnlessGrantedOneOff(['ROLE_RA', 'ROLE_READ']); $actorId = new IdentityId($request->get('actorId')); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaController.php index 3509aa0d1..08afa1f4a 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaController.php @@ -21,7 +21,7 @@ use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\RaListingService; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonCollectionResponse; -use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Surfnet\StepupMiddleware\ApiBundle\Controller\AbstractController; class RaController extends AbstractController { @@ -32,7 +32,7 @@ public function __construct( public function list(Institution $institution): JsonCollectionResponse { - $this->denyAccessUnlessGranted(['ROLE_SS', 'ROLE_READ']); + $this->denyAccessUnlessGrantedOneOff(['ROLE_SS', 'ROLE_READ']); $registrationAuthorityCredentials = $this->raListingService->listRegistrationAuthoritiesFor($institution); $count = count($registrationAuthorityCredentials); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php index fccbd478e..8e7760081 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php @@ -25,7 +25,7 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\RaListingQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\RaListingService; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonCollectionResponse; -use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Surfnet\StepupMiddleware\ApiBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; @@ -40,7 +40,7 @@ public function __construct( public function get(Request $request, string $identityId): JsonResponse { - $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); + $this->denyAccessUnlessGrantedOneOff(['ROLE_RA', 'ROLE_READ']); $actorId = new IdentityId($request->get('actorId')); $institution = new Institution($request->get('institution')); @@ -68,7 +68,7 @@ public function get(Request $request, string $identityId): JsonResponse */ public function search(Request $request): JsonCollectionResponse { - $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); + $this->denyAccessUnlessGrantedOneOff(['ROLE_RA', 'ROLE_READ']); $actorId = new IdentityId($request->get('actorId')); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaLocationController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaLocationController.php index ade76efdd..b27ee7750 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaLocationController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaLocationController.php @@ -23,7 +23,7 @@ use Surfnet\StepupMiddleware\ApiBundle\Configuration\Query\RaLocationQuery; use Surfnet\StepupMiddleware\ApiBundle\Configuration\Service\RaLocationService; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonCollectionResponse; -use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Surfnet\StepupMiddleware\ApiBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; @@ -36,7 +36,7 @@ public function __construct( public function search(Request $request, Institution $institution): JsonCollectionResponse { - $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); + $this->denyAccessUnlessGrantedOneOff(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); $query = new RaLocationQuery(); $query->institution = $institution; @@ -51,7 +51,7 @@ public function search(Request $request, Institution $institution): JsonCollecti public function get(Request $request): JsonResponse { - $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); + $this->denyAccessUnlessGrantedOneOff(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); $raLocationId = new RaLocationId($request->get('raLocationId')); $raLocation = $this->raLocationService->findByRaLocationId($raLocationId); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php index 3cba5462d..c8e84d4f5 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaSecondFactorController.php @@ -24,7 +24,7 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\RaSecondFactorQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\RaSecondFactorService; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonCollectionResponse; -use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Surfnet\StepupMiddleware\ApiBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; @@ -38,7 +38,7 @@ public function __construct( public function collection(Request $request): JsonCollectionResponse { - $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); + $this->denyAccessUnlessGrantedOneOff(['ROLE_RA', 'ROLE_READ']); $query = $this->buildRaSecondFactorQuery($request); @@ -51,7 +51,7 @@ public function collection(Request $request): JsonCollectionResponse public function export(Request $request): JsonResponse { - $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); + $this->denyAccessUnlessGrantedOneOff(['ROLE_RA', 'ROLE_READ']); $query = $this->buildRaSecondFactorQuery($request); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php index de32a08c2..db83e35fa 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php @@ -27,7 +27,7 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\RecoveryTokenQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\RecoveryTokenService; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonCollectionResponse; -use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Surfnet\StepupMiddleware\ApiBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; @@ -47,7 +47,7 @@ public function __construct( public function get(string $id): JsonResponse { - $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); + $this->denyAccessUnlessGrantedOneOff(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); $this->logger->info(sprintf('Received request to get recovery token: %s', $id)); try { @@ -60,7 +60,7 @@ public function get(string $id): JsonResponse public function collection(Request $request): JsonCollectionResponse { - $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); + $this->denyAccessUnlessGrantedOneOff(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); $this->logger->info( sprintf('Received search request for recovery tokens with params: %s', $request->getQueryString()), ); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/SraaController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/SraaController.php index 8bebfb399..a410fde6c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/SraaController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/SraaController.php @@ -21,7 +21,7 @@ use Surfnet\Stepup\Identity\Value\NameId; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\SraaService; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonNotFoundResponse; -use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Surfnet\StepupMiddleware\ApiBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; class SraaController extends AbstractController @@ -36,7 +36,7 @@ public function __construct(private readonly SraaService $sraaService) */ public function get(string $nameId): JsonResponse { - $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); + $this->denyAccessUnlessGrantedOneOff(['ROLE_RA', 'ROLE_READ']); $sraa = $this->sraaService->findByNameId(new NameId($nameId)); @@ -49,7 +49,7 @@ public function get(string $nameId): JsonResponse public function list(): JsonResponse { - $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); + $this->denyAccessUnlessGrantedOneOff(['ROLE_RA', 'ROLE_READ']); return new JsonResponse($this->sraaService->findAll()); } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php index 23247b188..8091a7855 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php @@ -23,7 +23,7 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\UnverifiedSecondFactorQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\SecondFactorService; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonCollectionResponse; -use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Surfnet\StepupMiddleware\ApiBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; @@ -37,7 +37,7 @@ public function __construct( public function get(string $id): JsonResponse { - $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); + $this->denyAccessUnlessGrantedOneOff(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); $secondFactor = $this->secondFactorService->findUnverified(new SecondFactorId($id)); @@ -50,7 +50,7 @@ public function get(string $id): JsonResponse public function collection(Request $request): JsonCollectionResponse { - $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); + $this->denyAccessUnlessGrantedOneOff(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); $query = new UnverifiedSecondFactorQuery(); $query->identityId = $request->get('identityId'); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VerifiedSecondFactorController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VerifiedSecondFactorController.php index 66c32cf3b..6fe3b9b2e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VerifiedSecondFactorController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VerifiedSecondFactorController.php @@ -29,7 +29,7 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\VerifiedSecondFactorQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\SecondFactorService; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonCollectionResponse; -use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Surfnet\StepupMiddleware\ApiBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; @@ -48,7 +48,7 @@ public function __construct( public function get(string $id): JsonResponse { - $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); + $this->denyAccessUnlessGrantedOneOff(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); $secondFactor = $this->secondFactorService->findVerified(new SecondFactorId($id)); @@ -61,7 +61,7 @@ public function get(string $id): JsonResponse public function collection(Request $request): JsonCollectionResponse { - $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); + $this->denyAccessUnlessGrantedOneOff(['ROLE_RA', 'ROLE_READ']); $actorId = new IdentityId($request->get('actorId')); @@ -89,7 +89,7 @@ public function collection(Request $request): JsonCollectionResponse public function collectionOfIdentity(Request $request): JsonCollectionResponse { - $this->denyAccessUnlessGranted(['ROLE_SS', 'ROLE_READ']); + $this->denyAccessUnlessGrantedOneOff(['ROLE_SS', 'ROLE_READ']); $query = new VerifiedSecondFactorOfIdentityQuery(); $query->identityId = new IdentityId($request->get('identityId')); @@ -102,7 +102,7 @@ public function collectionOfIdentity(Request $request): JsonCollectionResponse public function getCanSkipProvePossession(string $id): JsonResponse { - $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_READ']); + $this->denyAccessUnlessGrantedOneOff(['ROLE_RA', 'ROLE_READ']); $secondFactor = $this->secondFactorService->findVerified(new SecondFactorId($id)); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php index 1f31f9aa3..d348e8d57 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php @@ -23,7 +23,7 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\VettedSecondFactorQuery; use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\SecondFactorService; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonCollectionResponse; -use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Surfnet\StepupMiddleware\ApiBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; @@ -37,7 +37,7 @@ public function __construct( public function get(string $id): JsonResponse { - $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); + $this->denyAccessUnlessGrantedOneOff(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); $secondFactor = $this->secondFactorService->findVetted(new SecondFactorId($id)); @@ -50,7 +50,7 @@ public function get(string $id): JsonResponse public function collection(Request $request): JsonCollectionResponse { - $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); + $this->denyAccessUnlessGrantedOneOff(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); $query = new VettedSecondFactorQuery(); $query->identityId = $request->get('identityId'); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettingTypeHintController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettingTypeHintController.php index e01f3ebb1..7a316c5cf 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettingTypeHintController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettingTypeHintController.php @@ -22,7 +22,7 @@ use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Exception\NotFoundException; use Surfnet\StepupMiddleware\CommandHandlingBundle\Identity\Service\VettingTypeHintService; -use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Surfnet\StepupMiddleware\ApiBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; @@ -36,7 +36,7 @@ public function __construct( public function get(string $institution): JsonResponse { - $this->denyAccessUnlessGranted(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); + $this->denyAccessUnlessGrantedOneOff(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); $this->logger->info(sprintf('Received request to get a vetting type hint for institution: %s', $institution)); try { diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php index 76ad545ea..1b65368b7 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php @@ -36,6 +36,8 @@ public function __construct( public function update(Request $request): JsonResponse { + $this->denyAccessUnlessGranted('ROLE_MANAGEMENT'); + $command = new UpdateConfigurationCommand(); $command->configuration = $request->getContent(); $command->UUID = (string)Uuid::uuid4(); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php index 7418963fd..7f7609425 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/InstitutionConfigurationController.php @@ -59,7 +59,7 @@ public function __construct( public function show(): JsonResponse { - $this->denyAccessUnlessGranted(['ROLE_MANAGEMENT']); + $this->denyAccessUnlessGranted('ROLE_MANAGEMENT'); $institutionConfigurationOptions = $this->institutionConfigurationOptionsService ->findAllInstitutionConfigurationOptions(); @@ -104,7 +104,7 @@ public function show(): JsonResponse public function reconfigure(Request $request): JsonResponse { - $this->denyAccessUnlessGranted(['ROLE_MANAGEMENT']); + $this->denyAccessUnlessGranted('ROLE_MANAGEMENT'); $configuration = JsonHelper::decode($request->getContent()); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php index 2e0e78ca5..c74ded47c 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/RightToBeForgottenController.php @@ -49,7 +49,7 @@ public function __construct( public function forgetIdentity(Request $request): JsonResponse { - $this->denyAccessUnlessGranted(['ROLE_MANAGEMENT']); + $this->denyAccessUnlessGranted('ROLE_MANAGEMENT'); $payload = JsonHelper::decode($request->getContent()); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php index abf2f8e19..2ae69c0b5 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/WhitelistController.php @@ -50,7 +50,7 @@ public function __construct( public function replaceWhitelist(Request $request): JsonResponse { - $this->denyAccessUnlessGranted(['ROLE_MANAGEMENT']); + $this->denyAccessUnlessGranted('ROLE_MANAGEMENT'); $command = new ReplaceWhitelistCommand(); $command->UUID = (string)Uuid::uuid4(); @@ -61,7 +61,7 @@ public function replaceWhitelist(Request $request): JsonResponse public function addToWhitelist(Request $request): JsonResponse { - $this->denyAccessUnlessGranted(['ROLE_MANAGEMENT']); + $this->denyAccessUnlessGranted('ROLE_MANAGEMENT'); $command = new AddToWhitelistCommand(); $command->UUID = (string)Uuid::uuid4(); @@ -72,7 +72,7 @@ public function addToWhitelist(Request $request): JsonResponse public function removeFromWhitelist(Request $request): JsonResponse { - $this->denyAccessUnlessGranted(['ROLE_MANAGEMENT']); + $this->denyAccessUnlessGranted('ROLE_MANAGEMENT'); $command = new RemoveFromWhitelistCommand(); $command->UUID = (string)Uuid::uuid4(); From b9ff9de432756b3635be37c8c1ce70468a0c1bd5 Mon Sep 17 00:00:00 2001 From: Bas Date: Mon, 11 Nov 2024 17:11:48 +0100 Subject: [PATCH 62/89] Fix remaining configuration tests --- .../Controller/ConfigurationController.php | 10 +++++ .../invalid_configuration/invalid_sps.php | 37 ------------------- .../not_whitelisted_institution_use_raa.php | 2 +- 3 files changed, 11 insertions(+), 38 deletions(-) delete mode 100644 src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sps.php diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php index 1b65368b7..21f34bc25 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Controller/ConfigurationController.php @@ -20,17 +20,22 @@ use DateTime; use Ramsey\Uuid\Uuid; +use Surfnet\Stepup\Helper\JsonHelper; +use Surfnet\StepupMiddleware\ApiBundle\Exception\BadCommandRequestException; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\AbstractCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Configuration\Command\UpdateConfigurationCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Pipeline\TransactionAwarePipeline; +use Surfnet\StepupMiddleware\ManagementBundle\Validator\Constraints\HasValidConfigurationStructure; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Validator\Validator\ValidatorInterface; class ConfigurationController extends AbstractController { public function __construct( private readonly TransactionAwarePipeline $pipeline, + private readonly ValidatorInterface $validator, ) { } @@ -38,6 +43,11 @@ public function update(Request $request): JsonResponse { $this->denyAccessUnlessGranted('ROLE_MANAGEMENT'); + $violations = $this->validator->validate($request->getContent(), new HasValidConfigurationStructure()); + if ($violations->count() > 0) { + throw BadCommandRequestException::withViolations('Invalid configure institutions request', $violations); + } + $command = new UpdateConfigurationCommand(); $command->configuration = $request->getContent(); $command->UUID = (string)Uuid::uuid4(); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sps.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sps.php deleted file mode 100644 index ac2423f78..000000000 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_configuration/invalid_sps.php +++ /dev/null @@ -1,37 +0,0 @@ - 'gateway.service_providers', - 'configuration' => [ - 'gateway' => [ - 'identity_providers' => [], - 'service_providers' => 9, - ], - 'sraa' => ['20394-4320423-439248324'], - 'email_templates' => [ - 'confirm_email' => ['en_GB' => 'Verify {{ commonName }}'], - 'registration_code_with_ras' => ['en_GB' => 'Code {{ commonName }}'], - 'registration_code_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - 'vetted' => ['en_GB' => 'Vetted {{ commonName }}'], - 'second_factor_revoked' => ['en_GB' => 'Revoked token for {{ commonName }}'], - 'second_factor_verification_reminder_with_ras' => ['en_GB' => 'Code {{ commonName }}'], - 'second_factor_verification_reminder_with_ra_locations' => ['en_GB' => 'Code {{ commonName }}'], - ], - ], -]; diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_whitelisted_institution_use_raa.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_whitelisted_institution_use_raa.php index 4b13a20a9..641843703 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_whitelisted_institution_use_raa.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Validator/Fixtures/invalid_reconfigure_institution_request/not_whitelisted_institution_use_raa.php @@ -18,7 +18,7 @@ return [ 'expectedPropertyPath' => 'Institution(surfnet.nl)', - 'expectErrorMessageToContain' => 'All values of option "use_raa" should be known institutions.', + 'expectErrorMessageToContain' => 'All values of option "use_raa" for "surfnet.nl" should be known institutions.', 'reconfigureInstitutionRequest' => [ 'surfnet.nl' => [ "use_ra_locations" => true, From 01e784272db80fca8ba3577fd00ae46fb747050e Mon Sep 17 00:00:00 2001 From: Bas Date: Tue, 12 Nov 2024 15:22:09 +0100 Subject: [PATCH 63/89] Refactor all ParamConverters to ValueResolvers Refactor all ParamConverters to ValueResolvers and removed the deprecated SymfonyExtraBundle because that's now not used anymore. --- ci/qa/phpstan-baseline.neon | 46 +- ci/qa/phpunit.xml | 1 + composer.json | 1 - composer.lock | 904 ++++++++---------- .../Controller/CommandController.php | 2 +- .../Controller/IdentityController.php | 1 - ...Converter.php => CommandValueResolver.php} | 31 +- ...ConfigurationInstitutionValueResolver.php} | 25 +- ...erter.php => InstitutionValueResolver.php} | 31 +- ...onverter.php => MetadataValueResolver.php} | 29 +- ...rTest.php => CommandValueResolverTest.php} | 93 +- ...t.php => InstitutionValueResolverTest.php} | 31 +- symfony.lock | 12 - 13 files changed, 557 insertions(+), 650 deletions(-) rename src/Surfnet/StepupMiddleware/ApiBundle/Request/{CommandParamConverter.php => CommandValueResolver.php} (79%) rename src/Surfnet/StepupMiddleware/ApiBundle/Request/{ConfigurationInstitutionParamConverter.php => ConfigurationInstitutionValueResolver.php} (71%) rename src/Surfnet/StepupMiddleware/ApiBundle/Request/{InstitutionParamConverter.php => InstitutionValueResolver.php} (61%) rename src/Surfnet/StepupMiddleware/ApiBundle/Request/{MetadataParamConverter.php => MetadataValueResolver.php} (79%) rename src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/{CommandParamConverterTest.php => CommandValueResolverTest.php} (70%) rename src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/{InstitutionParamConverterTest.php => InstitutionValueResolverTest.php} (68%) diff --git a/ci/qa/phpstan-baseline.neon b/ci/qa/phpstan-baseline.neon index 563d4f2d9..f91d42e57 100644 --- a/ci/qa/phpstan-baseline.neon +++ b/ci/qa/phpstan-baseline.neon @@ -3115,45 +3115,35 @@ parameters: count: 1 path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Value/RegistrationAuthorityCredentials.php - - - message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#" - count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php - - message: "#^Cannot access offset 'command' on mixed\\.$#" count: 3 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandValueResolver.php - message: "#^Cannot access offset 'name' on mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandValueResolver.php - message: "#^Cannot access offset 'payload' on mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandValueResolver.php - message: "#^Cannot access offset 'uuid' on mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandValueResolver.php - message: "#^Cannot cast mixed to string\\.$#" count: 2 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php - - - - message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Command\\\\AbstractCommand\\:\\:\\$UUID \\(string\\) does not accept mixed\\.$#" - count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandValueResolver.php - message: "#^Cannot access property \\$meta on mixed\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Request/MetadataParamConverter.php + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Request/MetadataValueResolver.php - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Response\\\\JsonAuthorizationResponse\\:\\:__construct\\(\\) has parameter \\$errors with no value type specified in iterable type array\\.$#" @@ -3281,24 +3271,34 @@ parameters: path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Identity/Projector/AuditLogProjectorTest.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Request\\\\CommandParamConverterTest\\:\\:convertibleCommandNames\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Cannot access offset 0 on iterable\\\\.$#" + count: 4 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandValueResolverTest.php + + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Request\\\\CommandValueResolverTest\\:\\:convertibleCommandNames\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandValueResolverTest.php - - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Request\\\\CommandParamConverterTest\\:\\:invalidCommandJsonStructures\\(\\) return type has no value type specified in iterable type array\\.$#" + message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Tests\\\\Request\\\\CommandValueResolverTest\\:\\:invalidCommandJsonStructures\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandValueResolverTest.php - - message: "#^Cannot call method equals\\(\\) on mixed\\.$#" + message: "#^Parameter \\#1 \\$expected of method PHPUnit\\\\Framework\\\\Assert\\:\\:assertInstanceOf\\(\\) expects class\\-string\\, string given\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandValueResolverTest.php + + - + message: "#^Cannot access offset 0 on iterable\\\\.$#" count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionValueResolverTest.php - message: "#^Property Symfony\\\\Component\\\\HttpFoundation\\\\Request\\:\\:\\$query \\(Symfony\\\\Component\\\\HttpFoundation\\\\InputBag\\\\) does not accept Mockery\\\\MockInterface&Symfony\\\\Component\\\\HttpFoundation\\\\ParameterBag\\.$#" count: 2 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionValueResolverTest.php - message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Configuration\\\\Command\\\\ReconfigureInstitutionConfigurationOptionsCommand\\:\\:\\$allowedSecondFactors type has no value type specified in iterable type array\\.$#" diff --git a/ci/qa/phpunit.xml b/ci/qa/phpunit.xml index 2815bba19..84ae926ca 100644 --- a/ci/qa/phpunit.xml +++ b/ci/qa/phpunit.xml @@ -8,6 +8,7 @@ + diff --git a/composer.json b/composer.json index 68a6dfbad..fe062f863 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,6 @@ "pagerfanta/doctrine-orm-adapter": "*", "pagerfanta/pagerfanta": "^4.3", "ramsey/uuid": "^4.7", - "sensio/framework-extra-bundle": "*", "surfnet/stepup-bundle": "^6.0", "symfony/asset": "6.4.*", "symfony/expression-language": "6.4.*", diff --git a/composer.lock b/composer.lock index a303ac3fc..5f6501a77 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f96114a69480199bd5aa4734329b9506", + "content-hash": "e099ee148c2f60c64e12f4a68398b628", "packages": [ { "name": "beberlei/assert", @@ -670,181 +670,6 @@ ], "time": "2024-02-25T22:55:36+00:00" }, - { - "name": "doctrine/common", - "version": "3.4.3", - "source": { - "type": "git", - "url": "https://github.com/doctrine/common.git", - "reference": "8b5e5650391f851ed58910b3e3d48a71062eeced" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/8b5e5650391f851ed58910b3e3d48a71062eeced", - "reference": "8b5e5650391f851ed58910b3e3d48a71062eeced", - "shasum": "" - }, - "require": { - "doctrine/persistence": "^2.0 || ^3.0", - "php": "^7.1 || ^8.0" - }, - "require-dev": { - "doctrine/coding-standard": "^9.0 || ^10.0", - "doctrine/collections": "^1", - "phpstan/phpstan": "^1.4.1", - "phpstan/phpstan-phpunit": "^1", - "phpunit/phpunit": "^7.5.20 || ^8.5 || ^9.0", - "squizlabs/php_codesniffer": "^3.0", - "symfony/phpunit-bridge": "^6.1", - "vimeo/psalm": "^4.4" - }, - "type": "library", - "autoload": { - "psr-4": { - "Doctrine\\Common\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" - }, - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - }, - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com" - } - ], - "description": "PHP Doctrine Common project is a library that provides additional functionality that other Doctrine projects depend on such as better reflection support, proxies and much more.", - "homepage": "https://www.doctrine-project.org/projects/common.html", - "keywords": [ - "common", - "doctrine", - "php" - ], - "support": { - "issues": "https://github.com/doctrine/common/issues", - "source": "https://github.com/doctrine/common/tree/3.4.3" - }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcommon", - "type": "tidelift" - } - ], - "time": "2022-10-09T11:47:59+00:00" - }, - { - "name": "doctrine/data-fixtures", - "version": "1.7.0", - "source": { - "type": "git", - "url": "https://github.com/doctrine/data-fixtures.git", - "reference": "bbcb74f2ac6dbe81a14b3c3687d7623490a0448f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/bbcb74f2ac6dbe81a14b3c3687d7623490a0448f", - "reference": "bbcb74f2ac6dbe81a14b3c3687d7623490a0448f", - "shasum": "" - }, - "require": { - "doctrine/deprecations": "^0.5.3 || ^1.0", - "doctrine/persistence": "^2.0|^3.0", - "php": "^7.4 || ^8.0" - }, - "conflict": { - "doctrine/dbal": "<3.5 || >=5", - "doctrine/orm": "<2.14 || >=4", - "doctrine/phpcr-odm": "<1.3.0" - }, - "require-dev": { - "doctrine/annotations": "^1.12 || ^2", - "doctrine/coding-standard": "^12", - "doctrine/dbal": "^3.5 || ^4", - "doctrine/mongodb-odm": "^1.3.0 || ^2.0.0", - "doctrine/orm": "^2.14 || ^3", - "ext-sqlite3": "*", - "phpstan/phpstan": "^1.10", - "phpunit/phpunit": "^9.6.13 || ^10.4.2", - "symfony/cache": "^5.4 || ^6.3 || ^7", - "symfony/var-exporter": "^5.4 || ^6.3 || ^7", - "vimeo/psalm": "^5.9" - }, - "suggest": { - "alcaeus/mongo-php-adapter": "For using MongoDB ODM 1.3 with PHP 7 (deprecated)", - "doctrine/mongodb-odm": "For loading MongoDB ODM fixtures", - "doctrine/orm": "For loading ORM fixtures", - "doctrine/phpcr-odm": "For loading PHPCR ODM fixtures" - }, - "type": "library", - "autoload": { - "psr-4": { - "Doctrine\\Common\\DataFixtures\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" - } - ], - "description": "Data Fixtures for all Doctrine Object Managers", - "homepage": "https://www.doctrine-project.org", - "keywords": [ - "database" - ], - "support": { - "issues": "https://github.com/doctrine/data-fixtures/issues", - "source": "https://github.com/doctrine/data-fixtures/tree/1.7.0" - }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdata-fixtures", - "type": "tidelift" - } - ], - "time": "2023-11-24T11:18:31+00:00" - }, { "name": "doctrine/dbal", "version": "3.8.2", @@ -1125,47 +950,50 @@ "time": "2024-02-10T20:56:20+00:00" }, { - "name": "doctrine/doctrine-fixtures-bundle", - "version": "3.5.1", + "name": "doctrine/doctrine-migrations-bundle", + "version": "3.3.0", "source": { "type": "git", - "url": "https://github.com/doctrine/DoctrineFixturesBundle.git", - "reference": "c808a0c85c38c8ee265cc8405b456c1d2b38567d" + "url": "https://github.com/doctrine/DoctrineMigrationsBundle.git", + "reference": "1dd42906a5fb9c5960723e2ebb45c68006493835" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/c808a0c85c38c8ee265cc8405b456c1d2b38567d", - "reference": "c808a0c85c38c8ee265cc8405b456c1d2b38567d", + "url": "https://api.github.com/repos/doctrine/DoctrineMigrationsBundle/zipball/1dd42906a5fb9c5960723e2ebb45c68006493835", + "reference": "1dd42906a5fb9c5960723e2ebb45c68006493835", "shasum": "" }, "require": { - "doctrine/data-fixtures": "^1.3", - "doctrine/doctrine-bundle": "^2.2", - "doctrine/orm": "^2.14.0 || ^3.0", - "doctrine/persistence": "^2.4|^3.0", - "php": "^7.4 || ^8.0", - "symfony/config": "^5.4|^6.0|^7.0", - "symfony/console": "^5.4|^6.0|^7.0", - "symfony/dependency-injection": "^5.4|^6.0|^7.0", - "symfony/deprecation-contracts": "^2.1|^3", - "symfony/doctrine-bridge": "^5.4|^6.0|^7.0", - "symfony/http-kernel": "^5.4|^6.0|^7.0" - }, - "conflict": { - "doctrine/dbal": "< 3" + "doctrine/doctrine-bundle": "^2.4", + "doctrine/migrations": "^3.2", + "php": "^7.2|^8.0", + "symfony/deprecation-contracts": "^2.1 || ^3", + "symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0" }, "require-dev": { "doctrine/coding-standard": "^12", - "phpstan/phpstan": "^1.10.39", - "phpunit/phpunit": "^9.6.13", - "symfony/phpunit-bridge": "^6.3.6", - "vimeo/psalm": "^5.15" + "doctrine/orm": "^2.6 || ^3", + "doctrine/persistence": "^2.0 || ^3 ", + "phpstan/phpstan": "^1.4", + "phpstan/phpstan-deprecation-rules": "^1", + "phpstan/phpstan-phpunit": "^1", + "phpstan/phpstan-strict-rules": "^1.1", + "phpstan/phpstan-symfony": "^1.3", + "phpunit/phpunit": "^8.5|^9.5", + "psalm/plugin-phpunit": "^0.18.4", + "psalm/plugin-symfony": "^3 || ^5", + "symfony/phpunit-bridge": "^6.3 || ^7", + "symfony/var-exporter": "^5.4 || ^6 || ^7", + "vimeo/psalm": "^4.30 || ^5.15" }, "type": "symfony-bundle", "autoload": { "psr-4": { - "Doctrine\\Bundle\\FixturesBundle\\": "" - } + "Doctrine\\Bundle\\MigrationsBundle\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1185,15 +1013,16 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony DoctrineFixturesBundle", + "description": "Symfony DoctrineMigrationsBundle", "homepage": "https://www.doctrine-project.org", "keywords": [ - "Fixture", - "persistence" + "dbal", + "migrations", + "schema" ], "support": { - "issues": "https://github.com/doctrine/DoctrineFixturesBundle/issues", - "source": "https://github.com/doctrine/DoctrineFixturesBundle/tree/3.5.1" + "issues": "https://github.com/doctrine/DoctrineMigrationsBundle/issues", + "source": "https://github.com/doctrine/DoctrineMigrationsBundle/tree/3.3.0" }, "funding": [ { @@ -1205,110 +1034,19 @@ "type": "patreon" }, { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdoctrine-fixtures-bundle", + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdoctrine-migrations-bundle", "type": "tidelift" } ], - "time": "2023-11-19T12:48:54+00:00" + "time": "2023-11-13T19:44:41+00:00" }, { - "name": "doctrine/doctrine-migrations-bundle", - "version": "3.3.0", + "name": "doctrine/event-manager", + "version": "2.0.0", "source": { "type": "git", - "url": "https://github.com/doctrine/DoctrineMigrationsBundle.git", - "reference": "1dd42906a5fb9c5960723e2ebb45c68006493835" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineMigrationsBundle/zipball/1dd42906a5fb9c5960723e2ebb45c68006493835", - "reference": "1dd42906a5fb9c5960723e2ebb45c68006493835", - "shasum": "" - }, - "require": { - "doctrine/doctrine-bundle": "^2.4", - "doctrine/migrations": "^3.2", - "php": "^7.2|^8.0", - "symfony/deprecation-contracts": "^2.1 || ^3", - "symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0" - }, - "require-dev": { - "doctrine/coding-standard": "^12", - "doctrine/orm": "^2.6 || ^3", - "doctrine/persistence": "^2.0 || ^3 ", - "phpstan/phpstan": "^1.4", - "phpstan/phpstan-deprecation-rules": "^1", - "phpstan/phpstan-phpunit": "^1", - "phpstan/phpstan-strict-rules": "^1.1", - "phpstan/phpstan-symfony": "^1.3", - "phpunit/phpunit": "^8.5|^9.5", - "psalm/plugin-phpunit": "^0.18.4", - "psalm/plugin-symfony": "^3 || ^5", - "symfony/phpunit-bridge": "^6.3 || ^7", - "symfony/var-exporter": "^5.4 || ^6 || ^7", - "vimeo/psalm": "^4.30 || ^5.15" - }, - "type": "symfony-bundle", - "autoload": { - "psr-4": { - "Doctrine\\Bundle\\MigrationsBundle\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Doctrine Project", - "homepage": "https://www.doctrine-project.org" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony DoctrineMigrationsBundle", - "homepage": "https://www.doctrine-project.org", - "keywords": [ - "dbal", - "migrations", - "schema" - ], - "support": { - "issues": "https://github.com/doctrine/DoctrineMigrationsBundle/issues", - "source": "https://github.com/doctrine/DoctrineMigrationsBundle/tree/3.3.0" - }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdoctrine-migrations-bundle", - "type": "tidelift" - } - ], - "time": "2023-11-13T19:44:41+00:00" - }, - { - "name": "doctrine/event-manager", - "version": "2.0.0", - "source": { - "type": "git", - "url": "https://github.com/doctrine/event-manager.git", - "reference": "750671534e0241a7c50ea5b43f67e23eb5c96f32" + "url": "https://github.com/doctrine/event-manager.git", + "reference": "750671534e0241a7c50ea5b43f67e23eb5c96f32" }, "dist": { "type": "zip", @@ -2508,95 +2246,6 @@ }, "time": "2024-02-06T10:14:05+00:00" }, - { - "name": "liip/test-fixtures-bundle", - "version": "2.7.3", - "source": { - "type": "git", - "url": "https://github.com/liip/LiipTestFixturesBundle.git", - "reference": "a75285a3232383eaec8004b0f8c95573267f1aad" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/liip/LiipTestFixturesBundle/zipball/a75285a3232383eaec8004b0f8c95573267f1aad", - "reference": "a75285a3232383eaec8004b0f8c95573267f1aad", - "shasum": "" - }, - "require": { - "doctrine/common": "^2.13 || ^3.0", - "doctrine/persistence": "^1.3.3 || ^2.0 || ^3.0", - "php": "^7.4 || ^8.0", - "symfony/deprecation-contracts": "^2.1 || ^3.0", - "symfony/event-dispatcher": "^5.4 || ^6.3 || ^7.0", - "symfony/event-dispatcher-contracts": "^1 || ^2 || ^3", - "symfony/framework-bundle": "^5.4 || ^6.3 || ^7.0", - "symfony/yaml": "^5.4 || ^6.3 || ^7.0" - }, - "conflict": { - "doctrine/annotations": "<1.2.7 || >=3.0", - "doctrine/dbal": "<2.11" - }, - "require-dev": { - "doctrine/annotations": "^1.8.0 || ^2.0", - "doctrine/data-fixtures": "^1.7", - "doctrine/doctrine-bundle": "^2.11", - "doctrine/doctrine-fixtures-bundle": "^3.5.1 || ^4.0", - "doctrine/orm": "^2.7", - "doctrine/phpcr-bundle": "^2.4.3 || ^3.0", - "doctrine/phpcr-odm": "^1.7.2 || ^2.0", - "jackalope/jackalope-doctrine-dbal": "^1.10.1 || ^2.0", - "monolog/monolog": "^1.25.1 || ^2.0 || ^3.0", - "phpunit/phpunit": "^9.6 || ^10.4", - "symfony/doctrine-bridge": "^5.4 || ^6.3 || ^7.0", - "symfony/monolog-bridge": "^5.4 || ^6.3 || ^7.0", - "symfony/monolog-bundle": "^3.2", - "symfony/phpunit-bridge": "^5.4 || ^6.3 || ^7.0", - "theofidry/alice-data-fixtures": "^1.5.2" - }, - "suggest": { - "doctrine/dbal": "Required when using the fixture loading functionality with an ORM and SQLite", - "doctrine/doctrine-fixtures-bundle": "Required when using the fixture loading functionality", - "doctrine/orm": "Required when using the fixture loading functionality with an ORM and SQLite", - "hautelook/alice-bundle": "Required when using loadFixtureFiles functionality with custom providers", - "theofidry/alice-data-fixtures": "Required when using loadFixtureFiles functionality" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "2.x-dev" - } - }, - "autoload": { - "psr-4": { - "Liip\\TestFixturesBundle\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Liip AG", - "homepage": "http://www.liip.ch/" - }, - { - "name": "Community contributions", - "homepage": "https://github.com/liip/LiipTestFixturesBundle/contributors" - } - ], - "description": "This bundles enables efficient loading of Doctrine fixtures in functional test-cases for Symfony applications", - "keywords": [ - "fixtures", - "symfony", - "testing" - ], - "support": { - "issues": "https://github.com/liip/LiipTestFixturesBundle/issues", - "source": "https://github.com/liip/LiipTestFixturesBundle/tree/2.7.3" - }, - "time": "2024-02-25T22:34:13+00:00" - }, { "name": "monolog/monolog", "version": "3.5.0", @@ -3663,84 +3312,6 @@ }, "time": "2020-09-05T13:00:25+00:00" }, - { - "name": "sensio/framework-extra-bundle", - "version": "v6.2.10", - "source": { - "type": "git", - "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "2f886f4b31f23c76496901acaedfedb6936ba61f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/2f886f4b31f23c76496901acaedfedb6936ba61f", - "reference": "2f886f4b31f23c76496901acaedfedb6936ba61f", - "shasum": "" - }, - "require": { - "doctrine/annotations": "^1.0|^2.0", - "php": ">=7.2.5", - "symfony/config": "^4.4|^5.0|^6.0", - "symfony/dependency-injection": "^4.4|^5.0|^6.0", - "symfony/framework-bundle": "^4.4|^5.0|^6.0", - "symfony/http-kernel": "^4.4|^5.0|^6.0" - }, - "conflict": { - "doctrine/doctrine-cache-bundle": "<1.3.1", - "doctrine/persistence": "<1.3" - }, - "require-dev": { - "doctrine/dbal": "^2.10|^3.0", - "doctrine/doctrine-bundle": "^1.11|^2.0", - "doctrine/orm": "^2.5", - "symfony/browser-kit": "^4.4|^5.0|^6.0", - "symfony/doctrine-bridge": "^4.4|^5.0|^6.0", - "symfony/dom-crawler": "^4.4|^5.0|^6.0", - "symfony/expression-language": "^4.4|^5.0|^6.0", - "symfony/finder": "^4.4|^5.0|^6.0", - "symfony/monolog-bridge": "^4.0|^5.0|^6.0", - "symfony/monolog-bundle": "^3.2", - "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0", - "symfony/security-bundle": "^4.4|^5.0|^6.0", - "symfony/twig-bundle": "^4.4|^5.0|^6.0", - "symfony/yaml": "^4.4|^5.0|^6.0", - "twig/twig": "^1.34|^2.4|^3.0" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "6.1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Sensio\\Bundle\\FrameworkExtraBundle\\": "src/" - }, - "exclude-from-classmap": [ - "/tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "This bundle provides a way to configure your controllers with annotations", - "keywords": [ - "annotations", - "controllers" - ], - "support": { - "source": "https://github.com/sensiolabs/SensioFrameworkExtraBundle/tree/v6.2.10" - }, - "abandoned": "Symfony", - "time": "2023-02-24T14:57:12+00:00" - }, { "name": "simplesamlphp/saml2", "version": "v4.6.11", @@ -9002,37 +8573,299 @@ "time": "2022-02-25T21:32:43+00:00" }, { - "name": "hamcrest/hamcrest-php", - "version": "v2.0.1", + "name": "doctrine/common", + "version": "3.4.3", "source": { "type": "git", - "url": "https://github.com/hamcrest/hamcrest-php.git", - "reference": "8c3d0a3f6af734494ad8f6fbbee0ba92422859f3" + "url": "https://github.com/doctrine/common.git", + "reference": "8b5e5650391f851ed58910b3e3d48a71062eeced" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/8c3d0a3f6af734494ad8f6fbbee0ba92422859f3", - "reference": "8c3d0a3f6af734494ad8f6fbbee0ba92422859f3", + "url": "https://api.github.com/repos/doctrine/common/zipball/8b5e5650391f851ed58910b3e3d48a71062eeced", + "reference": "8b5e5650391f851ed58910b3e3d48a71062eeced", "shasum": "" }, "require": { - "php": "^5.3|^7.0|^8.0" - }, - "replace": { - "cordoval/hamcrest-php": "*", - "davedevelopment/hamcrest-php": "*", - "kodova/hamcrest-php": "*" + "doctrine/persistence": "^2.0 || ^3.0", + "php": "^7.1 || ^8.0" }, "require-dev": { - "phpunit/php-file-iterator": "^1.4 || ^2.0", - "phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7.0" + "doctrine/coding-standard": "^9.0 || ^10.0", + "doctrine/collections": "^1", + "phpstan/phpstan": "^1.4.1", + "phpstan/phpstan-phpunit": "^1", + "phpunit/phpunit": "^7.5.20 || ^8.5 || ^9.0", + "squizlabs/php_codesniffer": "^3.0", + "symfony/phpunit-bridge": "^6.1", + "vimeo/psalm": "^4.4" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.1-dev" - } - }, + "autoload": { + "psr-4": { + "Doctrine\\Common\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + }, + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" + } + ], + "description": "PHP Doctrine Common project is a library that provides additional functionality that other Doctrine projects depend on such as better reflection support, proxies and much more.", + "homepage": "https://www.doctrine-project.org/projects/common.html", + "keywords": [ + "common", + "doctrine", + "php" + ], + "support": { + "issues": "https://github.com/doctrine/common/issues", + "source": "https://github.com/doctrine/common/tree/3.4.3" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcommon", + "type": "tidelift" + } + ], + "time": "2022-10-09T11:47:59+00:00" + }, + { + "name": "doctrine/data-fixtures", + "version": "1.7.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/data-fixtures.git", + "reference": "bbcb74f2ac6dbe81a14b3c3687d7623490a0448f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/bbcb74f2ac6dbe81a14b3c3687d7623490a0448f", + "reference": "bbcb74f2ac6dbe81a14b3c3687d7623490a0448f", + "shasum": "" + }, + "require": { + "doctrine/deprecations": "^0.5.3 || ^1.0", + "doctrine/persistence": "^2.0|^3.0", + "php": "^7.4 || ^8.0" + }, + "conflict": { + "doctrine/dbal": "<3.5 || >=5", + "doctrine/orm": "<2.14 || >=4", + "doctrine/phpcr-odm": "<1.3.0" + }, + "require-dev": { + "doctrine/annotations": "^1.12 || ^2", + "doctrine/coding-standard": "^12", + "doctrine/dbal": "^3.5 || ^4", + "doctrine/mongodb-odm": "^1.3.0 || ^2.0.0", + "doctrine/orm": "^2.14 || ^3", + "ext-sqlite3": "*", + "phpstan/phpstan": "^1.10", + "phpunit/phpunit": "^9.6.13 || ^10.4.2", + "symfony/cache": "^5.4 || ^6.3 || ^7", + "symfony/var-exporter": "^5.4 || ^6.3 || ^7", + "vimeo/psalm": "^5.9" + }, + "suggest": { + "alcaeus/mongo-php-adapter": "For using MongoDB ODM 1.3 with PHP 7 (deprecated)", + "doctrine/mongodb-odm": "For loading MongoDB ODM fixtures", + "doctrine/orm": "For loading ORM fixtures", + "doctrine/phpcr-odm": "For loading PHPCR ODM fixtures" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Common\\DataFixtures\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + } + ], + "description": "Data Fixtures for all Doctrine Object Managers", + "homepage": "https://www.doctrine-project.org", + "keywords": [ + "database" + ], + "support": { + "issues": "https://github.com/doctrine/data-fixtures/issues", + "source": "https://github.com/doctrine/data-fixtures/tree/1.7.0" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdata-fixtures", + "type": "tidelift" + } + ], + "time": "2023-11-24T11:18:31+00:00" + }, + { + "name": "doctrine/doctrine-fixtures-bundle", + "version": "3.5.1", + "source": { + "type": "git", + "url": "https://github.com/doctrine/DoctrineFixturesBundle.git", + "reference": "c808a0c85c38c8ee265cc8405b456c1d2b38567d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/c808a0c85c38c8ee265cc8405b456c1d2b38567d", + "reference": "c808a0c85c38c8ee265cc8405b456c1d2b38567d", + "shasum": "" + }, + "require": { + "doctrine/data-fixtures": "^1.3", + "doctrine/doctrine-bundle": "^2.2", + "doctrine/orm": "^2.14.0 || ^3.0", + "doctrine/persistence": "^2.4|^3.0", + "php": "^7.4 || ^8.0", + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/doctrine-bridge": "^5.4|^6.0|^7.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0" + }, + "conflict": { + "doctrine/dbal": "< 3" + }, + "require-dev": { + "doctrine/coding-standard": "^12", + "phpstan/phpstan": "^1.10.39", + "phpunit/phpunit": "^9.6.13", + "symfony/phpunit-bridge": "^6.3.6", + "vimeo/psalm": "^5.15" + }, + "type": "symfony-bundle", + "autoload": { + "psr-4": { + "Doctrine\\Bundle\\FixturesBundle\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Doctrine Project", + "homepage": "https://www.doctrine-project.org" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony DoctrineFixturesBundle", + "homepage": "https://www.doctrine-project.org", + "keywords": [ + "Fixture", + "persistence" + ], + "support": { + "issues": "https://github.com/doctrine/DoctrineFixturesBundle/issues", + "source": "https://github.com/doctrine/DoctrineFixturesBundle/tree/3.5.1" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdoctrine-fixtures-bundle", + "type": "tidelift" + } + ], + "time": "2023-11-19T12:48:54+00:00" + }, + { + "name": "hamcrest/hamcrest-php", + "version": "v2.0.1", + "source": { + "type": "git", + "url": "https://github.com/hamcrest/hamcrest-php.git", + "reference": "8c3d0a3f6af734494ad8f6fbbee0ba92422859f3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/8c3d0a3f6af734494ad8f6fbbee0ba92422859f3", + "reference": "8c3d0a3f6af734494ad8f6fbbee0ba92422859f3", + "shasum": "" + }, + "require": { + "php": "^5.3|^7.0|^8.0" + }, + "replace": { + "cordoval/hamcrest-php": "*", + "davedevelopment/hamcrest-php": "*", + "kodova/hamcrest-php": "*" + }, + "require-dev": { + "phpunit/php-file-iterator": "^1.4 || ^2.0", + "phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, "autoload": { "classmap": [ "hamcrest" @@ -9052,6 +8885,95 @@ }, "time": "2020-07-09T08:09:16+00:00" }, + { + "name": "liip/test-fixtures-bundle", + "version": "2.7.3", + "source": { + "type": "git", + "url": "https://github.com/liip/LiipTestFixturesBundle.git", + "reference": "a75285a3232383eaec8004b0f8c95573267f1aad" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/liip/LiipTestFixturesBundle/zipball/a75285a3232383eaec8004b0f8c95573267f1aad", + "reference": "a75285a3232383eaec8004b0f8c95573267f1aad", + "shasum": "" + }, + "require": { + "doctrine/common": "^2.13 || ^3.0", + "doctrine/persistence": "^1.3.3 || ^2.0 || ^3.0", + "php": "^7.4 || ^8.0", + "symfony/deprecation-contracts": "^2.1 || ^3.0", + "symfony/event-dispatcher": "^5.4 || ^6.3 || ^7.0", + "symfony/event-dispatcher-contracts": "^1 || ^2 || ^3", + "symfony/framework-bundle": "^5.4 || ^6.3 || ^7.0", + "symfony/yaml": "^5.4 || ^6.3 || ^7.0" + }, + "conflict": { + "doctrine/annotations": "<1.2.7 || >=3.0", + "doctrine/dbal": "<2.11" + }, + "require-dev": { + "doctrine/annotations": "^1.8.0 || ^2.0", + "doctrine/data-fixtures": "^1.7", + "doctrine/doctrine-bundle": "^2.11", + "doctrine/doctrine-fixtures-bundle": "^3.5.1 || ^4.0", + "doctrine/orm": "^2.7", + "doctrine/phpcr-bundle": "^2.4.3 || ^3.0", + "doctrine/phpcr-odm": "^1.7.2 || ^2.0", + "jackalope/jackalope-doctrine-dbal": "^1.10.1 || ^2.0", + "monolog/monolog": "^1.25.1 || ^2.0 || ^3.0", + "phpunit/phpunit": "^9.6 || ^10.4", + "symfony/doctrine-bridge": "^5.4 || ^6.3 || ^7.0", + "symfony/monolog-bridge": "^5.4 || ^6.3 || ^7.0", + "symfony/monolog-bundle": "^3.2", + "symfony/phpunit-bridge": "^5.4 || ^6.3 || ^7.0", + "theofidry/alice-data-fixtures": "^1.5.2" + }, + "suggest": { + "doctrine/dbal": "Required when using the fixture loading functionality with an ORM and SQLite", + "doctrine/doctrine-fixtures-bundle": "Required when using the fixture loading functionality", + "doctrine/orm": "Required when using the fixture loading functionality with an ORM and SQLite", + "hautelook/alice-bundle": "Required when using loadFixtureFiles functionality with custom providers", + "theofidry/alice-data-fixtures": "Required when using loadFixtureFiles functionality" + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "2.x-dev" + } + }, + "autoload": { + "psr-4": { + "Liip\\TestFixturesBundle\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Liip AG", + "homepage": "http://www.liip.ch/" + }, + { + "name": "Community contributions", + "homepage": "https://github.com/liip/LiipTestFixturesBundle/contributors" + } + ], + "description": "This bundles enables efficient loading of Doctrine fixtures in functional test-cases for Symfony applications", + "keywords": [ + "fixtures", + "symfony", + "testing" + ], + "support": { + "issues": "https://github.com/liip/LiipTestFixturesBundle/issues", + "source": "https://github.com/liip/LiipTestFixturesBundle/tree/2.7.3" + }, + "time": "2024-02-25T22:34:13+00:00" + }, { "name": "malukenho/docheader", "version": "1.1.0", @@ -12275,7 +12197,7 @@ "ext-pdo": "*", "ext-openssl": "*" }, - "platform-dev": [], + "platform-dev": {}, "platform-overrides": { "php": "8.2" }, diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php index 82616a76f..1ccc0706a 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/CommandController.php @@ -104,7 +104,7 @@ private function resolveInstitution(Command $command, Metadata $metadata): Insti ); } - private function handleAuthorization(AbstractCommand $command, Metadata $metadata): void + private function handleAuthorization(Command $command, Metadata $metadata): void { // Get the actorId and actorInstitution from the metadata // Be aware that these values could be null when executing commands where we shouldn't log in for diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php index d4691875c..d490208e5 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php @@ -24,7 +24,6 @@ use Surfnet\StepupMiddleware\ApiBundle\Identity\Service\IdentityService; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonCollectionResponse; use Surfnet\StepupMiddleware\ApiBundle\Response\JsonNotFoundResponse; -use Surfnet\StepupMiddleware\ApiBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php b/src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandValueResolver.php similarity index 79% rename from src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php rename to src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandValueResolver.php index 0047bb9f0..20afc63f9 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandParamConverter.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Request/CommandValueResolver.php @@ -18,17 +18,27 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Request; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; -use Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\ParamConverterInterface; use Surfnet\StepupMiddleware\ApiBundle\Exception\BadCommandRequestException; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\AbstractCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpKernel\Controller\ValueResolverInterface; +use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata; -class CommandParamConverter implements ParamConverterInterface +class CommandValueResolver implements ValueResolverInterface { - public function apply(Request $request, ParamConverter $configuration): bool + /** + * @return AbstractCommand[] + */ + public function resolve(Request $request, ArgumentMetadata $argument): iterable { + $argumentType = $argument->getType(); + if (!$argumentType + || (!is_subclass_of($argumentType, Command::class, true) && Command::class !== $argumentType) + ) { + return []; + } + $data = json_decode($request->getContent(), true); $this->assertIsValidCommandStructure($data); @@ -43,21 +53,14 @@ public function apply(Request $request, ParamConverter $configuration): bool /** @var AbstractCommand $command */ $command = new $commandClassName; - $command->UUID = $data['command']['uuid']; + $command->UUID = (string)$data['command']['uuid']; - foreach ($data['command']['payload'] as $property => $value) { + foreach ((array)$data['command']['payload'] as $property => $value) { $properlyCasedProperty = lcfirst(str_replace(' ', '', ucwords(str_replace('_', ' ', (string)$property)))); $command->$properlyCasedProperty = $value; } - $request->attributes->set('command', $command); - return true; - } - - public function supports(ParamConverter $configuration): bool - { - return $configuration->getName() === 'command' - && $configuration->getClass() === Command::class; + return [$command]; } /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionParamConverter.php b/src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionValueResolver.php similarity index 71% rename from src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionParamConverter.php rename to src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionValueResolver.php index 55de2c5e7..0c38ed2e3 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionParamConverter.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionValueResolver.php @@ -18,26 +18,29 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Request; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; -use Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\ParamConverterInterface; use Surfnet\Stepup\Configuration\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Exception\BadApiRequestException; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpKernel\Controller\ValueResolverInterface; +use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata; -class ConfigurationInstitutionParamConverter implements ParamConverterInterface +class ConfigurationInstitutionValueResolver implements ValueResolverInterface { public const INSTITUTION = 'institution'; - public function apply(Request $request, ParamConverter $configuration): bool + /** + * @return Institution[] + */ + public function resolve(Request $request, ArgumentMetadata $argument): iterable { - $request->attributes->set(self::INSTITUTION, new Institution($this->getInstitutionFromRequest($request))); - return true; - } + $argumentType = $argument->getType(); + if (!$argumentType + || !is_subclass_of($argumentType, Institution::class, true) + ) { + return []; + } - public function supports(ParamConverter $configuration): bool - { - return $configuration->getName() === self::INSTITUTION - && $configuration->getClass() === Institution::class; + return [new Institution($this->getInstitutionFromRequest($request))]; } /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Request/InstitutionParamConverter.php b/src/Surfnet/StepupMiddleware/ApiBundle/Request/InstitutionValueResolver.php similarity index 61% rename from src/Surfnet/StepupMiddleware/ApiBundle/Request/InstitutionParamConverter.php rename to src/Surfnet/StepupMiddleware/ApiBundle/Request/InstitutionValueResolver.php index d3acaa98c..9959ab824 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Request/InstitutionParamConverter.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Request/InstitutionValueResolver.php @@ -18,17 +18,26 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Request; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; -use Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\ParamConverterInterface; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Exception\BadApiRequestException; use Symfony\Component\HttpFoundation\Request; -use function is_bool; +use Symfony\Component\HttpKernel\Controller\ValueResolverInterface; +use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata; -class InstitutionParamConverter implements ParamConverterInterface +class InstitutionValueResolver implements ValueResolverInterface { - public function apply(Request $request, ParamConverter $configuration): bool + /** + * @return Institution[] + */ + public function resolve(Request $request, ArgumentMetadata $argument): iterable { + $argumentType = $argument->getType(); + if (!$argumentType + || $argumentType !== Institution::class + ) { + return []; + } + $query = $request->query; $institution = $query->get('institution'); @@ -36,16 +45,6 @@ public function apply(Request $request, ParamConverter $configuration): bool throw new BadApiRequestException(['This API-call MUST include the institution as get parameter']); } - $query->remove('institution'); - - $request->attributes->set('institution', new Institution($institution)); - - return true; - } - - public function supports(ParamConverter $configuration): bool - { - return $configuration->getName() === 'institution' - && $configuration->getClass() === Institution::class; + return [new Institution($institution)]; } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Request/MetadataParamConverter.php b/src/Surfnet/StepupMiddleware/ApiBundle/Request/MetadataValueResolver.php similarity index 79% rename from src/Surfnet/StepupMiddleware/ApiBundle/Request/MetadataParamConverter.php rename to src/Surfnet/StepupMiddleware/ApiBundle/Request/MetadataValueResolver.php index 51d596957..fa8a31f02 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Request/MetadataParamConverter.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Request/MetadataValueResolver.php @@ -18,28 +18,38 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Request; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; -use Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\ParamConverterInterface; use Surfnet\StepupMiddleware\ApiBundle\Exception\BadCommandRequestException; use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Metadata; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpKernel\Controller\ValueResolverInterface; +use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata; use Symfony\Component\Validator\Validator\ValidatorInterface; -class MetadataParamConverter implements ParamConverterInterface +class MetadataValueResolver implements ValueResolverInterface { public function __construct(private readonly ValidatorInterface $validator) { } - public function apply(Request $request, ParamConverter $configuration): bool + /** + * @return Metadata[] + */ + public function resolve(Request $request, ArgumentMetadata $argument): iterable { + $argumentType = $argument->getType(); + if (!$argumentType + || $argumentType !== Metadata::class + ) { + return []; + } + $data = json_decode($request->getContent()); $this->assertIsValidMetadataStructure($data); $metadata = new Metadata(); - foreach ($data->meta as $property => $value) { + foreach ((array)$data->meta as $property => $value) { $properlyCasedProperty = lcfirst(str_replace(' ', '', ucwords(str_replace('_', ' ', (string)$property)))); $metadata->$properlyCasedProperty = $value; } @@ -49,14 +59,7 @@ public function apply(Request $request, ParamConverter $configuration): bool throw BadCommandRequestException::withViolations('Command metadata is not valid', $violations); } - $request->attributes->set('metadata', $metadata); - return true; - } - - public function supports(ParamConverter $configuration): bool - { - return $configuration->getName() === 'metadata' - && $configuration->getClass() === Metadata::class; + return [$metadata]; } /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandValueResolverTest.php similarity index 70% rename from src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php rename to src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandValueResolverTest.php index 12331883f..19a12d04c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandParamConverterTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/CommandValueResolverTest.php @@ -23,16 +23,16 @@ use Mockery\Matcher\MatcherAbstract; use Mockery\MockInterface; use PHPUnit\Framework\TestCase; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; use stdClass; use Surfnet\StepupMiddleware\ApiBundle\Exception\BadCommandRequestException; -use Surfnet\StepupMiddleware\ApiBundle\Request\CommandParamConverter; +use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\Command; +use Surfnet\StepupMiddleware\ApiBundle\Request\CommandValueResolver; use Surfnet\StepupMiddleware\CommandHandlingBundle\Root\Command\FooBarCommand; use Surfnet\StepupMiddleware\CommandHandlingBundle\Root\Command\Ns\QuuxCommand; -use Symfony\Component\HttpFoundation\ParameterBag; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata; -class CommandParamConverterTest extends TestCase +class CommandValueResolverTest extends TestCase { use MockeryPHPUnitIntegration; @@ -50,11 +50,17 @@ public function it_validates_the_command_structure(string $commandJson): void ->shouldReceive('getContent')->with()->andReturn($commandJson) ->getMock(); - /** @var ParamConverter&MockInterface $configuration */ - $configuration = m::mock(ParamConverter::class); + /** @var ArgumentMetadata&MockInterface $argument */ + $argument = m::mock(ArgumentMetadata::class); + $argument->shouldReceive('getType') + ->once() + ->andReturn(Command::class); - $converter = new CommandParamConverter(); - $converter->apply($request, $configuration); + $converter = new CommandValueResolver(); + $result = $converter->resolve($request, $argument); + + $this->assertCount(1, $result); + $this->assertInstanceOf(Command::class, $result[0]); } /** @@ -71,17 +77,17 @@ public function it_can_convert_command_name_notation(string $expectedCommandClas ->shouldReceive('getContent')->with()->andReturn(json_encode($command)) ->getMock(); - /** @var ParameterBag&MockInterface $attributes */ - $attributes = m::mock() - ->shouldReceive('set')->with('command', m::type($expectedCommandClass)) - ->getMock(); - $request->attributes = $attributes; - $configuration = m::mock(ParamConverter::class); + /** @var ArgumentMetadata&MockInterface $argument */ + $argument = m::mock(ArgumentMetadata::class); + $argument->shouldReceive('getType') + ->once() + ->andReturn(Command::class); - $converter = new CommandParamConverter(); - $converter->apply($request, $configuration); + $converter = new CommandValueResolver(); + $result = $converter->resolve($request, $argument); - $this->assertInstanceOf(CommandParamConverter::class, $converter); + $this->assertCount(1, $result); + $this->assertInstanceOf($expectedCommandClass, $result[0]); } /** @@ -97,18 +103,17 @@ public function it_sets_uuid(): void ->shouldReceive('getContent')->with()->andReturn(json_encode($command)) ->getMock(); - /** @var ParameterBag $attributes */ - $attributes = m::mock() - ->shouldReceive('set')->with('command', $this->spy($spiedCommand)) - ->getMock(); - $request->attributes = $attributes; - - $configuration = m::mock(ParamConverter::class); + /** @var ArgumentMetadata&MockInterface $argument */ + $argument = m::mock(ArgumentMetadata::class); + $argument->shouldReceive('getType') + ->once() + ->andReturn(Command::class); - $converter = new CommandParamConverter(); - $converter->apply($request, $configuration); + $converter = new CommandValueResolver(); + $result = $converter->resolve($request, $argument); - $this->assertEquals('abcdef', $spiedCommand->UUID, 'UUID mismatch'); + $this->assertCount(1, $result); + $this->assertEquals('abcdef', $result[0]->UUID, 'UUID mismatch'); } /** @@ -124,20 +129,20 @@ public function it_sets_payload(): void ->shouldReceive('getContent')->with()->andReturn(json_encode($command)) ->getMock(); - /** @var ParameterBag $attributes */ - $attributes = m::mock() - ->shouldReceive('set')->with('command', $this->spy($spiedCommand)) - ->getMock(); - - $request->attributes = $attributes; + /** @var ArgumentMetadata&MockInterface $argument */ + $argument = m::mock(ArgumentMetadata::class); + $argument->shouldReceive('getType') + ->once() + ->andReturn(Command::class); - $configuration = m::mock(ParamConverter::class); + $converter = new CommandValueResolver(); + $result = $converter->resolve($request, $argument); - $converter = new CommandParamConverter(); - $converter->apply($request, $configuration); + $this->assertCount(1, $result); - $spiedPayload = (array)$spiedCommand; + $spiedPayload = (array)$result[0]; unset($spiedPayload['UUID']); + $this->assertSame(['snakeCase' => true], $spiedPayload, 'Payload mismatch'); } @@ -183,18 +188,4 @@ public function convertibleCommandNames(): array ], ]; } - - /** - * @return MatcherAbstract - */ - private function spy(mixed &$spy): MatcherAbstract - { - return m::on( - function ($value) use (&$spy): bool { - $spy = $value; - - return true; - }, - ); - } } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionValueResolverTest.php similarity index 68% rename from src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php rename to src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionValueResolverTest.php index 1edd322f8..a53e83ec5 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionParamConverterTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/InstitutionValueResolverTest.php @@ -22,25 +22,28 @@ use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; use Mockery\MockInterface; use PHPUnit\Framework\TestCase as UnitTest; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\StepupMiddleware\ApiBundle\Exception\BadApiRequestException; -use Surfnet\StepupMiddleware\ApiBundle\Request\InstitutionParamConverter; +use Surfnet\StepupMiddleware\ApiBundle\Request\InstitutionValueResolver; use Symfony\Component\HttpFoundation\ParameterBag; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata; -class InstitutionParamConverterTest extends UnitTest +class InstitutionValueResolverTest extends UnitTest { use MockeryPHPUnitIntegration; private MockInterface&Request $request; - private MockInterface&ParamConverter $paramConverterConfig; + private MockInterface&ArgumentMetadata $argument; public function setUp(): void { $this->request = m::mock(Request::class); - $this->paramConverterConfig = m::mock(ParamConverter::class); + $this->argument = m::mock(ArgumentMetadata::class); + $this->argument->shouldReceive('getType') + ->once() + ->andReturn(Institution::class); } /** @@ -53,31 +56,27 @@ public function an_exception_is_thrown_when_the_parameter_is_missing(): void $this->request->query = $this->mockQuery(false); - $converter = new InstitutionParamConverter(); - $converter->apply($this->request, $this->paramConverterConfig); + $converter = new InstitutionValueResolver(); + $converter->resolve($this->request, $this->argument); } /** * @test * @group api-bundle */ - public function an_institution_is_set_as_attribute(): void + public function an_institution_is_resolved(): void { $query = $this->mockQuery('ABC'); - $query - ->shouldReceive('remove') - ->with('institution') - ->once(); $this->request->query = $query; - $this->request->attributes = new ParameterBag(); $equal = new Institution('ABC'); - $converter = new InstitutionParamConverter(); - $converter->apply($this->request, $this->paramConverterConfig); + $converter = new InstitutionValueResolver(); + $result = $converter->resolve($this->request, $this->argument); - $this->assertTrue($this->request->attributes->get('institution')->equals($equal)); + $this->assertCount(1, $result); + $this->assertEquals($equal, $result[0]); } private function mockQuery(bool|string $returnValue): ParameterBag&MockInterface diff --git a/symfony.lock b/symfony.lock index 8ba174f6b..a0bb09272 100644 --- a/symfony.lock +++ b/symfony.lock @@ -314,18 +314,6 @@ "sebastian/version": { "version": "2.0.1" }, - "sensio/framework-extra-bundle": { - "version": "5.2", - "recipe": { - "repo": "github.com/symfony/recipes", - "branch": "master", - "version": "5.2", - "ref": "fb7e19da7f013d0d422fa9bce16f5c510e27609b" - }, - "files": [ - "config/packages/sensio_framework_extra.yaml" - ] - }, "simplesamlphp/saml2": { "version": "v3.2.6" }, From b989615dc2470eb1fac182f3917fe0ce6fc781d5 Mon Sep 17 00:00:00 2001 From: Bas Date: Fri, 15 Nov 2024 10:02:22 +0100 Subject: [PATCH 64/89] Fix the event replay --- ci/qa/phpstan-baseline.neon | 43 ++++++++------ composer.json | 6 +- composer.lock | 8 +-- config/packages/doctrine.yaml | 59 +++++++++++++++++++ config/packages/prod/doctrine.yaml | 20 ------- .../packages/prod_event_replay/doctrine.yaml | 20 ------- config/packages/security.yaml | 18 ++++++ config/packages/smoketest/doctrine.yaml | 25 -------- config/packages/smoketest/security.yaml | 12 ---- .../smoketest_event_replay/doctrine.yaml | 19 ------ .../smoketest_event_replay/security.yaml | 12 ---- config/packages/test/doctrine.yaml | 16 ----- .../Controller/RecoveryTokenController.php | 2 +- .../UnverifiedSecondFactorController.php | 3 +- .../VettedSecondFactorController.php | 3 +- .../Doctrine/Type/RecoveryTokenStatusType.php | 4 ++ .../Doctrine/Type/SecondFactorStatusType.php | 3 + .../IdentitySelfAssertedTokenOptions.php | 2 +- .../Identity/Query/IdentityQuery.php | 6 +- .../Identity/Query/RaCandidateQuery.php | 25 ++------ .../Identity/Query/RaListingQuery.php | 2 +- .../ApiBundle/Identity/Query/RaaQuery.php | 2 +- .../Repository/IdentityRepository.php | 6 +- .../ConfigurationInstitutionValueResolver.php | 3 +- .../ApiBundle/Resources/config/services.yml | 25 -------- .../AddPipelineStagesCompilerPass.php | 4 ++ .../EventHandling/BufferedEventBus.php | 2 +- .../Command/VetSecondFactorCommand.php | 2 +- .../Pipeline/AuthorizingStage.php | 2 +- .../EventSourcing/SensitiveDataMessage.php | 2 +- .../Tests/Pipeline/AuthorizingStageTest.php | 10 ++-- .../Repository/WhitelistEntryRepository.php | 3 + .../Service/EventStreamReplayer.php | 29 +++++---- 33 files changed, 170 insertions(+), 228 deletions(-) delete mode 100644 config/packages/prod/doctrine.yaml delete mode 100644 config/packages/prod_event_replay/doctrine.yaml delete mode 100644 config/packages/smoketest/doctrine.yaml delete mode 100644 config/packages/smoketest/security.yaml delete mode 100644 config/packages/smoketest_event_replay/doctrine.yaml delete mode 100644 config/packages/smoketest_event_replay/security.yaml delete mode 100644 config/packages/test/doctrine.yaml diff --git a/ci/qa/phpstan-baseline.neon b/ci/qa/phpstan-baseline.neon index f91d42e57..a0e51d67c 100644 --- a/ci/qa/phpstan-baseline.neon +++ b/ci/qa/phpstan-baseline.neon @@ -2256,17 +2256,17 @@ parameters: path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php - - message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\IdentityQuery\\:\\:\\$commonName \\(string\\) does not accept mixed\\.$#" + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\IdentityQuery\\:\\:\\$commonName \\(string\\|null\\) does not accept mixed\\.$#" count: 1 path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php - - message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\IdentityQuery\\:\\:\\$email \\(string\\) does not accept mixed\\.$#" + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\IdentityQuery\\:\\:\\$email \\(string\\|null\\) does not accept mixed\\.$#" count: 1 path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php - - message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\IdentityQuery\\:\\:\\$nameId \\(string\\) does not accept mixed\\.$#" + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\IdentityQuery\\:\\:\\$nameId \\(string\\|null\\) does not accept mixed\\.$#" count: 1 path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php @@ -2291,22 +2291,22 @@ parameters: path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php - - message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RaCandidateQuery\\:\\:\\$commonName \\(string\\) does not accept mixed\\.$#" + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RaCandidateQuery\\:\\:\\$commonName \\(string\\|null\\) does not accept mixed\\.$#" count: 1 path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php - - message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RaCandidateQuery\\:\\:\\$email \\(string\\) does not accept mixed\\.$#" + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RaCandidateQuery\\:\\:\\$email \\(string\\|null\\) does not accept mixed\\.$#" count: 1 path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php - - message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RaCandidateQuery\\:\\:\\$institution \\(string\\|Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\Institution\\) does not accept mixed\\.$#" + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RaCandidateQuery\\:\\:\\$institution \\(string\\|Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\Institution\\|null\\) does not accept mixed\\.$#" count: 1 path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php - - message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RaCandidateQuery\\:\\:\\$raInstitution \\(string\\|Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\Institution\\) does not accept mixed\\.$#" + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RaCandidateQuery\\:\\:\\$raInstitution \\(string\\|Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\Institution\\|null\\) does not accept mixed\\.$#" count: 1 path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaCandidateController.php @@ -2336,7 +2336,7 @@ parameters: path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php - - message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RaListingQuery\\:\\:\\$institution \\(string\\|Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\Institution\\) does not accept mixed\\.$#" + message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RaListingQuery\\:\\:\\$institution \\(string\\|Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\Institution\\|null\\) does not accept mixed\\.$#" count: 1 path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RaListingController.php @@ -2452,7 +2452,7 @@ parameters: - message: "#^Parameter \\#1 \\$value of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\IdentityId constructor expects string, mixed given\\.$#" - count: 1 + count: 2 path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php - @@ -2465,11 +2465,6 @@ parameters: count: 1 path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php - - - message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RecoveryTokenQuery\\:\\:\\$identityId \\(Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\IdentityId\\|null\\) does not accept mixed\\.$#" - count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php - - message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\RecoveryTokenQuery\\:\\:\\$institution \\(string\\|null\\) does not accept mixed\\.$#" count: 1 @@ -2506,7 +2501,7 @@ parameters: path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php - - message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\UnverifiedSecondFactorQuery\\:\\:\\$identityId \\(Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\IdentityId\\|null\\) does not accept mixed\\.$#" + message: "#^Parameter \\#1 \\$value of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\IdentityId constructor expects string, mixed given\\.$#" count: 1 path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php @@ -2541,7 +2536,7 @@ parameters: path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php - - message: "#^Property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Query\\\\VettedSecondFactorQuery\\:\\:\\$identityId \\(Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\IdentityId\\|null\\) does not accept mixed\\.$#" + message: "#^Parameter \\#1 \\$value of class Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\IdentityId constructor expects string, mixed given\\.$#" count: 1 path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php @@ -2730,6 +2725,11 @@ parameters: count: 1 path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/IdentitySelfAssertedTokenOptions.php + - + message: "#^PHPDoc tag @var for property Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\IdentitySelfAssertedTokenOptions\\:\\:\\$identityId with type Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\IdentityId is incompatible with native type string\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/IdentitySelfAssertedTokenOptions.php + - message: "#^Method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\InstitutionListing\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 @@ -3326,12 +3326,17 @@ parameters: path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Configuration/Processor/InstitutionConfigurationProcessor.php - - message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\EventHandling\\\\BufferedEventBus\\:\\:\\$buffer \\(array\\\\) does not accept array\\.$#" + message: "#^Negated boolean expression is always false\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/CompilerPass/AddPipelineStagesCompilerPass.php + + - + message: "#^Comparison operation \"\\>\" between 0 and 0 is always false\\.$#" count: 1 path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php - - message: "#^Strict comparison using \\!\\=\\= between array\\{\\} and array\\{\\} will always evaluate to false\\.$#" + message: "#^Property Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\EventHandling\\\\BufferedEventBus\\:\\:\\$buffer \\(array\\\\) does not accept array\\.$#" count: 1 path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php @@ -3486,7 +3491,7 @@ parameters: path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventStore/SensitiveDataEventStoreDecorator.php - - message: "#^Parameter \\#1 \\$identityId of class Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\SensitiveData\\\\EventSourcing\\\\SensitiveDataMessage constructor expects Surfnet\\\\Stepup\\\\Identity\\\\Value\\\\IdentityId, mixed given\\.$#" + message: "#^Parameter \\#1 \\$identityId of class Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\SensitiveData\\\\EventSourcing\\\\SensitiveDataMessage constructor expects string, mixed given\\.$#" count: 1 path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventStore/SensitiveDataEventStoreDecorator.php diff --git a/composer.json b/composer.json index fe062f863..dabd8c9b5 100644 --- a/composer.json +++ b/composer.json @@ -21,6 +21,8 @@ "php": "^8.2", "ext-gmp": "*", "ext-json": "*", + "ext-openssl": "*", + "ext-pdo": "*", "broadway/broadway": "^2.5", "broadway/event-store-dbal": "^0.6", "doctrine/annotations": "^2.0", @@ -51,9 +53,7 @@ "symfony/validator": "6.4.*", "twig/extra-bundle": "^3.0", "twig/intl-extra": "^3", - "twig/twig": "^3", - "ext-pdo": "*", - "ext-openssl": "*" + "twig/twig": "^3" }, "require-dev": { "doctrine/data-fixtures": "~1.7", diff --git a/composer.lock b/composer.lock index 5f6501a77..5011771f1 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e099ee148c2f60c64e12f4a68398b628", + "content-hash": "56d93185946d0d8f3e111bcd4aa40848", "packages": [ { "name": "beberlei/assert", @@ -12194,10 +12194,10 @@ "php": "^8.2", "ext-gmp": "*", "ext-json": "*", - "ext-pdo": "*", - "ext-openssl": "*" + "ext-openssl": "*", + "ext-pdo": "*" }, - "platform-dev": {}, + "platform-dev": [], "platform-overrides": { "php": "8.2" }, diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml index 458a1c083..efc8e908e 100644 --- a/config/packages/doctrine.yaml +++ b/config/packages/doctrine.yaml @@ -153,3 +153,62 @@ doctrine: is_bundle: true deploy: connection: deploy + +when@prod: &prodOverride + doctrine: + orm: + auto_generate_proxy_classes: false + metadata_cache_driver: + type: pool + pool: doctrine.system_cache_pool + query_cache_driver: + type: pool + pool: doctrine.system_cache_pool + result_cache_driver: + type: pool + pool: doctrine.result_cache_pool + + framework: + cache: + pools: + doctrine.result_cache_pool: + adapter: cache.app + doctrine.system_cache_pool: + adapter: cache.system + +when@prod_event_replay: &prodOverride + +when@smoketest: &smoketestOveride + doctrine: + dbal: + default_connection: middleware + connections: + middleware: + dbname: middleware_test + host: mariadb + password: mw_deploy_secret + user: mw_deploy_user + gateway: + dbname: gateway_test + host: mariadb + password: mw_deploy_secret + user: mw_deploy_user + deploy: + dbname: middleware_test + host: mariadb + password: mw_deploy_secret + user: mw_deploy_user + +when@smoketest_event_replay: *smoketestOveride + +when@test: + doctrine: + dbal: + default_connection: middleware + connections: + middleware: + url: "sqlite:///%kernel.project_dir%/var/middleware.db" + gateway: + url: "sqlite:///%kernel.project_dir%/var/gateway.db" + deploy: + url: "sqlite:///%kernel.project_dir%/var/deploy.db" diff --git a/config/packages/prod/doctrine.yaml b/config/packages/prod/doctrine.yaml deleted file mode 100644 index 084f59a05..000000000 --- a/config/packages/prod/doctrine.yaml +++ /dev/null @@ -1,20 +0,0 @@ -doctrine: - orm: - auto_generate_proxy_classes: false - metadata_cache_driver: - type: pool - pool: doctrine.system_cache_pool - query_cache_driver: - type: pool - pool: doctrine.system_cache_pool - result_cache_driver: - type: pool - pool: doctrine.result_cache_pool - -framework: - cache: - pools: - doctrine.result_cache_pool: - adapter: cache.app - doctrine.system_cache_pool: - adapter: cache.system diff --git a/config/packages/prod_event_replay/doctrine.yaml b/config/packages/prod_event_replay/doctrine.yaml deleted file mode 100644 index 084f59a05..000000000 --- a/config/packages/prod_event_replay/doctrine.yaml +++ /dev/null @@ -1,20 +0,0 @@ -doctrine: - orm: - auto_generate_proxy_classes: false - metadata_cache_driver: - type: pool - pool: doctrine.system_cache_pool - query_cache_driver: - type: pool - pool: doctrine.system_cache_pool - result_cache_driver: - type: pool - pool: doctrine.result_cache_pool - -framework: - cache: - pools: - doctrine.result_cache_pool: - adapter: cache.app - doctrine.system_cache_pool: - adapter: cache.system diff --git a/config/packages/security.yaml b/config/packages/security.yaml index 462653faf..31d6d6ace 100644 --- a/config/packages/security.yaml +++ b/config/packages/security.yaml @@ -39,3 +39,21 @@ security: password_hashers: Symfony\Component\Security\Core\User\InMemoryUser: algorithm: plaintext + + + +# In test, it makes sense we use a hard-coded password for the api users. This, to aid the behat tests in Stepup-Deploy. +when@smoketest: &smoketestOveride + security: + providers: + in_memory: + memory: + users: + management: + password: "secret" + ss: + password: "secret" + ra: + password: "secret" + +when@smoketest_event_replay: *smoketestOveride \ No newline at end of file diff --git a/config/packages/smoketest/doctrine.yaml b/config/packages/smoketest/doctrine.yaml deleted file mode 100644 index 37fd4a81e..000000000 --- a/config/packages/smoketest/doctrine.yaml +++ /dev/null @@ -1,25 +0,0 @@ -doctrine: - dbal: - default_connection: middleware - connections: - middleware: - dbname: middleware_test - host: mariadb - password: mw_deploy_secret - user: mw_deploy_user - options: - 1002: 0 - gateway: - dbname: gateway_test - host: mariadb - password: mw_deploy_secret - user: mw_deploy_user - options: - 1002: 0 - deploy: - dbname: middleware_test - host: mariadb - password: mw_deploy_secret - user: mw_deploy_user - options: - 1002: 0 diff --git a/config/packages/smoketest/security.yaml b/config/packages/smoketest/security.yaml deleted file mode 100644 index 41ff33c42..000000000 --- a/config/packages/smoketest/security.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# In test, it makes sense we use a hard-coded password for the api users. This, to aid the behat tests in Stepup-Deploy. -security: - providers: - in_memory: - memory: - users: - management: - password: "secret" - ss: - password: "secret" - ra: - password: "secret" diff --git a/config/packages/smoketest_event_replay/doctrine.yaml b/config/packages/smoketest_event_replay/doctrine.yaml deleted file mode 100644 index 3face1dfc..000000000 --- a/config/packages/smoketest_event_replay/doctrine.yaml +++ /dev/null @@ -1,19 +0,0 @@ -doctrine: - dbal: - default_connection: middleware - connections: - middleware: - dbname: middleware_test - host: mariadb - password: mw_deploy_secret - user: mw_deploy_user - gateway: - dbname: gateway_test - host: mariadb - password: mw_deploy_secret - user: mw_deploy_user - deploy: - dbname: middleware_test - host: mariadb - password: mw_deploy_secret - user: mw_deploy_user diff --git a/config/packages/smoketest_event_replay/security.yaml b/config/packages/smoketest_event_replay/security.yaml deleted file mode 100644 index 41ff33c42..000000000 --- a/config/packages/smoketest_event_replay/security.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# In test, it makes sense we use a hard-coded password for the api users. This, to aid the behat tests in Stepup-Deploy. -security: - providers: - in_memory: - memory: - users: - management: - password: "secret" - ss: - password: "secret" - ra: - password: "secret" diff --git a/config/packages/test/doctrine.yaml b/config/packages/test/doctrine.yaml deleted file mode 100644 index bf9e04e0f..000000000 --- a/config/packages/test/doctrine.yaml +++ /dev/null @@ -1,16 +0,0 @@ -doctrine: - dbal: - default_connection: middleware - connections: - middleware: - url: "sqlite:///%kernel.project_dir%/var/middleware.db" - options: - 1002: 0 - gateway: - url: "sqlite:///%kernel.project_dir%/var/gateway.db" - options: - 1002: 0 - deploy: - url: "sqlite:///%kernel.project_dir%/var/deploy.db" - options: - 1002: 0 diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php index db83e35fa..63972b87c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php @@ -65,7 +65,7 @@ public function collection(Request $request): JsonCollectionResponse sprintf('Received search request for recovery tokens with params: %s', $request->getQueryString()), ); $query = new RecoveryTokenQuery(); - $query->identityId = $request->get('identityId'); + $query->identityId = new IdentityId($request->get('identityId')); $query->type = $request->get('type'); $query->status = $request->get('status'); $query->institution = $request->get('institution'); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php index 8091a7855..2cec19a2d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/UnverifiedSecondFactorController.php @@ -18,6 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Controller; +use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\SecondFactorId; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\UnverifiedSecondFactor; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\UnverifiedSecondFactorQuery; @@ -53,7 +54,7 @@ public function collection(Request $request): JsonCollectionResponse $this->denyAccessUnlessGrantedOneOff(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); $query = new UnverifiedSecondFactorQuery(); - $query->identityId = $request->get('identityId'); + $query->identityId = new IdentityId($request->get('identityId')); $query->verificationNonce = $request->get('verificationNonce'); $query->pageNumber = (int)$request->get('p', 1); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php index d348e8d57..ff13fcdf1 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/VettedSecondFactorController.php @@ -18,6 +18,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Controller; +use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\SecondFactorId; use Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\VettedSecondFactor; use Surfnet\StepupMiddleware\ApiBundle\Identity\Query\VettedSecondFactorQuery; @@ -53,7 +54,7 @@ public function collection(Request $request): JsonCollectionResponse $this->denyAccessUnlessGrantedOneOff(['ROLE_RA', 'ROLE_SS', 'ROLE_READ']); $query = new VettedSecondFactorQuery(); - $query->identityId = $request->get('identityId'); + $query->identityId = new IdentityId($request->get('identityId')); $query->pageNumber = (int)$request->get('p', 1); $paginator = $this->secondFactorService->searchVettedSecondFactors($query); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RecoveryTokenStatusType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RecoveryTokenStatusType.php index 0cfd34c42..a98d54d55 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RecoveryTokenStatusType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RecoveryTokenStatusType.php @@ -66,6 +66,10 @@ public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform) */ public function convertToPHPValue(mixed $value, AbstractPlatform $platform): RecoveryTokenStatus { + if (is_scalar($value)) { + $value = (string)$value; + } + if ($value === '0') { return RecoveryTokenStatus::active(); } elseif ($value === '10') { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorStatusType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorStatusType.php index f179fde92..e85378df4 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorStatusType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SecondFactorStatusType.php @@ -76,6 +76,9 @@ public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform) */ public function convertToPHPValue(mixed $value, AbstractPlatform $platform): SecondFactorStatus { + if (is_scalar($value)) { + $value = (string)$value; + } if ($value === '0') { return SecondFactorStatus::unverified(); } elseif ($value === '10') { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/IdentitySelfAssertedTokenOptions.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/IdentitySelfAssertedTokenOptions.php index 7b571d144..683b775a1 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/IdentitySelfAssertedTokenOptions.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/IdentitySelfAssertedTokenOptions.php @@ -32,7 +32,7 @@ class IdentitySelfAssertedTokenOptions implements JsonSerializable */ #[ORM\Id] #[ORM\Column(length: 36)] - public IdentityId $identityId; + public string $identityId; /** * In order to determine if the user is allowed to register diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/IdentityQuery.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/IdentityQuery.php index 9fa598625..aba44360e 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/IdentityQuery.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/IdentityQuery.php @@ -25,12 +25,12 @@ class IdentityQuery extends AbstractQuery /** * @var string */ - public string $nameId; + public ?string $nameId = null; /** * @var string */ - public string $commonName; + public ?string $commonName = null; /** * @var string|Institution @@ -40,5 +40,5 @@ class IdentityQuery extends AbstractQuery /** * @var string */ - public string $email; + public ?string $email = null; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaCandidateQuery.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaCandidateQuery.php index 7116e1af2..851593132 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaCandidateQuery.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaCandidateQuery.php @@ -23,33 +23,18 @@ class RaCandidateQuery extends AbstractQuery { - /** - * @var string|Institution - */ - public string|Institution $institution; + public string|Institution|null $institution = null; - /** - * @var string - */ - public string $commonName; + public ?string $commonName = null; - /** - * @var string - */ - public string $email; + public ?string $email = null; /** * @var string[] */ - public array $secondFactorTypes; + public array $secondFactorTypes = []; - /** - * @var string|Institution - */ - public string|Institution $raInstitution; + public string|Institution|null $raInstitution = null; - /** - * @var InstitutionAuthorizationContextInterface - */ public InstitutionAuthorizationContextInterface $authorizationContext; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaListingQuery.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaListingQuery.php index 4a85b8bf3..abfa6eece 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaListingQuery.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaListingQuery.php @@ -24,7 +24,7 @@ class RaListingQuery extends AbstractQuery { - public string|Institution $institution; + public string|Institution|null $institution = null; public ?IdentityId $identityId = null; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaaQuery.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaaQuery.php index 979080cc7..85da685e5 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaaQuery.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Query/RaaQuery.php @@ -30,5 +30,5 @@ class RaaQuery extends AbstractQuery /** * @var string */ - public string $nameId; + public string|null $nameId; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php index 761da538e..16e84b468 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php @@ -68,19 +68,19 @@ public function createSearchQuery( ->setParameter('institution', $query->institution); } - if ($query->nameId !== '' && $query->nameId !== '0') { + if ($query->nameId) { $queryBuilder ->andWhere('i.nameId = :nameId') ->setParameter('nameId', $query->nameId); } - if ($query->email !== '' && $query->email !== '0') { + if ($query->email) { $queryBuilder ->andWhere('i.email LIKE :email') ->setParameter('email', sprintf('%%%s%%', $query->email)); } - if ($query->commonName !== '' && $query->commonName !== '0') { + if ($query->commonName) { $queryBuilder ->andWhere('i.commonName LIKE :commonName') ->setParameter('commonName', sprintf('%%%s%%', $query->commonName)); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionValueResolver.php b/src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionValueResolver.php index 0c38ed2e3..472241550 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionValueResolver.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Request/ConfigurationInstitutionValueResolver.php @@ -34,8 +34,7 @@ class ConfigurationInstitutionValueResolver implements ValueResolverInterface public function resolve(Request $request, ArgumentMetadata $argument): iterable { $argumentType = $argument->getType(); - if (!$argumentType - || !is_subclass_of($argumentType, Institution::class, true) + if (!$argumentType || $argumentType !== Institution::class ) { return []; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/services.yml b/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/services.yml index 4d6f87bcf..e7c1b9d76 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/services.yml +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/services.yml @@ -127,31 +127,6 @@ services: arguments: - "@surfnet_stepup_middleware_api.repository.whitelist_entry" - # Param Converters - surfnet_stepup_middleware_api.request.command_param_converter: - class: Surfnet\StepupMiddleware\ApiBundle\Request\CommandParamConverter - tags: - - { name: request.param_converter, priority: -10, converter: surfnet_stepup_middleware_api.command } - - surfnet_stepup_middleware_api.request.metadata_param_converter: - class: Surfnet\StepupMiddleware\ApiBundle\Request\MetadataParamConverter - arguments: - - "@validator" - tags: - - { name: request.param_converter, priority: -15, converter: surfnet_stepup_middleware_api.metadata } - - surfnet_stepup_middleware_api.request.institution_param_converter: - class: Surfnet\StepupMiddleware\ApiBundle\Request\InstitutionParamConverter - tags: - - { name: request.param_converter, priority: -5, converter: surfnet_step_middleware.institution } - - surfnet_stepup_middleware_api.request.configuration_institution_param_converter: - class: Surfnet\StepupMiddleware\ApiBundle\Request\ConfigurationInstitutionParamConverter - tags: - - name: request.param_converter - priority: -4 - converter: surfnet_stepup_middleware_api.configuration_institution - # Exception Listeners surfnet_stepup_middleware_api.listener.exception_listener: class: Surfnet\StepupMiddleware\ApiBundle\EventListener\ExceptionListener diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/CompilerPass/AddPipelineStagesCompilerPass.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/CompilerPass/AddPipelineStagesCompilerPass.php index a43d46fb9..f1f95c04c 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/CompilerPass/AddPipelineStagesCompilerPass.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/DependencyInjection/CompilerPass/AddPipelineStagesCompilerPass.php @@ -53,6 +53,10 @@ public function process(ContainerBuilder $container): void $prioritized[$priority] = new Reference($stageServiceId); } + if (!ksort($prioritized)) { + throw new RuntimeException('Could not sort stages based on prioritization (ksort failed)'); + } + // ksort sorts low -> high, so reversing to get them sorted correctly. $prioritized = array_reverse($prioritized); diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php index 910e77220..9b50c3b28 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/EventHandling/BufferedEventBus.php @@ -102,7 +102,7 @@ public function flush(): void unset($buffer); // if during the handling of events new events have been queued, we need to flush them - if ($this->buffer !== []) { + if (count($this->buffer) > 0) { $this->flush(); } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/VetSecondFactorCommand.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/VetSecondFactorCommand.php index a96992d43..c643360e2 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/VetSecondFactorCommand.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Command/VetSecondFactorCommand.php @@ -85,7 +85,7 @@ class VetSecondFactorCommand extends AbstractCommand implements RaExecutable * @var boolean */ #[Assert\Type(type: 'bool')] - public bool $provePossessionSkipped; + public bool $provePossessionSkipped = false; /** * @inheritDoc diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/AuthorizingStage.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/AuthorizingStage.php index f2497e046..8cf9c1612 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/AuthorizingStage.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Pipeline/AuthorizingStage.php @@ -85,7 +85,7 @@ public function process(AbstractCommand $command): AbstractCommand private function clientHasAtLeastOneRole(array $rolesToCheck): bool { foreach ($rolesToCheck as $role) { - if ($this->authorizationChecker->isGranted([$role])) { + if ($this->authorizationChecker->isGranted($role)) { return true; } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessage.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessage.php index bcb2df9f5..988a78ef5 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessage.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/SensitiveData/EventSourcing/SensitiveDataMessage.php @@ -26,7 +26,7 @@ class SensitiveDataMessage { private readonly IdentityId $identityId; - public function __construct(IdentityId $identityId, private readonly int $playhead, private SensitiveData $sensitiveData) + public function __construct(string $identityId, private readonly int $playhead, private SensitiveData $sensitiveData) { $this->identityId = new IdentityId($identityId); } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/AuthorizingStageTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/AuthorizingStageTest.php index 4ad5e6c7f..287e52dee 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/AuthorizingStageTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Pipeline/AuthorizingStageTest.php @@ -77,7 +77,7 @@ public function a_command_with_a_marker_interface_triggers_a_check_for_the_corre $this->authorizationChecker ->shouldReceive('isGranted') ->once() - ->with([$role]) + ->with($role) ->andReturn(true); $authorizingStage = new AuthorizingStage($this->logger, $this->authorizationChecker); @@ -106,17 +106,17 @@ public function when_a_command_implements_multiple_marker_interfaces_at_least_on $this->authorizationChecker ->shouldReceive('isGranted') - ->with(['ROLE_SS']) + ->with('ROLE_SS') ->andReturn(false); $this->authorizationChecker ->shouldReceive('isGranted') - ->with(['ROLE_RA']) + ->with('ROLE_RA') ->andReturn(true); $this->authorizationChecker ->shouldReceive('isGranted') - ->with(['ROLE_MANAGEMENT']) + ->with('ROLE_MANAGEMENT') ->andReturn(false); $authorizingStage = new AuthorizingStage($this->logger, $this->authorizationChecker); @@ -146,7 +146,7 @@ public function when_the_client_does_not_have_the_required_role_an_forbidden_exc $this->authorizationChecker ->shouldReceive('isGranted') ->once() - ->with(['ROLE_SS']) + ->with('ROLE_SS') ->andReturn(false); $authorizingStage = new AuthorizingStage($this->logger, $this->authorizationChecker); diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/WhitelistEntryRepository.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/WhitelistEntryRepository.php index 37d44bb31..a48cca7ef 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/WhitelistEntryRepository.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/WhitelistEntryRepository.php @@ -49,6 +49,9 @@ public function saveEntries(array $whitelistEntries): void $entityManager = $this->getEntityManager(); foreach ($whitelistEntries as $whitelistEntry) { + if ($this->find($whitelistEntry)) { + continue; + } $entityManager->persist($whitelistEntry); } diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php index 72c50cb22..59a57104f 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php @@ -32,19 +32,26 @@ class EventStreamReplayer * @var string[] */ private array $middlewareTables = [ - 'unverified_second_factor', - 'verified_second_factor', - 'vetted_second_factor', + 'allowed_second_factor', + 'audit_log', 'configured_institution', - 'institution_configuration_options', + 'email_templates', + 'identity', + 'identity_self_asserted_token_options', 'institution_authorization', + 'institution_configuration_options', + 'institution_listing', +// 'institution_with_ra_locations', + 'ra_listing', 'ra_location', 'ra_second_factor', - 'identity', - 'sraa', - 'audit_log', - 'ra_listing', + 'recovery_token', 'second_factor_revocation', + 'sraa', + 'unverified_second_factor', + 'verified_second_factor', + 'vetted_second_factor', + 'vetting_type_hint', 'whitelist_entry', ]; @@ -52,8 +59,9 @@ class EventStreamReplayer * @var string[] */ private array $gatewayTables = [ - 'second_factor', + 'institution_configuration', 'saml_entity', + 'second_factor', 'whitelist_entry', ]; @@ -116,7 +124,8 @@ public function replayEvents(OutputInterface $output, int $increments): void foreach ($eventStream->getIterator() as $event) { /** @var DomainMessage $event */ $messages[] = sprintf( - ' > Publishing Event "%s" for UUID "%s"', + ' > Publishing Event %s "%s" for UUID "%s"', + $event->getRecordedOn()->toString(), $event->getType(), $event->getId(), ); From 92061816c1abdc80469231f8faaa19b0ae5b7f45 Mon Sep 17 00:00:00 2001 From: Bas Date: Fri, 15 Nov 2024 16:31:15 +0100 Subject: [PATCH 65/89] Update config --- composer.lock | 28 ++++----- config/packages/dev/mailer.yaml | 3 - config/packages/doctrine.yaml | 61 +++++++++++++++---- config/packages/mailer.yaml | 5 ++ config/packages/monolog.yaml | 2 +- config/packages/test/mailer.yaml | 4 -- .../routes/{routes.yaml => controllers.yaml} | 5 -- config/routes/dev/framework.yaml | 3 - config/routes/dev/routes.yaml | 12 ---- config/routes/dev/web_profiler.yaml | 7 --- config/routes/framework.yaml | 4 ++ config/routes/jms_translation.yaml | 5 ++ config/routes/nelmio_security.yaml | 4 ++ config/routes/web_profiler.yaml | 8 +++ .../Resources/config/processors.yml | 1 + 15 files changed, 91 insertions(+), 61 deletions(-) delete mode 100644 config/packages/dev/mailer.yaml delete mode 100644 config/packages/test/mailer.yaml rename config/routes/{routes.yaml => controllers.yaml} (64%) delete mode 100644 config/routes/dev/framework.yaml delete mode 100644 config/routes/dev/routes.yaml delete mode 100644 config/routes/dev/web_profiler.yaml create mode 100644 config/routes/framework.yaml create mode 100644 config/routes/jms_translation.yaml create mode 100644 config/routes/nelmio_security.yaml create mode 100644 config/routes/web_profiler.yaml diff --git a/composer.lock b/composer.lock index 5011771f1..8f414585d 100644 --- a/composer.lock +++ b/composer.lock @@ -2160,16 +2160,16 @@ }, { "name": "jms/translation-bundle", - "version": "2.2.0", + "version": "2.4.0", "source": { "type": "git", "url": "https://github.com/schmittjoh/JMSTranslationBundle.git", - "reference": "ad89a56dfe9de9485b10dc5d8893665101cd2fa3" + "reference": "d1f7e18b3c046ed84d8caa138e9a84ec46fa23d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/JMSTranslationBundle/zipball/ad89a56dfe9de9485b10dc5d8893665101cd2fa3", - "reference": "ad89a56dfe9de9485b10dc5d8893665101cd2fa3", + "url": "https://api.github.com/repos/schmittjoh/JMSTranslationBundle/zipball/d1f7e18b3c046ed84d8caa138e9a84ec46fa23d7", + "reference": "d1f7e18b3c046ed84d8caa138e9a84ec46fa23d7", "shasum": "" }, "require": { @@ -2183,7 +2183,7 @@ "symfony/translation": "^4.3 || ^5.4 || ^6.0", "symfony/translation-contracts": "^1.1 || ^2.0 || ^3.0", "symfony/validator": "^4.3 || ^5.4 || ^6.0", - "twig/twig": "^1.42.4 || ^2.12.5 || ^3.0" + "twig/twig": "^2.13.1 || ^3.0" }, "require-dev": { "doctrine/annotations": "^1.11", @@ -2242,9 +2242,9 @@ ], "support": { "issues": "https://github.com/schmittjoh/JMSTranslationBundle/issues", - "source": "https://github.com/schmittjoh/JMSTranslationBundle/tree/2.2.0" + "source": "https://github.com/schmittjoh/JMSTranslationBundle/tree/2.4.0" }, - "time": "2024-02-06T10:14:05+00:00" + "time": "2024-09-23T11:36:40+00:00" }, { "name": "monolog/monolog", @@ -7410,16 +7410,16 @@ }, { "name": "symfony/translation", - "version": "v6.4.4", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "bce6a5a78e94566641b2594d17e48b0da3184a8e" + "reference": "bee9bfabfa8b4045a66bf82520e492cddbaffa66" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/bce6a5a78e94566641b2594d17e48b0da3184a8e", - "reference": "bce6a5a78e94566641b2594d17e48b0da3184a8e", + "url": "https://api.github.com/repos/symfony/translation/zipball/bee9bfabfa8b4045a66bf82520e492cddbaffa66", + "reference": "bee9bfabfa8b4045a66bf82520e492cddbaffa66", "shasum": "" }, "require": { @@ -7485,7 +7485,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v6.4.4" + "source": "https://github.com/symfony/translation/tree/v6.4.13" }, "funding": [ { @@ -7501,7 +7501,7 @@ "type": "tidelift" } ], - "time": "2024-02-20T13:16:58+00:00" + "time": "2024-09-27T18:14:25+00:00" }, { "name": "symfony/translation-contracts", @@ -12197,7 +12197,7 @@ "ext-openssl": "*", "ext-pdo": "*" }, - "platform-dev": [], + "platform-dev": {}, "platform-overrides": { "php": "8.2" }, diff --git a/config/packages/dev/mailer.yaml b/config/packages/dev/mailer.yaml deleted file mode 100644 index be3e31f14..000000000 --- a/config/packages/dev/mailer.yaml +++ /dev/null @@ -1,3 +0,0 @@ -framework: - mailer: - dsn: "%mailer_transport%://%mailer_user%:%mailer_password%@%mailer_host%:1025" diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml index efc8e908e..3e5e61643 100644 --- a/config/packages/doctrine.yaml +++ b/config/packages/doctrine.yaml @@ -1,4 +1,3 @@ - # Doctrine Configuration doctrine: dbal: @@ -13,9 +12,6 @@ doctrine: password: "%database_middleware_password%" server_version: "%database_server_version%" charset: utf8 - options: - # The 1002 constant sets the PDO MYSQL_ATTR_INIT_COMMAND for when the connection is (re)connected. - 1002: "%database_driver_options_1002%" gateway: driver: "%database_driver%" host: "%database_host%" @@ -25,8 +21,6 @@ doctrine: password: "%database_gateway_password%" server_version: "%database_server_version%" charset: utf8 - options: - 1002: "%database_driver_options_1002%" deploy: driver: "%database_driver%" host: "%database_host%" @@ -36,8 +30,6 @@ doctrine: password: "%database_deploy_password%" server_version: "%database_server_version%" charset: utf8 - options: - 1002: "%database_driver_options_1002%" types: authority_role: class: Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\AuthorityRoleType @@ -154,6 +146,19 @@ doctrine: deploy: connection: deploy +when@dev: + doctrine: + dbal: &mariadbDbal + connections: + middleware: &options + options: + # The 1002 constant sets the PDO MYSQL_ATTR_INIT_COMMAND for when the connection is (re)connected. + 1002: "%database_driver_options_1002%" + gateway: + *options + deploy: + *options + when@prod: &prodOverride doctrine: orm: @@ -167,7 +172,8 @@ when@prod: &prodOverride result_cache_driver: type: pool pool: doctrine.result_cache_pool - + dbal: + <<: *mariadbDbal framework: cache: pools: @@ -176,30 +182,61 @@ when@prod: &prodOverride doctrine.system_cache_pool: adapter: cache.system -when@prod_event_replay: &prodOverride +when@prod_event_replay: + doctrine: + dbal: + <<: *mariadbDbal + orm: + default_entity_manager: deploy when@smoketest: &smoketestOveride doctrine: dbal: - default_connection: middleware connections: middleware: dbname: middleware_test host: mariadb password: mw_deploy_secret user: mw_deploy_user + <<: *options gateway: dbname: gateway_test host: mariadb password: mw_deploy_secret user: mw_deploy_user + <<: *options deploy: dbname: middleware_test host: mariadb password: mw_deploy_secret user: mw_deploy_user + <<: *options -when@smoketest_event_replay: *smoketestOveride +when@smoketest_event_replay: + doctrine: + dbal: + default_connection: deploy + connections: + middleware: + dbname: middleware_test + host: mariadb + password: mw_deploy_secret + user: mw_deploy_user + <<: *options + gateway: + dbname: gateway_test + host: mariadb + password: mw_deploy_secret + user: mw_deploy_user + <<: *options + deploy: + dbname: middleware_test + host: mariadb + password: mw_deploy_secret + user: mw_deploy_user + <<: *options + orm: + default_entity_manager: deploy when@test: doctrine: diff --git a/config/packages/mailer.yaml b/config/packages/mailer.yaml index a3ac9e101..bb0adb80c 100644 --- a/config/packages/mailer.yaml +++ b/config/packages/mailer.yaml @@ -1,3 +1,8 @@ framework: mailer: dsn: "%mailer_transport%://%mailer_user%:%mailer_password%@%mailer_host%:%mailer_port%" + +when@test: + framework: + mailer: + dsn: 'null://null' # disable delivery diff --git a/config/packages/monolog.yaml b/config/packages/monolog.yaml index 10bca89bc..6b61583e3 100644 --- a/config/packages/monolog.yaml +++ b/config/packages/monolog.yaml @@ -19,7 +19,7 @@ when@dev: &override main_syslog: type: stream path: php://stderr - level: error + level: debug channels: ["!event", "!doctrine", "!deprecation", "!console"] console: type: console diff --git a/config/packages/test/mailer.yaml b/config/packages/test/mailer.yaml deleted file mode 100644 index 95a11a2d2..000000000 --- a/config/packages/test/mailer.yaml +++ /dev/null @@ -1,4 +0,0 @@ -framework: - mailer: - dsn: 'null://null' # disable delivery - diff --git a/config/routes/routes.yaml b/config/routes/controllers.yaml similarity index 64% rename from config/routes/routes.yaml rename to config/routes/controllers.yaml index 7b18a027a..e8f3352fd 100644 --- a/config/routes/routes.yaml +++ b/config/routes/controllers.yaml @@ -6,10 +6,5 @@ openconext_monitor: resource: "@OpenConextMonitorBundle/Resources/config/routing.yml" prefix: / -nelmio_security_report: - path: /nelmio/csp/report/5dfbe9b445699acac9aa29de802dd6e20815f6e1 - defaults: { _controller: nelmio_security.csp_reporter_controller:indexAction } - methods: [POST] - surfnet_stepup_middleware_api: resource: "@SurfnetStepupMiddlewareApiBundle/Resources/config/routing.yml" diff --git a/config/routes/dev/framework.yaml b/config/routes/dev/framework.yaml deleted file mode 100644 index bcbbf13d0..000000000 --- a/config/routes/dev/framework.yaml +++ /dev/null @@ -1,3 +0,0 @@ -_errors: - resource: '@FrameworkBundle/Resources/config/routing/errors.xml' - prefix: /_error diff --git a/config/routes/dev/routes.yaml b/config/routes/dev/routes.yaml deleted file mode 100644 index ae22ca45a..000000000 --- a/config/routes/dev/routes.yaml +++ /dev/null @@ -1,12 +0,0 @@ -_wdt: - resource: "@WebProfilerBundle/Resources/config/routing/wdt.xml" - prefix: /_wdt - -_profiler: - resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml" - prefix: /_profiler - -JMSTranslationBundle_ui: - resource: "@JMSTranslationBundle/Controller/" - type: attribute - prefix: /_trans diff --git a/config/routes/dev/web_profiler.yaml b/config/routes/dev/web_profiler.yaml deleted file mode 100644 index c82beff2f..000000000 --- a/config/routes/dev/web_profiler.yaml +++ /dev/null @@ -1,7 +0,0 @@ -web_profiler_wdt: - resource: '@WebProfilerBundle/Resources/config/routing/wdt.xml' - prefix: /_wdt - -web_profiler_profiler: - resource: '@WebProfilerBundle/Resources/config/routing/profiler.xml' - prefix: /_profiler diff --git a/config/routes/framework.yaml b/config/routes/framework.yaml new file mode 100644 index 000000000..0fc74bbac --- /dev/null +++ b/config/routes/framework.yaml @@ -0,0 +1,4 @@ +when@dev: + _errors: + resource: '@FrameworkBundle/Resources/config/routing/errors.xml' + prefix: /_error diff --git a/config/routes/jms_translation.yaml b/config/routes/jms_translation.yaml new file mode 100644 index 000000000..41c129da1 --- /dev/null +++ b/config/routes/jms_translation.yaml @@ -0,0 +1,5 @@ +when@dev: + JMSTranslationBundle_ui: + resource: "@JMSTranslationBundle/Controller/" + type: annotation + prefix: /_trans diff --git a/config/routes/nelmio_security.yaml b/config/routes/nelmio_security.yaml new file mode 100644 index 000000000..6a14cf07f --- /dev/null +++ b/config/routes/nelmio_security.yaml @@ -0,0 +1,4 @@ +nelmio_security_report: + path: /nelmio/csp/report/5dfbe9b445699acac9aa29de802dd6e20815f6e1 + defaults: { _controller: nelmio_security.csp_reporter_controller:indexAction } + methods: [POST] \ No newline at end of file diff --git a/config/routes/web_profiler.yaml b/config/routes/web_profiler.yaml new file mode 100644 index 000000000..51338da36 --- /dev/null +++ b/config/routes/web_profiler.yaml @@ -0,0 +1,8 @@ +when@dev: + _wdt: + resource: "@WebProfilerBundle/Resources/config/routing/wdt.xml" + prefix: /_wdt + + _profiler: + resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml" + prefix: /_profiler diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Resources/config/processors.yml b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Resources/config/processors.yml index ef93f73d4..bfa786669 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Resources/config/processors.yml +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Resources/config/processors.yml @@ -3,6 +3,7 @@ services: class: Surfnet\StepupMiddleware\CommandHandlingBundle\Processor\EmailVerificationEmailProcessor arguments: - "@surfnet_stepup_middleware_command_handling.service.email_verification_mail" + - "@logger" tags: [ { name: event_bus.event_listener, disable_for_replay: true } ] surfnet_stepup_middleware_command_handling.processor.second_factor_revocation_email: From 626ac3736b6b020183f3118617e2d4a4f3208db4 Mon Sep 17 00:00:00 2001 From: Bas Date: Fri, 15 Nov 2024 16:31:27 +0100 Subject: [PATCH 66/89] Update Twig --- config/packages/twig_extensions.yaml | 11 ----------- config/services.yaml | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 config/packages/twig_extensions.yaml diff --git a/config/packages/twig_extensions.yaml b/config/packages/twig_extensions.yaml deleted file mode 100644 index 56e374059..000000000 --- a/config/packages/twig_extensions.yaml +++ /dev/null @@ -1,11 +0,0 @@ -services: - _defaults: - public: false - autowire: true - autoconfigure: true - - # Uncomment any lines below to activate that Twig extension - #Twig\Extensions\ArrayExtension: null - #Twig\Extensions\DateExtension: null - Twig\Extensions\IntlExtension: null - #Twig\Extensions\TextExtension: null diff --git a/config/services.yaml b/config/services.yaml index 9aa8ff92f..cd898a123 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -27,7 +27,7 @@ services: class: Twig\Sandbox\SecurityPolicy arguments: - [ if, else, elseif, for ] # Allowed tags - - [ escape, localizeddate ] # Allowed filters + - [ escape, format_datetime ] # Allowed filters - # Allowed methods Surfnet\Stepup\Identity\Value\CommonName: - __toString From 641281ff8ae7273f854632c87b9a09e0d42479ca Mon Sep 17 00:00:00 2001 From: Bas Date: Tue, 19 Nov 2024 13:38:15 +0100 Subject: [PATCH 67/89] Fix the entitymanager state while replaying --- .../InstitutionAuthorizationRepository.php | 2 ++ .../Identity/Repository/SraaRepository.php | 4 +++- .../Repository/WhitelistEntryRepository.php | 2 ++ .../GatewayBundle/Entity/SamlEntityRepository.php | 10 +++------- .../Repository/WhitelistEntryRepository.php | 15 +++++++++++---- .../Resources/config/services.yml | 1 + .../Resources/config/services.yml | 1 + .../Service/EventStreamReplayer.php | 9 +++++++++ 8 files changed, 32 insertions(+), 12 deletions(-) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionAuthorizationRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionAuthorizationRepository.php index 3c6b875f6..2300cb090 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionAuthorizationRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Repository/InstitutionAuthorizationRepository.php @@ -156,6 +156,8 @@ private function clearOldAuthorizations( ->setParameter('role', $role) ->setParameter('institution', $institution->getInstitution()) ->execute(); + + $this->getEntityManager()->clear(); } /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php index 847ceeebb..bcbe4b93f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/SraaRepository.php @@ -42,9 +42,11 @@ public function removeAll(): void $this ->getEntityManager() ->createQuery( - 'DELETE FROM Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Sraa', + 'DELETE FROM '.Sraa::class, ) ->execute(); + + $this->getEntityManager()->clear(); } /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php index 5c6f67d69..0754382a6 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/WhitelistEntryRepository.php @@ -72,6 +72,8 @@ public function removeAll(): void ->where('1 = 1') ->getQuery() ->execute(); + + $this->getEntityManager()->clear(); } /** diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntityRepository.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntityRepository.php index 5f9a83492..639b56cee 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntityRepository.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/SamlEntityRepository.php @@ -49,17 +49,11 @@ public function replaceAllIdps(array $newSamlEntities): void private function replaceAllOfType(string $type, array $newSamlEntities): void { $entityManager = $this->getEntityManager(); - $counter = 0; $this->removeAllOfType($type); - $entityManager->flush(); foreach ($newSamlEntities as $samlEntity) { $entityManager->persist($samlEntity); - - if (++$counter % 25 === 0) { - $entityManager->flush(); - } } $entityManager->flush(); @@ -73,8 +67,10 @@ private function removeAllOfType(string $type): void $this ->getEntityManager() ->createQuery( - 'DELETE FROM Surfnet\StepupMiddleware\GatewayBundle\Entity\SamlEntity se WHERE se.type = :type', + 'DELETE FROM '.SamlEntity::class.' se WHERE se.type = :type', ) ->execute(['type' => $type]); + + $this->getEntityManager()->clear(); } } diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/WhitelistEntryRepository.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/WhitelistEntryRepository.php index a48cca7ef..dbf9a97fa 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/WhitelistEntryRepository.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Repository/WhitelistEntryRepository.php @@ -18,7 +18,9 @@ namespace Surfnet\StepupMiddleware\GatewayBundle\Repository; +use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityRepository; +use Doctrine\ORM\Mapping\ClassMetadata; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\StepupMiddleware\GatewayBundle\Entity\WhitelistEntry; @@ -27,6 +29,12 @@ */ class WhitelistEntryRepository extends EntityRepository { + public function __construct(EntityManagerInterface $em, ClassMetadata $class) + { + parent::__construct($em, $class); + } + + /** * @param Institution[] $institutions * @return WhitelistEntry[] @@ -49,9 +57,6 @@ public function saveEntries(array $whitelistEntries): void $entityManager = $this->getEntityManager(); foreach ($whitelistEntries as $whitelistEntry) { - if ($this->find($whitelistEntry)) { - continue; - } $entityManager->persist($whitelistEntry); } @@ -68,6 +73,8 @@ public function removeAll(): void ->where('1 = 1') ->getQuery() ->execute(); + + $this->getEntityManager()->clear(); } /** @@ -81,6 +88,6 @@ public function remove(array $whitelistEntries): void $entityManager->remove($whitelistEntry); } - $entityManager->flush(); + $entityManager->clear(); } } diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Resources/config/services.yml b/src/Surfnet/StepupMiddleware/ManagementBundle/Resources/config/services.yml index 968106cb9..c8132f958 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Resources/config/services.yml +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Resources/config/services.yml @@ -69,3 +69,4 @@ services: arguments: - middleware: "@doctrine.dbal.middleware_connection" gateway: "@doctrine.dbal.gateway_connection" + deploy: "@doctrine.dbal.deploy_connection" diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Resources/config/services.yml b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Resources/config/services.yml index d22cbb057..d15802dee 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Resources/config/services.yml +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Resources/config/services.yml @@ -14,6 +14,7 @@ services: arguments: - middleware: "@doctrine.dbal.middleware_connection" gateway: "@doctrine.dbal.gateway_connection" + deploy: "@doctrine.dbal.deploy_connection" surfnet_stepup_middleware_middleware.institution_configuration_provider: class: Surfnet\StepupMiddleware\MiddlewareBundle\Migrations\InstitutionConfiguration\InstitutionConfigurationProvider diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php index 59a57104f..9324f2f0c 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php @@ -85,14 +85,20 @@ public function replayEvents(OutputInterface $output, int $increments): void $preparationProgress->setMessage('Starting Transaction'); $this->connectionHelper->beginTransaction(); + $preparationProgress->clear(); $preparationProgress->advance(); try { $preparationProgress->setMessage('Removing data from Read Tables'); + $preparationProgress->clear(); $this->wipeReadTables($output); + + $preparationProgress->setMessage('Done wiping'); + $preparationProgress->clear(); $preparationProgress->advance(); $preparationProgress->setMessage('Determining amount of events to replay...'); + $preparationProgress->clear(); $totalEvents = $this->eventHydrator->getCount(); $preparationProgress->advance(); @@ -100,6 +106,7 @@ public function replayEvents(OutputInterface $output, int $increments): void if ($totalEvents == 0) { // Spaces are needed to overwrite the previous message. $preparationProgress->setMessage('There are no events to replay. Done. '); + $preparationProgress->clear(); $preparationProgress->finish(); return; } else { @@ -109,6 +116,7 @@ public function replayEvents(OutputInterface $output, int $increments): void $increments, ); $preparationProgress->setMessage($defaultMessage); + $preparationProgress->clear(); $preparationProgress->finish(); } @@ -139,6 +147,7 @@ public function replayEvents(OutputInterface $output, int $increments): void unset($eventStream); $steps = (($count + $increments < $totalEvents) ? $increments : ($totalEvents - $count)); + $preparationProgress->clear(); $replayProgress->advance($steps); } From d4b8d6ce98f26f3e8aed4d51cad6530335f67785 Mon Sep 17 00:00:00 2001 From: Bas Date: Tue, 19 Nov 2024 13:38:59 +0100 Subject: [PATCH 68/89] Fix route controllers --- .../StepupMiddleware/ApiBundle/Resources/config/routing.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/routing.yml b/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/routing.yml index 01618e731..4f387b69c 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/routing.yml +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/routing.yml @@ -137,19 +137,19 @@ ra_second_factors: ra_second_factors_export: path: /ra-second-factors-export - defaults: { _controller: SurfnetStepupMiddlewareApiBundle:RaSecondFactor:export } + defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\RaSecondFactorController::export } methods: [ GET ] condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" identity_ra_list: path: /registration-authority - defaults: { _controller: SurfnetStepupMiddlewareApiBundle:Ra:list } + defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\RaController::list } methods: [ GET ] condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" identity_ra_listing: path: /ra-listing - defaults: { _controller: SurfnetStepupMiddlewareApiBundle:RaListing:search } + defaults: { _controller: Surfnet\StepupMiddleware\ApiBundle\Controller\RaListingController::search } methods: [ GET ] condition: "request.headers.get('Accept') matches '/^application\\\\/json($|[;,])/'" From 563c627290590038d4be6162a668512bc6905c0d Mon Sep 17 00:00:00 2001 From: Bas Date: Wed, 20 Nov 2024 15:38:26 +0100 Subject: [PATCH 69/89] Fix mail date format --- src/Surfnet/Stepup/DateTime/DateTime.php | 1 + .../Identity/Service/RegistrationMailService.php | 4 ++-- .../Service/VerifiedSecondFactorReminderMailService.php | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Surfnet/Stepup/DateTime/DateTime.php b/src/Surfnet/Stepup/DateTime/DateTime.php index 4a038ec1b..e04cec687 100644 --- a/src/Surfnet/Stepup/DateTime/DateTime.php +++ b/src/Surfnet/Stepup/DateTime/DateTime.php @@ -35,6 +35,7 @@ class DateTime implements Stringable * `DateTime::createFromString()`. */ public const FORMAT = 'Y-m-d\\TH:i:sP'; + public const MAIL_FORMAT = 'Y-m-d H:i:s'; /** * Allows for mocking of time. diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php index 5fac5c732..2d94876b2 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php @@ -158,7 +158,7 @@ private function sendRegistrationEmailWithRas( 'commonName' => $commonName, 'emailAddress' => $email, 'registrationCode' => $registrationCode, - 'expirationDate' => $expirationDate, + 'expirationDate' => $expirationDate->format(DateTime::MAIL_FORMAT), 'ras' => $ras, 'selfServiceUrl' => $this->selfServiceUrl, ]; @@ -208,7 +208,7 @@ private function sendRegistrationEmailWithRaLocations( 'commonName' => $commonName, 'emailAddress' => $email, 'registrationCode' => $registrationCode, - 'expirationDate' => $expirationDate, + 'expirationDate' => $expirationDate->format(DateTime::MAIL_FORMAT), 'raLocations' => $raLocations, 'selfServiceUrl' => $this->selfServiceUrl, ]; diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php index a8f9d296a..19df90d0d 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php @@ -131,7 +131,7 @@ private function sendReminderWithInstitution( 'templateString' => $emailTemplate->htmlContent, 'locale' => $locale, 'commonName' => $commonName, - 'expirationDate' => $requestedAt, + 'expirationDate' => $requestedAt->format(DateTime::MAIL_FORMAT), 'registrationCode' => $registrationCode, 'raLocations' => $raLocations, ]; @@ -153,7 +153,7 @@ private function sendReminderWithRas( string $locale, string $commonName, string $email, - DateTime$requestedAt, + DateTime $requestedAt, string $registrationCode, array $ras, ): void { @@ -174,7 +174,7 @@ private function sendReminderWithRas( 'templateString' => $emailTemplate->htmlContent, 'locale' => $locale, 'commonName' => $commonName, - 'expirationDate' => $requestedAt, + 'expirationDate' => $requestedAt->format(DateTime::MAIL_FORMAT), 'registrationCode' => $registrationCode, 'ras' => $ras, ]; From 6954f7dbb086cb8fe3e5c42d7facd423b451ed9b Mon Sep 17 00:00:00 2001 From: Bas Date: Wed, 20 Nov 2024 15:41:59 +0100 Subject: [PATCH 70/89] Fix deprecations --- .../ApiBundle/Tests/Request/commands.php | 8 +++++-- .../IdentityCommandHandlerTest.php | 8 +++---- .../RightToBeForgottenCommandHandlerTest.php | 22 +++++++++---------- .../EventSourcing/DBALEventHydrator.php | 4 ++++ .../Service/EventStreamReplayer.php | 6 +++-- .../AuthorizationRepositoryMatrixTest.php | 2 +- 6 files changed, 30 insertions(+), 20 deletions(-) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/commands.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/commands.php index 42ccb1d3b..40ad7bc7f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/commands.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/commands.php @@ -18,14 +18,18 @@ namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Root\Command { - class FooBarCommand + use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\AbstractCommand; + + class FooBarCommand extends AbstractCommand { } } namespace Surfnet\StepupMiddleware\CommandHandlingBundle\Root\Command\Ns { - class QuuxCommand + use Surfnet\StepupMiddleware\CommandHandlingBundle\Command\AbstractCommand; + + class QuuxCommand extends AbstractCommand { } } diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php index 3ed084f64..96aec0d76 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php @@ -23,7 +23,7 @@ use Broadway\EventSourcing\AggregateFactory\PublicConstructorAggregateFactory; use Broadway\EventStore\EventStore as EventStoreInterface; use DateTime as CoreDateTime; -use Hamcrest\Matchers; +use Mockery\Matcher\IsEqual; use Mockery as m; use Mockery\MockInterface; use Psr\Log\LoggerInterface; @@ -1202,7 +1202,7 @@ public function a_second_factor_can_be_vetted(): void $secondFactorType = new SecondFactorType($command->secondFactorType); $this->secondFactorProvePossessionHelper->shouldReceive('canSkipProvePossession') - ->with(Matchers::equalTo($secondFactorType)) + ->with(new IsEqual($secondFactorType)) ->andReturn(false); $this->scenario @@ -1462,7 +1462,7 @@ public function a_second_factor_can_be_vetted_without_a_physical_proven_possessi $secondFactorType = new SecondFactorType($command->secondFactorType); $this->secondFactorProvePossessionHelper->shouldReceive('canSkipProvePossession') - ->with(Matchers::equalTo($secondFactorType)) + ->with(new IsEqual($secondFactorType)) ->andReturn(true); $this->scenario @@ -1584,7 +1584,7 @@ public function a_second_factor_cannot_be_vetted_without_physical_prove_of_posse $secondFactorType = new SecondFactorType($command->secondFactorType); $this->secondFactorProvePossessionHelper->shouldReceive('canSkipProvePossession') - ->with(Matchers::equalTo($secondFactorType)) + ->with(new IsEqual($secondFactorType)) ->andReturn(false); $this->scenario diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RightToBeForgottenCommandHandlerTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RightToBeForgottenCommandHandlerTest.php index a24314892..039117b0e 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RightToBeForgottenCommandHandlerTest.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Identity/CommandHandler/RightToBeForgottenCommandHandlerTest.php @@ -22,7 +22,7 @@ use Broadway\EventHandling\EventBus as EventBusInterface; use Broadway\EventSourcing\AggregateFactory\PublicConstructorAggregateFactory; use Broadway\EventStore\EventStore as EventStoreInterface; -use Hamcrest\Matchers; +use Mockery\Matcher\IsEqual; use Mockery as m; use Mockery\MockInterface; use Psr\Log\LoggerInterface; @@ -113,15 +113,15 @@ public function an_identity_can_be_forgotten(): void $this->apiIdentityRepository ->shouldReceive('findOneByNameIdAndInstitution') ->once() - ->with(Matchers::equalTo($nameId), Matchers::equalTo($institution)) + ->with(new IsEqual($nameId), new IsEqual($institution)) ->andReturn($this->createIdentity($identityId->getIdentityId())); $this->sensitiveDataService ->shouldReceive('forgetSensitiveData') ->once() - ->with(Matchers::equalTo($identityId)); + ->with(new IsEqual($identityId)); - $this->sraaRepository->shouldReceive('contains')->once()->with(Matchers::equalTo($nameId))->andReturn(false); + $this->sraaRepository->shouldReceive('contains')->once()->with(new IsEqual($nameId))->andReturn(false); $command = new ForgetIdentityCommand(); $command->nameId = $nameId->getNameId(); @@ -175,10 +175,10 @@ public function an_identity_may_not_be_forgotten_twice(): void $this->apiIdentityRepository ->shouldReceive('findOneByNameIdAndInstitution') ->once() - ->with(Matchers::equalTo($nameId), Matchers::equalTo($institution)) + ->with(new IsEqual($nameId), new IsEqual($institution)) ->andReturn($this->createIdentity($identityId->getIdentityId())); - $this->sraaRepository->shouldReceive('contains')->once()->with(Matchers::equalTo($nameId))->andReturn(false); + $this->sraaRepository->shouldReceive('contains')->once()->with(new IsEqual($nameId))->andReturn(false); $command = new ForgetIdentityCommand(); $command->nameId = $nameId->getNameId(); @@ -230,10 +230,10 @@ public function an_ra_cannot_be_forgotten(): void $this->apiIdentityRepository ->shouldReceive('findOneByNameIdAndInstitution') ->once() - ->with(Matchers::equalTo($nameId), Matchers::equalTo($institution)) + ->with(new IsEqual($nameId), new IsEqual($institution)) ->andReturn($this->createIdentity($identityId->getIdentityId())); - $this->sraaRepository->shouldReceive('contains')->once()->with(Matchers::equalTo($nameId))->andReturn(false); + $this->sraaRepository->shouldReceive('contains')->once()->with(new IsEqual($nameId))->andReturn(false); $command = new ForgetIdentityCommand(); $command->nameId = $nameId->getNameId(); @@ -292,10 +292,10 @@ public function an_raa_cannot_be_forgotten(): void $this->apiIdentityRepository ->shouldReceive('findOneByNameIdAndInstitution') ->once() - ->with(Matchers::equalTo($nameId), Matchers::equalTo($institution)) + ->with(new IsEqual($nameId), new IsEqual($institution)) ->andReturn($this->createIdentity($identityId->getIdentityId())); - $this->sraaRepository->shouldReceive('contains')->once()->with(Matchers::equalTo($nameId))->andReturn(false); + $this->sraaRepository->shouldReceive('contains')->once()->with(new IsEqual($nameId))->andReturn(false); $command = new ForgetIdentityCommand(); $command->nameId = $nameId->getNameId(); @@ -352,7 +352,7 @@ public function an_sraa_cannot_be_forgotten(): void $email = new Email('e.kuopio@hy.fi'); $locale = new Locale('fi_FI'); - $this->sraaRepository->shouldReceive('contains')->once()->with(Matchers::equalTo($nameId))->andReturn(true); + $this->sraaRepository->shouldReceive('contains')->once()->with(new IsEqual($nameId))->andReturn(true); $command = new ForgetIdentityCommand(); $command->nameId = $nameId->getNameId(); diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php index 67702b702..62092f525 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php @@ -110,6 +110,10 @@ public function fetchByEventTypes(array $eventTypes): DomainEventStream private function deserializeEvent(array $row): DomainMessage { + echo '1: |'.(string)$row['payload']."|\n"; + echo '2: |'; + var_dump(json_decode($row['payload'], true, JSON_THROW_ON_ERROR)); + echo "|\n"; $event = $this->payloadSerializer->deserialize(json_decode((string)$row['payload'], true)); if ($event instanceof Forgettable) { diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php index 9324f2f0c..d54d41318 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/EventStreamReplayer.php @@ -25,6 +25,7 @@ use Surfnet\StepupMiddleware\MiddlewareBundle\EventSourcing\DBALEventHydrator; use Symfony\Component\Console\Helper\ProgressBar; use Symfony\Component\Console\Output\OutputInterface; +use Throwable; class EventStreamReplayer { @@ -147,7 +148,6 @@ public function replayEvents(OutputInterface $output, int $increments): void unset($eventStream); $steps = (($count + $increments < $totalEvents) ? $increments : ($totalEvents - $count)); - $preparationProgress->clear(); $replayProgress->advance($steps); } @@ -155,7 +155,9 @@ public function replayEvents(OutputInterface $output, int $increments): void $replayProgress->finish(); $output->writeln(['', 'Done', '']); - } catch (Exception $e) { + } catch (Throwable $e) { + echo $e->getMessage()."\n"; + $this->connectionHelper->rollBack(); if (isset($replayProgress)) { $replayProgress->setMessage(sprintf('ERROR OCCURRED: "%s"', $e->getMessage())); diff --git a/tests/database/AuthorizationRepositoryMatrixTest.php b/tests/database/AuthorizationRepositoryMatrixTest.php index 08d5245b3..8df576fcf 100644 --- a/tests/database/AuthorizationRepositoryMatrixTest.php +++ b/tests/database/AuthorizationRepositoryMatrixTest.php @@ -80,7 +80,7 @@ protected function setUp(): void $this->authzRepository = $kernel->getContainer()->get(AuthorizationRepository::class); $fixture = file_get_contents(__DIR__ . '/Fixture/test2.sql'); - $manager->getConnection()->exec($fixture); + $manager->getConnection()->executeStatement($fixture); $manager->flush(); } From b5071f92d985cae5c561b7b663c15436221c8fe2 Mon Sep 17 00:00:00 2001 From: Bas Date: Thu, 21 Nov 2024 11:03:40 +0100 Subject: [PATCH 71/89] Refactor remaining Symfony config to when@env --- config/packages/dev/nelmio_security.yaml | 4 ---- config/packages/dev/web_profiler.yaml | 6 ------ .../dev_event_replay/nelmio_security.yaml | 4 ---- .../dev_event_replay/web_profiler.yaml | 6 ------ config/packages/nelmio_security.yaml | 8 ++++++++ config/packages/prod/deprecations.yaml | 8 -------- config/packages/prod/routing.yaml | 3 --- .../prod_event_replay/deprecations.yaml | 8 -------- .../packages/prod_event_replay/routing.yaml | 3 --- config/packages/routing.yaml | 7 +++++++ .../packages/smoketest/nelmio_security.yaml | 4 ---- config/packages/smoketest/web_profiler.yaml | 6 ------ .../nelmio_security.yaml | 4 ---- .../smoketest_event_replay/web_profiler.yaml | 6 ------ config/packages/test/twig.yaml | 2 -- config/packages/test/validator.yaml | 3 --- config/packages/test/web_profiler.yaml | 6 ------ config/packages/twig.yaml | 4 ++++ config/packages/validator.yaml | 5 +++++ config/packages/web_profiler.yaml | 20 +++++++++++++++++++ 20 files changed, 44 insertions(+), 73 deletions(-) delete mode 100644 config/packages/dev/nelmio_security.yaml delete mode 100644 config/packages/dev/web_profiler.yaml delete mode 100644 config/packages/dev_event_replay/nelmio_security.yaml delete mode 100644 config/packages/dev_event_replay/web_profiler.yaml delete mode 100644 config/packages/prod/deprecations.yaml delete mode 100644 config/packages/prod/routing.yaml delete mode 100644 config/packages/prod_event_replay/deprecations.yaml delete mode 100644 config/packages/prod_event_replay/routing.yaml delete mode 100644 config/packages/smoketest/nelmio_security.yaml delete mode 100644 config/packages/smoketest/web_profiler.yaml delete mode 100644 config/packages/smoketest_event_replay/nelmio_security.yaml delete mode 100644 config/packages/smoketest_event_replay/web_profiler.yaml delete mode 100644 config/packages/test/twig.yaml delete mode 100644 config/packages/test/validator.yaml delete mode 100644 config/packages/test/web_profiler.yaml create mode 100644 config/packages/web_profiler.yaml diff --git a/config/packages/dev/nelmio_security.yaml b/config/packages/dev/nelmio_security.yaml deleted file mode 100644 index 79e60f1bb..000000000 --- a/config/packages/dev/nelmio_security.yaml +++ /dev/null @@ -1,4 +0,0 @@ -nelmio_security: - csp: - report: - level1_fallback: true diff --git a/config/packages/dev/web_profiler.yaml b/config/packages/dev/web_profiler.yaml deleted file mode 100644 index e92166a7f..000000000 --- a/config/packages/dev/web_profiler.yaml +++ /dev/null @@ -1,6 +0,0 @@ -web_profiler: - toolbar: true - intercept_redirects: false - -framework: - profiler: { only_exceptions: false } diff --git a/config/packages/dev_event_replay/nelmio_security.yaml b/config/packages/dev_event_replay/nelmio_security.yaml deleted file mode 100644 index 79e60f1bb..000000000 --- a/config/packages/dev_event_replay/nelmio_security.yaml +++ /dev/null @@ -1,4 +0,0 @@ -nelmio_security: - csp: - report: - level1_fallback: true diff --git a/config/packages/dev_event_replay/web_profiler.yaml b/config/packages/dev_event_replay/web_profiler.yaml deleted file mode 100644 index e92166a7f..000000000 --- a/config/packages/dev_event_replay/web_profiler.yaml +++ /dev/null @@ -1,6 +0,0 @@ -web_profiler: - toolbar: true - intercept_redirects: false - -framework: - profiler: { only_exceptions: false } diff --git a/config/packages/nelmio_security.yaml b/config/packages/nelmio_security.yaml index 1bd0cddf9..89ce0d2b6 100644 --- a/config/packages/nelmio_security.yaml +++ b/config/packages/nelmio_security.yaml @@ -27,4 +27,12 @@ nelmio_security: enabled: true mode_block: true +when@dev: &devOverride + nelmio_security: + csp: + report: + level1_fallback: true +when@dev_event_replay: *devOverride +when@smoketest: *devOverride +when@smoketest_event_replay: *devOverride \ No newline at end of file diff --git a/config/packages/prod/deprecations.yaml b/config/packages/prod/deprecations.yaml deleted file mode 100644 index 920a06197..000000000 --- a/config/packages/prod/deprecations.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# As of Symfony 5.1, deprecations are logged in the dedicated "deprecation" channel when it exists -#monolog: -# channels: [deprecation] -# handlers: -# deprecation: -# type: stream -# channels: [deprecation] -# path: "%kernel.logs_dir%/%kernel.environment%.deprecations.log" diff --git a/config/packages/prod/routing.yaml b/config/packages/prod/routing.yaml deleted file mode 100644 index b3e6a0af2..000000000 --- a/config/packages/prod/routing.yaml +++ /dev/null @@ -1,3 +0,0 @@ -framework: - router: - strict_requirements: null diff --git a/config/packages/prod_event_replay/deprecations.yaml b/config/packages/prod_event_replay/deprecations.yaml deleted file mode 100644 index 920a06197..000000000 --- a/config/packages/prod_event_replay/deprecations.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# As of Symfony 5.1, deprecations are logged in the dedicated "deprecation" channel when it exists -#monolog: -# channels: [deprecation] -# handlers: -# deprecation: -# type: stream -# channels: [deprecation] -# path: "%kernel.logs_dir%/%kernel.environment%.deprecations.log" diff --git a/config/packages/prod_event_replay/routing.yaml b/config/packages/prod_event_replay/routing.yaml deleted file mode 100644 index b3e6a0af2..000000000 --- a/config/packages/prod_event_replay/routing.yaml +++ /dev/null @@ -1,3 +0,0 @@ -framework: - router: - strict_requirements: null diff --git a/config/packages/routing.yaml b/config/packages/routing.yaml index 7e977620b..bdc5c170e 100644 --- a/config/packages/routing.yaml +++ b/config/packages/routing.yaml @@ -1,3 +1,10 @@ framework: router: utf8: true + +when@prod: &prodOverride + framework: + router: + strict_requirements: null + +when@prod_event_replay: *prodOverride diff --git a/config/packages/smoketest/nelmio_security.yaml b/config/packages/smoketest/nelmio_security.yaml deleted file mode 100644 index 79e60f1bb..000000000 --- a/config/packages/smoketest/nelmio_security.yaml +++ /dev/null @@ -1,4 +0,0 @@ -nelmio_security: - csp: - report: - level1_fallback: true diff --git a/config/packages/smoketest/web_profiler.yaml b/config/packages/smoketest/web_profiler.yaml deleted file mode 100644 index 7bb98b985..000000000 --- a/config/packages/smoketest/web_profiler.yaml +++ /dev/null @@ -1,6 +0,0 @@ -web_profiler: - toolbar: false - intercept_redirects: false - -framework: - profiler: { only_exceptions: false } diff --git a/config/packages/smoketest_event_replay/nelmio_security.yaml b/config/packages/smoketest_event_replay/nelmio_security.yaml deleted file mode 100644 index 79e60f1bb..000000000 --- a/config/packages/smoketest_event_replay/nelmio_security.yaml +++ /dev/null @@ -1,4 +0,0 @@ -nelmio_security: - csp: - report: - level1_fallback: true diff --git a/config/packages/smoketest_event_replay/web_profiler.yaml b/config/packages/smoketest_event_replay/web_profiler.yaml deleted file mode 100644 index 7bb98b985..000000000 --- a/config/packages/smoketest_event_replay/web_profiler.yaml +++ /dev/null @@ -1,6 +0,0 @@ -web_profiler: - toolbar: false - intercept_redirects: false - -framework: - profiler: { only_exceptions: false } diff --git a/config/packages/test/twig.yaml b/config/packages/test/twig.yaml deleted file mode 100644 index 8c6e0b401..000000000 --- a/config/packages/test/twig.yaml +++ /dev/null @@ -1,2 +0,0 @@ -twig: - strict_variables: true diff --git a/config/packages/test/validator.yaml b/config/packages/test/validator.yaml deleted file mode 100644 index 1e5ab7880..000000000 --- a/config/packages/test/validator.yaml +++ /dev/null @@ -1,3 +0,0 @@ -framework: - validation: - not_compromised_password: false diff --git a/config/packages/test/web_profiler.yaml b/config/packages/test/web_profiler.yaml deleted file mode 100644 index 03752de21..000000000 --- a/config/packages/test/web_profiler.yaml +++ /dev/null @@ -1,6 +0,0 @@ -web_profiler: - toolbar: false - intercept_redirects: false - -framework: - profiler: { collect: false } diff --git a/config/packages/twig.yaml b/config/packages/twig.yaml index 6403e6abe..d7764775c 100644 --- a/config/packages/twig.yaml +++ b/config/packages/twig.yaml @@ -3,3 +3,7 @@ twig: debug: '%kernel.debug%' strict_variables: '%kernel.debug%' exception_controller: null + +when@test: + twig: + strict_variables: true diff --git a/config/packages/validator.yaml b/config/packages/validator.yaml index 350786a13..0201281d3 100644 --- a/config/packages/validator.yaml +++ b/config/packages/validator.yaml @@ -6,3 +6,8 @@ framework: # For instance, basic validation constraints will be inferred from Doctrine's metadata. #auto_mapping: # App\Entity\: [] + +when@test: + framework: + validation: + not_compromised_password: false diff --git a/config/packages/web_profiler.yaml b/config/packages/web_profiler.yaml new file mode 100644 index 000000000..fa28583d5 --- /dev/null +++ b/config/packages/web_profiler.yaml @@ -0,0 +1,20 @@ +when@dev: &devOverride + web_profiler: + toolbar: true + intercept_redirects: false + + framework: + profiler: { only_exceptions: false } + +when@test: &testOverride + web_profiler: + toolbar: false + intercept_redirects: false + + framework: + profiler: { only_exceptions: false } + +when@dev_event_replay: &devOverride +when@test_event_replay: &testOverride +when@smoketes: &testOverride +when@smoketest_event_replay: &testOverride From ec393ad666f9b2f8b30653393a932dee1ab69e86 Mon Sep 17 00:00:00 2001 From: Bas Date: Thu, 21 Nov 2024 11:20:54 +0100 Subject: [PATCH 72/89] Fix translations and extract script --- bin/extract-translations.sh | 3 +- config/routes/jms_translation.yaml | 5 - translations/messages.en_GB.xliff | 173 +++++++++++---------------- translations/messages.nl_NL.xliff | 175 +++++++++++----------------- translations/validators.en_GB.xliff | 35 +++--- translations/validators.nl_NL.xliff | 35 +++--- 6 files changed, 171 insertions(+), 255 deletions(-) delete mode 100644 config/routes/jms_translation.yaml diff --git a/bin/extract-translations.sh b/bin/extract-translations.sh index 8a9cb3004..87a58aa5a 100755 --- a/bin/extract-translations.sh +++ b/bin/extract-translations.sh @@ -1,2 +1,3 @@ #!/bin/bash -php72 bin/console translation:extract --config=default --env=dev +php bin/console translation:extract --env=dev nl_NL --format=xliff --force +php bin/console translation:extract --env=dev en_GB --format=xliff --force diff --git a/config/routes/jms_translation.yaml b/config/routes/jms_translation.yaml deleted file mode 100644 index 41c129da1..000000000 --- a/config/routes/jms_translation.yaml +++ /dev/null @@ -1,5 +0,0 @@ -when@dev: - JMSTranslationBundle_ui: - resource: "@JMSTranslationBundle/Controller/" - type: annotation - prefix: /_trans diff --git a/translations/messages.en_GB.xliff b/translations/messages.en_GB.xliff index 1ddcaccf6..4a44e9e1b 100644 --- a/translations/messages.en_GB.xliff +++ b/translations/messages.en_GB.xliff @@ -1,188 +1,145 @@ - - + +
- - The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. +
- + locale.en_GB - English - /vendor/surfnet/stepup-bundle/src/Resources/views/translations.twig + English - + locale.nl_NL - Dutch - /vendor/surfnet/stepup-bundle/src/Resources/views/translations.twig + Dutch - + mw.mail.second_factor_revoked.subject Your %tokenType% token was revoked - /src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorRevocationMailService.php - /src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorRevocationMailService.php - + ss.mail.email_verification_email.subject Token registration: confirm your e-mail address - /src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/EmailVerificationMailService.php - /src/Surfnet/StepupMiddleware/CommandHandlingBundle/Resources/views/translations.twig - + ss.mail.recovery_token_created_email.subject Recovery method ready for use - /src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RecoveryTokenMailService.php - + ss.mail.recovery_token_revoked_email.subject - Your recovery method was revoked - /src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RecoveryTokenMailService.php + Your recovery method was revoked - + ss.mail.registration_email.subject Token activation: activate your token - /src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php - /src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php - /src/Surfnet/StepupMiddleware/CommandHandlingBundle/Resources/views/translations.twig - /src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php - /src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php - + ss.mail.registration_reminder_email.subject Token activation reminder: activate your token - /src/Surfnet/StepupMiddleware/CommandHandlingBundle/Resources/views/translations.twig - + ss.mail.vetted_email.subject Token ready to use - authentication in two steps - /src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorVettedMailService.php - + stepup.error.authentication_error.description - stepup.error.authentication_error.description - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php + stepup.error.authentication_error.description - + stepup.error.authentication_error.title - stepup.error.authentication_error.title - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php + stepup.error.authentication_error.title - + stepup.error.authn_failed.description - stepup.error.authn_failed.description - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php + stepup.error.authn_failed.description - + stepup.error.authn_failed.title - stepup.error.authn_failed.title - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php + stepup.error.authn_failed.title - + stepup.error.error_code - stepup.error.error_code - /vendor/surfnet/stepup-bundle/src/Resources/views/Exception/error.html.twig + stepup.error.error_code - + stepup.error.generic_error.description - stepup.error.generic_error.description - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php + stepup.error.generic_error.description - + stepup.error.generic_error.title - stepup.error.generic_error.title - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php + stepup.error.generic_error.title - + stepup.error.hostname - stepup.error.hostname - /vendor/surfnet/stepup-bundle/src/Resources/views/Exception/error.html.twig + stepup.error.hostname - + stepup.error.ip_address - stepup.error.ip_address - /vendor/surfnet/stepup-bundle/src/Resources/views/Exception/error.html.twig + stepup.error.ip_address - + stepup.error.page_not_found.text - stepup.error.page_not_found.text - /vendor/surfnet/stepup-bundle/src/Resources/views/Exception/error404.html.twig + stepup.error.page_not_found.text - + stepup.error.page_not_found.title - stepup.error.page_not_found.title - /vendor/surfnet/stepup-bundle/src/Resources/views/Exception/error404.html.twig + stepup.error.page_not_found.title - + stepup.error.precondition_not_met.description - stepup.error.precondition_not_met.description - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php + stepup.error.precondition_not_met.description - + stepup.error.precondition_not_met.title - stepup.error.precondition_not_met.title - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php + stepup.error.precondition_not_met.title - + stepup.error.request_id - stepup.error.request_id - /vendor/surfnet/stepup-bundle/src/Resources/views/Exception/error.html.twig + stepup.error.request_id - + stepup.error.signature_validation_failed.description - stepup.error.signature_validation_failed.description - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php + stepup.error.signature_validation_failed.description - + stepup.error.signature_validation_failed.title - stepup.error.signature_validation_failed.title - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php + stepup.error.signature_validation_failed.title - + stepup.error.support_page.text - stepup.error.support_page.text - /vendor/surfnet/stepup-bundle/src/Resources/views/Exception/error404.html.twig + stepup.error.support_page.text - + stepup.error.timestamp - stepup.error.timestamp - /vendor/surfnet/stepup-bundle/src/Resources/views/Exception/error.html.twig + stepup.error.timestamp - + stepup.error.unknown_service_provider.title - stepup.error.unknown_service_provider.title - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php + stepup.error.unknown_service_provider.title - + stepup.error.unsigned_request.description - stepup.error.unsigned_request.description - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php + stepup.error.unsigned_request.description - + stepup.error.unsigned_request.title - stepup.error.unsigned_request.title - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php + stepup.error.unsigned_request.title - + stepup.error.unsupported_signature.description - stepup.error.unsupported_signature.description - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php + stepup.error.unsupported_signature.description - + stepup.error.unsupported_signature.title - stepup.error.unsupported_signature.title - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php + stepup.error.unsupported_signature.title - + stepup.error.user_agent - stepup.error.user_agent - /vendor/surfnet/stepup-bundle/src/Resources/views/Exception/error.html.twig + stepup.error.user_agent - + stepup_middleware_client.form.switch_locale.switch - Switch - /vendor/surfnet/stepup-bundle/src/Form/Type/SwitchLocaleType.php + Switch diff --git a/translations/messages.nl_NL.xliff b/translations/messages.nl_NL.xliff index dfd838fe2..a7a754757 100644 --- a/translations/messages.nl_NL.xliff +++ b/translations/messages.nl_NL.xliff @@ -1,189 +1,146 @@ - - + +
- - The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. +
- + locale.en_GB - Engels - /vendor/surfnet/stepup-bundle/src/Resources/views/translations.twig + Engels - + locale.nl_NL - Nederlands - /vendor/surfnet/stepup-bundle/src/Resources/views/translations.twig + Nederlands - + mw.mail.second_factor_revoked.subject - Je %tokenType% token is ingetrokken + Je %tokenType% token is ingetrokken - /src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorRevocationMailService.php - /src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorRevocationMailService.php - + ss.mail.email_verification_email.subject Token registratie: bevestig je e-mailadres - /src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/EmailVerificationMailService.php - /src/Surfnet/StepupMiddleware/CommandHandlingBundle/Resources/views/translations.twig - + ss.mail.recovery_token_created_email.subject Je herstelmethode is klaar voor gebruik - /src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RecoveryTokenMailService.php - + ss.mail.recovery_token_revoked_email.subject - Je herstelmethode is ingetrokken - /src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RecoveryTokenMailService.php + Je herstelmethode is ingetrokken - + ss.mail.registration_email.subject Token activatie: activeer je token - /src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php - /src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php - /src/Surfnet/StepupMiddleware/CommandHandlingBundle/Resources/views/translations.twig - /src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php - /src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php - + ss.mail.registration_reminder_email.subject Token activatie herinnering: activeer je token - /src/Surfnet/StepupMiddleware/CommandHandlingBundle/Resources/views/translations.twig - + ss.mail.vetted_email.subject Token klaar voor gebruik - inloggen in twee stappen - /src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/SecondFactorVettedMailService.php - + stepup.error.authentication_error.description - stepup.error.authentication_error.description - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php + stepup.error.authentication_error.description - + stepup.error.authentication_error.title - stepup.error.authentication_error.title - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php + stepup.error.authentication_error.title - + stepup.error.authn_failed.description - stepup.error.authn_failed.description - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php + stepup.error.authn_failed.description - + stepup.error.authn_failed.title - stepup.error.authn_failed.title - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php + stepup.error.authn_failed.title - + stepup.error.error_code - stepup.error.error_code - /vendor/surfnet/stepup-bundle/src/Resources/views/Exception/error.html.twig + stepup.error.error_code - + stepup.error.generic_error.description - stepup.error.generic_error.description - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php + stepup.error.generic_error.description - + stepup.error.generic_error.title - stepup.error.generic_error.title - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php + stepup.error.generic_error.title - + stepup.error.hostname - stepup.error.hostname - /vendor/surfnet/stepup-bundle/src/Resources/views/Exception/error.html.twig + stepup.error.hostname - + stepup.error.ip_address - stepup.error.ip_address - /vendor/surfnet/stepup-bundle/src/Resources/views/Exception/error.html.twig + stepup.error.ip_address - + stepup.error.page_not_found.text - stepup.error.page_not_found.text - /vendor/surfnet/stepup-bundle/src/Resources/views/Exception/error404.html.twig + stepup.error.page_not_found.text - + stepup.error.page_not_found.title - stepup.error.page_not_found.title - /vendor/surfnet/stepup-bundle/src/Resources/views/Exception/error404.html.twig + stepup.error.page_not_found.title - + stepup.error.precondition_not_met.description - stepup.error.precondition_not_met.description - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php + stepup.error.precondition_not_met.description - + stepup.error.precondition_not_met.title - stepup.error.precondition_not_met.title - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php + stepup.error.precondition_not_met.title - + stepup.error.request_id - stepup.error.request_id - /vendor/surfnet/stepup-bundle/src/Resources/views/Exception/error.html.twig + stepup.error.request_id - + stepup.error.signature_validation_failed.description - stepup.error.signature_validation_failed.description - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php + stepup.error.signature_validation_failed.description - + stepup.error.signature_validation_failed.title - stepup.error.signature_validation_failed.title - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php + stepup.error.signature_validation_failed.title - + stepup.error.support_page.text - stepup.error.support_page.text - /vendor/surfnet/stepup-bundle/src/Resources/views/Exception/error404.html.twig + stepup.error.support_page.text - + stepup.error.timestamp - stepup.error.timestamp - /vendor/surfnet/stepup-bundle/src/Resources/views/Exception/error.html.twig + stepup.error.timestamp - + stepup.error.unknown_service_provider.title - stepup.error.unknown_service_provider.title - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php + stepup.error.unknown_service_provider.title - + stepup.error.unsigned_request.description - stepup.error.unsigned_request.description - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php + stepup.error.unsigned_request.description - + stepup.error.unsigned_request.title - stepup.error.unsigned_request.title - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php + stepup.error.unsigned_request.title - + stepup.error.unsupported_signature.description - stepup.error.unsupported_signature.description - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php + stepup.error.unsupported_signature.description - + stepup.error.unsupported_signature.title - stepup.error.unsupported_signature.title - /vendor/surfnet/stepup-bundle/src/Controller/ExceptionController.php + stepup.error.unsupported_signature.title - + stepup.error.user_agent - stepup.error.user_agent - /vendor/surfnet/stepup-bundle/src/Resources/views/Exception/error.html.twig + stepup.error.user_agent - + stepup_middleware_client.form.switch_locale.switch - Vertalen - /vendor/surfnet/stepup-bundle/src/Form/Type/SwitchLocaleType.php + Vertalen diff --git a/translations/validators.en_GB.xliff b/translations/validators.en_GB.xliff index f8b062e4c..52afa847b 100644 --- a/translations/validators.en_GB.xliff +++ b/translations/validators.en_GB.xliff @@ -1,34 +1,37 @@ - - + +
- - The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. +
- + stepup.send_sms_command.recipient.may_not_be_empty - stepup.send_sms_command.recipient.may_not_be_empty + stepup.send_sms_command.recipient.may_not_be_empty - + stepup.send_sms_command.recipient.must_be_string - stepup.send_sms_command.recipient.must_be_string + stepup.send_sms_command.recipient.must_be_string - + stepup.send_sms_command.recipient.must_consist_of_digits - stepup.send_sms_command.recipient.must_consist_of_digits + stepup.send_sms_command.recipient.must_consist_of_digits - + stepup.verify_possession_of_phone_command.challenge.may_not_be_empty - stepup.verify_possession_of_phone_command.challenge.may_not_be_empty + stepup.verify_possession_of_phone_command.challenge.may_not_be_empty - + stepup.verify_possession_of_phone_command.challenge.must_be_string - stepup.verify_possession_of_phone_command.challenge.must_be_string + stepup.verify_possession_of_phone_command.challenge.must_be_string - + stepup.verify_possession_of_phone_command.second_factor_id.must_be_string - stepup.verify_possession_of_phone_command.second_factor_id.must_be_string + stepup.verify_possession_of_phone_command.second_factor_id.must_be_string + + + Error + __Error diff --git a/translations/validators.nl_NL.xliff b/translations/validators.nl_NL.xliff index 624fa7551..361fe2838 100644 --- a/translations/validators.nl_NL.xliff +++ b/translations/validators.nl_NL.xliff @@ -1,34 +1,37 @@ - - + +
- - The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. +
- + stepup.send_sms_command.recipient.may_not_be_empty - stepup.send_sms_command.recipient.may_not_be_empty + stepup.send_sms_command.recipient.may_not_be_empty - + stepup.send_sms_command.recipient.must_be_string - stepup.send_sms_command.recipient.must_be_string + stepup.send_sms_command.recipient.must_be_string - + stepup.send_sms_command.recipient.must_consist_of_digits - stepup.send_sms_command.recipient.must_consist_of_digits + stepup.send_sms_command.recipient.must_consist_of_digits - + stepup.verify_possession_of_phone_command.challenge.may_not_be_empty - stepup.verify_possession_of_phone_command.challenge.may_not_be_empty + stepup.verify_possession_of_phone_command.challenge.may_not_be_empty - + stepup.verify_possession_of_phone_command.challenge.must_be_string - stepup.verify_possession_of_phone_command.challenge.must_be_string + stepup.verify_possession_of_phone_command.challenge.must_be_string - + stepup.verify_possession_of_phone_command.second_factor_id.must_be_string - stepup.verify_possession_of_phone_command.second_factor_id.must_be_string + stepup.verify_possession_of_phone_command.second_factor_id.must_be_string + + + Error + __Error From 8a0f7c0bf240fa6d73d3149b5496571c105c21dd Mon Sep 17 00:00:00 2001 From: Bas Date: Thu, 21 Nov 2024 11:43:27 +0100 Subject: [PATCH 73/89] Update Doctrine migration scripts --- bin/doctrine-migrations-diff.sh | 4 ++-- bin/doctrine-migrations-migrate.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/doctrine-migrations-diff.sh b/bin/doctrine-migrations-diff.sh index 88ac05787..189d22ed5 100755 --- a/bin/doctrine-migrations-diff.sh +++ b/bin/doctrine-migrations-diff.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -php72 ./bin/console do:mi:di --em=middleware --filter-expression='~^(?!event_stream).*$~' +bin/console doctrine:migrations:diff --em=middleware --filter-expression='~^(?!event_stream).*$~' sleep 1 -php72 ./bin/console do:mi:di --em=gateway \ No newline at end of file +bin/console doctrine:migrations:diff --em=gateway \ No newline at end of file diff --git a/bin/doctrine-migrations-migrate.sh b/bin/doctrine-migrations-migrate.sh index 210513247..02a2a4f63 100755 --- a/bin/doctrine-migrations-migrate.sh +++ b/bin/doctrine-migrations-migrate.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -php72 ./bin/console doctrine:migrations:migrate --env=prod --em=deploy \ No newline at end of file +php ./bin/console doctrine:migrations:migrate --env=prod --em=deploy \ No newline at end of file From f5d08f7d0d7dba077c9fc0faf5c6f27dd9f1e3c8 Mon Sep 17 00:00:00 2001 From: Bas Date: Tue, 26 Nov 2024 11:16:19 +0100 Subject: [PATCH 74/89] Fix deprecated container injection in migrations --- bin/doctrine-migrations-diff.sh | 4 +- ci/qa/phpstan-baseline.neon | 210 ------------------ config/packages/doctrine_migrations.yaml | 2 + config/services.yaml | 7 + .../Migrations/Version20141125173004.php | 23 +- .../Migrations/Version20141209150426.php | 20 +- .../Migrations/Version20141210174213.php | 18 +- .../Migrations/Version20150312162849.php | 17 +- .../Migrations/Version20150508085838.php | 21 +- .../Migrations/Version20150522163053.php | 16 +- .../Migrations/Version20150522164907.php | 18 +- .../Migrations/Version20150528154959.php | 21 +- .../Migrations/Version20150615114646.php | 28 +-- .../Migrations/Version20180131150800.php | 21 +- .../Migrations/Version20200114161618.php | 18 +- .../Migrations/Version20220519134637.php | 18 +- .../Migrations/Version20221102143350.php | 18 +- .../ConfigurationAwareMigrationInterface.php | 26 +++ .../ConfigurationAwareMigrationTrait.php | 62 ++++++ .../ConfigurationMigrationFactory.php | 46 ++++ 20 files changed, 199 insertions(+), 415 deletions(-) create mode 100644 src/Surfnet/Stepup/MigrationsFactory/ConfigurationAwareMigrationInterface.php create mode 100644 src/Surfnet/Stepup/MigrationsFactory/ConfigurationAwareMigrationTrait.php create mode 100644 src/Surfnet/Stepup/MigrationsFactory/ConfigurationMigrationFactory.php diff --git a/bin/doctrine-migrations-diff.sh b/bin/doctrine-migrations-diff.sh index 189d22ed5..4350c0599 100755 --- a/bin/doctrine-migrations-diff.sh +++ b/bin/doctrine-migrations-diff.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -bin/console doctrine:migrations:diff --em=middleware --filter-expression='~^(?!event_stream).*$~' +bin/console doctrine:migrations:diff --em=middleware --env=dev --filter-expression='~^(?!event_stream).*$~' sleep 1 -bin/console doctrine:migrations:diff --em=gateway \ No newline at end of file +bin/console doctrine:migrations:diff --em=gateway --env=dev \ No newline at end of file diff --git a/ci/qa/phpstan-baseline.neon b/ci/qa/phpstan-baseline.neon index a0e51d67c..dd7e15771 100644 --- a/ci/qa/phpstan-baseline.neon +++ b/ci/qa/phpstan-baseline.neon @@ -1,185 +1,5 @@ parameters: ignoreErrors: - - - message: "#^Cannot call method getParameter\\(\\) on Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\|null\\.$#" - count: 2 - path: ../../src/Surfnet/Migrations/Version20141125173004.php - - - - message: "#^Method Surfnet\\\\Migrations\\\\Version20141125173004\\:\\:getGatewaySchema\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/Migrations/Version20141125173004.php - - - - message: "#^Method Surfnet\\\\Migrations\\\\Version20141125173004\\:\\:getMiddlewareUser\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/Migrations/Version20141125173004.php - - - - message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, array\\|bool\\|float\\|int\\|string\\|null given\\.$#" - count: 4 - path: ../../src/Surfnet/Migrations/Version20141125173004.php - - - - message: "#^Parameter \\#3 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, array\\|bool\\|float\\|int\\|string\\|null given\\.$#" - count: 2 - path: ../../src/Surfnet/Migrations/Version20141125173004.php - - - - message: "#^Cannot call method getParameter\\(\\) on Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\|null\\.$#" - count: 2 - path: ../../src/Surfnet/Migrations/Version20141209150426.php - - - - message: "#^Method Surfnet\\\\Migrations\\\\Version20141209150426\\:\\:getGatewaySchema\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/Migrations/Version20141209150426.php - - - - message: "#^Method Surfnet\\\\Migrations\\\\Version20141209150426\\:\\:getMiddlewareUser\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/Migrations/Version20141209150426.php - - - - message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, array\\|bool\\|float\\|int\\|string\\|null given\\.$#" - count: 3 - path: ../../src/Surfnet/Migrations/Version20141209150426.php - - - - message: "#^Parameter \\#3 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, array\\|bool\\|float\\|int\\|string\\|null given\\.$#" - count: 2 - path: ../../src/Surfnet/Migrations/Version20141209150426.php - - - - message: "#^Cannot call method getParameter\\(\\) on Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\|null\\.$#" - count: 1 - path: ../../src/Surfnet/Migrations/Version20141210174213.php - - - - message: "#^Method Surfnet\\\\Migrations\\\\Version20141210174213\\:\\:getGatewaySchema\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/Migrations/Version20141210174213.php - - - - message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, array\\|bool\\|float\\|int\\|string\\|null given\\.$#" - count: 7 - path: ../../src/Surfnet/Migrations/Version20141210174213.php - - - - message: "#^Cannot call method getParameter\\(\\) on Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\|null\\.$#" - count: 2 - path: ../../src/Surfnet/Migrations/Version20150312162849.php - - - - message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, array\\|bool\\|float\\|int\\|string\\|null given\\.$#" - count: 2 - path: ../../src/Surfnet/Migrations/Version20150312162849.php - - - - message: "#^Cannot call method getParameter\\(\\) on Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\|null\\.$#" - count: 1 - path: ../../src/Surfnet/Migrations/Version20150508085838.php - - - - message: "#^Method Surfnet\\\\Migrations\\\\Version20150508085838\\:\\:getGatewaySchema\\(\\) should return string but returns array\\|bool\\|float\\|int\\|string\\|null\\.$#" - count: 1 - path: ../../src/Surfnet/Migrations/Version20150508085838.php - - - - message: "#^Cannot call method getParameter\\(\\) on Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\|null\\.$#" - count: 1 - path: ../../src/Surfnet/Migrations/Version20150522163053.php - - - - message: "#^Method Surfnet\\\\Migrations\\\\Version20150522163053\\:\\:getGatewaySchema\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/Migrations/Version20150522163053.php - - - - message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, array\\|bool\\|float\\|int\\|string\\|null given\\.$#" - count: 8 - path: ../../src/Surfnet/Migrations/Version20150522163053.php - - - - message: "#^Cannot call method getParameter\\(\\) on Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\|null\\.$#" - count: 1 - path: ../../src/Surfnet/Migrations/Version20150522164907.php - - - - message: "#^Method Surfnet\\\\Migrations\\\\Version20150522164907\\:\\:getGatewaySchema\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/Migrations/Version20150522164907.php - - - - message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, array\\|bool\\|float\\|int\\|string\\|null given\\.$#" - count: 2 - path: ../../src/Surfnet/Migrations/Version20150522164907.php - - - - message: "#^Cannot call method getParameter\\(\\) on Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\|null\\.$#" - count: 1 - path: ../../src/Surfnet/Migrations/Version20150528154959.php - - - - message: "#^Method Surfnet\\\\Migrations\\\\Version20150528154959\\:\\:getGatewaySchema\\(\\) should return string but returns array\\|bool\\|float\\|int\\|string\\|null\\.$#" - count: 1 - path: ../../src/Surfnet/Migrations/Version20150528154959.php - - - - message: "#^Cannot call method getParameter\\(\\) on Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\|null\\.$#" - count: 3 - path: ../../src/Surfnet/Migrations/Version20150615114646.php - - - - message: "#^Method Surfnet\\\\Migrations\\\\Version20150615114646\\:\\:getGatewaySchema\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/Migrations/Version20150615114646.php - - - - message: "#^Method Surfnet\\\\Migrations\\\\Version20150615114646\\:\\:getMiddlewareSchema\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/Migrations/Version20150615114646.php - - - - message: "#^Method Surfnet\\\\Migrations\\\\Version20150615114646\\:\\:getMiddlewareUser\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/Migrations/Version20150615114646.php - - - - message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, array\\|bool\\|float\\|int\\|string\\|null given\\.$#" - count: 6 - path: ../../src/Surfnet/Migrations/Version20150615114646.php - - - - message: "#^Parameter \\#3 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, array\\|bool\\|float\\|int\\|string\\|null given\\.$#" - count: 2 - path: ../../src/Surfnet/Migrations/Version20150615114646.php - - - - message: "#^Cannot call method getParameter\\(\\) on Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\|null\\.$#" - count: 1 - path: ../../src/Surfnet/Migrations/Version20180131150800.php - - - - message: "#^Method Surfnet\\\\Migrations\\\\Version20180131150800\\:\\:getGatewaySchema\\(\\) should return string but returns array\\|bool\\|float\\|int\\|string\\|null\\.$#" - count: 1 - path: ../../src/Surfnet/Migrations/Version20180131150800.php - - - - message: "#^Cannot call method getParameter\\(\\) on Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\|null\\.$#" - count: 1 - path: ../../src/Surfnet/Migrations/Version20200114161618.php - - - - message: "#^Method Surfnet\\\\Migrations\\\\Version20200114161618\\:\\:getGatewaySchema\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/Migrations/Version20200114161618.php - - - - message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, array\\|bool\\|float\\|int\\|string\\|null given\\.$#" - count: 2 - path: ../../src/Surfnet/Migrations/Version20200114161618.php - - message: "#^Cannot access offset 'payload' on mixed\\.$#" count: 1 @@ -210,36 +30,6 @@ parameters: count: 1 path: ../../src/Surfnet/Migrations/Version20210610131957.php - - - message: "#^Cannot call method getParameter\\(\\) on Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\|null\\.$#" - count: 1 - path: ../../src/Surfnet/Migrations/Version20220519134637.php - - - - message: "#^Method Surfnet\\\\Migrations\\\\Version20220519134637\\:\\:getGatewaySchema\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/Migrations/Version20220519134637.php - - - - message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, array\\|bool\\|float\\|int\\|string\\|null given\\.$#" - count: 2 - path: ../../src/Surfnet/Migrations/Version20220519134637.php - - - - message: "#^Cannot call method getParameter\\(\\) on Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\|null\\.$#" - count: 1 - path: ../../src/Surfnet/Migrations/Version20221102143350.php - - - - message: "#^Method Surfnet\\\\Migrations\\\\Version20221102143350\\:\\:getGatewaySchema\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../src/Surfnet/Migrations/Version20221102143350.php - - - - message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, array\\|bool\\|float\\|int\\|string\\|null given\\.$#" - count: 2 - path: ../../src/Surfnet/Migrations/Version20221102143350.php - - message: "#^Cannot access offset 'email_templates' on mixed\\.$#" count: 1 diff --git a/config/packages/doctrine_migrations.yaml b/config/packages/doctrine_migrations.yaml index 84f8ecdac..fc920395a 100644 --- a/config/packages/doctrine_migrations.yaml +++ b/config/packages/doctrine_migrations.yaml @@ -8,3 +8,5 @@ doctrine_migrations: table_name: 'migration_versions' version_column_name: 'version' version_column_length: 192 + services: + Doctrine\Migrations\Version\MigrationFactory: 'Surfnet\Stepup\MigrationsFactory\ConfigurationMigrationFactory' \ No newline at end of file diff --git a/config/services.yaml b/config/services.yaml index cd898a123..082d1bdf8 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -53,3 +53,10 @@ services: - location - contactInformation - [] # Allowed functions + + Surfnet\Stepup\MigrationsFactory\ConfigurationMigrationFactory: + arguments: + - "@doctrine.migrations.migrations_factory" + - "%database_gateway_name%" + - "%database_middleware_name%" + - "%database_middleware_user%" diff --git a/src/Surfnet/Migrations/Version20141125173004.php b/src/Surfnet/Migrations/Version20141125173004.php index 290c68db7..f8df2b3a6 100644 --- a/src/Surfnet/Migrations/Version20141125173004.php +++ b/src/Surfnet/Migrations/Version20141125173004.php @@ -20,20 +20,15 @@ use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; -use Symfony\Component\DependencyInjection\ContainerAwareInterface; -use Symfony\Component\DependencyInjection\ContainerInterface; +use Surfnet\Stepup\MigrationsFactory\ConfigurationAwareMigrationInterface; +use Surfnet\Stepup\MigrationsFactory\ConfigurationAwareMigrationTrait; /** * Auto-generated Migration: Please modify to your needs! */ -class Version20141125173004 extends AbstractMigration implements ContainerAwareInterface +class Version20141125173004 extends AbstractMigration implements ConfigurationAwareMigrationInterface { - private ?ContainerInterface $container = null; - - public function setContainer(ContainerInterface $container = null): void - { - $this->container = $container; - } + use ConfigurationAwareMigrationTrait; public function up(Schema $schema): void { @@ -73,14 +68,4 @@ public function down(Schema $schema): void ); $this->addSql(sprintf('DROP TABLE %s.saml_entity', $gatewaySchema)); } - - private function getGatewaySchema(): float|array|bool|int|string|null - { - return $this->container->getParameter('database_gateway_name'); - } - - private function getMiddlewareUser(): float|array|bool|int|string|null - { - return $this->container->getParameter('database_middleware_user'); - } } diff --git a/src/Surfnet/Migrations/Version20141209150426.php b/src/Surfnet/Migrations/Version20141209150426.php index a388124e9..3bb0ee217 100644 --- a/src/Surfnet/Migrations/Version20141209150426.php +++ b/src/Surfnet/Migrations/Version20141209150426.php @@ -19,20 +19,18 @@ use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; +use Surfnet\Stepup\MigrationsFactory\ConfigurationAwareMigrationInterface; +use Surfnet\Stepup\MigrationsFactory\ConfigurationAwareMigrationTrait; use Symfony\Component\DependencyInjection\ContainerAwareInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** * Auto-generated Migration: Please modify to your needs! */ -class Version20141209150426 extends AbstractMigration implements ContainerAwareInterface +class Version20141209150426 extends AbstractMigration implements ConfigurationAwareMigrationInterface { - private ?ContainerInterface $container = null; + use ConfigurationAwareMigrationTrait; - public function setContainer(ContainerInterface $container = null): void - { - $this->container = $container; - } public function up(Schema $schema): void { @@ -78,14 +76,4 @@ public function down(Schema $schema): void ); $this->addSql('DROP TABLE second_factor'); } - - private function getGatewaySchema(): float|array|bool|int|string|null - { - return $this->container->getParameter('database_gateway_name'); - } - - private function getMiddlewareUser(): float|array|bool|int|string|null - { - return $this->container->getParameter('database_middleware_user'); - } } diff --git a/src/Surfnet/Migrations/Version20141210174213.php b/src/Surfnet/Migrations/Version20141210174213.php index 36a5234fe..d0a4ff6ab 100644 --- a/src/Surfnet/Migrations/Version20141210174213.php +++ b/src/Surfnet/Migrations/Version20141210174213.php @@ -20,15 +20,15 @@ use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; -use Symfony\Component\DependencyInjection\ContainerAwareInterface; -use Symfony\Component\DependencyInjection\ContainerInterface; +use Surfnet\Stepup\MigrationsFactory\ConfigurationAwareMigrationInterface; +use Surfnet\Stepup\MigrationsFactory\ConfigurationAwareMigrationTrait; /** * Auto-generated Migration: Please modify to your needs! */ -class Version20141210174213 extends AbstractMigration implements ContainerAwareInterface +class Version20141210174213 extends AbstractMigration implements ConfigurationAwareMigrationInterface { - private ?ContainerInterface $container = null; + use ConfigurationAwareMigrationTrait; public function up(Schema $schema): void { @@ -62,14 +62,4 @@ public function down(Schema $schema): void $this->addSql(sprintf('ALTER TABLE %s.second_factor DROP id', $gatewaySchema)); $this->addSql(sprintf('ALTER TABLE %s.second_factor ADD PRIMARY KEY (identity_id)', $gatewaySchema)); } - - private function getGatewaySchema(): float|array|bool|int|string|null - { - return $this->container->getParameter('database_gateway_name'); - } - - public function setContainer(ContainerInterface $container = null): void - { - $this->container = $container; - } } diff --git a/src/Surfnet/Migrations/Version20150312162849.php b/src/Surfnet/Migrations/Version20150312162849.php index 010a22008..170300ecf 100644 --- a/src/Surfnet/Migrations/Version20150312162849.php +++ b/src/Surfnet/Migrations/Version20150312162849.php @@ -20,15 +20,15 @@ use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; -use Symfony\Component\DependencyInjection\ContainerAwareInterface; -use Symfony\Component\DependencyInjection\ContainerInterface; +use Surfnet\Stepup\MigrationsFactory\ConfigurationAwareMigrationInterface; +use Surfnet\Stepup\MigrationsFactory\ConfigurationAwareMigrationTrait; /** * Auto-generated Migration: Please modify to your needs! */ -class Version20150312162849 extends AbstractMigration implements ContainerAwareInterface +class Version20150312162849 extends AbstractMigration implements ConfigurationAwareMigrationInterface { - private ?ContainerInterface $container = null; + use ConfigurationAwareMigrationTrait; public function up(Schema $schema): void { @@ -38,7 +38,7 @@ public function up(Schema $schema): void 'Migration can only be executed safely on \'mysql\'.', ); - $gatewaySchema = $this->container->getParameter('database_gateway_name'); + $gatewaySchema = $this->getGatewaySchema(); $this->addSql( sprintf( 'ALTER TABLE %s.second_factor CHANGE second_factor_identifier second_factor_identifier VARCHAR(255) NOT NULL', @@ -55,7 +55,7 @@ public function down(Schema $schema): void 'Migration can only be executed safely on \'mysql\'.', ); - $gatewaySchema = $this->container->getParameter('database_gateway_name'); + $gatewaySchema = $this->getGatewaySchema(); $this->addSql( sprintf( 'ALTER TABLE %s.second_factor CHANGE second_factor_identifier second_factor_identifier VARCHAR(36) NOT NULL COLLATE utf8_unicode_ci', @@ -63,9 +63,4 @@ public function down(Schema $schema): void ), ); } - - public function setContainer(ContainerInterface $container = null): void - { - $this->container = $container; - } } diff --git a/src/Surfnet/Migrations/Version20150508085838.php b/src/Surfnet/Migrations/Version20150508085838.php index 8aeecccd4..43b0c7c65 100644 --- a/src/Surfnet/Migrations/Version20150508085838.php +++ b/src/Surfnet/Migrations/Version20150508085838.php @@ -20,20 +20,15 @@ use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; -use Symfony\Component\DependencyInjection\ContainerAwareInterface; -use Symfony\Component\DependencyInjection\ContainerInterface; +use Surfnet\Stepup\MigrationsFactory\ConfigurationAwareMigrationInterface; +use Surfnet\Stepup\MigrationsFactory\ConfigurationAwareMigrationTrait; /** * Auto-generated Migration: Please modify to your needs! */ -class Version20150508085838 extends AbstractMigration implements ContainerAwareInterface +class Version20150508085838 extends AbstractMigration implements ConfigurationAwareMigrationInterface { - private ?ContainerInterface $container = null; - - public function setContainer(ContainerInterface $container = null): void - { - $this->container = $container; - } + use ConfigurationAwareMigrationTrait; /** * @param Schema $schema @@ -75,12 +70,4 @@ public function down(Schema $schema): void $this->addSql(sprintf('ALTER TABLE %s.second_factor ADD id INT PRIMARY KEY AUTO_INCREMENT', $gatewaySchema)); $this->addSql(sprintf('ALTER TABLE %s.second_factor DROP COLUMN uuid', $gatewaySchema)); } - - /** - * @return string - */ - private function getGatewaySchema(): string - { - return $this->container->getParameter('database_gateway_name'); - } } diff --git a/src/Surfnet/Migrations/Version20150522163053.php b/src/Surfnet/Migrations/Version20150522163053.php index 4488eed3e..c121b3ab1 100644 --- a/src/Surfnet/Migrations/Version20150522163053.php +++ b/src/Surfnet/Migrations/Version20150522163053.php @@ -19,20 +19,16 @@ use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; -use Symfony\Component\DependencyInjection\ContainerAwareInterface; -use Symfony\Component\DependencyInjection\ContainerInterface; +use Surfnet\Stepup\MigrationsFactory\ConfigurationAwareMigrationInterface; +use Surfnet\Stepup\MigrationsFactory\ConfigurationAwareMigrationTrait; /** * Auto-generated Migration: Please modify to your needs! */ -class Version20150522163053 extends AbstractMigration implements ContainerAwareInterface +class Version20150522163053 extends AbstractMigration implements ConfigurationAwareMigrationInterface { - private ?ContainerInterface $container = null; + use ConfigurationAwareMigrationTrait; - public function setContainer(ContainerInterface $container = null): void - { - $this->container = $container; - } /** * @param Schema $schema @@ -72,8 +68,4 @@ public function down(Schema $schema): void $this->addSql(sprintf('ALTER TABLE %s.saml_entity ADD PRIMARY KEY (entity_id)', $gatewaySchema)); } - private function getGatewaySchema(): float|array|bool|int|string|null - { - return $this->container->getParameter('database_gateway_name'); - } } diff --git a/src/Surfnet/Migrations/Version20150522164907.php b/src/Surfnet/Migrations/Version20150522164907.php index fecb0f9d2..9b679a350 100644 --- a/src/Surfnet/Migrations/Version20150522164907.php +++ b/src/Surfnet/Migrations/Version20150522164907.php @@ -20,20 +20,15 @@ use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; -use Symfony\Component\DependencyInjection\ContainerAwareInterface; -use Symfony\Component\DependencyInjection\ContainerInterface; +use Surfnet\Stepup\MigrationsFactory\ConfigurationAwareMigrationInterface; +use Surfnet\Stepup\MigrationsFactory\ConfigurationAwareMigrationTrait; /** * Auto-generated Migration: Please modify to your needs! */ -class Version20150522164907 extends AbstractMigration implements ContainerAwareInterface +class Version20150522164907 extends AbstractMigration implements ConfigurationAwareMigrationInterface { - private ?ContainerInterface $container = null; - - public function setContainer(ContainerInterface $container = null): void - { - $this->container = $container; - } + use ConfigurationAwareMigrationTrait; /** * @param Schema $schema @@ -71,9 +66,4 @@ public function down(Schema $schema): void $this->addSql(sprintf('DROP INDEX unq_saml_entity_entity_id_type ON %s.saml_entity', $gatewaySchema)); } - - private function getGatewaySchema(): float|array|bool|int|string|null - { - return $this->container->getParameter('database_gateway_name'); - } } diff --git a/src/Surfnet/Migrations/Version20150528154959.php b/src/Surfnet/Migrations/Version20150528154959.php index aaab64c1d..abce6140d 100644 --- a/src/Surfnet/Migrations/Version20150528154959.php +++ b/src/Surfnet/Migrations/Version20150528154959.php @@ -20,20 +20,15 @@ use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; -use Symfony\Component\DependencyInjection\ContainerAwareInterface; -use Symfony\Component\DependencyInjection\ContainerInterface; +use Surfnet\Stepup\MigrationsFactory\ConfigurationAwareMigrationInterface; +use Surfnet\Stepup\MigrationsFactory\ConfigurationAwareMigrationTrait; /** * Auto-generated Migration: Please modify to your needs! */ -class Version20150528154959 extends AbstractMigration implements ContainerAwareInterface +class Version20150528154959 extends AbstractMigration implements ConfigurationAwareMigrationInterface { - private ?ContainerInterface $container = null; - - public function setContainer(ContainerInterface $container = null): void - { - $this->container = $container; - } + use ConfigurationAwareMigrationTrait; /** * @param Schema $schema @@ -66,12 +61,4 @@ public function down(Schema $schema): void $this->addSql(sprintf('ALTER TABLE %s.second_factor DROP display_locale', $gatewaySchema)); } - - /** - * @return string - */ - private function getGatewaySchema(): string - { - return $this->container->getParameter('database_gateway_name'); - } } diff --git a/src/Surfnet/Migrations/Version20150615114646.php b/src/Surfnet/Migrations/Version20150615114646.php index 91642c8d5..f784f9c46 100644 --- a/src/Surfnet/Migrations/Version20150615114646.php +++ b/src/Surfnet/Migrations/Version20150615114646.php @@ -20,20 +20,15 @@ use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; -use Symfony\Component\DependencyInjection\ContainerAwareInterface; -use Symfony\Component\DependencyInjection\ContainerInterface; +use Surfnet\Stepup\MigrationsFactory\ConfigurationAwareMigrationInterface; +use Surfnet\Stepup\MigrationsFactory\ConfigurationAwareMigrationTrait; /** * Auto-generated Migration: Please modify to your needs! */ -class Version20150615114646 extends AbstractMigration implements ContainerAwareInterface +class Version20150615114646 extends AbstractMigration implements ConfigurationAwareMigrationInterface { - private ?ContainerInterface $container = null; - - public function setContainer(ContainerInterface $container = null): void - { - $this->container = $container; - } + use ConfigurationAwareMigrationTrait; public function up(Schema $schema): void { @@ -90,19 +85,4 @@ public function down(Schema $schema): void $this->addSql(sprintf('DROP TABLE %s.saml_entity', $middlewareSchema)); $this->addSql(sprintf('DROP TABLE %s.saml_entity', $gatewaySchema)); } - - private function getGatewaySchema(): float|array|bool|int|string|null - { - return $this->container->getParameter('database_gateway_name'); - } - - private function getMiddlewareUser(): float|array|bool|int|string|null - { - return $this->container->getParameter('database_middleware_user'); - } - - private function getMiddlewareSchema(): float|array|bool|int|string|null - { - return $this->container->getParameter('database_middleware_name'); - } } diff --git a/src/Surfnet/Migrations/Version20180131150800.php b/src/Surfnet/Migrations/Version20180131150800.php index 35f45d192..005e978bf 100644 --- a/src/Surfnet/Migrations/Version20180131150800.php +++ b/src/Surfnet/Migrations/Version20180131150800.php @@ -20,20 +20,15 @@ use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; -use Symfony\Component\DependencyInjection\ContainerAwareInterface; -use Symfony\Component\DependencyInjection\ContainerInterface; +use Surfnet\Stepup\MigrationsFactory\ConfigurationAwareMigrationInterface; +use Surfnet\Stepup\MigrationsFactory\ConfigurationAwareMigrationTrait; /** * Update the Gateway `second_factor` table setting the primary key on the `id` and `identity_id` fields. */ -class Version20180131150800 extends AbstractMigration implements ContainerAwareInterface +class Version20180131150800 extends AbstractMigration implements ConfigurationAwareMigrationInterface { - private ?ContainerInterface $container = null; - - public function setContainer(ContainerInterface $container = null): void - { - $this->container = $container; - } + use ConfigurationAwareMigrationTrait; /** * @param Schema $schema @@ -68,12 +63,4 @@ public function down(Schema $schema): void $this->addSql(sprintf('ALTER TABLE %s.second_factor DROP PRIMARY KEY', $gatewaySchema)); $this->addSql(sprintf('ALTER TABLE %s.second_factor ADD PRIMARY KEY (id)', $gatewaySchema)); } - - /** - * @return string - */ - private function getGatewaySchema(): string - { - return $this->container->getParameter('database_gateway_name'); - } } diff --git a/src/Surfnet/Migrations/Version20200114161618.php b/src/Surfnet/Migrations/Version20200114161618.php index 8ec0055e5..267d0c01a 100644 --- a/src/Surfnet/Migrations/Version20200114161618.php +++ b/src/Surfnet/Migrations/Version20200114161618.php @@ -20,20 +20,15 @@ use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; -use Symfony\Component\DependencyInjection\ContainerAwareInterface; -use Symfony\Component\DependencyInjection\ContainerInterface; +use Surfnet\Stepup\MigrationsFactory\ConfigurationAwareMigrationInterface; +use Surfnet\Stepup\MigrationsFactory\ConfigurationAwareMigrationTrait; /** * Auto-generated Migration: Please modify to your needs! */ -class Version20200114161618 extends AbstractMigration implements ContainerAwareInterface +class Version20200114161618 extends AbstractMigration implements ConfigurationAwareMigrationInterface { - private ?ContainerInterface $container = null; - - public function setContainer(ContainerInterface $container = null): void - { - $this->container = $container; - } + use ConfigurationAwareMigrationTrait; /** * @param Schema $schema @@ -78,9 +73,4 @@ public function down(Schema $schema): void $this->throwIrreversibleMigrationException('This migration is irreversible'); } - - private function getGatewaySchema(): float|array|bool|int|string|null - { - return $this->container->getParameter('database_gateway_name'); - } } diff --git a/src/Surfnet/Migrations/Version20220519134637.php b/src/Surfnet/Migrations/Version20220519134637.php index 995f5748e..1eba25a72 100644 --- a/src/Surfnet/Migrations/Version20220519134637.php +++ b/src/Surfnet/Migrations/Version20220519134637.php @@ -22,20 +22,15 @@ use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; -use Symfony\Component\DependencyInjection\ContainerAwareInterface; -use Symfony\Component\DependencyInjection\ContainerInterface; +use Surfnet\Stepup\MigrationsFactory\ConfigurationAwareMigrationInterface; +use Surfnet\Stepup\MigrationsFactory\ConfigurationAwareMigrationTrait; /** * Adds the Self asserted tokens feature to the middleware and gateway databases */ -final class Version20220519134637 extends AbstractMigration implements ContainerAwareInterface +final class Version20220519134637 extends AbstractMigration implements ConfigurationAwareMigrationInterface { - private ?ContainerInterface $container = null; - - public function setContainer(ContainerInterface $container = null): void - { - $this->container = $container; - } + use ConfigurationAwareMigrationTrait; public function up(Schema $schema): void { @@ -95,9 +90,4 @@ public function down(Schema $schema): void $gatewaySchema = $this->getGatewaySchema(); $this->addSql(sprintf('ALTER TABLE %s.second_factor DROP identity_vetted', $gatewaySchema)); } - - private function getGatewaySchema(): float|array|bool|int|string|null - { - return $this->container->getParameter('database_gateway_name'); - } } diff --git a/src/Surfnet/Migrations/Version20221102143350.php b/src/Surfnet/Migrations/Version20221102143350.php index 1c8cb9911..5da598094 100644 --- a/src/Surfnet/Migrations/Version20221102143350.php +++ b/src/Surfnet/Migrations/Version20221102143350.php @@ -22,17 +22,12 @@ use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; -use Symfony\Component\DependencyInjection\ContainerAwareInterface; -use Symfony\Component\DependencyInjection\ContainerInterface; +use Surfnet\Stepup\MigrationsFactory\ConfigurationAwareMigrationInterface; +use Surfnet\Stepup\MigrationsFactory\ConfigurationAwareMigrationTrait; -final class Version20221102143350 extends AbstractMigration implements ContainerAwareInterface +final class Version20221102143350 extends AbstractMigration implements ConfigurationAwareMigrationInterface { - private ?ContainerInterface $container = null; - - public function setContainer(ContainerInterface $container = null): void - { - $this->container = $container; - } + use ConfigurationAwareMigrationTrait; public function up(Schema $schema): void { @@ -64,9 +59,4 @@ public function down(Schema $schema): void $gatewaySchema = $this->getGatewaySchema(); $this->addSql(sprintf('DROP TABLE %s.institution_configuration', $gatewaySchema)); } - - private function getGatewaySchema(): float|array|bool|int|string|null - { - return $this->container->getParameter('database_gateway_name'); - } } diff --git a/src/Surfnet/Stepup/MigrationsFactory/ConfigurationAwareMigrationInterface.php b/src/Surfnet/Stepup/MigrationsFactory/ConfigurationAwareMigrationInterface.php new file mode 100644 index 000000000..6f56d876a --- /dev/null +++ b/src/Surfnet/Stepup/MigrationsFactory/ConfigurationAwareMigrationInterface.php @@ -0,0 +1,26 @@ +gatewaySchema = $gatewaySchema; + $this->middlewareSchema = $middlewareSchema; + $this->middlewareUser = $middlewareUser; + } + + public function getGatewaySchema(): string + { + if (empty($this->gatewaySchema)) { + throw new RuntimeException("Gateway schema must be set"); + } + return $this->gatewaySchema; + } + + public function getMiddlewareSchema(): string + { + if (empty($this->middlewareSchema)) { + throw new RuntimeException("Middleware schema must be set"); + } + return $this->middlewareSchema; + } + + public function getMiddlewareUser(): string + { + if (empty($this->middlewareUser)) { + throw new RuntimeException("Middleware user must be set"); + } + return $this->middlewareUser; + } +} diff --git a/src/Surfnet/Stepup/MigrationsFactory/ConfigurationMigrationFactory.php b/src/Surfnet/Stepup/MigrationsFactory/ConfigurationMigrationFactory.php new file mode 100644 index 000000000..34dc1322c --- /dev/null +++ b/src/Surfnet/Stepup/MigrationsFactory/ConfigurationMigrationFactory.php @@ -0,0 +1,46 @@ +migrationFactory->createVersion($migrationClassName); + + if ($migration instanceof ConfigurationAwareMigrationInterface) { + $migration->setConfiguration($this->gatewaySchema, $this->middlewareSchema, $this->middlewareUser); + } + + return $migration; + } +} From 29bc0bbb876f5f410662a53b931e23e84b558557 Mon Sep 17 00:00:00 2001 From: Bas Date: Tue, 26 Nov 2024 15:30:13 +0100 Subject: [PATCH 75/89] Fix replay errors test2 replay --- ci/qa/phpstan-baseline.neon | 9 ++------- .../Identity/Event/U2fDevicePossessionProvenEvent.php | 7 ++++--- .../ApiBundle/Identity/Entity/RaCandidate.php | 7 +++++++ .../Identity/Projector/SecondFactorProjector.php | 9 ++++++++- .../MiddlewareBundle/EventSourcing/DBALEventHydrator.php | 4 ---- 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/ci/qa/phpstan-baseline.neon b/ci/qa/phpstan-baseline.neon index dd7e15771..3190610d6 100644 --- a/ci/qa/phpstan-baseline.neon +++ b/ci/qa/phpstan-baseline.neon @@ -2665,19 +2665,14 @@ parameters: count: 2 path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RecoveryTokenProjector.php - - - message: "#^Cannot access property \\$secondFactorIdentifier on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\UnverifiedSecondFactor\\|null\\.$#" - count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php - - message: "#^Parameter \\#1 \\$secondFactor of method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\UnverifiedSecondFactorRepository\\:\\:remove\\(\\) expects Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\UnverifiedSecondFactor, Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\UnverifiedSecondFactor\\|null given\\.$#" - count: 3 + count: 2 path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php - message: "#^Parameter \\#1 \\$secondFactor of method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\VerifiedSecondFactorRepository\\:\\:remove\\(\\) expects Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\VerifiedSecondFactor, Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\VerifiedSecondFactor\\|null given\\.$#" - count: 4 + count: 3 path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php - diff --git a/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php b/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php index 200254f7c..6d6327061 100644 --- a/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php +++ b/src/Surfnet/Stepup/Identity/Event/U2fDevicePossessionProvenEvent.php @@ -22,10 +22,12 @@ use Surfnet\Stepup\Identity\Value\CommonName; use Surfnet\Stepup\Identity\Value\Email; use Surfnet\Stepup\Identity\Value\EmailVerificationWindow; +use Surfnet\Stepup\Identity\Value\GssfId; use Surfnet\Stepup\Identity\Value\IdentityId; use Surfnet\Stepup\Identity\Value\Institution; use Surfnet\Stepup\Identity\Value\Locale; use Surfnet\Stepup\Identity\Value\SecondFactorId; +use Surfnet\Stepup\Identity\Value\SecondFactorIdentifier; use Surfnet\Stepup\Identity\Value\U2fKeyHandle; use Surfnet\StepupBundle\Value\SecondFactorType; use Surfnet\StepupMiddleware\CommandHandlingBundle\SensitiveData\Forgettable; @@ -55,7 +57,7 @@ class U2fDevicePossessionProvenEvent extends IdentityEvent implements Forgettabl * @param IdentityId $identityId * @param Institution $identityInstitution * @param SecondFactorId $secondFactorId - * @param U2fKeyHandle $keyHandle + * @param SecondFactorIdentifier $keyHandle * @param bool $emailVerificationRequired * @param EmailVerificationWindow $emailVerificationWindow * @param string $emailVerificationNonce @@ -69,7 +71,7 @@ public function __construct( IdentityId $identityId, Institution $identityInstitution, public SecondFactorId $secondFactorId, - public U2fKeyHandle $keyHandle, + public SecondFactorIdentifier $keyHandle, public bool $emailVerificationRequired, public EmailVerificationWindow $emailVerificationWindow, public string $emailVerificationNonce, @@ -143,7 +145,6 @@ public function setSensitiveData(SensitiveData $sensitiveData): void $this->email = $sensitiveData->getEmail(); $this->commonName = $sensitiveData->getCommonName(); $keyHandle = $sensitiveData->getSecondFactorIdentifier(); - assert($keyHandle instanceof U2fKeyHandle); $this->keyHandle = $keyHandle; } diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaCandidate.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaCandidate.php index 3c4f9fb54..4a3d8c327 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaCandidate.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaCandidate.php @@ -30,7 +30,14 @@ /** * Be aware that this entity is used for the RA Candidate presentation only. This entity shouldn't be used to store any RA candidates. */ +#[ORM\Table] #[ORM\Entity(repositoryClass: RaCandidateRepository::class, readOnly: true)] +#[ORM\Index(name: "idx_ra_candidate_institution", columns: ["institution"])] +#[ORM\Index(name: "idx_ra_candidate_name_id", columns: ["name_id"])] +#[ORM\Index(name: "idxft_ra_candidate_email", columns: ["email"], flags: ['FULLTEXT'])] +#[ORM\Index(name: "idxft_ra_candidate_commonname", columns: ["common_name"], flags: ['FULLTEXT'])] +#[ORM\Index(name: "idx_ra_institution", columns: ["ra_institution"])] +#[ORM\UniqueConstraint(name: "idx_ra_candidate_unique_identity_institution", columns: ["identity_id", "ra_institution"])] class RaCandidate implements JsonSerializable { /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php index 355573cb4..1ce9912f3 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php @@ -155,6 +155,9 @@ public function applyGssfPossessionProvenAndVerifiedEvent(GssfPossessionProvenAn public function applyEmailVerifiedEvent(EmailVerifiedEvent $event): void { $unverified = $this->unverifiedRepository->find($event->secondFactorId->getSecondFactorId()); + if (is_null($unverified)) { + return; + } $verified = new VerifiedSecondFactor(); $verified->id = $event->secondFactorId->getSecondFactorId(); @@ -247,7 +250,11 @@ protected function applyCompliedWithUnverifiedSecondFactorRevocationEvent( protected function applyVerifiedSecondFactorRevokedEvent(VerifiedSecondFactorRevokedEvent $event): void { - $this->verifiedRepository->remove($this->verifiedRepository->find($event->secondFactorId->getSecondFactorId())); + $verifiedSecondFactor = $this->verifiedRepository->find($event->secondFactorId->getSecondFactorId()); + if (is_null($verifiedSecondFactor)) { + return; + } + $this->verifiedRepository->remove($verifiedSecondFactor); } protected function applyCompliedWithVerifiedSecondFactorRevocationEvent( diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php index 62092f525..67702b702 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/EventSourcing/DBALEventHydrator.php @@ -110,10 +110,6 @@ public function fetchByEventTypes(array $eventTypes): DomainEventStream private function deserializeEvent(array $row): DomainMessage { - echo '1: |'.(string)$row['payload']."|\n"; - echo '2: |'; - var_dump(json_decode($row['payload'], true, JSON_THROW_ON_ERROR)); - echo "|\n"; $event = $this->payloadSerializer->deserialize(json_decode((string)$row['payload'], true)); if ($event instanceof Forgettable) { From 911f385e093f1065c6c5ff2437aee212039a960c Mon Sep 17 00:00:00 2001 From: Bas Date: Tue, 26 Nov 2024 15:30:30 +0100 Subject: [PATCH 76/89] Lower dev log level --- config/packages/monolog.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/packages/monolog.yaml b/config/packages/monolog.yaml index 6b61583e3..10bca89bc 100644 --- a/config/packages/monolog.yaml +++ b/config/packages/monolog.yaml @@ -19,7 +19,7 @@ when@dev: &override main_syslog: type: stream path: php://stderr - level: debug + level: error channels: ["!event", "!doctrine", "!deprecation", "!console"] console: type: console From 9d834afec85880b14d3c3de74b69d7ed915e1d0d Mon Sep 17 00:00:00 2001 From: Bas Date: Thu, 28 Nov 2024 13:36:19 +0100 Subject: [PATCH 77/89] Fix production database diff --- ci/qa/phpstan-baseline.neon | 5 -- config/packages/doctrine.yaml | 2 + .../Migrations/Version20241128131107.php | 55 +++++++++++++++++++ .../Migrations/Version20241128131108.php | 55 +++++++++++++++++++ .../Type/NumberOfTokensPerIdentityType.php | 3 +- .../Type/SelfAssertedTokensOptionType.php | 4 +- .../Doctrine/Type/SelfVetOptionType.php | 3 +- .../Doctrine/Type/SsoOn2faOptionType.php | 3 +- .../Doctrine/Type/VerifyEmailOptionType.php | 3 +- .../Doctrine/Type/VettingTypeHintsType.php | 8 +-- .../ApiBundle/Identity/Entity/RaCandidate.php | 7 --- .../ConfiguredInstitutionControllerTest.php | 1 + .../Tests/Endpoint/SraaControllerTest.php | 1 + .../Entity/InstitutionConfiguration.php | 2 +- .../ConfigurationControllerTest.php | 1 + ...InstitutionConfigurationControllerTest.php | 1 + 16 files changed, 130 insertions(+), 24 deletions(-) create mode 100644 src/Surfnet/Migrations/Version20241128131107.php create mode 100644 src/Surfnet/Migrations/Version20241128131108.php diff --git a/ci/qa/phpstan-baseline.neon b/ci/qa/phpstan-baseline.neon index 3190610d6..5a12babb9 100644 --- a/ci/qa/phpstan-baseline.neon +++ b/ci/qa/phpstan-baseline.neon @@ -2450,11 +2450,6 @@ parameters: count: 1 path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NameIdType.php - - - message: "#^Cannot cast mixed to int\\.$#" - count: 1 - path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NumberOfTokensPerIdentityType.php - - message: "#^Parameter \\#1 \\$raLocationName of class Surfnet\\\\Stepup\\\\Configuration\\\\Value\\\\RaLocationName constructor expects string, mixed given\\.$#" count: 1 diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml index 3e5e61643..0db800f56 100644 --- a/config/packages/doctrine.yaml +++ b/config/packages/doctrine.yaml @@ -135,6 +135,8 @@ doctrine: dir: "%kernel.project_dir%/src/Surfnet/StepupMiddleware/ManagementBundle/Configuration" prefix: Surfnet\StepupMiddleware\ManagementBundle\Configuration is_bundle: false + schema_ignore_classes: + - Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\RaCandidate gateway: connection: gateway naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware diff --git a/src/Surfnet/Migrations/Version20241128131107.php b/src/Surfnet/Migrations/Version20241128131107.php new file mode 100644 index 000000000..c045d9107 --- /dev/null +++ b/src/Surfnet/Migrations/Version20241128131107.php @@ -0,0 +1,55 @@ +addSql('DROP TABLE institution_with_ra_locations'); + $this->addSql('ALTER TABLE institution_configuration_options CHANGE number_of_tokens_per_identity_option number_of_tokens_per_identity_option INT DEFAULT 0 NOT NULL'); + $this->addSql('ALTER TABLE vetted_second_factor CHANGE vetting_type vetting_type VARCHAR(255) DEFAULT NULL'); + $this->addSql('CREATE INDEX idx_vetted_second_factor_vetting_type ON vetted_second_factor (vetting_type)'); + $this->addSql('ALTER TABLE vetting_type_hint CHANGE hints hints JSON NOT NULL COMMENT \'(DC2Type:stepup_vetting_type_hints)\''); + } + + public function down(Schema $schema): void + { + // this down() migration is auto-generated, please modify it to your needs + $this->addSql('CREATE TABLE institution_with_ra_locations (institution VARCHAR(255) CHARACTER SET utf8mb3 NOT NULL COLLATE `utf8mb3_unicode_ci`, PRIMARY KEY(institution)) DEFAULT CHARACTER SET utf8mb3 COLLATE `utf8mb3_unicode_ci` ENGINE = InnoDB COMMENT = \'\' '); + $this->addSql('ALTER TABLE institution_configuration_options CHANGE number_of_tokens_per_identity_option number_of_tokens_per_identity_option TINYINT(1) DEFAULT 0 NOT NULL'); + $this->addSql('DROP INDEX idx_vetted_second_factor_vetting_type ON vetted_second_factor'); + $this->addSql('ALTER TABLE vetted_second_factor CHANGE vetting_type vetting_type VARCHAR(255) DEFAULT \'unknown\''); + $this->addSql('ALTER TABLE vetting_type_hint CHANGE hints hints LONGTEXT NOT NULL'); + } +} diff --git a/src/Surfnet/Migrations/Version20241128131108.php b/src/Surfnet/Migrations/Version20241128131108.php new file mode 100644 index 000000000..62529e049 --- /dev/null +++ b/src/Surfnet/Migrations/Version20241128131108.php @@ -0,0 +1,55 @@ +getGatewaySchema(); + + // this up() migration is auto-generated, please modify it to your needs + $this->addSql(sprintf('ALTER TABLE %s.second_factor CHANGE identity_vetted identity_vetted TINYINT(1) DEFAULT 1 NOT NULL', $gatewaySchema)); + } + + public function down(Schema $schema): void + { + $gatewaySchema = $this->getGatewaySchema(); + + // this down() migration is auto-generated, please modify it to your needs + $this->addSql(sprintf('ALTER TABLE %s.second_factor CHANGE identity_vetted identity_vetted TINYINT(1) DEFAULT 1', $gatewaySchema)); + } +} diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NumberOfTokensPerIdentityType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NumberOfTokensPerIdentityType.php index 91d0c4de8..1bbfb6b74 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NumberOfTokensPerIdentityType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NumberOfTokensPerIdentityType.php @@ -20,6 +20,7 @@ use Doctrine\DBAL\Platforms\AbstractPlatform; use Doctrine\DBAL\Types\ConversionException; +use Doctrine\DBAL\Types\IntegerType; use Doctrine\DBAL\Types\Type; use Surfnet\Stepup\Configuration\Value\NumberOfTokensPerIdentityOption; use Surfnet\Stepup\Exception\InvalidArgumentException; @@ -27,7 +28,7 @@ /** * Custom Type for the NumberOfTokensPerIdentityOption Value Object */ -class NumberOfTokensPerIdentityType extends Type +class NumberOfTokensPerIdentityType extends IntegerType { public const NAME = 'stepup_number_of_tokens_per_identity_option'; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SelfAssertedTokensOptionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SelfAssertedTokensOptionType.php index b6297d277..3d24cfd23 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SelfAssertedTokensOptionType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SelfAssertedTokensOptionType.php @@ -20,14 +20,16 @@ use Doctrine\DBAL\Platforms\AbstractPlatform; use Doctrine\DBAL\Types\ConversionException; +use Doctrine\DBAL\Types\IntegerType; use Doctrine\DBAL\Types\Type; +use phpseclib3\Math\PrimeField\Integer; use Surfnet\Stepup\Configuration\Value\SelfAssertedTokensOption; use TypeError; /** * Custom Type for the SelfAssertedTokens options Value Object */ -class SelfAssertedTokensOptionType extends Type +class SelfAssertedTokensOptionType extends IntegerType { public const NAME = 'stepup_self_asserted_tokens_option'; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SelfVetOptionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SelfVetOptionType.php index ba8006124..1202b099a 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SelfVetOptionType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SelfVetOptionType.php @@ -20,6 +20,7 @@ use Doctrine\DBAL\Platforms\AbstractPlatform; use Doctrine\DBAL\Types\ConversionException; +use Doctrine\DBAL\Types\IntegerType; use Doctrine\DBAL\Types\Type; use Surfnet\Stepup\Configuration\Value\SelfVetOption; use TypeError; @@ -27,7 +28,7 @@ /** * Custom Type for the SelfVetOption Value Object */ -class SelfVetOptionType extends Type +class SelfVetOptionType extends IntegerType { public const NAME = 'stepup_self_vet_option'; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SsoOn2faOptionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SsoOn2faOptionType.php index dcac72b54..904cee34d 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SsoOn2faOptionType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/SsoOn2faOptionType.php @@ -20,6 +20,7 @@ use Doctrine\DBAL\Platforms\AbstractPlatform; use Doctrine\DBAL\Types\ConversionException; +use Doctrine\DBAL\Types\IntegerType; use Doctrine\DBAL\Types\Type; use Surfnet\Stepup\Configuration\Value\SsoOn2faOption; use TypeError; @@ -27,7 +28,7 @@ /** * Custom Type for the SsoOn2faOption Value Object */ -class SsoOn2faOptionType extends Type +class SsoOn2faOptionType extends IntegerType { public const NAME = 'stepup_sso_on_2fa_option'; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VerifyEmailOptionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VerifyEmailOptionType.php index ef7fa4a3d..5ade89796 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VerifyEmailOptionType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VerifyEmailOptionType.php @@ -19,6 +19,7 @@ namespace Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type; use Doctrine\DBAL\Platforms\AbstractPlatform; +use Doctrine\DBAL\Types\BooleanType; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use Surfnet\Stepup\Configuration\Value\VerifyEmailOption; @@ -27,7 +28,7 @@ /** * Custom Type for the VerifyEmailOption Value Object */ -class VerifyEmailOptionType extends Type +class VerifyEmailOptionType extends BooleanType { public const NAME = 'stepup_verify_email_option'; diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VettingTypeHintsType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VettingTypeHintsType.php index 3b0847c44..f58c7006b 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VettingTypeHintsType.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/VettingTypeHintsType.php @@ -20,6 +20,7 @@ use Doctrine\DBAL\Platforms\AbstractPlatform; use Doctrine\DBAL\Types\ConversionException; +use Doctrine\DBAL\Types\JsonType; use Doctrine\DBAL\Types\Type; use Surfnet\Stepup\Exception\InvalidArgumentException; use Surfnet\Stepup\Identity\Collection\VettingTypeHintCollection; @@ -27,7 +28,7 @@ /** * Custom Type for the vetting type hints Value Object */ -class VettingTypeHintsType extends Type +class VettingTypeHintsType extends JsonType { public const NAME = 'stepup_vetting_type_hints'; @@ -36,11 +37,6 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st return $platform->getJsonTypeDeclarationSQL($column); } - public function convertToDatabaseValue($value, AbstractPlatform $platform): mixed - { - return $value; - } - public function convertToPHPValue($value, AbstractPlatform $platform): ?VettingTypeHintCollection { if (is_null($value)) { diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaCandidate.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaCandidate.php index 4a3d8c327..3c4f9fb54 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaCandidate.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/RaCandidate.php @@ -30,14 +30,7 @@ /** * Be aware that this entity is used for the RA Candidate presentation only. This entity shouldn't be used to store any RA candidates. */ -#[ORM\Table] #[ORM\Entity(repositoryClass: RaCandidateRepository::class, readOnly: true)] -#[ORM\Index(name: "idx_ra_candidate_institution", columns: ["institution"])] -#[ORM\Index(name: "idx_ra_candidate_name_id", columns: ["name_id"])] -#[ORM\Index(name: "idxft_ra_candidate_email", columns: ["email"], flags: ['FULLTEXT'])] -#[ORM\Index(name: "idxft_ra_candidate_commonname", columns: ["common_name"], flags: ['FULLTEXT'])] -#[ORM\Index(name: "idx_ra_institution", columns: ["ra_institution"])] -#[ORM\UniqueConstraint(name: "idx_ra_candidate_unique_identity_institution", columns: ["identity_id", "ra_institution"])] class RaCandidate implements JsonSerializable { /** diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php index c55d85d92..160a9ccfe 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/ConfiguredInstitutionControllerTest.php @@ -65,6 +65,7 @@ public function setUp(): void $this->databaseTool->setObjectManagerName('middleware'); // Initialises schema. + $this->databaseTool->setExcludedDoctrineTables(['ra_candidate']); $this->databaseTool->loadFixtures(); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php index 0bef81039..dce2051c0 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Tests/Endpoint/SraaControllerTest.php @@ -53,6 +53,7 @@ public function setUp(): void $this->databaseTool = $databaseTool->get(); // Initialises schema. + $this->databaseTool->setExcludedDoctrineTables(['ra_candidate']); $this->databaseTool->loadFixtures([]); diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/InstitutionConfiguration.php b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/InstitutionConfiguration.php index 2afca69db..1af95c2af 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/InstitutionConfiguration.php +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Entity/InstitutionConfiguration.php @@ -29,7 +29,7 @@ class InstitutionConfiguration { public function __construct( #[ORM\Id] - #[ORM\Column(length: 200)] + #[ORM\Column(length: 255)] public string $institution, /** * @var bool is the SSO on 2FA feature enabled? diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php index 3ca1fd63c..80d28853a 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/ConfigurationControllerTest.php @@ -47,6 +47,7 @@ public function setUp(): void } $this->databaseTool = $databaseTool->get(); // Initialises schema. + $this->databaseTool->setExcludedDoctrineTables(['ra_candidate']); $this->databaseTool->loadFixtures([]); $managementPassword = $this->client->getKernel()->getContainer()->getParameter('management_password'); diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php index 427124229..93647b23a 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Tests/Controller/InstitutionConfigurationControllerTest.php @@ -48,6 +48,7 @@ public function setUp(): void } $this->databaseTool = $databaseTool->get(); // Initialises schema. + $this->databaseTool->setExcludedDoctrineTables(['ra_candidate']); $this->databaseTool->loadFixtures([]); $managementPassword = $this->client->getKernel()->getContainer()->getParameter('management_password'); From d10ad3c13dd50cedb992a13b01d3e21c732dfdfb Mon Sep 17 00:00:00 2001 From: Thijs Kinkhorst Date: Fri, 6 Dec 2024 10:12:08 +0100 Subject: [PATCH 78/89] Bump saml2, xmlseclibs --- composer.lock | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/composer.lock b/composer.lock index 8f414585d..950203e45 100644 --- a/composer.lock +++ b/composer.lock @@ -3272,16 +3272,16 @@ }, { "name": "robrichards/xmlseclibs", - "version": "3.1.1", + "version": "3.1.3", "source": { "type": "git", "url": "https://github.com/robrichards/xmlseclibs.git", - "reference": "f8f19e58f26cdb42c54b214ff8a820760292f8df" + "reference": "2bdfd742624d739dfadbd415f00181b4a77aaf07" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/robrichards/xmlseclibs/zipball/f8f19e58f26cdb42c54b214ff8a820760292f8df", - "reference": "f8f19e58f26cdb42c54b214ff8a820760292f8df", + "url": "https://api.github.com/repos/robrichards/xmlseclibs/zipball/2bdfd742624d739dfadbd415f00181b4a77aaf07", + "reference": "2bdfd742624d739dfadbd415f00181b4a77aaf07", "shasum": "" }, "require": { @@ -3308,22 +3308,22 @@ ], "support": { "issues": "https://github.com/robrichards/xmlseclibs/issues", - "source": "https://github.com/robrichards/xmlseclibs/tree/3.1.1" + "source": "https://github.com/robrichards/xmlseclibs/tree/3.1.3" }, - "time": "2020-09-05T13:00:25+00:00" + "time": "2024-11-20T21:13:56+00:00" }, { "name": "simplesamlphp/saml2", - "version": "v4.6.11", + "version": "v4.16.14", "source": { "type": "git", "url": "https://github.com/simplesamlphp/saml2.git", - "reference": "1b5d48753c78d02e88667068e633531c233141fb" + "reference": "fe6c7bdda5e166e326d19d78f230d959ab51d01d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/simplesamlphp/saml2/zipball/1b5d48753c78d02e88667068e633531c233141fb", - "reference": "1b5d48753c78d02e88667068e633531c233141fb", + "url": "https://api.github.com/repos/simplesamlphp/saml2/zipball/fe6c7bdda5e166e326d19d78f230d959ab51d01d", + "reference": "fe6c7bdda5e166e326d19d78f230d959ab51d01d", "shasum": "" }, "require": { @@ -3335,6 +3335,9 @@ "robrichards/xmlseclibs": "^3.1.1", "webmozart/assert": "^1.9" }, + "conflict": { + "robrichards/xmlseclibs": "3.1.2" + }, "require-dev": { "mockery/mockery": "^1.3", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", @@ -3366,9 +3369,9 @@ "description": "SAML2 PHP library from SimpleSAMLphp", "support": { "issues": "https://github.com/simplesamlphp/saml2/issues", - "source": "https://github.com/simplesamlphp/saml2/tree/v4.6.11" + "source": "https://github.com/simplesamlphp/saml2/tree/v4.16.14" }, - "time": "2024-01-25T19:39:46+00:00" + "time": "2024-12-01T22:26:30+00:00" }, { "name": "surfnet/stepup-bundle", From f0a1b1436fb6fdaaf944ebe59ce272f6a988a86d Mon Sep 17 00:00:00 2001 From: Bas Date: Mon, 9 Dec 2024 10:13:31 +0100 Subject: [PATCH 79/89] Add BC localizeddate twig filter --- ci/qa/phpstan-baseline.neon | 5 ++ config/services.yaml | 6 +- .../Twig/BackwardsCompatibleExtensionTest.php | 61 +++++++++++++++++++ .../Twig/BackwardsCompatibleExtension.php | 59 ++++++++++++++++++ 4 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Twig/BackwardsCompatibleExtensionTest.php create mode 100644 src/Surfnet/StepupMiddleware/CommandHandlingBundle/Twig/BackwardsCompatibleExtension.php diff --git a/ci/qa/phpstan-baseline.neon b/ci/qa/phpstan-baseline.neon index 5a12babb9..03251e4ad 100644 --- a/ci/qa/phpstan-baseline.neon +++ b/ci/qa/phpstan-baseline.neon @@ -3435,6 +3435,11 @@ parameters: count: 1 path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/SensitiveData/SensitiveDataTest.php + - + message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Twig\\\\BackwardsCompatibleExtensionTest\\:\\:templateProvider\\(\\) return type has no value type specified in iterable type array\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Twig/BackwardsCompatibleExtensionTest.php + - message: "#^Method Surfnet\\\\StepupMiddleware\\\\CommandHandlingBundle\\\\Tests\\\\Value\\\\InstitutionTest\\:\\:nonStringOrNonEmptyStringProvider\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 diff --git a/config/services.yaml b/config/services.yaml index 082d1bdf8..93190a767 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -14,6 +14,10 @@ services: - "@surfnet_stepup.service.second_factor_type" - '%skip_prove_possession_second_factors%' + Surfnet\StepupMiddleware\CommandHandlingBundle\Twig\BackwardsCompatibleExtension: + arguments: [ "@twig.extension.intl"] + tags: [{ name: twig.extension }] + twig.extension.stringloader: class: Twig\Extension\StringLoaderExtension tags: [{ name: twig.extension }] @@ -27,7 +31,7 @@ services: class: Twig\Sandbox\SecurityPolicy arguments: - [ if, else, elseif, for ] # Allowed tags - - [ escape, format_datetime ] # Allowed filters + - [ escape, localizeddate ] # Allowed filters - # Allowed methods Surfnet\Stepup\Identity\Value\CommonName: - __toString diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Twig/BackwardsCompatibleExtensionTest.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Twig/BackwardsCompatibleExtensionTest.php new file mode 100644 index 000000000..02d080689 --- /dev/null +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Tests/Twig/BackwardsCompatibleExtensionTest.php @@ -0,0 +1,61 @@ + $template]), ['debug' => true, 'cache' => false, 'autoescape' => 'html', 'optimizations' => 0]); + $twig->addExtension( new BackwardsCompatibleExtension(new IntlExtension())); + + $output = $twig->render('template', ['date' => $date, 'locale' => $locale]); + $this->assertEquals($expected, $output); + + $output = $twig->render('template', ['date' => $dateString, 'locale' => $locale]); + $this->assertEquals($expected, $output); + } + + public function templateProvider(): array + { + return [ + 'date en' => ["{{ date | localizeddate('full', 'none', locale) }}", 'Thursday, 5 December 2024', 'en_GB'], + 'date nl' => ["{{ date | localizeddate('full', 'none', locale) }}", 'donderdag 5 december 2024', 'nl_NL'], + 'date and time nl' => ["{{ date | localizeddate('full', 'medium', locale) }}", 'Thursday, 5 December 2024 at 13:12:10', 'en_GB'], + 'date and time en' => ["{{ date | localizeddate('full', 'medium', locale) }}", 'donderdag 5 december 2024 om 13:12:10', 'nl_NL'], + 'time nl' => ["{{ date | localizeddate('none', 'medium', locale) }}", '13:12:10', 'en_GB'], + 'time en' => ["{{ date | localizeddate('none', 'medium', locale) }}", '13:12:10', 'nl_NL'], + ]; + } +} \ No newline at end of file diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Twig/BackwardsCompatibleExtension.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Twig/BackwardsCompatibleExtension.php new file mode 100644 index 000000000..8c254acf9 --- /dev/null +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Twig/BackwardsCompatibleExtension.php @@ -0,0 +1,59 @@ +intlExtension = $intlExtension; + } + + public function getFilters(): array + { + return [ + new TwigFilter('localizeddate', [$this, 'localizedDate'], ['needs_environment' => true]), + ]; + } + + // localizeddate('full', 'none', locale) + public function localizedDate( + Environment $env, + DateTimeInterface|string|null $date, + ?string $dateFormat = 'medium', + ?string $timeFormat = 'medium', + string $locale = null + ): string { + return $this->intlExtension->formatDateTime($env, $date, $dateFormat, $timeFormat, locale: $locale); + } +} From 83ef80ecec593f00f650a16055cbd11c64a70e23 Mon Sep 17 00:00:00 2001 From: Bas Date: Mon, 9 Dec 2024 10:45:15 +0100 Subject: [PATCH 80/89] Fix typo in doc block --- .../Console/Command/ReplaySpecificEventsCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplaySpecificEventsCommand.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplaySpecificEventsCommand.php index 316bb3a64..50aef8adb 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplaySpecificEventsCommand.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Console/Command/ReplaySpecificEventsCommand.php @@ -85,7 +85,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int } if ($availableProjectors === []) { - $output->writeln('There are no projectors configured to reply events for'); + $output->writeln('There are no projectors configured to replay events for'); return 1; } From a274cc595d1bfbc2a7f4dc11c8e5773fc875117a Mon Sep 17 00:00:00 2001 From: Bas Date: Mon, 9 Dec 2024 11:50:12 +0100 Subject: [PATCH 81/89] Support deprecated u2f support in projection This is done to prevent failing replays --- ci/qa/phpstan-baseline.neon | 9 +++++++-- .../Identity/Projector/SecondFactorProjector.php | 11 +++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ci/qa/phpstan-baseline.neon b/ci/qa/phpstan-baseline.neon index 03251e4ad..271b2c137 100644 --- a/ci/qa/phpstan-baseline.neon +++ b/ci/qa/phpstan-baseline.neon @@ -2660,14 +2660,19 @@ parameters: count: 2 path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RecoveryTokenProjector.php + - + message: "#^Cannot access property \\$secondFactorIdentifier on Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\UnverifiedSecondFactor\\|null\\.$#" + count: 1 + path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php + - message: "#^Parameter \\#1 \\$secondFactor of method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\UnverifiedSecondFactorRepository\\:\\:remove\\(\\) expects Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\UnverifiedSecondFactor, Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\UnverifiedSecondFactor\\|null given\\.$#" - count: 2 + count: 3 path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php - message: "#^Parameter \\#1 \\$secondFactor of method Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Repository\\\\VerifiedSecondFactorRepository\\:\\:remove\\(\\) expects Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\VerifiedSecondFactor, Surfnet\\\\StepupMiddleware\\\\ApiBundle\\\\Identity\\\\Entity\\\\VerifiedSecondFactor\\|null given\\.$#" - count: 3 + count: 4 path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php - diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php index 1ce9912f3..093ed64be 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/SecondFactorProjector.php @@ -154,10 +154,11 @@ public function applyGssfPossessionProvenAndVerifiedEvent(GssfPossessionProvenAn public function applyEmailVerifiedEvent(EmailVerifiedEvent $event): void { - $unverified = $this->unverifiedRepository->find($event->secondFactorId->getSecondFactorId()); - if (is_null($unverified)) { + if ($event->secondFactorType->isU2f()) { + // u2f is deprecated so those events shouldn't be handled anymore return; } + $unverified = $this->unverifiedRepository->find($event->secondFactorId->getSecondFactorId()); $verified = new VerifiedSecondFactor(); $verified->id = $event->secondFactorId->getSecondFactorId(); @@ -250,10 +251,12 @@ protected function applyCompliedWithUnverifiedSecondFactorRevocationEvent( protected function applyVerifiedSecondFactorRevokedEvent(VerifiedSecondFactorRevokedEvent $event): void { - $verifiedSecondFactor = $this->verifiedRepository->find($event->secondFactorId->getSecondFactorId()); - if (is_null($verifiedSecondFactor)) { + if ($event->secondFactorType->isU2f()) { + // u2f is deprecated so those events shouldn't be handled anymore return; } + $verifiedSecondFactor = $this->verifiedRepository->find($event->secondFactorId->getSecondFactorId()); + $this->verifiedRepository->remove($verifiedSecondFactor); } From 756032af40dfc03ec7530b4a67f063975cf72e0c Mon Sep 17 00:00:00 2001 From: Bas Date: Tue, 10 Dec 2024 15:12:39 +0100 Subject: [PATCH 82/89] Fixes after manual testing Fix bugs after manual testing --- .../ApiBundle/Controller/RecoveryTokenController.php | 2 +- .../ApiBundle/Identity/Entity/AuditLogEntry.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php index 63972b87c..ace32e80f 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Controller/RecoveryTokenController.php @@ -65,7 +65,7 @@ public function collection(Request $request): JsonCollectionResponse sprintf('Received search request for recovery tokens with params: %s', $request->getQueryString()), ); $query = new RecoveryTokenQuery(); - $query->identityId = new IdentityId($request->get('identityId')); + $query->identityId = $request->get('identityId') ? new IdentityId($request->get('identityId')) : null; $query->type = $request->get('type'); $query->status = $request->get('status'); $query->institution = $request->get('institution'); diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/AuditLogEntry.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/AuditLogEntry.php index f047a96f7..cbd110731 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/AuditLogEntry.php +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Entity/AuditLogEntry.php @@ -169,7 +169,7 @@ public function jsonSerialize(): array return [ 'actor_id' => $this->actorId, 'actor_institution' => $this->actorInstitution instanceof Institution ? (string)$this->actorInstitution : null, - 'actor_common_name' => $this->actorCommonName, + 'actor_common_name' => (string)$this->actorCommonName, 'identity_id' => $this->identityId, 'identity_institution' => (string)$this->identityInstitution, 'ra_institution' => (string)$this->raInstitution, From 894632a9c3f2326ec0da1a3a5fbc29cd1d8c3f9a Mon Sep 17 00:00:00 2001 From: Bas Date: Tue, 10 Dec 2024 17:40:18 +0100 Subject: [PATCH 83/89] Bump test image --- .../build-push-test-docker-image.yml | 2 +- docker/Dockerfile.test | 21 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-push-test-docker-image.yml b/.github/workflows/build-push-test-docker-image.yml index 74440c1b6..9f314ad25 100644 --- a/.github/workflows/build-push-test-docker-image.yml +++ b/.github/workflows/build-push-test-docker-image.yml @@ -16,7 +16,7 @@ jobs: uses: actions/checkout@v3 - name: Build the app - uses: openconext/build-and-publish-test-container/php72-node14@main + uses: openconext/build-and-publish-test-container/php82-node20@main with: use_yarn: false diff --git a/docker/Dockerfile.test b/docker/Dockerfile.test index fba1f6b9a..2820fecd8 100644 --- a/docker/Dockerfile.test +++ b/docker/Dockerfile.test @@ -1,20 +1,21 @@ -FROM ghcr.io/openconext/openconext-basecontainers/php72-apache2:latest -WORKDIR /var/www/html -ADD output.tar /var/www/html/ +FROM busybox AS unpack +WORKDIR /unpack +COPY output.zip /unpack +RUN unzip /unpack/output.zip +FROM ghcr.io/openconext/openconext-basecontainers/php82-apache2:latest +# Set the default workdir +WORKDIR /var/www/html +COPY --from=unpack /unpack/ /var/www/html/ # Add the application configuration files -COPY config/legacy/parameters.yaml.dist config/legacy/parameters.yaml -COPY config/packages/prod/monolog.yaml.docker config/packages/prod/monolog.yaml +COPY config/openconext/parameters.yaml.dist config/openconext/parameters.yaml # Add the config files for Apache2 RUN rm -rf /etc/apache2/sites-enabled/* COPY ./docker/conf/middleware-test-apache2.conf /etc/apache2/sites-enabled/middleware.conf - -# Recreate the cache directory and set the correct permissions -RUN rm -rf /var/www/html/var/cache/prod && \ - mkdir -p /var/www/html/var/cache/prod && \ +RUN rm -rf /var/www/html/var/cache/prod &&\ + mkdir -p /var/www/html/var/cache &&\ chown -R www-data /var/www/html/var EXPOSE 80 - CMD ["apache2-foreground"] From 9ad9861d0b921617b46c4d09194e947f54436c9e Mon Sep 17 00:00:00 2001 From: Bas Date: Wed, 11 Dec 2024 16:24:55 +0100 Subject: [PATCH 84/89] Remove `php` from bash scripts --- bin/doctrine-migrations-migrate.sh | 2 +- bin/extract-translations.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/doctrine-migrations-migrate.sh b/bin/doctrine-migrations-migrate.sh index 02a2a4f63..a652f62f4 100755 --- a/bin/doctrine-migrations-migrate.sh +++ b/bin/doctrine-migrations-migrate.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -php ./bin/console doctrine:migrations:migrate --env=prod --em=deploy \ No newline at end of file +bin/console doctrine:migrations:migrate --env=prod --em=deploy \ No newline at end of file diff --git a/bin/extract-translations.sh b/bin/extract-translations.sh index 87a58aa5a..41081b9b9 100755 --- a/bin/extract-translations.sh +++ b/bin/extract-translations.sh @@ -1,3 +1,3 @@ #!/bin/bash -php bin/console translation:extract --env=dev nl_NL --format=xliff --force -php bin/console translation:extract --env=dev en_GB --format=xliff --force +bin/console translation:extract --env=dev nl_NL --format=xliff --force +bin/console translation:extract --env=dev en_GB --format=xliff --force From 50a1111e33a4bbd07f4258437c37f6db474f5111 Mon Sep 17 00:00:00 2001 From: Bas Date: Wed, 11 Dec 2024 16:40:39 +0100 Subject: [PATCH 85/89] Split nameid VO exception --- src/Surfnet/Stepup/Identity/Value/NameId.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Surfnet/Stepup/Identity/Value/NameId.php b/src/Surfnet/Stepup/Identity/Value/NameId.php index 71ad0eafc..f1bb3a28f 100644 --- a/src/Surfnet/Stepup/Identity/Value/NameId.php +++ b/src/Surfnet/Stepup/Identity/Value/NameId.php @@ -39,7 +39,13 @@ final class NameId implements JsonSerializable, Stringable public function __construct(string $value) { - if (strlen($value) > self::MAX_LENGTH || strlen($value) === 0) { + if (strlen($value) === 0) { + throw new InvalidArgumentException( + 'Invalid argument type: nameId is empty', + ); + } + + if (strlen($value) > self::MAX_LENGTH) { throw new InvalidArgumentException( 'Invalid argument type: maximum length for nameId exceeds configured length of ' . self::MAX_LENGTH, ); From c97543d8bd3a453df2362196e54e98da8e145b85 Mon Sep 17 00:00:00 2001 From: Bas Date: Wed, 11 Dec 2024 16:41:17 +0100 Subject: [PATCH 86/89] Change the mail date format back so timezone is used --- src/Surfnet/Stepup/DateTime/DateTime.php | 1 - .../Identity/Service/RegistrationMailService.php | 4 ++-- .../Service/VerifiedSecondFactorReminderMailService.php | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Surfnet/Stepup/DateTime/DateTime.php b/src/Surfnet/Stepup/DateTime/DateTime.php index e04cec687..4a038ec1b 100644 --- a/src/Surfnet/Stepup/DateTime/DateTime.php +++ b/src/Surfnet/Stepup/DateTime/DateTime.php @@ -35,7 +35,6 @@ class DateTime implements Stringable * `DateTime::createFromString()`. */ public const FORMAT = 'Y-m-d\\TH:i:sP'; - public const MAIL_FORMAT = 'Y-m-d H:i:s'; /** * Allows for mocking of time. diff --git a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php index 2d94876b2..c9920b130 100644 --- a/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php +++ b/src/Surfnet/StepupMiddleware/CommandHandlingBundle/Identity/Service/RegistrationMailService.php @@ -158,7 +158,7 @@ private function sendRegistrationEmailWithRas( 'commonName' => $commonName, 'emailAddress' => $email, 'registrationCode' => $registrationCode, - 'expirationDate' => $expirationDate->format(DateTime::MAIL_FORMAT), + 'expirationDate' => (string)$expirationDate, 'ras' => $ras, 'selfServiceUrl' => $this->selfServiceUrl, ]; @@ -208,7 +208,7 @@ private function sendRegistrationEmailWithRaLocations( 'commonName' => $commonName, 'emailAddress' => $email, 'registrationCode' => $registrationCode, - 'expirationDate' => $expirationDate->format(DateTime::MAIL_FORMAT), + 'expirationDate' => (string)$expirationDate, 'raLocations' => $raLocations, 'selfServiceUrl' => $this->selfServiceUrl, ]; diff --git a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php index 19df90d0d..221c31369 100644 --- a/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php +++ b/src/Surfnet/StepupMiddleware/MiddlewareBundle/Service/VerifiedSecondFactorReminderMailService.php @@ -131,7 +131,7 @@ private function sendReminderWithInstitution( 'templateString' => $emailTemplate->htmlContent, 'locale' => $locale, 'commonName' => $commonName, - 'expirationDate' => $requestedAt->format(DateTime::MAIL_FORMAT), + 'expirationDate' => (string)$requestedAt, 'registrationCode' => $registrationCode, 'raLocations' => $raLocations, ]; @@ -174,7 +174,7 @@ private function sendReminderWithRas( 'templateString' => $emailTemplate->htmlContent, 'locale' => $locale, 'commonName' => $commonName, - 'expirationDate' => $requestedAt->format(DateTime::MAIL_FORMAT), + 'expirationDate' => (string)$requestedAt, 'registrationCode' => $registrationCode, 'ras' => $ras, ]; From 28d61a2e981a4d960630f8d6bda588f812f23251 Mon Sep 17 00:00:00 2001 From: Bas Date: Thu, 12 Dec 2024 10:34:05 +0100 Subject: [PATCH 87/89] Remove pagerfanta orm adapter as separate dependency --- composer.json | 1 - composer.lock | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index dabd8c9b5..2b414b6a3 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,6 @@ "jms/translation-bundle": "^2.2", "nelmio/security-bundle": "^3.1", "openconext/monitor-bundle": "^4.1", - "pagerfanta/doctrine-orm-adapter": "*", "pagerfanta/pagerfanta": "^4.3", "ramsey/uuid": "^4.7", "surfnet/stepup-bundle": "^6.0", diff --git a/composer.lock b/composer.lock index 950203e45..612352194 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "56d93185946d0d8f3e111bcd4aa40848", + "content-hash": "3af2927138e653a05743587ad9d8d24c", "packages": [ { "name": "beberlei/assert", From c118697b722e4bac0a20c41f9400d8afd49af90e Mon Sep 17 00:00:00 2001 From: Bas Date: Tue, 17 Dec 2024 11:28:44 +0100 Subject: [PATCH 88/89] Minor changes after review --- ci/qa/create-test-db | 8 -------- ci/qa/phpunit | 2 -- src/Surfnet/Stepup/Identity/Value/UnhashedSecret.php | 4 +++- 3 files changed, 3 insertions(+), 11 deletions(-) delete mode 100755 ci/qa/create-test-db diff --git a/ci/qa/create-test-db b/ci/qa/create-test-db deleted file mode 100755 index ab23a004d..000000000 --- a/ci/qa/create-test-db +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -cd $(dirname $0)/../../ - -printf "\nCreating 'middleware' test database\n\n" - -./bin/console doctrine:schema:drop -qf --env=test -./bin/console doctrine:schema:create -q --env=test diff --git a/ci/qa/phpunit b/ci/qa/phpunit index 60d577c1c..e402c8609 100755 --- a/ci/qa/phpunit +++ b/ci/qa/phpunit @@ -5,8 +5,6 @@ set -e cd $(dirname $0)/../../ -#./ci/qa/create-test-db - # PHPUnit Bridge should always be used in Symfony applications. (https://symfony.com/doc/current/components/phpunit_bridge.html) # This will create a phpunit executable in /bin/ instead of /vendor/bin/ ./vendor/bin/phpunit --configuration=ci/qa/phpunit.xml --coverage-text --stop-on-error $1 diff --git a/src/Surfnet/Stepup/Identity/Value/UnhashedSecret.php b/src/Surfnet/Stepup/Identity/Value/UnhashedSecret.php index da0fa4422..6c2c9e15d 100644 --- a/src/Surfnet/Stepup/Identity/Value/UnhashedSecret.php +++ b/src/Surfnet/Stepup/Identity/Value/UnhashedSecret.php @@ -18,6 +18,8 @@ namespace Surfnet\Stepup\Identity\Value; +use SensitiveParameter; + /** * Unhashed secret * @@ -51,7 +53,7 @@ public function hashSecret(): HashedSecret return new HashedSecret($hashedSecret); } - public function __construct(private readonly string $secret) + public function __construct(#[SensitiveParameter] private readonly string $secret) { } From b404242905263325c8b4c3446f812943a87d87c1 Mon Sep 17 00:00:00 2001 From: Peter Havekes Date: Thu, 19 Dec 2024 15:52:20 +0100 Subject: [PATCH 89/89] Use php8 for docker builds --- docker/Dockerfile.prod | 19 +++++++------------ docker/Dockerfile.test | 16 +++++++--------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/docker/Dockerfile.prod b/docker/Dockerfile.prod index aab4ab55c..be42fa234 100644 --- a/docker/Dockerfile.prod +++ b/docker/Dockerfile.prod @@ -1,29 +1,24 @@ -FROM ghcr.io/openconext/openconext-basecontainers/php72-apache2:latest +FROM ghcr.io/openconext/openconext-basecontainers/php82-apache2:latest AS php-build ARG APP_VERSION ARG GIT_SHA ARG GIT_COMMIT_TIME ENV OPENCONEXT_APP_VERSION=${APP_VERSION} ENV OPENCONEXT_GIT_SHA=${GIT_SHA} ENV OPENCONEXT_COMMIT_DATE=${GIT_COMMIT_TIME} - COPY *.tar.bz2 /tmp/ RUN tar -xvjf /tmp/*.tar.bz2 -C /var/www/html/ && \ rm -rf /tmp/*.tar.bz2 -WORKDIR /var/www/html # Add the application configuration files -COPY config/legacy/parameters.yaml.dist config/legacy/parameters.yaml -COPY config/packages/prod/monolog.yaml.docker config/packages/prod/monolog.yaml +RUN cp config/openconext/parameters.yaml.dist config/openconext/parameters.yaml # Add the config files for Apache2 RUN rm -rf /etc/apache2/sites-enabled/* COPY ./docker/conf/middleware-apache2.conf /etc/apache2/sites-enabled/middleware.conf - -# Recreate the cache directory and set the correct permissions -RUN rm -rf /var/www/html/var/cache/prod && \ - mkdir -p /var/www/html/var/cache/prod && \ - chown -R www-data /var/www/html/var - +RUN rm -rf /var/www/html/var/cache/prod && chown -R www-data /var/www/html/var EXPOSE 80 -CMD ["apache2-foreground"] +# Set the default workdir +WORKDIR /var/www/html + +CMD ["apache2-foreground"] \ No newline at end of file diff --git a/docker/Dockerfile.test b/docker/Dockerfile.test index 2820fecd8..6fcc12639 100644 --- a/docker/Dockerfile.test +++ b/docker/Dockerfile.test @@ -8,14 +8,12 @@ FROM ghcr.io/openconext/openconext-basecontainers/php82-apache2:latest WORKDIR /var/www/html COPY --from=unpack /unpack/ /var/www/html/ # Add the application configuration files -COPY config/openconext/parameters.yaml.dist config/openconext/parameters.yaml - -# Add the config files for Apache2 -RUN rm -rf /etc/apache2/sites-enabled/* -COPY ./docker/conf/middleware-test-apache2.conf /etc/apache2/sites-enabled/middleware.conf -RUN rm -rf /var/www/html/var/cache/prod &&\ - mkdir -p /var/www/html/var/cache &&\ +RUN cp config/openconext/parameters.yaml.dist config/openconext/parameters.yaml && \ + rm -rf /etc/apache2/sites-enabled/* +COPY ./docker/conf/middleware-apache2.conf /etc/apache2/sites-enabled/middleware.conf +RUN rm -rf /var/www/html/var/cache/prod && \ + mkdir -p /var/www/html/var/ && \ chown -R www-data /var/www/html/var - EXPOSE 80 -CMD ["apache2-foreground"] + +CMD ["apache2-foreground"] \ No newline at end of file