Fix deprecations for SF4.4 upgrade

OpenConext · Jul 3, 2020 · 3cb1bdc · 3cb1bdc
1 parent 334fb6d
commit 3cb1bdc
Show file tree

Hide file tree

Showing 239 changed files with 1,049 additions and 1,128 deletions.
diff --git a/src/Surfnet/Stepup/Configuration/Configuration.php b/src/Surfnet/Stepup/Configuration/Configuration.php
@@ -70,7 +70,7 @@ public function update($configurationAsJson)
         $this->apply(new EmailTemplatesUpdatedEvent(self::CONFIGURATION_ID, $decodedConfiguration['email_templates']));
     }
 
-    public function getAggregateRootId()
+    public function getAggregateRootId(): string
     {
         return self::CONFIGURATION_ID;
     }

diff --git a/src/Surfnet/Stepup/Configuration/Event/AllowedSecondFactorListUpdatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/AllowedSecondFactorListUpdatedEvent.php
@@ -18,7 +18,7 @@
 
 namespace Surfnet\Stepup\Configuration\Event;
 
-use Broadway\Serializer\SerializableInterface;
+use Broadway\Serializer\Serializable as SerializableInterface;
 use Surfnet\Stepup\Configuration\Value\AllowedSecondFactorList;
 use Surfnet\Stepup\Configuration\Value\Institution;
 use Surfnet\Stepup\Configuration\Value\InstitutionConfigurationId;
@@ -59,7 +59,7 @@ public static function deserialize(array $data)
         );
     }
 
-    public function serialize()
+    public function serialize(): array
     {
         return [
             'institution_configuration_id' => $this->institutionConfigurationId->getInstitutionConfigurationId(),

diff --git a/src/Surfnet/Stepup/Configuration/Event/ConfigurationEvent.php b/src/Surfnet/Stepup/Configuration/Event/ConfigurationEvent.php
@@ -18,7 +18,7 @@
 
 namespace Surfnet\Stepup\Configuration\Event;
 
-use Broadway\Serializer\SerializableInterface;
+use Broadway\Serializer\Serializable as SerializableInterface;
 use Surfnet\Stepup\Configuration\Configuration;
 use Symfony\Component\Form\Exception\LogicException;
 

diff --git a/src/Surfnet/Stepup/Configuration/Event/ConfigurationUpdatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/ConfigurationUpdatedEvent.php
@@ -52,7 +52,7 @@ public static function deserialize(array $data)
         );
     }
 
-    public function serialize()
+    public function serialize(): array
     {
         return [
             'id'                => $this->id,

diff --git a/src/Surfnet/Stepup/Configuration/Event/EmailTemplatesUpdatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/EmailTemplatesUpdatedEvent.php
@@ -41,7 +41,7 @@ public static function deserialize(array $data)
         return new self($data['id'], $data['email_templates']);
     }
 
-    public function serialize()
+    public function serialize(): array
     {
         return ['id' => $this->id, 'email_templates' => $this->emailTemplates];
     }

diff --git a/src/Surfnet/Stepup/Configuration/Event/IdentityProvidersUpdatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/IdentityProvidersUpdatedEvent.php
@@ -41,7 +41,7 @@ public static function deserialize(array $data)
         return new self($data['id'], $data['identity_providers']);
     }
 
-    public function serialize()
+    public function serialize(): array
     {
         return ['id' => $this->id, 'identity_providers' => $this->identityProviders];
     }

diff --git a/src/Surfnet/Stepup/Configuration/Event/InstitutionConfigurationRemovedEvent.php b/src/Surfnet/Stepup/Configuration/Event/InstitutionConfigurationRemovedEvent.php
@@ -18,7 +18,7 @@
 
 namespace Surfnet\Stepup\Configuration\Event;
 
-use Broadway\Serializer\SerializableInterface;
+use Broadway\Serializer\Serializable as SerializableInterface;
 use Surfnet\Stepup\Configuration\Value\Institution;
 use Surfnet\Stepup\Configuration\Value\InstitutionConfigurationId;
 
