Merge branch '7.0' into 7.1

nicolas-grekas · nicolas-grekas · commit 9fc4bebf69f0 · 2024-06-28T11:27:18.000+02:00
* 7.0:
  Revert "bug #57520 [SecurityBundle] Remove unused memory users’ `name` attribute from the XSD (MatTheCat)"
  [HttpKernel] Enable optional cache-warmers when cache-dir != build-dir
  [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
@@ -58,6 +58,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
`@@ -58,6 +58,8 @@ function (&$wrappedInstance, LazyLoadingInterface $manager) use ($name) {`
`58`	`58`	`}`
`59`	`59`	`if (isset($this->fileMap[$name])) {`
`60`	`60`	`$wrappedInstance = $this->load($this->fileMap[$name], false);`
	`61`	`+ } elseif ((new \ReflectionMethod($this, $this->methodMap[$name]))->isStatic()) {`
	`62`	`+ $wrappedInstance = $this->{$this->methodMap[$name]}($this, false);`
`61`	`63`	`} else {`
`62`	`64`	`$wrappedInstance = $this->{$this->methodMap[$name]}(false);`
`63`	`65`	`}`