remove functions

Author: nyamsprod

README.md

@@ -9,17 +9,16 @@ This package contains a userland PHP uri query parser and builder.
 ```php
 <?php
 
-use function League\Uri\query_parse;
-use function League\Uri\query_build;
+use League\Uri\Parser\QueryString;
 
-$pairs = query_parse('module=home&action=show&page=😓');
+$pairs = QueryString::parse('module=home&action=show&page=😓');
 // returns [
 //     ['module', 'home'],
 //     ['action', 'show'],
 //     ['page', '😓']
 // ];
 
-$str = query_build($pairs, '|');
+$str = QueryString::build($pairs, '|');
 // returns 'module=home|action=show|page=😓'
 ```
 
@@ -49,9 +48,9 @@ Parsing a query string is easy.
 ```php
 <?php
 
-use function League\Uri\query_parse;
+use League\Uri\Parser\QueryString;
 
-$pairs = query_parse('module=home&action=show&page=😓');
+$pairs = QueryString::parse('module=home&action=show&page=😓');
 // returns [
 //     ['module', 'home'],
 //     ['action', 'show'],
@@ -64,12 +63,12 @@ $pairs = query_parse('module=home&action=show&page=😓');
 ```php
 <?php
 
-function League\Uri\query_parse($query, string $separator = '&', int $enc_type = PHP_QUERY_RFC3986): array;
+public static function QueryString::parse($query, string $separator = '&', int $enc_type = PHP_QUERY_RFC3986): array;
 ```
 
 The returned array is a collection of key/value pairs. Each pair is represented as an array where the first element is the pair key and the second element the pair value. While the pair key is always a string, the pair value can be a string or the `null` value.
 
-The `League\Uri\query_parse` parameters are
+The `League\Uri\QueryString::parse` parameters are
 
 - `$query` can be the `null` value, any scalar or object which is stringable;
 - `$separator` is a string; by default it is the `&` character;
@@ -82,9 +81,9 @@ Here's a simple example showing how to use all the given parameters:
 ```php
 <?php
 
-use function League\Uri\query_parse;
+use League\Uri\QueryString;
 