@@ -55,7 +55,7 @@ public static function deserialize(array $data)
     /**
      * @return array
      */
-    public function serialize()
+    public function serialize(): array
     {
         return [
             'institution_configuration_id' => $this->institutionConfigurationId->getInstitutionConfigurationId(),

diff --git a/src/Surfnet/Stepup/Configuration/Event/NewConfigurationCreatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/NewConfigurationCreatedEvent.php
@@ -31,7 +31,7 @@ public static function deserialize(array $data)
     /**
      * @return array
      */
-    public function serialize()
+    public function serialize(): array
     {
         return ['id' => $this->id];
     }

diff --git a/src/Surfnet/Stepup/Configuration/Event/NewInstitutionConfigurationCreatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/NewInstitutionConfigurationCreatedEvent.php
@@ -18,7 +18,7 @@
 
 namespace Surfnet\Stepup\Configuration\Event;
 
-use Broadway\Serializer\SerializableInterface;
+use Broadway\Serializer\Serializable as SerializableInterface;
 use Surfnet\Stepup\Configuration\Value\Institution;
 use Surfnet\Stepup\Configuration\Value\InstitutionConfigurationId;
 use Surfnet\Stepup\Configuration\Value\NumberOfTokensPerIdentityOption;
@@ -92,7 +92,7 @@ public static function deserialize(array $data)
         );
     }
 
-    public function serialize()
+    public function serialize(): array
     {
         return [
             'institution_configuration_id'        => $this->institutionConfigurationId->getInstitutionConfigurationId(),

diff --git a/src/Surfnet/Stepup/Configuration/Event/NumberOfTokensPerIdentityOptionChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/NumberOfTokensPerIdentityOptionChangedEvent.php
@@ -18,7 +18,7 @@
 
 namespace Surfnet\Stepup\Configuration\Event;
 
-use Broadway\Serializer\SerializableInterface;
+use Broadway\Serializer\Serializable as SerializableInterface;
 use Surfnet\Stepup\Configuration\Value\Institution;
 use Surfnet\Stepup\Configuration\Value\InstitutionConfigurationId;
 use Surfnet\Stepup\Configuration\Value\NumberOfTokensPerIdentityOption;
@@ -59,7 +59,7 @@ public static function deserialize(array $data)
         );
     }
 
-    public function serialize()
+    public function serialize(): array
     {
         return [
             'institution_configuration_id' => $this->institutionConfigurationId->getInstitutionConfigurationId(),

diff --git a/src/Surfnet/Stepup/Configuration/Event/RaLocationAddedEvent.php b/src/Surfnet/Stepup/Configuration/Event/RaLocationAddedEvent.php
@@ -18,7 +18,7 @@
 
 namespace Surfnet\Stepup\Configuration\Event;
 
-use Broadway\Serializer\SerializableInterface;
+use Broadway\Serializer\Serializable as SerializableInterface;
 use Surfnet\Stepup\Configuration\Value\ContactInformation;
 use Surfnet\Stepup\Configuration\Value\Institution;
 use Surfnet\Stepup\Configuration\Value\InstitutionConfigurationId;
@@ -85,7 +85,7 @@ public static function deserialize(array $data)
         );
     }
 
-    public function serialize()
+    public function serialize(): array
     {
         return [
             'institution_configuration_id' => $this->institutionConfigurationId->getInstitutionConfigurationId(),

diff --git a/src/Surfnet/Stepup/Configuration/Event/RaLocationContactInformationChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/RaLocationContactInformationChangedEvent.php
@@ -18,7 +18,7 @@
 
 namespace Surfnet\Stepup\Configuration\Event;
 
-use Broadway\Serializer\SerializableInterface;
+use Broadway\Serializer\Serializable as SerializableInterface;
 use Surfnet\Stepup\Configuration\Value\ContactInformation;
 use Surfnet\Stepup\Configuration\Value\InstitutionConfigurationId;
 use Surfnet\Stepup\Configuration\Value\RaLocationId;
@@ -59,7 +59,7 @@ public static function deserialize(array $data)
         );
     }
 
