reduce complexity

rikmeijer · Nov 7, 2023 · 0be9298 · 0be9298
1 parent e6e15f7
commit 0be9298
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/UI/Template.php b/lib/UI/Template.php
@@ -32,11 +32,11 @@ static function extract(callable $try) : mixed {
         return $reflection->getStaticVariables()['value'];
     }
 
-    static function negotiateType(callable $directory) {
+    static function negotiateType(callable $blocks) {
         return fn(callable $templateExists) => fn(callable $found, callable $missingType) => $templateExists(
             [Functional::class, 'populated'],
             Functional::first(
-                fn(string $typePath, string $acceptedType) => $found($acceptedType, self::render(file_get_contents($typePath))(self::open($directory('.php')))),
+                fn(string $typePath, string $acceptedType) => $found($acceptedType, self::render(file_get_contents($typePath))($blocks)),
             ), 
             $missingType
         );
@@ -56,7 +56,7 @@ static function negotiateResource(callable $resourceExists, callable $methodNego
     static function negotiate(callable $directory, string $method) : callable {
         return self::negotiateResource(
             Functional::curry(self::try($directory('')))('is_dir')(fn(string $path) => glob($path . DIRECTORY_SEPARATOR . $method . '.*')),
-            self::negotiateMethod(self::negotiateType($directory), Functional::map(fn(float $v, string $k) => $directory(DIRECTORY_SEPARATOR . $method . '.' . self::typeToExtension($k))))
+            self::negotiateMethod(self::negotiateType(self::open($directory('.php'))), Functional::map(fn(float $v, string $k) => $directory(DIRECTORY_SEPARATOR . $method . '.' . self::typeToExtension($k))))
         );
     }