Merge branch '5.4' into 6.4

nicolas-grekas · nicolas-grekas · commit 64d024fcb3aa · 2024-06-28T11:25:38.000+02:00
* 5.4:
  [Filesystem] Fix Filesystem::remove() on Windows
  [DoctrineBridge] Fix compat with DI &gt;= 6.4
  [String] Fix *String::snake methods
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);
                 }

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,8 @@ function (&$wrappedInstance, LazyLoadingInterface $manager) use ($name) {`
`61`	`61`	`}`
`62`	`62`	`if (isset($this->fileMap[$name])) {`
`63`	`63`	`$wrappedInstance = $this->load($this->fileMap[$name], false);`
	`64`	`+ } elseif ((new \ReflectionMethod($this, $this->methodMap[$name]))->isStatic()) {`
	`65`	`+ $wrappedInstance = $this->{$this->methodMap[$name]}($this, false);`
`64`	`66`	`} else {`
`65`	`67`	`$wrappedInstance = $this->{$this->methodMap[$name]}(false);`
`66`	`68`	`}`