diff --git a/core/modules/system/tests/src/Unit/Plugin/ImageToolkit/GdToolkitTest.php b/core/modules/system/tests/src/Unit/Plugin/ImageToolkit/GdToolkitTest.php index d117f0f..7e8b516 100644 --- a/core/modules/system/tests/src/Unit/Plugin/ImageToolkit/GdToolkitTest.php +++ b/core/modules/system/tests/src/Unit/Plugin/ImageToolkit/GdToolkitTest.php @@ -51,13 +51,9 @@ class GdToolkitTest extends UnitTestCase { /** * Result for GDToolkit::isMemoryAvailable, for mocking. * - * @var array + * @var \Drupal\Component\Utility\BytesUnitAndSize[] */ - protected $availableMemoryFalse = [ - 'free' => new BytesUnitAndSize(10, 'MB'), - 'required' => new BytesUnitAndSize(20, 'MB'), - 'total' => new BytesUnitAndSize(20, 'MB'), - ]; + protected $availableMemoryFalse; /** * @inheritdoc @@ -65,6 +61,11 @@ class GdToolkitTest extends UnitTestCase { protected function setUp() { // Use the Druplicon image. $this->source = __DIR__ . '/../../../../../../simpletest/files/image-test.jpg'; + $this->availableMemoryFalse = [ + 'free' => new BytesUnitAndSize(10, 'MB'), + 'required' => new BytesUnitAndSize(20, 'MB'), + 'total' => new BytesUnitAndSize(20, 'MB'), + ]; } /** diff --git a/core/tests/Drupal/Tests/Component/Utility/BytesTest.php b/core/tests/Drupal/Tests/Component/Utility/BytesTest.php index 19a37f7..f980d3d 100644 --- a/core/tests/Drupal/Tests/Component/Utility/BytesTest.php +++ b/core/tests/Drupal/Tests/Component/Utility/BytesTest.php @@ -69,14 +69,14 @@ public function providerTestToInt() { * @param int $size * The value for the size argument for * \Drupal\Component\Utility\Bytes::toUnitAndSize(). - * @param array $expected_unit_and_size + * @param \Drupal\Component\Utility\BytesUnitAndSize $expected_unit_and_size * The expected return value from * \Drupal\Component\Utility\Bytes::toUnitAndSize(). * * @dataProvider providerTestToUnitAndSize * @covers ::toUnitAndSize */ - public function testToUnitAndSize($size, array $expected_unit_and_size) { + public function testToUnitAndSize($size, BytesUnitAndSize $expected_unit_and_size = NULL) { $this->assertEquals($expected_unit_and_size, Bytes::toUnitAndSize($size)); } @@ -101,7 +101,7 @@ public function providerTestToUnitAndSize() { [pow(Bytes::KILOBYTE, 5), new BytesUnitAndSize(1, 'PB')], [pow(Bytes::KILOBYTE, 6), new BytesUnitAndSize(1, 'EB')], [pow(Bytes::KILOBYTE, 7), new BytesUnitAndSize(1, 'ZB')], - [pow(Bytes::KILOBYTE, 8), new BytesUnitAndSize(1, 'KB')], + [pow(Bytes::KILOBYTE, 8), new BytesUnitAndSize(1, 'YB')], [23476892, new BytesUnitAndSize(22.39, 'MB')], [79691776, new BytesUnitAndSize(76, 'MB')], [81862076662, new BytesUnitAndSize(76.24, 'GB')],