Extract some reoccurring checks

captainhookphp · Jan 9, 2025 · 628b242 · 628b242
1 parent 3e212ac
commit 628b242
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/src/Config/Factory.php b/src/Config/Factory.php
@@ -33,14 +33,14 @@ final class Factory
      *
      * @var int
      */
-    private $maxIncludeLevel = 1;
+    private int $maxIncludeLevel = 1;
 
     /**
      * Current level of inclusion
      *
      * @var int
      */
-    private $includeLevel = 0;
+    private int $includeLevel = 0;
 
     /**
      * Create a CaptainHook configuration
@@ -156,7 +156,7 @@ private function loadConfigFromFile(Json $file, array $settings): Config
      */
     private function extractSettings(array $json): array
     {
-        return isset($json['config']) && is_array($json['config']) ? $json['config'] : [];
+        return Util::extractListFromJson($json, 'config');
     }
 
     /**
@@ -167,7 +167,7 @@ private function extractSettings(array $json): array
      */
     private function extractConditions(mixed $json): array
     {
-        return isset($json['conditions']) && is_array($json['conditions']) ? $json['conditions'] : [];
+        return Util::extractListFromJson($json, 'conditions');
     }
 
     /**
@@ -178,7 +178,7 @@ private function extractConditions(mixed $json): array
      */
     private function extractOptions(mixed $json): array
     {
-        return isset($json['options']) && is_array($json['options']) ? $json['options'] : [];
+        return Util::extractListFromJson($json, 'options');
     }
 
     /**
@@ -309,10 +309,7 @@ protected function loadIncludedConfigs(array $json, string $path): array
     {
         $includes  = [];
         $directory = dirname($path);
-        $files     = isset($json['config'][Config::SETTING_INCLUDES])
-                     && is_array($json['config'][Config::SETTING_INCLUDES])
-                   ? $json['config'][Config::SETTING_INCLUDES]
-                   : [];
+        $files     = Util::extractListFromJson(Util::extractListFromJson($json, 'config'), Config::SETTING_INCLUDES);
 
         foreach ($files as $file) {
             $includes[] = $this->includeConfig($directory . DIRECTORY_SEPARATOR . $file);

diff --git a/src/Config/Util.php b/src/Config/Util.php
@@ -128,6 +128,18 @@ public static function validateConditionsConfig(array $json): void
         }
     }
 
+    /**
+     * Extracts a list from a json data struct with the necessary safeguards
+     *
+     * @param  array<string, mixed>  $json
+     * @param  string                $value
+     * @return array<string, mixed>
+     */
+    public static function extractListFromJson(array $json, string $value): array
+    {
+        return isset($json[$value]) && is_array($json[$value]) ? $json[$value] : [];
+    }
+
     /**
      * Write the config to disk
      *