update

Author: tamedevelopers

README.md

@@ -137,6 +137,7 @@ Support Package For PHP, Laravel and PHP Frameworks
     * [lastModified](#file-lastmodified) 
     * [extension](#file-extension) 
     * [name](#file-name) 
+    * [base](#file-base) 
     * [mimeType](#file-mimetype) 
     * [type](#file-type) 
     * [permissions](#file-permissions)

composer.json

@@ -22,8 +22,7 @@
         "phpmailer/phpmailer": "^6.9",
         "filp/whoops": "^2.15",
         "ezyang/htmlpurifier": "^4.13",
-        "composer-plugin-api": "^2.0",
-        "dompdf/dompdf": "^3.0"
+        "composer-plugin-api": "^2.0"
     },
     "extra": {
         "class": "Tamedevelopers\\Support\\ComposerPlugin"

src/Asset.php

@@ -81,17 +81,16 @@ public static function config($path = null, $cache = false, $type = false): void
     {
         // if not defined
         if(!defined('ASSET_BASE_DIRECTORY')){
-            // url helper class
-            $urlFromhelper = HttpRequest::host();
 
-            // we don't care the configured url address
-            // prepare a fallback of using combination of full url
-            if(empty($urlFromhelper)){
-                $urlFromhelper = HttpRequest::url();
-            }
+            // http
+            $http = HttpRequest::http();
+            $host = HttpRequest::host();
+
+            // url helper class
+            $urlFromhelper = HttpRequest::url();
 
             // clean http from url
-            $urlFromhelper = Str::replace(HttpRequest::http(), '', $urlFromhelper);
+            $urlFromhelper = Str::replace($http, '', $urlFromhelper);
 
             // if base path is set
             if(!empty($path)){
@@ -103,7 +102,7 @@ public static function config($path = null, $cache = false, $type = false): void
                 $baseForUrlPath = $path;
 
                 // check if accessed from default ip:address
-                if(HttpRequest::isIpAccessedVia127Port()){
+                if(HttpRequest::isIpAccessedViaPrivateLanPort()){
                     $baseForUrlPath = '';
                 }
 
@@ -117,10 +116,10 @@ public static function config($path = null, $cache = false, $type = false): void
                 'path'      => $path,
                 'server'    => self::formatWithBaseDirectory($path),
                 'domain'    => rtrim(
-                    self::cleanServerPath(HttpRequest::http() . $urlFromhelper), 
+                    self::cleanServerPath("{$http}{$urlFromhelper}"), 
                     '/'
                 ),
-                'removeDomain' => HttpRequest::http() . HttpRequest::host()
+                'removeDomain' => "{$http}{$host}"
             ]);
         }
     }

src/Capsule/File.php

@@ -173,7 +173,7 @@ public static function extension(string $path): ?string
     }
 
     /**
-     * Get the file's basename.
+     * Get the file's name.
      *
      * @param string $path
      * @return string
@@ -183,6 +183,17 @@ public static function name(string $path): string
         return pathinfo($path, PATHINFO_FILENAME);
     }
 
+    /**
+     * Get the file's basename.
+     *
+     * @param string $path
+     * @return string
+     */
+    public static function base(string $path): string
+    {
+        return basename($path);
+    }
+
     /**
      * Get the file's mime type.
      *

src/Laravel.php

@@ -46,7 +46,12 @@ public static function cssDirective()
     {
         self::initBladeFacades()::directive('css', function ($expression) {
             return "<?php
-                list(\$path, \$class) = array_pad(explode(',', {$expression}, 2), 2, '');
+                // Put Blade expression into an array so PHP parses arguments correctly
+                \$arguments = [{$expression}];
+
+                // Normalize args and ensure two elements
+                list(\$path, \$class) = array_pad(\$arguments, 2, '');
+                
                 \$path = str_replace(['\"', \"'\"], '', \$path);
                 \$class = str_replace(['\"', \"'\"], '', \$class);
                 \$assets = tasset(\$path, true, true);
@@ -65,7 +70,12 @@ public static function jsDirective()
     {
         self::initBladeFacades()::directive('js', function ($expression) {
             return "<?php
-                list(\$path, \$class) = array_pad(explode(',', {$expression}, 2), 2, '');
+                // Put Blade expression into an array so PHP parses arguments correctly
+                \$arguments = [{$expression}];
+
+                // Normalize args and ensure two elements
+                list(\$path, \$class) = array_pad(\$arguments, 2, '');
+
                 \$path = str_replace(['\"', \"'\"], '', \$path);
                 \$class = str_replace(['\"', \"'\"], '', \$class);
                 \$assets = tasset(\$path, true, true);
@@ -84,10 +94,16 @@ public static function svgDirective()
     {
         self::initBladeFacades()::directive('svg', function ($expression) {
             return "<?php
-                list(\$path, \$class) = array_pad(explode(',', {$expression}, 2), 2, '');
-                \$path = str_replace(['\"', \"'\"], '', \$path);
-                \$class = str_replace(['\"', \"'\"], '', \$class);
+                // Put Blade expression into an array so PHP parses arguments correctly
+                \$arguments = [{$expression}];
+
+                // Normalize args and ensure two elements
+                list(\$path, \$class) = array_pad(\$arguments, 2, '');
                 
+                // Clean quotes/whitespace
+                \$path = trim(str_replace(['\"', \"'\"], '', (string)\$path));
+                \$class = trim(str_replace(['\"', \"'\"], '', (string)\$class));
+
                 \$fullPath = \\Tamedevelopers\\Support\\Tame::stringReplacer(
                     str_replace(rtrim(domain('')), '', tasset(\$path, false, false))
                 );

src/Process/HttpRequest.php

@@ -252,6 +252,16 @@ public static function isLocalIp()
         return (new Collection($localRanges))->startsWith($serverAddr);
     }
 
+    /**
+     * Is IP accessed via private LAN port in browser
+     * 
+     * @return bool
+     */
+    public static function isIpAccessedViaPrivateLanPort()
+    {
+        return self::isIpAccessedVia127Port();
+    }
+
     /**
      * Is IP accessed via 127.0.0.1 port in browser
      * 

src/helpers.php

@@ -134,6 +134,24 @@ function tcollect($items = [])
     }
 }
 
+if (! function_exists('toptional')) {
+    /**
+     * Optional Class
+     *
+     * @param array|object|null $items 
+     * 
+     * @return \Tamedevelopers\Support\Collections\Collection|mixed
+     */
+    function toptional($items = [])
+    {
+        if(!is_array($items) && !is_null($items)){
+            $items = Server::toArray($items);
+        }
+
+        return new Collection($items);
+    }
+}
+
 if (! function_exists('tmanager')) {
     /**
      * Manager Class

tests/url.php

@@ -10,7 +10,7 @@
 // URL Helpers
 
 
-// config_asset('/', true);
+config_asset('/', true);
 
 $http = new Http();
 
@@ -35,7 +35,7 @@
       'Host: ' . $http->host(),
       'Path: ' . $http->path(),
       'Is AJAX: ' . ($http->isAjax() ? 'yes' : 'no'),
-      'Accessed via 127.0.0.1: ' . ($http->isIpAccessedVia127Port() ? 'yes' : 'no'),
+      'Accessed via Private Lan - 127.0.0.1: ' . ($http->isIpAccessedViaPrivateLanPort() ? 'yes' : 'no'),
     ],
 
     [