-$pairs = query_parse(
+$pairs = QueryString::parse(
     'module=home:action=show:page=toto+bar&action=hide',
     ':',
     PHP_QUERY_RFC1738
@@ -99,14 +98,14 @@ $pairs = query_parse(
 
 ### Building the URI query string
 
-To convert back the collection of key/value pairs into a valid query string or the `null` value you can use the `League\Uri\query_build` function.
+To convert back the collection of key/value pairs into a valid query string or the `null` value you can use the `QueryString::build` function.
 
 ```php
 <?php
 
-use function League\Uri\query_build;
+use League\Uri\Parser\QueryString;
 
-$pairs = query_build([
+$pairs = QueryString::build([
     ['module', 'home'],
     ['action', 'show'],
     ['page', 'toto bar'],
@@ -121,32 +120,32 @@ $pairs = query_build([
 ```php
 <?php
 
-function League\Uri\query_build(iterable $pairs, string $separator = '&', int $enc_type = PHP_QUERY_RFC3986): ?string;
+public static function QueryString::build(iterable $pairs, string $separator = '&', int $enc_type = PHP_QUERY_RFC3986): ?string;
 ```
 
-The `League\Uri\query_build` :
+The `QueryString::build` :
 
-- accepts any iterable structure containing a collection of key/pair pairs as describe in the returned array of the `League\Uri\query_parse` function.
+- accepts any iterable structure containing a collection of key/pair pairs as describe in the returned array of the QueryString::parse` function.
 
-Just like with `League\Uri\query_parse`, you can specify the separator and the encoding algorithm to use.
+Just like with `QueryString::parse`, you can specify the separator and the encoding algorithm to use.
 
 - the function returns the `null` value if an empty array or collection is given as input.
 
 ### Extracting PHP variables
 
-`League\Uri\query_parse` and `League\Uri\query_build` preserve the query string pairs content and order. If you want to extract PHP variables from the query string *à la* `parse_str` you can use `League\Uri\query_extract`. The function:
+`QueryString::parse` and `QueryString::build` preserve the query string pairs content and order. If you want to extract PHP variables from the query string *à la* `parse_str` you can use `QueryString::extract`. The public static method:
 
-- takes the same parameters as `League\Uri\query_parse`
+- takes the same parameters as `League\Uri\QueryString::parse`
 - does not allow parameters key mangling in the returned array;
 
 ```php
 <?php
 
-use function League\Uri\query_extract;
+use League\Uri\Parser\QueryString;
 
 $query = 'module=show&arr.test[1]=sid&arr test[4][two]=fred&+module+=hide';
 
-$params = query_extract($query, '&', PHP_QUERY_RFC1738);
+$params = QueryString::extract($query, '&', PHP_QUERY_RFC1738);
 // $params contains [
 //     'module' = 'show',
 //     'arr.test' => [
@@ -177,18 +176,18 @@ parse_str($query, $variables);
 
 All exceptions extends the `League\Uri\Parser\InvalidUriComponent` marker class which extends PHP's `InvalidArgumentException` class.
 
-- If the query string is invalid a `League\Uri\Parser\InvalidQueryString` exception is thrown.
+- If the query string is invalid a `League\Uri\Exception\MalformedUriComponent` exception is thrown.
 - If the query pair is invalid a `League\Uri\Parser\InvalidQueryPair` exception is thrown.
 - If the encoding algorithm is unknown or invalid a `League\Uri\Parser\UnknownEncoding` exception is thrown.
 
 ```php
 <?php
 
-use League\Uri\Parser\InvalidUriComponent;
-use function League\Uri\query_extract;
+use League\Uri\Exception\InvalidUriComponent;
+use League\Uri\Parser\QueryString;
 
 try {
-    query_extract('foo=bar', '&', 42);
+    QueryString::extract('foo=bar', '&', 42);
 } catch (InvalidUriComponent $e) {
     //$e is an instanceof League\Uri\Parser\UnknownEncoding
 }

composer.json

@@ -36,8 +36,7 @@
     "autoload": {
         "psr-4": {
             "League\\Uri\\": "src"
-        },
-        "files": ["src/functions_include.php"]
+        }
     },
     "autoload-dev": {
         "psr-4": {

src/Parser/QueryParser.php src/Parser/QueryString.phpsrc/Parser/QueryParser.php renamed to src/Parser/QueryString.php

@@ -45,15 +45,15 @@
 use const PHP_QUERY_RFC3986;
 
 /**
- * A class to parse a URI query string.
+ * A class to parse the URI query string.
  *
  * @package  League\Uri
  * @author   Ignace Nyamagana Butera <[email protected]>
  * @since    1.0.0
  * @see      https://tools.ietf.org/html/rfc3986#section-3.4
  * @internal Use the function League\Uri\query_parse and League\Uri\query_extract instead
  */
-final class QueryParser
+final class QueryString
 {
     private const REGEXP_INVALID_CHARS = '/[\x00-\x1f\x7f]/';
 
@@ -124,7 +124,7 @@ public static function parse($query, string $separator = '&', int $enc_type = PH
             $query = str_replace('+', ' ', $query);
         }
 
-        return array_map([QueryParser::class, 'parsePair'], (array) explode($separator, $query));
+        return array_map([self::class, 'parsePair'], (array) explode($separator, $query));
     }
 
     /**

src/functions.php

@@ -18,12 +18,10 @@
 use League\Uri\Exception\InvalidQueryPair;
 use League\Uri\Exception\MalformedUriComponent;
 use League\Uri\Exception\UnknownEncoding;
+use League\Uri\Parser\QueryString;
 use PHPUnit\Framework\TestCase;
 use TypeError;
 use function date_create;
-use function League\Uri\query_build;
-use function League\Uri\query_extract;
-use function League\Uri\query_parse;
 use const PHP_QUERY_RFC1738;
 use const PHP_QUERY_RFC3986;
 
@@ -32,31 +30,31 @@ class FunctionsTest extends TestCase
     public function testEncodingThrowsExceptionWithQueryParser(): void
     {
         self::expectException(UnknownEncoding::class);
-        query_parse('foo=bar', '&', 42);
+        QueryString::parse('foo=bar', '&', 42);
     }
 
     public function testMalformedUriComponentThrowsExceptionWithQueryParser(): void
     {
         self::expectException(MalformedUriComponent::class);
-        query_parse("foo=bar\0");
+        QueryString::parse("foo=bar\0");
     }
 
     public function testEncodingThrowsExceptionWithQueryBuilder(): void
     {
         self::expectException(UnknownEncoding::class);
-        query_build([['foo', 'bar']], '&', 42);
+        QueryString::build([['foo', 'bar']], '&', 42);
     }
 
     public function testBuildThrowsExceptionWithQueryBuilder(): void
     {
         self::expectException(InvalidQueryPair::class);
-        query_build([['foo', 'boo' => 'bar']]);
+        QueryString::build([['foo', 'boo' => 'bar']]);
     }
 
     public function testWrongTypeThrowExceptionParseQuery(): void
     {
         self::expectException(TypeError::class);
-        query_parse(['foo=bar'], '&', PHP_QUERY_RFC1738);
+        QueryString::parse(['foo=bar'], '&', PHP_QUERY_RFC1738);
     }
 
     /**
@@ -66,7 +64,7 @@ public function testWrongTypeThrowExceptionParseQuery(): void
      */
     public function testExtractQuery($query, array $expectedData): void
     {
-        self::assertSame($expectedData, query_extract($query));
+        self::assertSame($expectedData, QueryString::extract($query));
     }
 
     public function extractQueryProvider(): array
@@ -145,7 +143,7 @@ public function extractQueryProvider(): array
      */
     public function testParse($query, string $separator, array $expected, int $encoding): void
     {
-        self::assertSame($expected, query_parse($query, $separator, $encoding));
+        self::assertSame($expected, QueryString::parse($query, $separator, $encoding));
     }
 
     public function parserProvider(): array
@@ -295,8 +293,8 @@ public function testBuild(
         ?string $expected_rfc1738,
         ?string $expected_rfc3986
     ): void {
-        self::assertSame($expected_rfc1738, query_build($pairs, '&', PHP_QUERY_RFC1738));
-        self::assertSame($expected_rfc3986, query_build($pairs, '&', PHP_QUERY_RFC3986));
+        self::assertSame($expected_rfc1738, QueryString::build($pairs, '&', PHP_QUERY_RFC1738));
+        self::assertSame($expected_rfc3986, QueryString::build($pairs, '&', PHP_QUERY_RFC3986));
     }
 
     public function buildProvider(): array
@@ -386,7 +384,7 @@ public function buildProvider(): array
     public function testBuildQueryThrowsException(iterable $pairs, int $enc_type): void
     {
         self::expectException(InvalidQueryPair::class);
-        query_build($pairs, '&', $enc_type);
+        QueryString::build($pairs, '&', $enc_type);
     }
 
     public function failedBuilderProvider(): array