The SecondFactor::getType method is now public

The SecondFactorCollection performs the comparison on the two SF's using
the SFTService. The service expects to be called with SecondFactorType
instances. To do so, the type has been exposed publicly.

Author: MKodde

src/Surfnet/Stepup/Identity/Entity/AbstractSecondFactor.php

@@ -33,9 +33,4 @@ public function hasTypeWithEqualOrLowerLoaComparedTo(SecondFactorType $type, Sec
     {
         return $service->hasEqualOrLowerLoaComparedTo($this->getType(), $type);
     }
-
-    /**
-     * @return SecondFactorType
-     */
-    abstract protected function getType();
 }

src/Surfnet/Stepup/Identity/Entity/SecondFactor.php

@@ -36,4 +36,10 @@ public function hasEqualOrHigherLoaComparedTo(SecondFactor $comparable, SecondFa
      * @return bool
      */
     public function hasTypeWithEqualOrLowerLoaComparedTo(SecondFactorType $type, SecondFactorTypeService $service);
+
+    /**
+     * @return SecondFactorType
+     */
+    public function getType();
+
 }

src/Surfnet/Stepup/Identity/Entity/SecondFactorCollection.php

@@ -32,7 +32,7 @@ public function getSecondFactorWithHighestLoa(SecondFactorTypeService $service)
         return array_reduce(
             $this->toArray(),
             function (SecondFactor $carry, SecondFactor $item) use ($service) {
-                return $service->hasEqualOrHigherLoaComparedTo($carry, $item->getType()) ? $carry : $item;
+                return $service->hasEqualOrHigherLoaComparedTo($carry->getType(), $item->getType()) ? $carry : $item;
             },
             $this->first() ?: null
         );

src/Surfnet/Stepup/Identity/Entity/UnverifiedSecondFactor.php

@@ -204,7 +204,7 @@ protected function applyIdentityForgottenEvent(IdentityForgottenEvent $event)
         $this->secondFactorIdentifier = $secondFactorIdentifierClass::unknown();
     }
 
-    protected function getType()
+    public function getType()
     {
         return $this->type;
     }

src/Surfnet/Stepup/Identity/Entity/VerifiedSecondFactor.php

@@ -191,7 +191,7 @@ protected function applyIdentityForgottenEvent(IdentityForgottenEvent $event)
         $this->secondFactorIdentifier = $secondFactorIdentifierClass::unknown();
     }
 
-    protected function getType()
+    public function getType()
     {
         return $this->type;
     }

src/Surfnet/Stepup/Identity/Entity/VettedSecondFactor.php

@@ -122,7 +122,7 @@ protected function applyIdentityForgottenEvent(IdentityForgottenEvent $event)
         $this->secondFactorIdentifier = $secondFactorIdentifierClass::unknown();
     }
 
-    protected function getType()
+    public function getType()
     {
         return $this->type;
     }