Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3419356 by taraskorpach, acbramley: Use constructor property promotion on $serializer in Drupal\Core\Cache\DatabaseBackend

merge-requests/6498/head
Dave Long 2024-02-07 23:59:46 +00:00
parent 19dfeb4f17
commit 5ce8edeafa
No known key found for this signature in database
GPG Key ID: ED52AE211E142771
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/lib/Drupal/Core/Cache/DatabaseBackend.php
View File

@ -67,13 +67,6 @@ class DatabaseBackend implements CacheBackendInterface {
*/
protected $checksumProvider;
/**
* The serializer to use.
*
* @var \Drupal\Component\Serialization\ObjectAwareSerializationInterface
*/
protected ObjectAwareSerializationInterface $serializer;
/**
* Constructs a DatabaseBackend object.
*
@ -93,7 +86,7 @@ class DatabaseBackend implements CacheBackendInterface {
Connection $connection,
CacheTagsChecksumInterface $checksum_provider,
$bin,
ObjectAwareSerializationInterface|int|string|null $serializer = NULL,
protected ObjectAwareSerializationInterface|int|string|null $serializer = NULL,
$max_rows = NULL,
) {
// All cache tables should be prefixed with 'cache_'.
@ -102,16 +95,15 @@ class DatabaseBackend implements CacheBackendInterface {
$this->bin = $bin;
$this->connection = $connection;
$this->checksumProvider = $checksum_provider;
if (is_int($serializer) || is_string($serializer)) {
if (is_int($this->serializer) || is_string($this->serializer)) {
@trigger_error('Calling ' . __METHOD__ . ' with the $max_rows as 3rd argument is deprecated in drupal:10.3.0 and it will be the 4th argument in drupal:11.0.0. See https://www.drupal.org/node/3014684', E_USER_DEPRECATED);
$max_rows = $serializer;
$serializer = \Drupal::service('serialization.phpserialize');
$max_rows = $this->serializer;
$this->serializer = \Drupal::service('serialization.phpserialize');
}
elseif ($serializer === NULL) {
elseif ($this->serializer === NULL) {
@trigger_error('Calling ' . __METHOD__ . ' without the $serializer argument is deprecated in drupal:10.3.0 and it will be required in drupal:11.0.0. See https://www.drupal.org/node/3014684', E_USER_DEPRECATED);
$serializer = \Drupal::service('serialization.phpserialize');
$this->serializer = \Drupal::service('serialization.phpserialize');
}
$this->serializer = $serializer;
$this->maxRows = $max_rows === NULL ? static::DEFAULT_MAX_ROWS : $max_rows;
}