Stan fixed

Spomky-Labs · Sep 29, 2021 · 6376f58 · 6376f58
1 parent 3598c8c
commit 6376f58
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 19 deletions.
diff --git a/Makefile b/Makefile
@@ -1,16 +1,13 @@
-.PHONY: it
-it: coding-standards tests static-analyse performance-tests mutation-tests
-
 .PHONY: code-coverage
 code-coverage: vendor ## Show test coverage rates (console)
 	vendor/bin/phpunit --coverage-text
 
-.PHONY: code-coverage-html
-code-coverage-html: vendor ## Show test coverage rates (HTML)
+.PHONY: coverage
+coverage: vendor ## Show test coverage rates (HTML)
 	vendor/bin/phpunit --coverage-html ./build
 
-.PHONY: fix-coding-standards
-fix-coding-standards: vendor ## Fix all files using defined PHP-CS-FIXER rules
+.PHONY: fix-cs
+fix-cs: vendor ## Fix all files using defined PHP-CS-FIXER rules
 	vendor/bin/php-cs-fixer fix
 
 .PHONY: coding-standards

diff --git a/src/ListObject.php b/src/ListObject.php
@@ -93,6 +93,9 @@ public function get(int $index): CBORObject
         return $this->data[$index];
     }
 
+    /**
+     * @return array<int, mixed>
+     */
     public function normalize(): array
     {
         return array_map(static function (CBORObject $object) {

diff --git a/src/MapObject.php b/src/MapObject.php
@@ -97,6 +97,9 @@ public function getIterator(): Iterator
         return new ArrayIterator($this->data);
     }
 
+    /**
+     * @return array<mixed, mixed>
+     */
     public function normalize(): array
     {
         $result = [];

diff --git a/src/Tag/BigFloatTag.php b/src/Tag/BigFloatTag.php
@@ -76,8 +76,12 @@ public static function createFromExponentAndMantissa(CBORObject $e, CBORObject $
 
     public function normalize()
     {
-        $e = $this->object->get(0);
-        $m = $this->object->get(1);
+        /** @var ListObject $object */
+        $object = $this->object;
+        /** @var UnsignedIntegerObject|NegativeIntegerObject $e */
+        $e = $object->get(0);
+        /** @var UnsignedIntegerObject|NegativeIntegerObject|NegativeBigIntegerTag|UnsignedBigIntegerTag $m */
+        $m = $object->get(1);
 
         return rtrim(
             bcmul(

diff --git a/src/Tag/DatetimeTag.php b/src/Tag/DatetimeTag.php
@@ -54,12 +54,19 @@ public static function create(CBORObject $object): Tag
 
     public function normalize(): DateTimeInterface
     {
-        $result = DateTimeImmutable::createFromFormat(DATE_RFC3339, $this->object->normalize());
+        /** @var TextStringObject|IndefiniteLengthTextStringObject $object */
+        $object = $this->object;
+        $result = DateTimeImmutable::createFromFormat(DATE_RFC3339, $object->normalize());
         if (false !== $result) {
             return $result;
         }
 
-        return DateTimeImmutable::createFromFormat('Y-m-d\TH:i:s.uP', $this->object->normalize());
+        $formatted = DateTimeImmutable::createFromFormat('Y-m-d\TH:i:s.uP', $object->normalize());
+        if (false === $formatted) {
+            throw new InvalidArgumentException('Invalid data. Cannot be converted into a datetime object');
+        }
+
+        return $formatted;
     }
 
     /**

diff --git a/src/Tag/DecimalFractionTag.php b/src/Tag/DecimalFractionTag.php
@@ -75,8 +75,12 @@ public static function createFromExponentAndMantissa(CBORObject $e, CBORObject $
 
     public function normalize()
     {
-        $e = $this->object->get(0);
-        $m = $this->object->get(1);
+        /** @var ListObject $object */
+        $object = $this->object;
+        /** @var UnsignedIntegerObject|NegativeIntegerObject $e */
+        $e = $object->get(0);
+        /** @var UnsignedIntegerObject|NegativeIntegerObject|NegativeBigIntegerTag|UnsignedBigIntegerTag $m */
+        $m = $object->get(1);
 
         return rtrim(
             bcmul(

diff --git a/src/Tag/MimeTag.php b/src/Tag/MimeTag.php
@@ -50,7 +50,10 @@ public static function create(CBORObject $object): Tag
 
     public function normalize(): string
     {
-        return $this->object->normalize();
+        /** @var TextStringObject|IndefiniteLengthTextStringObject $object */
+        $object = $this->object;
+
+        return $object->normalize();
     }
 
     /**

diff --git a/src/Tag/NegativeBigIntegerTag.php b/src/Tag/NegativeBigIntegerTag.php
@@ -51,7 +51,9 @@ public static function create(CBORObject $object): Tag
 
     public function normalize(): string
     {
-        $integer = BigInteger::fromBase(bin2hex($this->object->getValue()), 16);
+        /** @var ByteStringObject|IndefiniteLengthByteStringObject $object */
+        $object = $this->object;
+        $integer = BigInteger::fromBase(bin2hex($object->getValue()), 16);
         $minusOne = BigInteger::of(-1);
 
         return $minusOne->minus($integer)->toBase(10);

diff --git a/src/Tag/TimestampTag.php b/src/Tag/TimestampTag.php
@@ -59,7 +59,9 @@ public function normalize(): DateTimeInterface
         switch (true) {
             case $object instanceof UnsignedIntegerObject:
             case $object instanceof NegativeIntegerObject:
-                return DateTimeImmutable::createFromFormat('U', (string) $object->normalize());
+                $formatted = DateTimeImmutable::createFromFormat('U', (string) $object->normalize());
+
+            break;
             case $object instanceof HalfPrecisionFloatObject:
             case $object instanceof SinglePrecisionFloatObject:
             case $object instanceof DoublePrecisionFloatObject:
@@ -72,11 +74,18 @@ public function normalize(): DateTimeInterface
                         $parts[1] = str_pad($parts[1], 6, '0', STR_PAD_RIGHT);
                     }
                 }
+                $formatted = DateTimeImmutable::createFromFormat('U.u', implode('.', $parts));
 
-                return DateTimeImmutable::createFromFormat('U.u', implode('.', $parts));
+                break;
             default:
                 throw new InvalidArgumentException('Unable to normalize the object');
         }
+
+        if (false === $formatted) {
+            throw new InvalidArgumentException('Invalid data. Cannot be converted into a datetime object');
+        }
+
+        return $formatted;
     }
 
     /**

diff --git a/src/Tag/UnsignedBigIntegerTag.php b/src/Tag/UnsignedBigIntegerTag.php
@@ -54,7 +54,10 @@ public static function create(CBORObject $object): Tag
 
     public function normalize(): string
     {
-        return Utils::hexToString($this->object->normalize());
+        /** @var ByteStringObject|IndefiniteLengthByteStringObject $object */
+        $object = $this->object;
+
+        return Utils::hexToString($object->normalize());
     }
 
     /**

diff --git a/src/Tag/UriTag.php b/src/Tag/UriTag.php
@@ -50,7 +50,10 @@ public static function create(CBORObject $object): Tag
 
     public function normalize(): string
     {
-        return $this->object->normalize();
+        /** @var TextStringObject|IndefiniteLengthTextStringObject $object */
+        $object = $this->object;
+
+        return $object->normalize();
     }
 
     /**