-    public function serialize()
+    public function serialize(): array
     {
         return [
             'institution_configuration_id' => $this->institutionConfigurationId->getInstitutionConfigurationId(),

diff --git a/src/Surfnet/Stepup/Configuration/Event/RaLocationRelocatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/RaLocationRelocatedEvent.php
@@ -18,7 +18,7 @@
 
 namespace Surfnet\Stepup\Configuration\Event;
 
-use Broadway\Serializer\SerializableInterface;
+use Broadway\Serializer\Serializable as SerializableInterface;
 use Surfnet\Stepup\Configuration\Value\InstitutionConfigurationId;
 use Surfnet\Stepup\Configuration\Value\Location;
 use Surfnet\Stepup\Configuration\Value\RaLocationId;
@@ -59,7 +59,7 @@ public static function deserialize(array $data)
         );
     }
 
-    public function serialize()
+    public function serialize(): array
     {
         return [
             'institution_configuration_id' => $this->institutionConfigurationId->getInstitutionConfigurationId(),

diff --git a/src/Surfnet/Stepup/Configuration/Event/RaLocationRemovedEvent.php b/src/Surfnet/Stepup/Configuration/Event/RaLocationRemovedEvent.php
@@ -18,7 +18,7 @@
 
 namespace Surfnet\Stepup\Configuration\Event;
 
-use Broadway\Serializer\SerializableInterface;
+use Broadway\Serializer\Serializable as SerializableInterface;
 use Surfnet\Stepup\Configuration\Value\Institution;
 use Surfnet\Stepup\Configuration\Value\InstitutionConfigurationId;
 use Surfnet\Stepup\Configuration\Value\RaLocationId;
@@ -56,7 +56,7 @@ public static function deserialize(array $data)
         );
     }
 
-    public function serialize()
+    public function serialize(): array
     {
         return [
             'institution_configuration_id' => $this->institutionConfigurationId->getInstitutionConfigurationId(),

diff --git a/src/Surfnet/Stepup/Configuration/Event/RaLocationRenamedEvent.php b/src/Surfnet/Stepup/Configuration/Event/RaLocationRenamedEvent.php
@@ -18,7 +18,7 @@
 
 namespace Surfnet\Stepup\Configuration\Event;
 
-use Broadway\Serializer\SerializableInterface;
+use Broadway\Serializer\Serializable as SerializableInterface;
 use Surfnet\Stepup\Configuration\Value\InstitutionConfigurationId;
 use Surfnet\Stepup\Configuration\Value\RaLocationId;
 use Surfnet\Stepup\Configuration\Value\RaLocationName;
@@ -59,7 +59,7 @@ public static function deserialize(array $data)
         );
     }
 
-    public function serialize()
+    public function serialize(): array
     {
         return [
             'institution_configuration_id' => $this->institutionConfigurationId->getInstitutionConfigurationId(),

diff --git a/src/Surfnet/Stepup/Configuration/Event/SelectRaaOptionChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/SelectRaaOptionChangedEvent.php
@@ -18,7 +18,7 @@
 
 namespace Surfnet\Stepup\Configuration\Event;
 
-use Broadway\Serializer\SerializableInterface;
+use Broadway\Serializer\Serializable as SerializableInterface;
 use Surfnet\Stepup\Configuration\Value\Institution;
 use Surfnet\Stepup\Configuration\Value\InstitutionConfigurationId;
 use Surfnet\Stepup\Configuration\Value\InstitutionAuthorizationOption;
@@ -61,7 +61,7 @@ public static function deserialize(array $data)
         );
     }
 
