Consolidate Calculator::class public methods

Intervention · Nov 10, 2024 · 71afcaf · 71afcaf
1 parent 76acb04
commit 71afcaf
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 34 deletions.
diff --git a/README.md b/README.md
@@ -32,19 +32,19 @@ use DateTime;
 use Carbon\Carbon;
 
 // get zodiac object from a date
-$zodiac = Calculator::make('1980-09-15');
+$zodiac = Calculator::zodiac('1980-09-15');
 
 // method takes mixed formats
-$zodiac = Calculator::make('first day of June 2008');
+$zodiac = Calculator::zodiac('first day of June 2008');
 
 // create from DateTime object
-$zodiac = Calculator::make(new DateTime('1977-03-15'));
+$zodiac = Calculator::zodiac(new DateTime('1977-03-15'));
 
 // get zodiac from a Carbon object
-$zodiac = Calculator::make(Carbon::yesterday());
+$zodiac = Calculator::zodiac(Carbon::yesterday());
 
 // get zodiac from unix timestamp
-$zodiac = Calculator::make(228268800);
+$zodiac = Calculator::zodiac(228268800);
 ```
 
 ```php
@@ -53,7 +53,7 @@ use DateTime;
 use Carbon\Carbon;
 
 // calculate zodiac sing
-$zodiac = Calculator::make('1977-06-17');
+$zodiac = Calculator::zodiac('1977-06-17');
 
 $name = $zodiac->name(); // 'gemini'
 $html = $zodiac->html(); // '♊︎'

diff --git a/src/Calculator.php b/src/Calculator.php
@@ -11,7 +11,6 @@
 use Intervention\Zodiac\Interfaces\ZodiacInterface;
 use Intervention\Zodiac\Interfaces\CalculatorInterface;
 use InvalidArgumentException;
-use ReflectionException;
 
 class Calculator implements CalculatorInterface
 {
@@ -32,33 +31,22 @@ class Calculator implements CalculatorInterface
         Zodiacs\Virgo::class,
     ];
 
-    /**
-     * {@inheritdoc}
-     *
-     * @see ZodiacInterface::make()
-     * @throws NotReadableException
-     * @throws ReflectionException
-     */
-    public static function make(int|string|DateTimeInterface $date): ZodiacInterface
-    {
-        return (new self())->zodiac($date);
-    }
-
     /**
      * {@inheritdoc}
      *
      * @throws NotReadableException
      * @see ZodiacInterface::zodiac()
      */
-    public function zodiac(int|string|DateTimeInterface $date): ZodiacInterface
+    public static function zodiac(int|string|DateTimeInterface $date): ZodiacInterface
     {
-        $date = $this->normalizeDate($date);
+        $calculator = new self();
+        $date = $calculator->normalizeDate($date);
 
-        foreach ($this::ZODIAC_CLASSNAMES as $classname) {
+        foreach ($calculator::ZODIAC_CLASSNAMES as $classname) {
             try {
                 $zodiac = new $classname();
                 if ($date->isZodiac($zodiac)) {
-                    return $zodiac->setTranslator($this->translator());
+                    return $zodiac->setTranslator($calculator->translator());
                 }
             } catch (InvalidFormatException | InvalidArgumentException) {
                 // try next zodiac
@@ -70,6 +58,17 @@ public function zodiac(int|string|DateTimeInterface $date): ZodiacInterface
         );
     }
 
+    /**
+     * Alias of zodiac()
+     *
+     * @see self::zodiac()
+     * @throws NotReadableException
+     */
+    public static function make(int|string|DateTimeInterface $date): ZodiacInterface
+    {
+        return (new self())->zodiac($date);
+    }
+
     /**
      * Normalze given date to Carbon object
      *

diff --git a/src/Interfaces/CalculatorInterface.php b/src/Interfaces/CalculatorInterface.php
@@ -14,13 +14,5 @@ interface CalculatorInterface
      * @param int|string|DateTimeInterface $date
      * @return ZodiacInterface
      */
-    public static function make(int|string|DateTimeInterface $date): ZodiacInterface;
-
-    /**
-     * Get zodiac for given date
-     *
-     * @param int|string|DateTimeInterface $date
-     * @return ZodiacInterface
-     */
-    public function zodiac(int|string|DateTimeInterface $date): ZodiacInterface;
+    public static function zodiac(int|string|DateTimeInterface $date): ZodiacInterface;
 }
diff --git a/src/Laravel/ZodiacBridge.php b/src/Laravel/ZodiacBridge.php
@@ -19,7 +19,7 @@ public function __construct(protected Application $app)
     }
 
     /**
-     * Make zodiac from input date
+     * Create zodiac from input date
      *
      * @param mixed $date
      * @throws NotReadableException

diff --git a/tests/CalculatorTest.php b/tests/CalculatorTest.php
@@ -30,7 +30,10 @@ final class CalculatorTest extends TestCase
     #[DataProvider('validZodiacDataProvider')]
     public function testValidCalculatorInputs(int|string|DateTimeInterface $input, string $resultClassname): void
     {
-        $this->assertInstanceOf($resultClassname, (new Calculator())->zodiac($input));
+        $calculator = new Calculator();
+        $this->assertInstanceOf($resultClassname, $calculator->zodiac($input));
+        $this->assertInstanceOf($resultClassname, $calculator->make($input));
+        $this->assertInstanceOf($resultClassname, Calculator::zodiac($input));
         $this->assertInstanceOf($resultClassname, Calculator::make($input));
     }