Simplify uri-components package structure

.php-cs-fixer.php

@@ -11,7 +11,7 @@
 
 $finder = PhpCsFixer\Finder::create()
     ->in(__DIR__.'/uri/src')
-    ->in(__DIR__.'/components/src')
+    ->in(__DIR__.'/components')
     ->in(__DIR__.'/interfaces');
 
 $config = new PhpCsFixer\Config();

components/composer.json

@@ -29,7 +29,7 @@
     },
     "autoload": {
         "psr-4": {
-            "League\\Uri\\": "src"
+            "League\\Uri\\": ""
         }
     },
     "extra": {

composer.json

@@ -43,7 +43,7 @@
     },
     "autoload": {
         "psr-4": {
-            "League\\Uri\\": ["uri/src", "components/src", "interfaces"]
+            "League\\Uri\\": ["uri/src", "components", "interfaces"]
         }
     },
     "scripts": {

phpbench.json

@@ -1,7 +1,7 @@
 {
     "$schema": "vendor/phpbench/phpbench/phpbench.schema.json",
     "runner.bootstrap": "vendor/autoload.php",
-    "runner.path": ["uri/src", "components/src"],
+    "runner.path": ["uri/src", "components"],
     "runner.file_pattern": "*Bench.php",
     "runner.php_disable_ini": true
 }

phpstan.neon

@@ -6,20 +6,20 @@ includes:
 parameters:
 	paths:
 		- uri/src
-		- components/src
+		- components
 		- interfaces
 	ignoreErrors:
 		- '#Parameter \#1 \$pairs of static method League\\Uri\\Components\\Query::createFromPairs\(\) expects iterable.*#'
 		- '#^Call to deprecated method withContent\(\) of#'
 		- message: '#Parameter \#2 \$value of method League\\Uri\\Contracts\\QueryInterface::appendTo\(\) expects string\|null, int given\.#'
-		  path: components/src/Components/QueryTest.php
+		  path: components/Components/QueryTest.php
 		- message: '#Cannot cast mixed to string.#'
-		  path: components/src/IPv4Calculators/BCMathCalculator.php
+		  path: components/IPv4Calculators/BCMathCalculator.php
 		- message: '#Cannot cast mixed to string.#'
-		  path: components/src/IPv4Calculators/NativeCalculator.php
+		  path: components/IPv4Calculators/NativeCalculator.php
 		- message: '#function gmp_(.*)? expects (GMP|int)#'
-		  path: components/src/IPv4Calculators/GMPCalculator.php
+		  path: components/IPv4Calculators/GMPCalculator.php
 		- message : "#Strict comparison using === between '' and non-empty-string will always evaluate to false.#"
-		  path: components/src/QueryString.php
+		  path: components/QueryString.php
 	reportUnmatchedIgnoredErrors: true
 	checkMissingIterableValueType: false

phpunit.xml

@@ -15,14 +15,14 @@
     <coverage>
         <include>
             <directory suffix=".php">uri/src</directory>
-            <directory suffix=".php">components/src</directory>
+            <directory suffix=".php">components</directory>
             <directory suffix=".php">interfaces</directory>
         </include>
         <exclude>
             <directory suffix="Bench.php">uri/src</directory>
             <directory suffix="Test.php">uri/src</directory>
-            <directory suffix="Bench.php">components/src</directory>
-            <directory suffix="Test.php">components/src</directory>
+            <directory suffix="Bench.php">components</directory>
+            <directory suffix="Test.php">components</directory>
             <directory suffix="Bench.php">interfaces</directory>
             <directory suffix="Test.php">interfaces</directory>
         </exclude>
@@ -35,7 +35,7 @@
     <testsuites>
         <testsuite name="URI Test Suite">
             <directory suffix="Test.php">uri/src</directory>
-            <directory suffix="Test.php">components/src</directory>
+            <directory suffix="Test.php">components</directory>
             <directory suffix="Test.php">interfaces</directory>
         </testsuite>
     </testsuites>