Upgrade path for System 7.x

Rerolled. Getting errors in MigrateSystemConfigurationTest.php but let's see if there is anything else.

Reroll. Interdiff against #6.

How to handle system.filter, which has been moved to a container parameter?

#16 is a bad patch.

For now, removed the system.filter migration. Maybe that should be in a separate issue now that it is a container parameter?

Moved the migration of filter_allowed_protocols to a separate issue, #2682229: Variable to container parameter: filter_allowed_protocols [d7]. It really is different from these 'simple' migrations.

Uploaded a new patch to remove filter_allowed_protocols from the test fixture.

Just a code style issue below, I think could be fixed on commit. RTBC.

1. +++ b/core/modules/system/src/Tests/Migrate/d7/MigrateSystemConfigurationTest.php
   @@ -0,0 +1,184 @@
   +        'd7_action_settings',
   +        'd7_file_settings',
   +        'd7_system_authorize',
   

   Indent is wrong here.

2. +++ b/core/modules/system/src/Tests/Migrate/d7/MigrateSystemConfigurationTest.php
   @@ -0,0 +1,184 @@
   +
   

   Un-needed new line.

The test is failing on system.mail. \Drupal::config('system.mail')->get() returns 'test_mail_collector' but it really contains php_mail.

| system.mail | a:2:{s:9:"interface";a:1:{s:7:"default";s:8:"php_mail";}s:5:"_core";a:1:{s:19:"default_config_hash";s:43:"rYgt7uhPafP2ngaN_ZUPFuyI4KdE0zU868zLNSlzKoE";}} |

Added a check so that when 'system.mail' is being tested the actual config data is retrieved with getRawData so that overrides are avoided.

A bit of a cleanup only. The migration templates for action_settings, file_settings, system_image, system_image_gd, system_logging, system_maintenance and system_rss are the same for d6 and d7 and have been merged. action_settings has been moved to the action module, where d6_action_settings was. file_settings has been moved to the file module, where d6_file_settings was.

Merged the d6_system_site and d7_system_site templates.

Restore accidentally removed blank line in MigrateUpgradeTestBase.php.

Rerolled.

1. +++ b/core/modules/action/tests/src/Kernel/Migrate/d7/MigrateActionConfigsTest.php
   @@ -0,0 +1,39 @@
   +    $this->assertIdentical(28, $config->get('recursion_limit'));
   

   Let's use assertSame() instead of the deprecated assertIdentical(). I know the corresponding D6 test has assertIdentical(), and it's out of scope to address that here, but let's not introduce deprecated uses in new files.

2. +++ b/core/modules/file/tests/src/Kernel/Migrate/d7/MigrateFileConfigsTest.php
   @@ -0,0 +1,36 @@
   +    $this->assertIdentical('textfield', $config->get('description.type'));
   +    $this->assertIdentical(256, $config->get('description.length'));
   +    $this->assertIdentical('sites/default/files/icons', $config->get('icon.directory'));
   

   assertSame()

Otherwise this looks good - I'm ready to RTBC with the above changes.

Changed the assertions as per #39.

Thanks! Setting RTBC on the assumption the bots still pass...

Retested because the failures were not related to the patch. Passing again, so back to RTBC

Committed and pushed ffde245 to 8.3.x and 9c705b8 to 8.2.x. Thanks!

As this is for migrate this is rc eligible.

diff --git a/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateSystemConfigurationTest.php b/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateSystemConfigurationTest.php
index 0034209..59d7b01 100644
--- a/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateSystemConfigurationTest.php
+++ b/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateSystemConfigurationTest.php
@@ -11,7 +11,7 @@
  */
 class MigrateSystemConfigurationTest extends MigrateDrupal7TestBase {
 
-  static $modules = ['action', 'file', 'system'];
+  public static $modules = ['action', 'file', 'system'];
 
   protected $expectedConfig = [
     'system.authorize' => [

diff --git a/core/modules/system/migration_templates/d7_system_authorize.yml b/core/modules/system/migration_templates/d7_system_authorize.yml
old mode 100755
new mode 100644

Fixed on commit.