README.md

@@ -12,7 +12,7 @@ Network Library for PHP with native Yggdrasil support
 
 #### Check socket is open
 
-``` php
+```
 var_dump(
     \Yggverse\Net\Socket::isOpen('yo.index', 80)
 );
@@ -20,7 +20,7 @@ var_dump(
 
 #### Check host valid
 
-``` php
+```
 var_dump(
     \Yggverse\Net\Socket::isHost('yo.index')
 );
@@ -28,7 +28,7 @@ var_dump(
 
 #### Check port valid
 
-``` php
+```
 var_dump(
     \Yggverse\Net\Socket::isPort(80)
 );
@@ -38,7 +38,7 @@ var_dump(
 
 #### Resolve records
 
-``` php
+```
 var_dump(
     \Yggverse\Net\Dig::records('yo.index', ['A', 'AAAA'], &$result = [], &$error = [], $provider = null, $timeout = 5)
 );
@@ -46,7 +46,7 @@ var_dump(
 
 #### Check hostname valid
 
-``` php
+```
 var_dump(
     \Yggverse\Net\Dig::isHostName('yo.index')
 );
@@ -54,7 +54,7 @@ var_dump(
 
 #### Check record valid
 
-``` php
+```
 var_dump(
     \Yggverse\Net\Dig::isRecord('A')
 );
@@ -62,7 +62,7 @@ var_dump(
 
 #### Check record value valid
 
-``` php
+```
 var_dump(
     \Yggverse\Net\Dig::isRecordValue('A', '127.0.0.1')
 );
@@ -72,7 +72,7 @@ var_dump(
 
 #### Init resolver
 
-``` php
+```
 $resolve = new \Yggverse\Net\Resolve(
     [
         'A',
@@ -88,7 +88,7 @@ $resolve = new \Yggverse\Net\Resolve(
 
 #### Get resolved URL string
 
-``` php
+```
 $resolved = $resolve->url(
     'https://en.wikipedia.org/wiki/Domain_Name_System'
     // next arguments contain debug variables and new address object
@@ -104,7 +104,7 @@ if ($resolved)
 
 #### Resolve Address object
 
-``` php
+```
 $resolved = $resolve->address(
     new \Yggverse\Net\Address(
         'https://en.wikipedia.org/wiki/Domain_Name_System'
@@ -144,7 +144,7 @@ Different operations with address parts:
 
 **Document root**
 
-``` php
+```
 $base = new \Yggverse\Net\Address(
     'http://yo.ygg/a1/b1/c1'
 );
@@ -162,7 +162,7 @@ var_dump(
 
 **Current folder**
 
-``` php
+```
 $base = new \Yggverse\Net\Address(
     'http://yo.ygg/a1/b1/c1'
 );
@@ -180,7 +180,7 @@ var_dump(
 
 **Ending slash**
 
-``` php
+```
 $base = new \Yggverse\Net\Address(
     'http://yo.ygg/a1/b1/c1/'
 );
@@ -198,7 +198,7 @@ var_dump(
 
 **All options**
 
-``` php
+```
 $base = new \Yggverse\Net\Address(
     'http://user:password@yo.ygg/a1/b1/c1?attribute=value#anchor'
 );
@@ -214,20 +214,7 @@ var_dump(
 );
 ```
 
-### Valid
-
-Network entities validation
-
-**Supported methods**
-
-* `Valid::ip`
-* `Valid::ip4`
-* `Valid::ip6`
-* `Valid::domainHostName`
-
 ## Integrations
 
-* [gemini-dl](https://github.com/YGGverse/gemini-dl) - CLI batch downloader for Gemini protocol
+* [Network API with native Yggdrasil/IPv6 support](https://github.com/YGGverse/web-api)
-* [web-api](https://github.com/YGGverse/web-api) - Network API with native Yggdrasil/IPv6 support
+* [Yo! Crawler for different networks](https://github.com/YGGverse/Yo)
-* [Yo!](https://github.com/YGGverse/Yo) - Crawler and search engine for different networks
-* [Yoda](https://github.com/YGGverse/Yoda) - Experimental PHP-GTK browser for Gemini protocol

src/Address.php

@@ -83,9 +83,7 @@ class Address
 
     public function isAbsolute(): bool
     {
-        return boolval(
+        return ($this->_scheme && $this->_host);
-            $this->_scheme || $this->_host
-        );
     }
 
     public function isRelative(): bool
@@ -200,37 +198,28 @@ class Address
         $this->_separator = $value;
     }
 
-    public function get(
+    public function get(): string
-        bool $scheme   = true,
-        bool $user     = true,
-        bool $pass     = true,
-        bool $host     = true,
-        bool $port     = true,
-        bool $path     = true,
-        bool $query    = true,
-        bool $fragment = true,
-    ): string
     {
         $address = '';
 
-        if ($scheme && $this->getScheme())
+        if ($scheme = $this->getScheme())
         {
             $address .= sprintf(
                 '%s:%s%s',
-                $this->getScheme(),
+                $scheme,
                 $this->getSeparator(),
                 $this->getSeparator()
             );
         }
 
-        if ($user && $this->getUser())
+        if ($user = $this->getUser())
         {
-            if ($pass && $this->getPass())
+            if ($pass = $this->getPass())
             {
                 $address .= sprintf(
                     '%s:%s@',
-                    $this->getUser(),
+                    $user,
-                    $this->getPass()
+                    $pass
                 );
             }
 
@@ -238,65 +227,65 @@ class Address
             {
                 $address .= sprintf(
                     '%s@',
-                    $this->getUser()
+                    $user
                 );
             }
         }
 
-        if ($host && $this->getHost())
+        if ($host = $this->getHost())
         {
-            $address .= $this->getHost();
+            $address .= $host;
         }
 
-        if ($port && $this->getPort())
+        if ($port = $this->getPort())
         {
             $address .= sprintf(
                 ':%d',
-                $this->getPort()
+                $port
             );
         }
 
-        if ($path && $this->getPath())
+        if ($path = $this->getPath())
         {
-            if (!str_starts_with($this->getPath(), $this->getSeparator()))
+            if (!str_starts_with($path, $this->getSeparator()))
             {
                 $address .= $this->getSeparator();
             }
 
-            $address .= $this->getPath();
+            $address .= $path;
         }
 
-        if ($query && $this->getQuery())
+        if ($query = $this->getQuery())
         {
             $address .= sprintf(
                 '?%s',
-                $this->getQuery()
+                $query
             );
         }
 
-        if ($fragment && $this->getFragment())
+        if ($fragment = $this->getFragment())
         {
             $address .= sprintf(
                 '#%s',
-                $this->getFragment()
+                $fragment
             );
         }
 
         return $address;
     }
 
-    public function toAbsolute(
+    public function getAbsolute(
         \Yggverse\Net\Address $base
-    ): bool
+    ): ?string
     {
         if ($this->isAbsolute())
         {
-            return true;
+            return $this->get();
         }
 
         if ($base->isRelative())
         {
-            return false;
+            return null;
         }
 
         $this->setScheme(
@@ -325,7 +314,7 @@ class Address
 
         if (str_starts_with((string) $this->getPath(), $this->getSeparator()))
         {
-            return true;
+            return $this->get();
         }
 
         if ($path = $this->getPath())
@@ -353,7 +342,7 @@ class Address
                 {
                     if (empty($prefix[$index]))
                     {
-                        return false;
+                        return null;
                     }
 
                     unset(
@@ -379,23 +368,8 @@ class Address
                     )
                 )
             );
-
-            return true;
         }
 
-        return false;
+        return $this->get();
-    }
-
-    // @TODO deprecated, legacy needs only
-    public function getAbsolute(
-        \Yggverse\Net\Address $base
-    ): ?string
-    {
-        if ($this->toAbsolute($base))
-        {
-            return $this->get();
-        }
-
-        return null;
     }
 }

src/Resolve.php

@@ -179,7 +179,7 @@ class Resolve
                 {
                     if (\Yggverse\Net\Valid::ip6($host))
                     {
-                        $address->setHost(
+                        $resolved->setHost(
                             sprintf(
                                 '[%s]',
                                 $host