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..
OpenConext · Mar 26, 2024 · 0004916 · 0004916
1 parent b63cd3a
commit 0004916
Show file tree

Hide file tree

Showing 337 changed files with 3,376 additions and 2,658 deletions.
diff --git a/ci/qa/phpstan-baseline.neon b/ci/qa/phpstan-baseline.neon
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;
     }
 
     /**