Merge pull request #151 from greg0ire/psr-4

Use shallower trees

Author: greg0ire

composer.json

@@ -29,14 +29,14 @@
     },
     "autoload": {
         "psr-4": {
-            "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+            "Doctrine\\Instantiator\\": "src/"
         }
     },
     "autoload-dev": {
-        "psr-0": {
-            "DoctrineTest\\InstantiatorPerformance\\": "tests",
-            "DoctrineTest\\InstantiatorTest\\": "tests",
-            "DoctrineTest\\InstantiatorTestAsset\\": "tests"
+        "psr-4": {
+            "DoctrineTest\\InstantiatorPerformance\\": "tests/InstantiatorPerformance",
+            "DoctrineTest\\InstantiatorTest\\": "tests/InstantiatorTest",
+            "DoctrineTest\\InstantiatorTestAsset\\": "tests/InstantiatorTestAsset"
         }
     },
     "config": {

phpbench.json

@@ -1,4 +1,4 @@
 {
     "runner.bootstrap": "vendor/autoload.php",
-    "runner.path": "tests/DoctrineTest/InstantiatorPerformance"
+    "runner.path": "tests/InstantiatorPerformance"
 }

phpcs.xml.dist

@@ -22,16 +22,16 @@
     </rule>
 
     <rule ref="SlevomatCodingStandard.Classes.SuperfluousAbstractClassNaming">
-        <exclude-pattern>tests/DoctrineTest/InstantiatorTestAsset/AbstractClassAsset.php</exclude-pattern>
+        <exclude-pattern>tests/InstantiatorTestAsset/AbstractClassAsset.php</exclude-pattern>
     </rule>
 
     <rule ref="SlevomatCodingStandard.Classes.SuperfluousExceptionNaming">
-        <exclude-pattern>src/Doctrine/Instantiator/Exception/UnexpectedValueException.php</exclude-pattern>
-        <exclude-pattern>src/Doctrine/Instantiator/Exception/InvalidArgumentException.php</exclude-pattern>
+        <exclude-pattern>src/Exception/UnexpectedValueException.php</exclude-pattern>
+        <exclude-pattern>src/Exception/InvalidArgumentException.php</exclude-pattern>
     </rule>
 
     <rule ref="SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming">
-        <exclude-pattern>src/Doctrine/Instantiator/Exception/ExceptionInterface.php</exclude-pattern>
-        <exclude-pattern>src/Doctrine/Instantiator/InstantiatorInterface.php</exclude-pattern>
+        <exclude-pattern>src/Exception/ExceptionInterface.php</exclude-pattern>
+        <exclude-pattern>src/InstantiatorInterface.php</exclude-pattern>
     </rule>
 </ruleset>

phpstan.neon.dist

@@ -13,19 +13,19 @@ parameters:
         # PHPStan is unable to infer the return type of unserialize() in this case.
         -
             message: '#Method Doctrine\\Instantiator\\Instantiator\:\:buildFactory\(\) should return callable\(\): T but returns Closure\(\): mixed\.#'
-            path: 'src/Doctrine/Instantiator/Instantiator.php'
+            path: 'src/Instantiator.php'
 
         # dynamic properties confuse static analysis
         -
             message: '#Access to an undefined property object::\$foo\.#'
-            path: 'tests/DoctrineTest/InstantiatorTest/InstantiatorTest.php'
+            path: 'tests/InstantiatorTest/InstantiatorTest.php'
 
 	# The property is static, we cannot use templating here
         -
             message: '#instantiate\(\) should return#'
-            path: 'src/Doctrine/Instantiator/Instantiator.php'
+            path: 'src/Instantiator.php'
 
 	# this trait is not meant to be use'd
         -
             message: '#is used zero times#'
-            path: 'tests/DoctrineTest/InstantiatorTestAsset/SimpleTraitAsset.php'
+            path: 'tests/InstantiatorTestAsset/SimpleTraitAsset.php'

phpunit.xml.dist

@@ -13,7 +13,7 @@
     </php>
 
     <testsuite name="Doctrine\Instantiator tests">
-        <directory>./tests/DoctrineTest/InstantiatorTest</directory>
+        <directory>./tests/InstantiatorTest</directory>
     </testsuite>
     <source>
         <include>