Added isValidQuery

Fixed uri/iri validations

Author: sorinsarca

src/Formats/Iri.php

@@ -42,7 +42,7 @@ public function validate($data): bool
             if (!$data) {
                 return false;
             }
-            foreach (['host', 'path', 'fragment'] as $component) {
+            foreach (['host', 'path', 'query', 'fragment'] as $component) {
                 if (isset($data[$component])) {
                     $data[$component] = idn_to_ascii($data[$component], 0, INTL_IDNA_VARIANT_UTS46);
                 }

src/Formats/IriReference.php

@@ -42,7 +42,7 @@ public function validate($data): bool
             if (!$data) {
                 return false;
             }
-            foreach (['host', 'path', 'fragment'] as $component) {
+            foreach (['host', 'path', 'query', 'fragment'] as $component) {
                 if (isset($data[$component])) {
                     $data[$component] = idn_to_ascii($data[$component], 0, INTL_IDNA_VARIANT_UTS46);
                 }

src/URI.php

@@ -31,7 +31,9 @@ class URI
         'fragment' => null
     ];
 
-    const FRAGMENT_REGEX = '/^(?:(%[0-9a-f]{2})|[a-z0-9\-\/?:@._~!\$&\'\(\)*+,;=])*$/i';
+    const FRAGMENT_REGEX = '/^(?:(?:%[0-9a-f]{2})+|[a-z0-9\-\/?:@._~!\$&\'\(\)*+,;=])*$/i';
+
+    const QUERY_REGEX = self::FRAGMENT_REGEX;
 
     const PATH_REGEX = '/^(?:(%[0-9a-f]{2})|[a-z0-9\/:@\-._~\!\$&\'\(\)*+,;=])*$/i';
 
@@ -134,6 +136,9 @@ public static function isValid(string $uri, bool $require_scheme = true): bool
         if (isset($uri['path']) && !static::isValidPath($uri['path'])) {
             return false;
         }
+        if (isset($uri['query']) && !static::isValidQuery($uri['query'])) {
+            return false;
+        }
         if (isset($uri['fragment']) && !static::isValidFragment($uri['fragment'])) {
             return false;
         }
@@ -173,6 +178,15 @@ public static function isValidFragment(string $fragment): bool
         return (bool) preg_match(static::FRAGMENT_REGEX, $fragment);
     }
 
+    /**
+     * @param string $query
+     * @return bool
+     */
+    public static function isValidQuery(string $query): bool
+    {
+        return $query === '' || preg_match(static::QUERY_REGEX, $query);
+    }
+
     /**
      * @param string $uri
      * @return array