-    public function serialize()
+    public function serialize(): array
     {
         return [
             'institution_configuration_id' => $this->institutionConfigurationId->getInstitutionConfigurationId(),

diff --git a/src/Surfnet/Stepup/Configuration/Event/ServiceProvidersUpdatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/ServiceProvidersUpdatedEvent.php
@@ -47,7 +47,7 @@ public static function deserialize(array $data)
     /**
      * @return array
      */
-    public function serialize()
+    public function serialize(): array
     {
         return ['id' => $this->id, 'service_providers' => $this->serviceProviders];
     }

diff --git a/src/Surfnet/Stepup/Configuration/Event/ShowRaaContactInformationOptionChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/ShowRaaContactInformationOptionChangedEvent.php
@@ -18,7 +18,7 @@
 
 namespace Surfnet\Stepup\Configuration\Event;
 
-use Broadway\Serializer\SerializableInterface;
+use Broadway\Serializer\Serializable as SerializableInterface;
 use Surfnet\Stepup\Configuration\Value\Institution;
 use Surfnet\Stepup\Configuration\Value\InstitutionConfigurationId;
 use Surfnet\Stepup\Configuration\Value\ShowRaaContactInformationOption;
@@ -59,7 +59,7 @@ public static function deserialize(array $data)
         );
     }
 
-    public function serialize()
+    public function serialize(): array
     {
         return [
             'institution_configuration_id'        => $this->institutionConfigurationId->getInstitutionConfigurationId(),

diff --git a/src/Surfnet/Stepup/Configuration/Event/SraaUpdatedEvent.php b/src/Surfnet/Stepup/Configuration/Event/SraaUpdatedEvent.php
@@ -41,7 +41,7 @@ public static function deserialize(array $data)
         return new self($data['id'], $data['sraa_list']);
     }
 
-    public function serialize()
+    public function serialize(): array
     {
         return ['id' => $this->id, 'sraa_list' => $this->sraaList];
     }

diff --git a/src/Surfnet/Stepup/Configuration/Event/UseRaLocationsOptionChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/UseRaLocationsOptionChangedEvent.php
@@ -18,7 +18,7 @@
 
 namespace Surfnet\Stepup\Configuration\Event;
 
-use Broadway\Serializer\SerializableInterface;
+use Broadway\Serializer\Serializable as SerializableInterface;
 use Surfnet\Stepup\Configuration\Value\Institution;
 use Surfnet\Stepup\Configuration\Value\InstitutionConfigurationId;
 use Surfnet\Stepup\Configuration\Value\UseRaLocationsOption;
@@ -59,7 +59,7 @@ public static function deserialize(array $data)
         );
     }
 
-    public function serialize()
+    public function serialize(): array
     {
         return [
             'institution_configuration_id' => $this->institutionConfigurationId->getInstitutionConfigurationId(),

diff --git a/src/Surfnet/Stepup/Configuration/Event/UseRaOptionChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/UseRaOptionChangedEvent.php
@@ -18,7 +18,7 @@
 
 namespace Surfnet\Stepup\Configuration\Event;
 
-use Broadway\Serializer\SerializableInterface;
+use Broadway\Serializer\Serializable as SerializableInterface;
 use Surfnet\Stepup\Configuration\Value\Institution;
 use Surfnet\Stepup\Configuration\Value\InstitutionConfigurationId;
 use Surfnet\Stepup\Configuration\Value\InstitutionAuthorizationOption;
@@ -62,7 +62,7 @@ public static function deserialize(array $data)
         );
     }
 
-    public function serialize()
+    public function serialize(): array
     {
         return [
             'institution_configuration_id' => $this->institutionConfigurationId->getInstitutionConfigurationId(),

diff --git a/src/Surfnet/Stepup/Configuration/Event/UseRaaOptionChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/UseRaaOptionChangedEvent.php
@@ -18,7 +18,7 @@
 
 namespace Surfnet\Stepup\Configuration\Event;
 
-use Broadway\Serializer\SerializableInterface;
+use Broadway\Serializer\Serializable as SerializableInterface;
 use Surfnet\Stepup\Configuration\Value\Institution;
 use Surfnet\Stepup\Configuration\Value\InstitutionConfigurationId;
 use Surfnet\Stepup\Configuration\Value\InstitutionAuthorizationOption;
@@ -61,7 +61,7 @@ public static function deserialize(array $data)
         );
     }
 
