Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[10.x] Disconnecting the database connection after testing #49327

Merged
merged 7 commits into from
Dec 12, 2023
Merged

[10.x] Disconnecting the database connection after testing #49327

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
71c6653
Disconnection after testing with traits for database testing
KentarouTakeda Dec 11, 2023
558efcd
Revert "Disconnection after testing with traits for database testing"
KentarouTakeda Dec 12, 2023
25b0f87
Disconnection at teardown
KentarouTakeda Dec 12, 2023
f52cc3b
No need to disconnect for individual traits
KentarouTakeda Dec 12, 2023
8dc1054
fix: Behavior when run without database
KentarouTakeda Dec 12, 2023
71d57c2
Avoid changing the behavior before fixing as much as possible.
KentarouTakeda Dec 12, 2023
04a0fac
Update TestCase.php
taylorotwell Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/Illuminate/Foundation/Testing/DatabaseTransactions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ public function beginDatabaseTransaction()
$connection->unsetEventDispatcher();
$connection->rollBack();
$connection->setEventDispatcher($dispatcher);
$connection->disconnect();
driesvints marked this conversation as resolved.
Show resolved Hide resolved
}
});
}
Expand Down
1 change: 0 additions & 1 deletion src/Illuminate/Foundation/Testing/RefreshDatabase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ public function beginDatabaseTransaction()
$connection->unsetEventDispatcher();
$connection->rollBack();
$connection->setEventDispatcher($dispatcher);
$connection->disconnect();
driesvints marked this conversation as resolved.
Show resolved Hide resolved
}
});
}
Expand Down
5 changes: 5 additions & 0 deletions src/Illuminate/Foundation/Testing/TestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,11 @@ protected function tearDown(): void

ParallelTesting::callTearDownTestCaseCallbacks($this);

$database = $this->app['db'];
driesvints marked this conversation as resolved.
Show resolved Hide resolved
foreach (array_keys($database->getConnections()) as $name) {
$database->purge($name);
}
driesvints marked this conversation as resolved.
Show resolved Hide resolved

$this->app->flush();

$this->app = null;
Expand Down