Introduction to Tag and OtherObject interfaces

src/OtherObject.php

@@ -4,7 +4,9 @@
 
 namespace CBOR;
 
-abstract class OtherObject extends AbstractCBORObject
+use CBOR\OtherObject\OtherObjectInterface;
+
+abstract class OtherObject extends AbstractCBORObject implements OtherObjectInterface
 {
     private const MAJOR_TYPE = self::MAJOR_TYPE_OTHER_TYPE;
 
@@ -29,11 +31,4 @@ public function getContent(): ?string
     {
         return $this->data;
     }
-
-    /**
-     * @return int[]
-     */
-    abstract public static function supportedAdditionalInformation(): array;
-
-    abstract public static function createFromLoadedData(int $additionalInformation, ?string $data): self;
 }

src/OtherObject/OtherObjectInterface.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CBOR\OtherObject;
+
+use CBOR\CBORObject;
+
+interface OtherObjectInterface extends CBORObject
+{
+    /**
+     * @return int[]
+     */
+    public static function supportedAdditionalInformation(): array;
+
+    public static function createFromLoadedData(int $additionalInformation, ?string $data): self;
+}

src/OtherObject/OtherObjectManager.php

@@ -37,7 +37,7 @@ public function getClassForValue(int $value): string
         return array_key_exists($value, $this->classes) ? $this->classes[$value] : GenericObject::class;
     }
 
-    public function createObjectForValue(int $value, ?string $data): OtherObject
+    public function createObjectForValue(int $value, ?string $data): OtherObjectInterface
     {
         /** @var OtherObject $class */
         $class = $this->getClassForValue($value);

src/OtherObject/OtherObjectManagerInterface.php

@@ -4,9 +4,7 @@
 
 namespace CBOR\OtherObject;
 
-use CBOR\OtherObject;
-
 interface OtherObjectManagerInterface
 {
-    public function createObjectForValue(int $value, ?string $data): OtherObject;
+    public function createObjectForValue(int $value, ?string $data): OtherObjectInterface;
 }

src/Tag.php

@@ -4,9 +4,10 @@
 
 namespace CBOR;
 
+use CBOR\Tag\TagInterface;
 use InvalidArgumentException;
 
-abstract class Tag extends AbstractCBORObject
+abstract class Tag extends AbstractCBORObject implements TagInterface
 {
     private const MAJOR_TYPE = self::MAJOR_TYPE_TAG;
 
@@ -33,14 +34,6 @@ public function getData(): ?string
         return $this->data;
     }
 
-    abstract public static function getTagId(): int;
-
-    abstract public static function createFromLoadedData(
-        int $additionalInformation,
-        ?string $data,
-        CBORObject $object
-    ): self;
-
     public function getValue(): CBORObject
     {
         return $this->object;

src/Tag/TagInterface.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CBOR\Tag;
+
+use CBOR\CBORObject;
+
+interface TagInterface extends CBORObject
+{
+    public static function getTagId(): int;
+
+    public function getValue(): CBORObject;
+
+    public static function createFromLoadedData(
+        int $additionalInformation,
+        ?string $data,
+        CBORObject $object
+    ): self;
+}

src/Tag/TagManager.php

@@ -37,7 +37,7 @@ public function getClassForValue(int $value): string
         return array_key_exists($value, $this->classes) ? $this->classes[$value] : GenericTag::class;
     }
 
-    public function createObjectForValue(int $additionalInformation, ?string $data, CBORObject $object): Tag
+    public function createObjectForValue(int $additionalInformation, ?string $data, CBORObject $object): TagInterface
     {
         $value = $additionalInformation;
         if ($additionalInformation >= 24) {

src/Tag/TagManagerInterface.php

@@ -5,9 +5,8 @@
 namespace CBOR\Tag;
 
 use CBOR\CBORObject;
-use CBOR\Tag;
 
 interface TagManagerInterface
 {
-    public function createObjectForValue(int $additionalInformation, ?string $data, CBORObject $object): Tag;
+    public function createObjectForValue(int $additionalInformation, ?string $data, CBORObject $object): TagInterface;
 }