doctrine · greg0ire · Feb 3, 2026 · Feb 3, 2026
diff --git a/composer.json b/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": {

diff --git a/phpbench.json b/phpbench.json
@@ -1,4 +1,4 @@
 {
     "runner.bootstrap": "vendor/autoload.php",
-    "runner.path": "tests/DoctrineTest/InstantiatorPerformance"
+    "runner.path": "tests/InstantiatorPerformance"
 }
diff --git a/phpcs.xml.dist b/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>
diff --git a/phpstan.neon.dist b/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'
diff --git a/phpunit.xml.dist b/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>

diff --git a/...antiator/Exception/ExceptionInterface.php → src/Exception/ExceptionInterface.php b/...antiator/Exception/ExceptionInterface.php → src/Exception/ExceptionInterface.php
diff --git a/...or/Exception/InvalidArgumentException.php → src/Exception/InvalidArgumentException.php b/...or/Exception/InvalidArgumentException.php → src/Exception/InvalidArgumentException.php
diff --git a/...or/Exception/UnexpectedValueException.php → src/Exception/UnexpectedValueException.php b/...or/Exception/UnexpectedValueException.php → src/Exception/UnexpectedValueException.php
diff --git a/src/Doctrine/Instantiator/Instantiator.php → src/Instantiator.php b/src/Doctrine/Instantiator/Instantiator.php → src/Instantiator.php
diff --git a/...ne/Instantiator/InstantiatorInterface.php → src/InstantiatorInterface.php b/...ne/Instantiator/InstantiatorInterface.php → src/InstantiatorInterface.php
diff --git a/...formance/InstantiatorPerformanceBench.php → ...formance/InstantiatorPerformanceBench.php b/...formance/InstantiatorPerformanceBench.php → ...formance/InstantiatorPerformanceBench.php
diff --git a/...xception/InvalidArgumentExceptionTest.php → ...xception/InvalidArgumentExceptionTest.php b/...xception/InvalidArgumentExceptionTest.php → ...xception/InvalidArgumentExceptionTest.php
diff --git a/...xception/UnexpectedValueExceptionTest.php → ...xception/UnexpectedValueExceptionTest.php b/...xception/UnexpectedValueExceptionTest.php → ...xception/UnexpectedValueExceptionTest.php
diff --git a/...est/InstantiatorTest/InstantiatorTest.php → tests/InstantiatorTest/InstantiatorTest.php b/...est/InstantiatorTest/InstantiatorTest.php → tests/InstantiatorTest/InstantiatorTest.php
diff --git a/...tantiatorTestAsset/AbstractClassAsset.php → ...tantiatorTestAsset/AbstractClassAsset.php b/...tantiatorTestAsset/AbstractClassAsset.php → ...tantiatorTestAsset/AbstractClassAsset.php
diff --git a/...nstantiatorTestAsset/ArrayObjectAsset.php → ...nstantiatorTestAsset/ArrayObjectAsset.php b/...nstantiatorTestAsset/ArrayObjectAsset.php → ...nstantiatorTestAsset/ArrayObjectAsset.php
diff --git a/.../InstantiatorTestAsset/ExceptionAsset.php → .../InstantiatorTestAsset/ExceptionAsset.php b/.../InstantiatorTestAsset/ExceptionAsset.php → .../InstantiatorTestAsset/ExceptionAsset.php
diff --git a/...antiatorTestAsset/FinalExceptionAsset.php → ...antiatorTestAsset/FinalExceptionAsset.php b/...antiatorTestAsset/FinalExceptionAsset.php → ...antiatorTestAsset/FinalExceptionAsset.php
diff --git a/...eTest/InstantiatorTestAsset/PharAsset.php → tests/InstantiatorTestAsset/PharAsset.php b/...eTest/InstantiatorTestAsset/PharAsset.php → tests/InstantiatorTestAsset/PharAsset.php
diff --git a/...tantiatorTestAsset/PharExceptionAsset.php → ...tantiatorTestAsset/PharExceptionAsset.php b/...tantiatorTestAsset/PharExceptionAsset.php → ...tantiatorTestAsset/PharExceptionAsset.php
diff --git a/...estAsset/SerializableArrayObjectAsset.php → ...estAsset/SerializableArrayObjectAsset.php b/...estAsset/SerializableArrayObjectAsset.php → ...estAsset/SerializableArrayObjectAsset.php
diff --git a/...t/SerializableFinalInternalChildAsset.php → ...t/SerializableFinalInternalChildAsset.php b/...t/SerializableFinalInternalChildAsset.php → ...t/SerializableFinalInternalChildAsset.php
diff --git a/...InstantiatorTestAsset/SimpleEnumAsset.php → ...InstantiatorTestAsset/SimpleEnumAsset.php b/...InstantiatorTestAsset/SimpleEnumAsset.php → ...InstantiatorTestAsset/SimpleEnumAsset.php
diff --git a/...atorTestAsset/SimpleSerializableAsset.php → ...atorTestAsset/SimpleSerializableAsset.php b/...atorTestAsset/SimpleSerializableAsset.php → ...atorTestAsset/SimpleSerializableAsset.php
diff --git a/...nstantiatorTestAsset/SimpleTraitAsset.php → ...nstantiatorTestAsset/SimpleTraitAsset.php b/...nstantiatorTestAsset/SimpleTraitAsset.php → ...nstantiatorTestAsset/SimpleTraitAsset.php
diff --git a/...nstantiatorTestAsset/UnCloneableAsset.php → ...nstantiatorTestAsset/UnCloneableAsset.php b/...nstantiatorTestAsset/UnCloneableAsset.php → ...nstantiatorTestAsset/UnCloneableAsset.php
diff --git a/.../UnserializeExceptionArrayObjectAsset.php → .../UnserializeExceptionArrayObjectAsset.php b/.../UnserializeExceptionArrayObjectAsset.php → .../UnserializeExceptionArrayObjectAsset.php
diff --git a/...tantiatorTestAsset/WakeUpNoticesAsset.php → ...tantiatorTestAsset/WakeUpNoticesAsset.php b/...tantiatorTestAsset/WakeUpNoticesAsset.php → ...tantiatorTestAsset/WakeUpNoticesAsset.php
diff --git a/.../InstantiatorTestAsset/XMLReaderAsset.php → .../InstantiatorTestAsset/XMLReaderAsset.php b/.../InstantiatorTestAsset/XMLReaderAsset.php → .../InstantiatorTestAsset/XMLReaderAsset.php