Optimize code

phpstan.dist.neon

@@ -1,12 +1,7 @@
 parameters:
-    level: 6
+    level: 10
     paths:
         - src
-    exceptions:
-        check:
-            missingCheckedExceptionInThrows: true
-        uncheckedExceptionClasses:
-            - Error
     ignoreErrors:
         -
             identifier: trait.unused

src/AbstractZodiac.php

@@ -6,6 +6,7 @@
 
 use Carbon\Carbon;
 use Carbon\Exceptions\InvalidFormatException;
+use Intervention\Zodiac\Exceptions\RuntimeException;
 use Intervention\Zodiac\Interfaces\TranslatableInterface;
 use Intervention\Zodiac\Interfaces\ZodiacInterface;
 use InvalidArgumentException;
@@ -26,49 +27,70 @@ abstract class AbstractZodiac implements ZodiacInterface, TranslatableInterface
      *
      * @see ZodiacInterface::start()
      * @throws InvalidFormatException
+     * @throws RuntimeException
      */
     public function start(): Carbon
     {
-        return Carbon::create(
+        $date = Carbon::create(
             month: $this->startMonth,
             day: $this->startDay
         );
+
+        if ($date === false) {
+            throw new RuntimeException('Unable to create end date of zodiac sign.');
+        }
+
+        return $date;
     }
 
     /**
      * {@inheritdoc}
      *
      * @see ZodiacInterface::end()
      * @throws InvalidFormatException
+     * @throws RuntimeException
      */
     public function end(): Carbon
     {
-        return Carbon::create(
+        $date = Carbon::create(
             month: $this->endMonth,
             day: $this->endDay,
             hour: 23,
             minute: 59,
             second: 59
         );
+
+        if ($date === false) {
+            throw new RuntimeException('Unable to create end date of zodiac sign.');
+        }
+
+        return $date;
     }
 
     /**
      * {@inheritdoc}
      *
      * @see ZodiacInterface::localized()
      * @throws InvalidArgumentException
+     * @throws RuntimeException
      */
     public function localized(?string $locale = null): ?string
     {
         $translator = $this->translator($locale);
         $key = "zodiacs.{$this->name}";
 
-        if ($translator->has($key)) {
-            return $translator->get($key);
+        $translated = match ($translator->has($key)) {
+            true => $translator->get($key),
+            false => $translator->get("zodiacs::{$key}"),
+        };
+
+        if (is_array($translated)) {
+            throw new RuntimeException(
+                'Unable to get translated name from array, should be string.'
+            );
         }
 
-        // return packages default message
-        return $translator->get("zodiacs::{$key}");
+        return $translated;
     }
 
     /**

src/Calculator.php

@@ -8,6 +8,7 @@
 use Carbon\Exceptions\InvalidFormatException;
 use DateTimeInterface;
 use Intervention\Zodiac\Exceptions\NotReadableException;
+use Intervention\Zodiac\Exceptions\RuntimeException;
 use Intervention\Zodiac\Interfaces\ZodiacInterface;
 use Intervention\Zodiac\Interfaces\CalculatorInterface;
 use Intervention\Zodiac\Interfaces\TranslatableInterface;
@@ -17,7 +18,10 @@ class Calculator implements CalculatorInterface, TranslatableInterface
 {
     use Traits\CanTranslate;
 
-    protected const ZODIAC_CLASSNAMES = [
+    /**
+     * @var array<string>
+     */
+    protected array $zodiac_classnames = [
         Zodiacs\Aquarius::class,
         Zodiacs\Aries::class,
         Zodiacs\Cancer::class,
@@ -35,15 +39,16 @@ class Calculator implements CalculatorInterface, TranslatableInterface
     /**
      * {@inheritdoc}
      *
-     * @throws NotReadableException
      * @see ZodiacInterface::zodiac()
+     * @throws NotReadableException
+     * @throws RuntimeException
      */
     public static function zodiac(int|string|DateTimeInterface $date): ZodiacInterface
     {
         $calculator = new self();
         $date = $calculator->normalizeDate($date);
 
-        foreach ($calculator::ZODIAC_CLASSNAMES as $classname) {
+        foreach ($calculator->zodiac_classnames as $classname) {
             try {
                 $zodiac = new $classname();
                 if (
@@ -70,6 +75,7 @@ public static function zodiac(int|string|DateTimeInterface $date): ZodiacInterfa
      *
      * @see self::zodiac()
      * @throws NotReadableException
+     * @throws RuntimeException
      */
     public static function make(int|string|DateTimeInterface $date): ZodiacInterface
     {

src/Laravel/ZodiacBridge.php

@@ -4,9 +4,13 @@
 
 namespace Intervention\Zodiac\Laravel;
 
+use DateTimeInterface;
+use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Translation\Translator;
 use Intervention\Zodiac\Calculator;
 use Intervention\Zodiac\Exceptions\NotReadableException;
+use Intervention\Zodiac\Exceptions\RuntimeException;
 use Intervention\Zodiac\Interfaces\ZodiacInterface;
 use InvalidArgumentException;
 use ReflectionException;
@@ -21,16 +25,35 @@ public function __construct(protected Application $app)
     /**
      * Create zodiac from input date
      *
-     * @param mixed $date
+     * @param int|string|DateTimeInterface $date
      * @throws NotReadableException
      * @throws InvalidArgumentException
      * @throws ReflectionException
+     * @throws RuntimeException
+     * @throws BindingResolutionException
      * @return ZodiacInterface
      */
-    public function make(mixed $date): ZodiacInterface
+    public function make(int|string|DateTimeInterface $date): ZodiacInterface
     {
-        return (new Calculator())
-            ->setTranslator($this->app['translator'])
-            ->zodiac($date);
+        $calculator = new Calculator();
+        $calculator->setTranslator($this->translator());
+
+        return $calculator->zodiac($date);
+    }
+
+    /**
+     * @return Translator
+     * @throws BindingResolutionException
+     * @throws RuntimeException
+     */
+    private function translator(): Translator
+    {
+        $translator = $this->app->make(Translator::class);
+
+        if (!($translator instanceof Translator)) {
+            throw new RuntimeException('Unable to resolve translator from Laravel application.');
+        }
+
+        return $translator;
     }
 }

src/Laravel/ZodiacServiceProvider.php

@@ -4,6 +4,7 @@
 
 namespace Intervention\Zodiac\Laravel;
 
+use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Support\ServiceProvider;
 
 class ZodiacServiceProvider extends ServiceProvider
@@ -33,7 +34,7 @@ public function boot()
      */
     public function register()
     {
-        $this->app->singleton('zodiac', function ($app) {
+        $this->app->singleton('zodiac', function (Application $app) {
             return new ZodiacBridge($app);
         });
     }

src/ZodiacComparableDate.php

@@ -6,6 +6,7 @@
 
 use Carbon\Carbon;
 use Carbon\Exceptions\InvalidFormatException;
+use Intervention\Zodiac\Exceptions\RuntimeException;
 use Intervention\Zodiac\Interfaces\ZodiacInterface;
 use Intervention\Zodiac\Zodiacs\Capricorn;
 
@@ -27,6 +28,7 @@ public function __construct(protected Carbon $date)
      *
      * @param ZodiacInterface $zodiac
      * @throws InvalidFormatException
+     * @throws RuntimeException
      * @return bool
      */
     public function isZodiac(ZodiacInterface $zodiac): bool