Bump andrey-helldar/support to 4.0 version

Author: Andrey Helldar

.github/workflows/phpunit.yml

@@ -10,7 +10,7 @@ jobs:
             matrix:
                 php: [ "7.2", "7.3", "7.4" ]
                 laravel: [ "5.4.*" ]
-                support: [ "2.0", "3.0" ]
+                support: [ "4.0" ]
                 laravel_support: [ "1.3", "2.0" ]
 
         name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}, Support ${{ matrix.support }}, Laravel Support ${{ matrix.laravel_support }}
@@ -45,7 +45,7 @@ jobs:
             matrix:
                 php: [ "7.2", "7.3", "7.4" ]
                 laravel: [ "5.5.*" ]
-                support: [ "2.0", "3.0" ]
+                support: [ "4.0" ]
                 laravel_support: [ "1.3", "2.0" ]
 
         name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}, Support ${{ matrix.support }}, Laravel Support ${{ matrix.laravel_support }}
@@ -80,7 +80,7 @@ jobs:
             matrix:
                 php: [ "7.2", "7.3", "7.4" ]
                 laravel: [ "5.6.*" ]
-                support: [ "2.0", "3.0" ]
+                support: [ "4.0" ]
                 laravel_support: [ "1.3", "2.0" ]
 
         name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}, Support ${{ matrix.support }}, Laravel Support ${{ matrix.laravel_support }}
@@ -115,7 +115,7 @@ jobs:
             matrix:
                 php: [ "7.2", "7.3", "7.4" ]
                 laravel: [ "5.7.*" ]
-                support: [ "2.0", "3.0" ]
+                support: [ "4.0" ]
                 laravel_support: [ "1.3", "2.0" ]
 
         name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}, Support ${{ matrix.support }}, Laravel Support ${{ matrix.laravel_support }}
@@ -150,7 +150,7 @@ jobs:
             matrix:
                 php: [ "7.2", "7.3", "7.4" ]
                 laravel: [ "5.8.*" ]
-                support: [ "2.0", "3.0" ]
+                support: [ "4.0" ]
                 laravel_support: [ "1.3", "2.0" ]
 
         name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}, Support ${{ matrix.support }}, Laravel Support ${{ matrix.laravel_support }}
@@ -185,7 +185,7 @@ jobs:
             matrix:
                 php: [ "7.2", "7.3", "7.4", "8.0" ]
                 laravel: [ "^6.0" ]
-                support: [ "2.0", "3.0" ]
+                support: [ "4.0" ]
                 laravel_support: [ "1.3", "2.0" ]
 
         name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}, Support ${{ matrix.support }}, Laravel Support ${{ matrix.laravel_support }}
@@ -220,7 +220,7 @@ jobs:
             matrix:
                 php: [ "7.2", "7.3", "7.4", "8.0" ]
                 laravel: [ "^7.0" ]
-                support: [ "2.0", "3.0" ]
+                support: [ "4.0" ]
                 laravel_support: [ "1.3", "2.0" ]
 
         name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}, Support ${{ matrix.support }}, Laravel Support ${{ matrix.laravel_support }}
@@ -255,7 +255,7 @@ jobs:
             matrix:
                 php: [ "7.3", "7.4", "8.0" ]
                 laravel: [ "^8.0" ]
-                support: [ "2.0", "3.0" ]
+                support: [ "4.0" ]
                 laravel_support: [ "1.3", "2.0" ]
 
         name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}, Support ${{ matrix.support }}, Laravel Support ${{ matrix.laravel_support }}

composer.json

@@ -17,7 +17,7 @@
     "require": {
         "php": "^7.2.5|^8.0",
         "andrey-helldar/laravel-support": "^1.3.2|^2.0",
-        "andrey-helldar/support": "^2.0|^3.0",
+        "andrey-helldar/support": "^4.0",
         "illuminate/routing": "^5.0|^6.0|^7.0|^8.0",
         "illuminate/support": "^5.0|^6.0|^7.0|^8.0",
         "phpdocumentor/reflection-docblock": "^5.0"

src/Models/Route.php

@@ -5,7 +5,8 @@
 use Helldar\LaravelRoutesCore\Facades\Annotation;
 use Helldar\LaravelSupport\Facades\App;
 use Helldar\Support\Facades\Helpers\Arr as ArrHelper;
-use Helldar\Support\Facades\Helpers\Http;
+use Helldar\Support\Facades\Http\Builder;
+use Helldar\Support\Facades\Http\Url;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Routing\Route as IlluminateRoute;
 use Illuminate\Support\Arr;
@@ -102,8 +103,8 @@ public function getDomain(): ?string
             return $domain;
         }
 
-        return $this->domain_force
-            ? Http::domain($this->url)
+        return $this->domain_force && Url::is($this->url)
+            ? Builder::parse($this->url)->getDomain()
             : null;
     }
 

tests/Fixtures/Config.php

@@ -28,7 +28,7 @@ public function getHideMatching(): array
 
     public function getDomainForce(): bool
     {
-        return false;
+        return true;
     }
 
     public function getUrl(): ?string