SDK-2090 getAttributeById (#280)

* SDK-2090 getAttributeById

* SDK-2090 Refactor test

Co-authored-by: Rodion Liuborets <[email protected]>

Author: LuborRod

phpstan-baseline.neon

@@ -1,7 +0,0 @@
-parameters:
-	ignoreErrors:
-		-
-			message: "#^Instanceof between Yoti\\\\Protobuf\\\\Sharepubapi\\\\IssuingAttributes and Yoti\\\\Protobuf\\\\Sharepubapi\\\\IssuingAttributes will always evaluate to true\\.$#"
-			count: 1
-			path: src/Profile/Util/ExtraData/ThirdPartyAttributeConverter.php
-

src/Profile/Attribute.php

@@ -19,22 +19,29 @@ class Attribute
     private $value;
 
     /**
-     * @var \Yoti\Profile\Attribute\Anchor[]
+     * @var Anchor[]
      */
     private $anchors;
 
+    /**
+     * @var string|null
+     */
+    private $id;
+
     /**
      * Attribute constructor.
      *
      * @param string $name
      * @param mixed $value
-     * @param \Yoti\Profile\Attribute\Anchor[] $anchors
+     * @param Anchor[] $anchors
+     * @param string|null $id
      */
-    public function __construct(string $name, $value, array $anchors)
+    public function __construct(string $name, $value, array $anchors, string $id = null)
     {
         $this->name = $name;
         $this->value = $value;
         $this->anchors = $anchors;
+        $this->id = $id;
     }
 
     /**
@@ -54,15 +61,15 @@ public function getValue()
     }
 
     /**
-     * @return \Yoti\Profile\Attribute\Anchor[]
+     * @return Anchor[]
      */
     public function getSources(): array
     {
         return $this->filterAnchors(Anchor::TYPE_SOURCE_NAME);
     }
 
     /**
-     * @return \Yoti\Profile\Attribute\Anchor[]
+     * @return Anchor[]
      */
     public function getVerifiers(): array
     {
@@ -77,7 +84,7 @@ public function getVerifiers(): array
      *  ...
      * ]
      *
-     * @return \Yoti\Profile\Attribute\Anchor[]
+     * @return Anchor[]
      */
     public function getAnchors(): array
     {
@@ -87,7 +94,7 @@ public function getAnchors(): array
     /**
      * @param string $type
      *
-     * @return \Yoti\Profile\Attribute\Anchor[]
+     * @return Anchor[]
      */
     private function filterAnchors(string $type): array
     {
@@ -99,4 +106,14 @@ function (Anchor $anchor) use ($type): bool {
         );
         return array_values($filteredAnchors);
     }
+
+    /**
+     * Gets the ID of the attribute
+     *
+     * @return string|null
+     */
+    public function getId(): ?string
+    {
+        return $this->id;
+    }
 }

src/Profile/BaseProfile.php

@@ -55,6 +55,23 @@ public function getAttributesByName(string $attributeName): array
         return $this->attributesMap[$attributeName] ?? [];
     }
 
+    /**
+     * Retrieves an attribute which matches the ID specified.
+     *
+     * @param string $attributeId
+     *
+     * @return Attribute
+     */
+    public function getAttributeById(string $attributeId): ?Attribute
+    {
+        foreach ($this->attributesList as $attribute) {
+            if ($attribute->getId() == $attributeId) {
+                return $attribute;
+            }
+        }
+        return null;
+    }
+
     /**
      * @param string $attributeName.
      *

src/Profile/Util/Attribute/AttributeConverter.php

@@ -160,10 +160,12 @@ public static function convertToYotiAttribute(
                 $attrValue,
                 $attrName
             );
+            $attrId = $protobufAttribute->getEphemeralId();
             $yotiAttribute = new Attribute(
                 $attrName,
                 $attrValue,
-                $yotiAnchors
+                $yotiAnchors,
+                $attrId
             );
         } catch (AttributeException $e) {
             $logger->warning(