Fixed the return values of \Didww\Item\BaseItem's children (#57)

* fixed the return values of `\Didww\Item\BaseItem`'s children * added `php-http/discovery` package to allowed plugins * code style is fixed * added return value to the `\Didww\Item\OrderItem\Base` class * fixed the return value of `CapacityPool::getRenewDate()` method --------- Co-authored-by: Andrey Bakharev <[email protected]>
didww · Feb 17, 2023 · 6dad2f1 · 6dad2f1
1 parent b62410a
commit 6dad2f1
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -43,5 +43,10 @@
       "test": "XDEBUG_MODE=coverage phpunit",
       "check-style": "php-cs-fixer fix --dry-run -v",
       "fix-style": "php-cs-fixer fix"
-    }
+    },
+    "config": {
+      "allow-plugins": {
+        "php-http/discovery": true
+      }
+  }
 }
diff --git a/src/Item/CapacityPool.php b/src/Item/CapacityPool.php
@@ -29,9 +29,9 @@ public function getName(): string
         return $this->getAttributes()['name'];
     }
 
-    public function getRenewDate(): \Date
+    public function getRenewDate(): \DateTime
     {
-        return new \Date($this->getAttributes()['renew_date']);
+        return new \DateTime($this->getAttributes()['renew_date']);
     }
 
     public function getTotalChannelsCount(): int

diff --git a/src/Item/Configuration/Base.php b/src/Item/Configuration/Base.php
@@ -27,6 +27,8 @@ public function getAttributes()
     public function fill(array $attributes)
     {
         $this->attributes = $attributes;
+
+        return $this;
     }
 
     private static $didPlaceHolder = '{DID}';

diff --git a/src/Item/Order.php b/src/Item/Order.php
@@ -47,7 +47,8 @@ public function fill(array $attributes)
             $this->fillItems($attributes['items']);
             unset($attributes['items']);
         }
-        parent::fill($attributes);
+
+        return parent::fill($attributes);
     }
 
     private function fillItems($items)

diff --git a/src/Item/OrderItem/Base.php b/src/Item/OrderItem/Base.php
@@ -38,12 +38,17 @@ public function getCreatableAttributes(): array
         return $creatableAttributes;
     }
 
-    public function fill(array $attributes)
+    /**
+     * @return $this
+     */
+    public function fill(array $attributes): self
     {
         // remove deprecated attributes
         unset($attributes['monthly_price']);
         unset($attributes['setup_price']);
         $this->attributes = $attributes;
+
+        return $this;
     }
 
     public function getNrc(): float

diff --git a/src/Item/VoiceInTrunk.php b/src/Item/VoiceInTrunk.php
@@ -156,7 +156,8 @@ public function fill(array $attributes)
             $this->fillConfiguration($attributes['configuration']);
             unset($attributes['configuration']);
         }
-        parent::fill($attributes);
+
+        return parent::fill($attributes);
     }
 
     private function fillConfiguration($configuration)