Issue #3443489 by smustgrave: Remove deprecated code from lib/Installer and lib/KeyValueStore

core/lib/Drupal/Core/KeyValueStore/DatabaseStorageExpirable.php

@@ -23,7 +23,7 @@ class DatabaseStorageExpirable extends DatabaseStorage implements KeyValueStoreE
    *   The serialization class to use.
    * @param \Drupal\Core\Database\Connection $connection
    *   The database connection to use.
-   * @param \Drupal\Component\Datetime\TimeInterface|string|null $time
+   * @param \Drupal\Component\Datetime\TimeInterface $time
    *   The time service.
    * @param string $table
    *   The name of the SQL table to use, defaults to key_value_expire.
@@ -32,18 +32,9 @@ public function __construct(
     $collection,
     SerializationInterface $serializer,
     Connection $connection,
-    protected TimeInterface|string|null $time = NULL,
+    protected TimeInterface $time,
     $table = 'key_value_expire',
   ) {
-    if (is_null($time)) {
-      @trigger_error('Calling ' . __METHOD__ . ' without the $time argument is deprecated in drupal:10.3.0 and it will be required in drupal:11.0.0. See https://www.drupal.org/node/3387233', E_USER_DEPRECATED);
-      $this->time = \Drupal::time();
-    }
-    elseif (is_string($time)) {
-      @trigger_error('Calling ' . __METHOD__ . ' with the $table as 4th argument is deprecated in drupal:10.3.0 and it will be the 5th argument in drupal:11.0.0. See https://www.drupal.org/node/3387233', E_USER_DEPRECATED);
-      $table = $time;
-      $this->time = \Drupal::time();
-    }
     parent::__construct($collection, $serializer, $connection, $table);
   }
 

core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseExpirableFactory.php

@@ -18,20 +18,6 @@ class KeyValueDatabaseExpirableFactory implements KeyValueExpirableFactoryInterf
    */
   protected $storages = [];
 
-  /**
-   * The serialization class to use.
-   *
-   * @var \Drupal\Component\Serialization\SerializationInterface
-   */
-  protected $serializer;
-
-  /**
-   * The database connection.
-   *
-   * @var \Drupal\Core\Database\Connection
-   */
-  protected $connection;
-
   /**
    * Constructs this factory object.
    *
@@ -39,20 +25,14 @@ class KeyValueDatabaseExpirableFactory implements KeyValueExpirableFactoryInterf
    *   The serialization class to use.
    * @param \Drupal\Core\Database\Connection $connection
    *   The Connection object containing the key-value tables.
-   * @param \Drupal\Component\Datetime\TimeInterface|null $time
+   * @param \Drupal\Component\Datetime\TimeInterface $time
    *   The time service.
    */
   public function __construct(
-    SerializationInterface $serializer,
-    Connection $connection,
-    protected ?TimeInterface $time = NULL,
+    protected SerializationInterface $serializer,
+    protected Connection $connection,
+    protected TimeInterface $time,
   ) {
-    $this->serializer = $serializer;
-    $this->connection = $connection;
-    if (!$time) {
-      @trigger_error('Calling ' . __METHOD__ . '() without the $time argument is deprecated in drupal:10.3.0 and it will be required in drupal:11.0.0. See https://www.drupal.org/node/3387233', E_USER_DEPRECATED);
-      $this->time = \Drupal::service(TimeInterface::class);
-    }
   }
 
   /**