Skip to content

Commit

Permalink
Merge branch '7.0' into 7.1
Browse files Browse the repository at this point in the history
* 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 >= 6.4
  [String] Fix *String::snake methods
  • Loading branch information
nicolas-grekas committed Jun 28, 2024
2 parents 9cbab67 + 9359ce4 commit 9fc4beb
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions ManagerRegistry.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit 9fc4beb

Please sign in to comment.