-    public function serialize()
+    public function serialize(): array
     {
         return [
             'institution_configuration_id' => $this->institutionConfigurationId->getInstitutionConfigurationId(),

diff --git a/src/Surfnet/Stepup/Configuration/Event/VerifyEmailOptionChangedEvent.php b/src/Surfnet/Stepup/Configuration/Event/VerifyEmailOptionChangedEvent.php
@@ -18,7 +18,7 @@
 
 namespace Surfnet\Stepup\Configuration\Event;
 
-use Broadway\Serializer\SerializableInterface;
+use Broadway\Serializer\Serializable as SerializableInterface;
 use Surfnet\Stepup\Configuration\Value\Institution;
 use Surfnet\Stepup\Configuration\Value\InstitutionConfigurationId;
 use Surfnet\Stepup\Configuration\Value\VerifyEmailOption;
@@ -59,7 +59,7 @@ public static function deserialize(array $data)
         );
     }
 
-    public function serialize()
+    public function serialize(): array
     {
         return [
             'institution_configuration_id' => $this->institutionConfigurationId->getInstitutionConfigurationId(),

diff --git a/src/Surfnet/Stepup/Configuration/EventSourcing/ConfigurationRepository.php b/src/Surfnet/Stepup/Configuration/EventSourcing/ConfigurationRepository.php
@@ -18,10 +18,11 @@
 
 namespace Surfnet\Stepup\Configuration\EventSourcing;
 
-use Broadway\EventHandling\EventBusInterface;
-use Broadway\EventSourcing\AggregateFactory\AggregateFactoryInterface;
+use Broadway\EventHandling\EventBus as EventBusInterface;
+use Broadway\EventSourcing\AggregateFactory\AggregateFactory as  AggregateFactoryInterface;
 use Broadway\EventSourcing\EventSourcingRepository;
-use Broadway\EventStore\EventStoreInterface;
+use Broadway\EventStore\EventStore as EventStoreInterface;
+use Surfnet\Stepup\Configuration\Configuration;
 
 class ConfigurationRepository extends EventSourcingRepository
 {
@@ -30,6 +31,6 @@ public function __construct(
         EventBusInterface $eventBus,
         AggregateFactoryInterface $aggregateFactory
     ) {
-        parent::__construct($eventStore, $eventBus, 'Surfnet\Stepup\Configuration\Configuration', $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
@@ -18,10 +18,11 @@
 
 namespace Surfnet\Stepup\Configuration\EventSourcing;
 
-use Broadway\EventHandling\EventBusInterface;
-use Broadway\EventSourcing\AggregateFactory\AggregateFactoryInterface;
+use Broadway\EventHandling\EventBus as EventBusInterface;
+use Broadway\EventSourcing\AggregateFactory\AggregateFactory as  AggregateFactoryInterface;
 use Broadway\EventSourcing\EventSourcingRepository;
-use Broadway\EventStore\EventStoreInterface;
+use Broadway\EventStore\EventStore as EventStoreInterface;
+use Surfnet\Stepup\Configuration\InstitutionConfiguration;
 
 class InstitutionConfigurationRepository extends EventSourcingRepository
 {
@@ -33,7 +34,7 @@ public function __construct(
         parent::__construct(
             $eventStore,
             $eventBus,
-            'Surfnet\Stepup\Configuration\InstitutionConfiguration',
+            InstitutionConfiguration::class,
             $aggregateFactory
         );
     }

diff --git a/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php b/src/Surfnet/Stepup/Configuration/InstitutionConfiguration.php
@@ -463,7 +463,7 @@ public function destroy()
         $this->apply(new InstitutionConfigurationRemovedEvent($this->institutionConfigurationId, $this->institution));
     }
 
-    public function getAggregateRootId()
+    public function getAggregateRootId(): string
     {
         return $this->institutionConfigurationId;
     }