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

Issue #3261229 by mfb, danflanagan8, smustgrave, daffie, catch, alexpott: Passing null to parameter #1 ($num) of type int|float to abs() is deprecated

merge-requests/4449/head
Dave Long 2023-07-22 14:50:00 +02:00
parent 6cfd0670af
commit 5f3e8885b8
No known key found for this signature in database
GPG Key ID: ED52AE211E142771
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/file/file.module
View File

@ -1080,7 +1080,7 @@ function template_preprocess_file_link(&$variables) {
// Set file classes to the options array.
$variables['attributes'] = new Attribute($variables['attributes']);
$variables['attributes']->addClass($classes);
$variables['file_size'] = format_size($file->getSize() ?? 0);
$variables['file_size'] = $file->getSize() !== NULL ? format_size($file->getSize()) : '';
$variables['link'] = Link::fromTextAndUrl($link_text, $url->mergeOptions($options))->toRenderable();
}

2
core/modules/file/src/Plugin/Field/FieldFormatter/TableFormatter.php
View File

@ -39,7 +39,7 @@ class TableFormatter extends DescriptionAwareFileFormatterBase {
],
],
],
['data' => format_size($file->getSize())],
['data' => $file->getSize() !== NULL ? format_size($file->getSize()) : $this->t('Unknown')],
];
}

10
core/modules/file/tests/src/Functional/FileFieldDisplayTest.php
View File

@ -232,6 +232,16 @@ class FileFieldDisplayTest extends FileFieldTestBase {
$this->drupalGet('node/' . $nid);
$this->assertSession()->elementTextContains('xpath', '//a[@href="' . $node->{$field_name}->entity->createFileUrl() . '"]', $description);
// Test that null file size is rendered as "Unknown".
$nonexistent_file = File::create([
'uri' => 'temporary://' . $this->randomMachineName() . '.txt',
]);
$nonexistent_file->save();
$node->set($field_name, $nonexistent_file->id());
$node->save();
$this->drupalGet('node/' . $nid);
$this->assertSession()->elementTextEquals('xpath', '//a[@href="' . $node->{$field_name}->entity->createFileUrl() . '"]/../../../td[2]', 'Unknown');
}
}