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

src/Extension/UrlExtension.php

@@ -6,6 +6,14 @@ use Picea\Compiler\Context;
 
 class UrlExtension implements Extension {
 
+    public const URLIZE_PATTERN_URL = <<<PATTERN
+        ~(?<!href=['"])https?://[\w/._\-&?]*(?!</a>)(?=[^\w/._\-&])~s
+    PATTERN;
+
+    public const URLIZE_PATTERN_EMAIL = <<<PATTERN
+        /(?:[a-z0-9!#$%&'*+\\/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+\\/=?^_`{|}~-]+)*|\"(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21\\x23-\\x5b\\x5d-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])*\")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21-\\x5a\\x53-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])+)\\])/
+PATTERN;
+
     protected string $urlBase;
 
     protected string $assetToken;
@@ -14,8 +22,8 @@ class UrlExtension implements Extension {
 
     protected array $routesTarget;
 
-    public array $tokens = [ "url" , "route", "asset", "url.current", "url.parameters", "slug" ];
-    
+    public array $tokens = [ "url" , "route", "route.cacheless", "asset", "url.current", "url.parameters", "slug" ];
+
     public function __construct(Context $context, string $urlBase = "", string $assetToken = "") {
         $this->urlBase = trim($urlBase, "/");
         $this->assetToken = $assetToken;
@@ -54,6 +62,7 @@ class UrlExtension implements Extension {
         $context->pushFunction("asset", [ $this, 'buildAssetUrl' ]);
         $context->pushFunction("route", [ $this, 'buildRouteUrl' ]);
         $context->pushFunction("slug", [ $this, 'slug' ]);
+        $context->pushFunction("urlize", [ $this, 'urlize' ]);
     }
 
     public function getRouteList(bool $full = false) : array
@@ -66,25 +75,36 @@ class UrlExtension implements Extension {
         return $url . ( $parameters ? "?" . http_build_query($parameters) : "" );
     }
 
+    public function urlize(string $string) : string
+    {
+        # Normal URL patterns
+        $string = preg_replace(static::URLIZE_PATTERN_URL, '<a href="$0" target="_blank" title="$0">$0</a>', $string);
+
+        # Email patterns
+        $string = preg_replace(static::URLIZE_PATTERN_EMAIL, '<a href="mailto:$0" title="$0">$0</a>', $string);
+
+        return $string;
+    }
+
     public function currentUrl(array $parameters = []) : string
     {
         return $this->buildUrl($this->uri(), $parameters);
     }
 
-    public function buildUrl(string $uri = "", array $parameters = []) : string
+    public function buildUrl(string $uri = "", array $parameters = [], bool $appendVersion = false) : string
     {
-        return $this->setUrlParameters($this->url() . "/" . ltrim($uri, "/"), $parameters);
+        return $this->setUrlParameters($this->url() . "/" . ltrim($uri, "/"), $appendVersion ? array_replace([ 'v' => $this->assetToken ], $parameters) : $parameters);
     }
     
-    public function buildAssetUrl(string $uri, array $parameters = []) : string
+    public function buildAssetUrl(string $uri, array $parameters = [], bool $appendVersion = true) : string
     {
-        return $this->buildUrl($uri, array_replace([ 'v' => $this->assetToken ], $parameters));
+        return $this->buildUrl($uri, $parameters, $appendVersion);
     }
 
-    public function buildRouteUrl(string $name, array $parameters = []) : string
+    public function buildRouteUrl(string $name, array $parameters = [], bool $appendVersion = false) : string
     {
         if ( false !== ( $route = $this->routes[$name] ?? false ) ) {
-            return $this->buildUrl($this->prepareRoute($route['route'], $parameters), $parameters);
+            return $this->buildUrl($this->prepareRoute($route['route'], $parameters), $parameters, $appendVersion);
         }
 
         $routeList = json_encode($this->routes, \JSON_PRETTY_PRINT);
@@ -174,7 +194,7 @@ class UrlExtension implements Extension {
             $_SERVER['Front-End-Https'] ?? "",
             $_SERVER['X-Forwarded-Proto'] ?? "",
             $_SERVER['X-Forwarded-Protocol'] ?? "",
-            $_SERVER['HTTP_X_FORWARDED_PROTO'] ?? "",
+	    $_SERVER['HTTP_X_FORWARDED_PROTO'] ?? "",
             $_SERVER['HTTP_X_FORWARDED_PROTOCOL'] ?? "",
         ])) || isset($_SERVER['HTTP_X_ARR_SSL']);
 
@@ -193,7 +213,7 @@ class UrlExtension implements Extension {
                     list($variable, $default) = explode('=', $item[1]);
                 }
                 elseif (strpos($item[1], ":") !== false) {
-                    list($variable, $type) = explode(':', $item[1]);
+                    list($variable, ) = explode(':', $item[1]);
                 }
                 else {
                     $variable = $item[1];
@@ -201,7 +221,6 @@ class UrlExtension implements Extension {
 
                 if ( array_key_exists($variable, $arguments) ) {
                     $value = $arguments[ $variable ];
-
                     unset($arguments[ $variable ]);
                 }
                 else {
@@ -209,22 +228,12 @@ class UrlExtension implements Extension {
                 }
 
                 $search[ $item[0] ] = $value;
+
             }
 
             $route = str_replace(array_keys($search), array_values($search), $route);
         }
 
-        /*
-         * @TODO - must also take into account that recursivity is possible here [/test[/another[/still]]],
-         *         so the regex must be adjusted (or simply using another method could also be a possiblity)
-         * while(strpos($route, '[') !== false && strpos($route, ']') !== false ) {
-            if ( preg_match_all('~[(.*?)]~si', $route, $matches, PREG_SET_ORDER) ) {
-
-            }
-        }*/
-        $route = trim(str_replace([ '[', ']' ], '', $route), '/');
-
         return $route;
     }
-
 }