Merge branch 'master' of https://git.mcnd.ca/mcndave/picea

src/Extension/LanguageExtension.php

@@ -9,7 +9,7 @@ class LanguageExtension implements Extension {
     public array $tokens = [ "lang", "_", "language.set" ];
 
     public string $currentLanguage = "";
-    
+
     protected LanguageHandler $languageHandler;
 
     public function __construct(Context $context, LanguageHandler $handler) {
@@ -38,13 +38,13 @@ class LanguageExtension implements Extension {
         $context->pushFunction("_",   [ $this, 'relativeLang' ]);
         $context->pushFunction("lang", [ $this, 'absoluteLang' ]);
     }
-    
-    public function relativeLang(string $key, array $variables = []) : string
+
+    public function relativeLang(string $key, array $variables = []) #: array|string
     {
         return $this->languageHandler->languageFromKey("{$this->currentLanguage}.{$key}", $variables);
     }
 
-    public function absoluteLang(string $key, array $variables = []) : string
+    public function absoluteLang(string $key, array $variables = []) #: array|string
     {
         return $this->languageHandler->languageFromKey($key, $variables);
     }

src/Extension/LanguageHandler.php

@@ -2,7 +2,7 @@
 
 namespace Picea\Extension;
 
-interface LanguageHandler 
-{    
-    public function languageFromKey(string $key, array $variables = []) : string;   
+interface LanguageHandler
+{
+    public function languageFromKey(string $key, array $variables = []); #: array|string;
 }

src/Extension/UrlExtension.php

@@ -173,23 +173,14 @@ class UrlExtension implements Extension {
                     $value = $arguments[ $item[1] ];
                 }
                 else if ( isset($default) ) {
-                    $value = $default;
+                    $value = ""; # $default;
                 }
                 else {
                     $variable = $item[1];
                 }
 
-#                if ( array_key_exists($variable, $arguments) ) {
-#                    $value = $arguments[ $item[1] ];
-#                }
-#                else if ( isset($default) ) {
-#                    $value = $default;
-#                }
-#                else {
-#                    throw new \InvalidArgumentException("Argument `$variable` is missing within required route parameter(s)");                    
-#                }
-
                 $search[ $item[0] ] = $value;
+
                 unset($arguments[ $item[1] ]);
             }