Ensure database connection is always restored in usingConnection() (#56258)

Co-authored-by: Xurshudyan <v.khurshudyan@aico.swiss>

Author: xurshudyan

src/Illuminate/Database/DatabaseManager.php

@@ -354,9 +354,11 @@ public function usingConnection($name, callable $callback)
 
  $this->setDefaultConnection($name);
 
- return tap($callback(), function () use ($previousName) {
+ try {
+ return $callback();
+ } finally {
  $this->setDefaultConnection($previousName);
- });
+ }
  }
 
  /**

src/Illuminate/Database/Migrations/Migrator.php

@@ -662,7 +662,11 @@ public function usingConnection($name, callable $callback)
 
  $this->setConnection($name);
 
- return tap($callback(), fn () => $this->setConnection($previousConnection));
+ try {
+ return $callback();
+ } finally {
+ $this->setConnection($previousConnection);
+ }
  }
 
  /**