validator 0.4 support added

Author: Triplkrypl

.github/workflows/main.yml

@@ -28,15 +28,15 @@ jobs:
         run: vendor/bin/phpunit test/
 
   php81a:
-    name: "php 8.1, laravel 8, symfony 5"
+    name: "php 8.1, laravel 8, symfony 5, validator 0.3"
     runs-on: ubuntu-latest
     container: "nofutur3/php-tests:8.1"
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
 
       - name: Install dependencies
-        run: composer update --no-interaction --with illuminate/support:^8.81 --with symfony/http-kernel:^5.4 --with symfony/http-foundation:^5.4
+        run: composer update --no-interaction --with illuminate/support:^8.81 --with symfony/http-kernel:^5.4 --with symfony/http-foundation:^5.4 --with simple-as-fuck/php-validator:^0.3.0
 
       - name: Run static analysis
         run: vendor/bin/phpstan analyse

composer.json

@@ -5,7 +5,7 @@
         "ext-json": "*",
         "psr/http-message": "^1.0",
         "psr/http-factory": "^1.0",
-        "simple-as-fuck/php-validator": "^0.3.0",
+        "simple-as-fuck/php-validator": "^0.3.0|^0.4.0",
         "guzzlehttp/guzzle": "^7.4",
         "illuminate/support": "^8.81|^9.0",
         "kayex/http-codes": "^1.1",

src/Model/Client/Request.php

@@ -33,12 +33,12 @@ final class Request
     public function __construct(string $method, string $url, array $query = [], ?StreamInterface $body = null, array $headers = [])
     {
         if (count($query) !== 0) {
-            $url = ParseUrl::make($url, [], [PHP_URL_QUERY, PHP_URL_FRAGMENT], '$url')->notNull();
+            $url = ParseUrl::make($url, [], [PHP_URL_QUERY, PHP_URL_FRAGMENT], 'Parameter $url')->notNull();
             $url .= '?'.\http_build_query($query, '', '&', PHP_QUERY_RFC3986);
         }
 
         $this->method = $method;
-        $this->url = ParseUrl::make($url, [], [PHP_URL_SCHEME, PHP_URL_USER, PHP_URL_PASS, PHP_URL_HOST, PHP_URL_PORT], '$url')->notNull();
+        $this->url = ParseUrl::make($url, [], [PHP_URL_SCHEME, PHP_URL_USER, PHP_URL_PASS, PHP_URL_HOST, PHP_URL_PORT], 'Parameter $url')->notNull();
         $this->headers = $headers;
         $this->body = $body;
         $this->baseUrl = null;
@@ -50,7 +50,7 @@ public function __construct(string $method, string $url, array $query = [], ?Str
     public function withBaseUrl(string $baseUrl): self
     {
         $request = new self($this->method, $this->url, [], $this->body, $this->headers);
-        $request->baseUrl = StringRule::make($baseUrl, '$baseUrl')->parseHttpUrl([], [PHP_URL_QUERY, PHP_URL_FRAGMENT])->notNull();
+        $request->baseUrl = StringRule::make($baseUrl, 'Parameter $baseUrl')->parseHttpUrl([], [PHP_URL_QUERY, PHP_URL_FRAGMENT])->notNull();
         return $request;
     }