refactor: check for type rather than null value to be more explicit. …

…Untangle nested ifs to early returns allowing for quick exit.

Signed-off-by: Sacha Telgenhof <me@sachatelgenhof.com>

src/Yasumi/Yasumi.php

@@ -137,7 +137,7 @@ public static function create(string $class, int $year = self::YEAR_LOWER_BOUND,
         }
 
         // Load internal translations variable
-        if (null === self::$globalTranslations) {
+        if (! self::$globalTranslations instanceof Translations) {
             self::$globalTranslations = new Translations(self::$locales);
             self::$globalTranslations->loadTranslations(__DIR__.'/data/translations');
         }
@@ -237,9 +237,16 @@ public static function getProviders(): array
             $class = new \ReflectionClass(sprintf('Yasumi\Provider\%s', str_replace('/', '\\', $provider)));
 
             $key = 'ID';
-            if ($class->isSubclassOf(AbstractProvider::class) && $class->hasConstant($key)) {
-                $providers[strtoupper($class->getConstant($key))] = $provider;
+
+            if (! $class->isSubclassOf(AbstractProvider::class)) {
+                continue;
+            }
+
+            if (! $class->hasConstant($key)) {
+                continue;
             }
+
+            $providers[strtoupper($class->getConstant($key))] = $provider;
         }
 
         return $providers;

tests/Ukraine/SubstitutedHolidayTest.php

@@ -74,7 +74,8 @@ public function assertHolidayWithSubstitution(
         self::assertEquals(Holiday::TYPE_OFFICIAL, $holidayOfficial->getType());
 
         $holidaySubstitution = $holidays->getHoliday('substituteHoliday:'.$holidayOfficial->getKey());
-        if (null === $expectedSubstitution) {
+
+        if (! $expectedSubstitution instanceof \DateTimeInterface) {
             // without substitution
             self::assertNull($holidaySubstitution);
         } else {