Merge pull request #170 from gacela-project/feature/refactor-setup-ga…

…cela Refactor SetupGacela
gacela-project · Jun 16, 2022 · 09d2312 · 09d2312
2 parents 528ba03 + 6856c94
commit 09d2312
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 15 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Framework/Bootstrap/SetupGacela.php b/src/Framework/Bootstrap/SetupGacela.php
@@ -11,14 +11,14 @@
 
 final class SetupGacela extends AbstractSetupGacela
 {
-    /** @var ?callable(ConfigBuilder):void */
-    private $configFn = null;
+    /** @var callable(ConfigBuilder):void */
+    private $configFn;
 
-    /** @var ?callable(MappingInterfacesBuilder,array<string,mixed>):void */
-    private $mappingInterfacesFn = null;
+    /** @var callable(MappingInterfacesBuilder,array<string,mixed>):void */
+    private $mappingInterfacesFn;
 
-    /** @var ?callable(SuffixTypesBuilder):void */
-    private $suffixTypesFn = null;
+    /** @var callable(SuffixTypesBuilder):void */
+    private $suffixTypesFn;
 
     /** @var array<string,class-string|object|callable> */
     private array $externalServices = [];
@@ -31,6 +31,16 @@ final class SetupGacela extends AbstractSetupGacela
 
     private bool $cacheEnabled = true;
 
+    public function __construct()
+    {
+        $this->configFn = static function (): void {
+        };
+        $this->mappingInterfacesFn = static function (): void {
+        };
+        $this->suffixTypesFn = static function (): void {
+        };
+    }
+
     /**
      * @param Closure(GacelaConfig):void $setupGacelaFileFn
      */
@@ -91,7 +101,7 @@ public function buildConfig(ConfigBuilder $configBuilder): ConfigBuilder
             $configBuilder = $this->configBuilder;
         }
 
-        $this->configFn && ($this->configFn)($configBuilder);
+        ($this->configFn)($configBuilder);
 
         return $configBuilder;
     }
@@ -119,7 +129,7 @@ public function buildMappingInterfaces(
             $mappingInterfacesBuilder = $this->mappingInterfacesBuilder;
         }
 
-        $this->mappingInterfacesFn && ($this->mappingInterfacesFn)(
+        ($this->mappingInterfacesFn)(
             $mappingInterfacesBuilder,
             array_merge($this->externalServices, $externalServices)
         );
@@ -146,7 +156,7 @@ public function buildSuffixTypes(SuffixTypesBuilder $suffixTypesBuilder): Suffix
             $suffixTypesBuilder = $this->suffixTypesBuilder;
         }
 
-        $this->suffixTypesFn && ($this->suffixTypesFn)($suffixTypesBuilder);
+        ($this->suffixTypesFn)($suffixTypesBuilder);
 
         return $suffixTypesBuilder;
     }