Inject database connection into DatabaseLockBackend

yes!

+++ b/core/lib/Drupal/Core/Lock/DatabaseLockBackend.php
@@ -15,12 +16,23 @@
   /**
+   * The database connection.
+   *
+   * @var \Drupal\Core\Database\Connection
+   */
+  protected $connection;
+

Can we please name this $database instead? The code below...

+++ b/core/lib/Drupal/Core/Lock/DatabaseLockBackend.php
@@ -32,7 +44,7 @@ public function acquire($name, $timeout = 30.0) {
-      $success = (bool) db_update('semaphore')
+      $success = (bool) $this->connection->update('semaphore')

Is a lot less readable than the code before it. "db" is a crucial part of explaining what's going on. What's a "connection"?

λ d8 → ħ git 8.x* → grep "protected \$connection\;" . -rn | wc -l
42
λ d8 → ħ git 8.x* → grep "protected \$database\;" . -rn | wc -l
29

So connection seems to be more consistent

On the other hand though we do have \Drupal::database() and nothing on ControllerBase()

well

'connection' imo breaks encapsulation ; why do I need to know or care that the database system uses a connection object to communicate with the database?

'connection' is a bad name because it does not tell me what am I connected to.

So, 'database' is a win.

+++ b/core/lib/Drupal/Core/Lock/DatabaseLockBackend.php
@@ -15,12 +16,23 @@
+   * @param \Drupal\Core\Database\Connection $connection

this should be $database

And it is still ready to go!

Patch no longer applies.

Yep you're correct - committed 4e1d667

Tags