diff --git a/core/lib/Drupal/Core/Database/Driver/fake/FakeConnection.php b/core/lib/Drupal/Core/Database/Driver/fake/FakeConnection.php index c39005a..96a9375 100644 --- a/core/lib/Drupal/Core/Database/Driver/fake/FakeConnection.php +++ b/core/lib/Drupal/Core/Database/Driver/fake/FakeConnection.php @@ -257,10 +257,12 @@ protected function popCommittableTransactions() { $this->databaseContentsStack = array('default' => $this->databaseContentsStack[$name]); } else { - $last_entry = array_pop($this->databaseContentsStack); + // Commit the database content to the previous on the stack. + $entry_to_commit = $this->databaseContentsStack[$name]; + unset($this->databaseContentsStack[$name]); end($this->databaseContentsStack); $end = key($this->databaseContentsStack); - $this->databaseContentsStack[$end] = $last_entry; + $this->databaseContentsStack[$end] = $entry_to_commit; } } } diff --git a/core/tests/Drupal/Tests/Core/Database/Driver/fake/FakeConnectionTest.php b/core/tests/Drupal/Tests/Core/Database/Driver/fake/FakeConnectionTest.php index 12a4e24..7e5fc34 100644 --- a/core/tests/Drupal/Tests/Core/Database/Driver/fake/FakeConnectionTest.php +++ b/core/tests/Drupal/Tests/Core/Database/Driver/fake/FakeConnectionTest.php @@ -13,6 +13,11 @@ use Drupal\Core\Database\TransactionOutOfOrderException; use Drupal\Tests\UnitTestCase; +/** + * Tests the fake database connection. + * + * @coversDefaultClass \Drupal\Core\Database\Driver\fake\FakeConnection + */ class FakeConnectionTest extends UnitTestCase { /**