Restructure the SqlWalkerCompat trait to fix optimized autoloading

mbabker · franmomu · commit c7e01ca89c10 · 2024-06-25T18:15:29.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,8 @@ a release.
 ---
 
 ## [Unreleased]
+### Fixed
+- Restructure the SqlWalkerCompat trait to fix optimized autoloading
 
 ## [3.16.0]
 ### Added
diff --git a/src/Tool/ORM/Walker/SqlWalkerCompat.php b/src/Tool/ORM/Walker/SqlWalkerCompat.php
@@ -12,9 +12,27 @@
 use Doctrine\ORM\Query\SqlWalker;
 
 if ((new \ReflectionClass(SqlWalker::class))->getMethod('getExecutor')->hasReturnType()) {
-    // ORM 3.x
-    require_once __DIR__.'/orm-3.php';
+    /**
+     * Helper trait to address compatibility issues between ORM 2.x and 3.x.
+     *
+     * @mixin SqlWalker
+     *
+     * @internal
+     */
+    trait SqlWalkerCompat
+    {
+        use SqlWalkerCompatForOrm3;
+    }
 } else {
-    // ORM 2.x
-    require_once __DIR__.'/orm-2.php';
+    /**
+     * Helper trait to address compatibility issues between ORM 2.x and 3.x.
+     *
+     * @mixin SqlWalker
+     *
+     * @internal
+     */
+    trait SqlWalkerCompat
+    {
+        use SqlWalkerCompatForOrm2;
+    }
 }
diff --git a/src/Tool/ORM/Walker/SqlWalkerCompatForOrm2.php b/src/Tool/ORM/Walker/SqlWalkerCompatForOrm2.php
@@ -30,7 +30,7 @@
  *
  * @internal
  */
-trait SqlWalkerCompat
+trait SqlWalkerCompatForOrm2
 {
     /**
      * Gets an executor that can be used to execute the result of this walker.
diff --git a/src/Tool/ORM/Walker/SqlWalkerCompatForOrm3.php b/src/Tool/ORM/Walker/SqlWalkerCompatForOrm3.php
@@ -32,7 +32,7 @@
  *
  * @internal
  */
-trait SqlWalkerCompat
+trait SqlWalkerCompatForOrm3
 {
     /**
      * Gets an executor that can be used to execute the result of this walker.

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`*`
`31`	`31`	`* @internal`
`32`	`32`	`*/`
`33`		`-trait SqlWalkerCompat`
	`33`	`+trait SqlWalkerCompatForOrm2`
`34`	`34`	`{`
`35`	`35`	`/**`
`36`	`36`	`* Gets an executor that can be used to execute the result of this walker.`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`*`
`33`	`33`	`* @internal`
`34`	`34`	`*/`
`35`		`-trait SqlWalkerCompat`
	`35`	`+trait SqlWalkerCompatForOrm3`
`36`	`36`	`{`
`37`	`37`	`/**`
`38`	`38`	`* Gets an executor that can be used to execute the result of this walker.`