Merge branch '5.4' into 6.4

* 5.4: [Filesystem] Fix Filesystem::remove() on Windows [DoctrineBridge] Fix compat with DI >= 6.4 [String] Fix *String::snake methods
symfony · Jun 28, 2024 · 64d024f · 64d024f
2 parents 934e826 + 2c2f0c8
commit 64d024f
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/ManagerRegistry.php b/ManagerRegistry.php
@@ -61,6 +61,8 @@ function (&$wrappedInstance, LazyLoadingInterface $manager) use ($name) {
                 }
                 if (isset($this->fileMap[$name])) {
                     $wrappedInstance = $this->load($this->fileMap[$name], false);
+                } elseif ((new \ReflectionMethod($this, $this->methodMap[$name]))->isStatic()) {
+                    $wrappedInstance = $this->{$this->methodMap[$name]}($this, false);
                 } else {
                     $wrappedInstance = $this->{$this->methodMap[$name]}(false);
                 }