Issue #3270556 by quietone: Handle NULL for max_filesize_per_file in...

Issue #3270556 by quietone: Handle NULL for max_filesize_per_file in d6\FieldInstanceSettings::convertSizeUnit

(cherry picked from commit 54816afa)

core/modules/field/src/Plugin/migrate/process/d6/FieldInstanceSettings.php

@@ -49,7 +49,7 @@ public function transform($value, MigrateExecutableInterface $migrate_executable
       case 'imagefield_widget':
         $settings['file_extensions'] = $widget_settings['file_extensions'];
         $settings['file_directory'] = $widget_settings['file_path'];
-        $settings['max_filesize'] = $this->convertSizeUnit($widget_settings['max_filesize_per_file']);
+        $settings['max_filesize'] = $this->convertSizeUnit($widget_settings['max_filesize_per_file'] ?? '');
         $settings['alt_field'] = $widget_settings['alt'];
         $settings['alt_field_required'] = $widget_settings['custom_alt'];
         $settings['title_field'] = $widget_settings['title'];

core/modules/field/tests/src/Unit/Plugin/migrate/process/d6/FieldInstanceSettingsTest.php

+<?php
+
+namespace Drupal\Tests\field\Unit\Plugin\migrate\process\d6;
+
+use Drupal\field\Plugin\migrate\process\d6\FieldInstanceSettings;
+use Drupal\migrate\Plugin\MigrationInterface;
+use Drupal\migrate\MigrateExecutableInterface;
+use Drupal\migrate\Row;
+use Drupal\Tests\UnitTestCase;
+
+// cspell:ignore imagefield
+
+/**
+ * @coversDefaultClass \Drupal\field\Plugin\migrate\process\d6\FieldInstanceSettings
+ * @group field
+ */
+class FieldInstanceSettingsTest extends UnitTestCase {
+
+  /**
+   * @covers ::getSettings
+   *
+   * @dataProvider getSettingsProvider
+   */
+  public function testGetSettings($field_type, $instance_settings, $expected) {
+    $instance_settings = unserialize($instance_settings);
+    $migration = $this->createMock(MigrationInterface::class);
+    $plugin = new FieldInstanceSettings([], 'd6_field_field_settings', [], $migration);
+
+    $executable = $this->createMock(MigrateExecutableInterface::class);
+    $row = $this->getMockBuilder(Row::class)
+      ->disableOriginalConstructor()
+      ->getMock();
+
+    $result = $plugin->transform([
+      $field_type,
+      $instance_settings,
+      NULL,
+    ], $executable, $row, 'foo');
+    $this->assertSame($expected, $result);
+  }
+
+  /**
+   * Provides field settings for testGetSettings().
+   */
+  public function getSettingsProvider() {
+    return [
+      'imagefield size set' => [
+        'imagefield_widget',
+        'a:14:{s:15:"file_extensions";s:11:"gif jpg png";s:9:"file_path";N;s:18:"progress_indicator";N;s:21:"max_filesize_per_file";s:3:"10M";s:21:"max_filesize_per_node";N;s:14:"max_resolution";N;s:14:"min_resolution";N;s:3:"alt";N;s:10:"custom_alt";i:1;s:5:"title";N;s:12:"custom_title";i:1;s:10:"title_type";N;s:13:"default_image";N;s:17:"use_default_image";N;}',
+        [
+          'file_extensions' => 'gif jpg png',
+          'file_directory' => NULL,
+          'max_filesize' => '10MB',
+          'alt_field' => NULL,
+          'alt_field_required' => 1,
+          'title_field' => NULL,
+          'title_field_required' => 1,
+          'max_resolution' => '',
+          'min_resolution' => '',
+        ],
+      ],
+      'imagefield size NULL' => [
+        'imagefield_widget',
+        'a:14:{s:15:"file_extensions";s:11:"gif jpg png";s:9:"file_path";N;s:18:"progress_indicator";N;s:21:"max_filesize_per_file";N;s:21:"max_filesize_per_node";N;s:14:"max_resolution";N;s:14:"min_resolution";N;s:3:"alt";N;s:10:"custom_alt";i:1;s:5:"title";N;s:12:"custom_title";i:1;s:10:"title_type";N;s:13:"default_image";N;s:17:"use_default_image";N;}',
+        [
+          'file_extensions' => 'gif jpg png',
+          'file_directory' => NULL,
+          'max_filesize' => '',
+          'alt_field' => NULL,
+          'alt_field_required' => 1,
+          'title_field' => NULL,
+          'title_field_required' => 1,
+          'max_resolution' => '',
+          'min_resolution' => '',
+        ],
+      ],
+
+    ];
+  }
+
+}