revert variadic $items dependency

michael-rubel · Mar 24, 2022 · eb1d9ac · eb1d9ac
1 parent ebbc7ca
commit eb1d9ac
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/src/Collection/LocaleNumberFormatter.php b/src/Collection/LocaleNumberFormatter.php
@@ -50,8 +50,6 @@ class LocaleNumberFormatter implements Formatter
      */
     public function format(Collection $items): string
     {
-        $items = $this->getFirstFrom($items);
-
         $formatter = new NumberFormatter(
             $items->get($this->locale_key) ?? app()->getLocale(),
             $items->get($this->style_key) ?? NumberFormatter::DECIMAL

diff --git a/src/Collection/TaxNumberFormatter.php b/src/Collection/TaxNumberFormatter.php
@@ -32,15 +32,13 @@ class TaxNumberFormatter implements Formatter
      */
     public function format(Collection $items): string
     {
-        $instance = $this->getFirstFrom($items);
+        $tax_number = $this->cleanupTaxNumber($items);
 
-        $tax_number = $this->cleanupTaxNumber($instance);
-
-        return empty($instance->get($this->country_key))
+        return empty($items->get($this->country_key))
             ? $tax_number
             : $this->getFullTaxNumber(
                 $tax_number,
-                $this->getCountry($instance)
+                $this->getCountry($items)
             );
     }
 

diff --git a/src/Helpers/helpers.php b/src/Helpers/helpers.php
@@ -11,7 +11,7 @@
      *
      * @return mixed
      */
-    function format(string $formatter, mixed ...$items): mixed
+    function format(string $formatter, mixed $items): mixed
     {
         $formatter = class_exists($formatter) || interface_exists($formatter)
             ? app($formatter)

diff --git a/tests/DateFormatterTest.php b/tests/DateFormatterTest.php
@@ -83,7 +83,7 @@ public function testCanFormatWithTimezone()
         Carbon::setTestNow('2022-03-24 23:30');
         config(['app.timezone' => 'Europe/Warsaw']);
 
-        $result = format('date', now(), 'UTC');
+        $result = format('date', [now(), 'UTC']);
         $this->assertEquals('2022-03-24', $result);
 
         $result = format('date', now());

diff --git a/tests/DateTimeFormatterTest.php b/tests/DateTimeFormatterTest.php
@@ -73,7 +73,7 @@ public function testCanFormatWithTimezone()
         Carbon::setTestNow('2022-03-24 10:30');
         config(['app.timezone' => 'Europe/Warsaw']);
 
-        $result = format('date-time', now(), 'UTC');
+        $result = format('date-time', [now(), 'UTC']);
         $this->assertEquals('2022-03-24 10:30', $result);
 
         $result = format('date-time', now());