Issue #3145710: Drupal 9 Readiness

src/Controller/DownloadCountController.php

@@ -5,6 +5,7 @@ namespace Drupal\download_count\Controller;
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Controller\ControllerBase;
+use Drupal\Core\Database\Connection;
 use Drupal\Core\Database\Database;
 use Drupal\Component\Utility\Html;
 use Drupal\Core\Datetime\DateFormatterInterface;
@@ -59,12 +60,15 @@ class DownloadCountController extends ControllerBase implements ContainerInjecti
    *   Date Formatter.
    * @param \Drupal\Core\Queue\QueueFactory $queue
    *   Queue Manager.
+   * @param \Drupal\Core\Database\Connection $connection
+   *   The database connection.
    */
-  public function __construct(ConfigFactoryInterface $config_factory, AccountInterface $current_user, DateFormatterInterface $date_formatter, QueueFactory $queue) {
+  public function __construct(ConfigFactoryInterface $config_factory, AccountInterface $current_user, DateFormatterInterface $date_formatter, QueueFactory $queue, Connection $connection) {
     $this->configFactory = $config_factory;
     $this->currentUser = $current_user;
     $this->dateFormatter = $date_formatter;
     $this->queue = $queue->get('download_count');
+    $this->connection = $connection;
   }
 
   /**
@@ -75,7 +79,8 @@ class DownloadCountController extends ControllerBase implements ContainerInjecti
       $container->get('config.factory'),
       $container->get('current_user'),
       $container->get('date.formatter'),
-      $container->get('queue')
+      $container->get('queue'),
+      $container->get('database')
     );
   }
 
@@ -136,8 +141,7 @@ class DownloadCountController extends ControllerBase implements ContainerInjecti
         'field' => 'last',
       ],
     ];
-    $connection = Database::getConnection();
-    $query = $connection->select('download_count', 'dc')
+    $query = $this->connection->select('download_count', 'dc')
       ->fields('dc', ['type', 'id'])
       ->fields('f', ['filename', 'fid', 'filesize'])
       ->groupBy('dc.type')
@@ -272,8 +276,7 @@ class DownloadCountController extends ControllerBase implements ContainerInjecti
     $last_cron = $config->get('download_count_last_cron');
 
     if ($download_count_entry != NULL) {
-      $connection = Database::getConnection();
-      $query = $connection->select('download_count', 'dc');
+      $query = $this->connection->select('download_count', 'dc');
       $query->innerjoin('file_managed', 'f', 'dc.fid = f.fid');
       $query->fields('dc', [
         'dcid',
@@ -295,8 +298,7 @@ class DownloadCountController extends ControllerBase implements ContainerInjecti
 
     $output = Link::fromTextAndUrl($this->t('« Back to summary'), Url::fromRoute('download_count.reports'))
       ->toString();
-    $connection = Database::getConnection();
-    $query = $connection->select('download_count_cache', 'dc');
+    $query = $this->connection->select('download_count_cache', 'dc');
     $query->addExpression('COUNT(dc.count)', 'count');
 
     if (!is_object($dc_entry)) {
@@ -443,7 +445,7 @@ class DownloadCountController extends ControllerBase implements ContainerInjecti
       '#header' => $header,
       '#rows' => $rows,
       '#attributes' => [
-        'id' => 'download-count-' . Unicode::strtolower($caption),
+        'id' => 'download-count-' . mb_strtolower($caption),
         'class' => 'download-count-details download-count-table',
       ],
       '#caption' => $caption,