Convert system_theme_settings to FormInterface

+++ b/core/modules/system/lib/Drupal/system/EventSubscriber/RouteSubscriber.phpundefined
@@ -0,0 +1,47 @@
+          '_permission' => 'administer themes',

+++ b/core/modules/system/system.moduleundefined
@@ -726,28 +726,25 @@ function system_menu() {
-      'access callback' => '_system_themes_access',
-      'access arguments' => array($key),
...
+    if (!empty($theme->status)) {

This doesn't seem right

+++ b/core/modules/system/lib/Drupal/system/EventSubscriber/RouteSubscriber.phpundefined
@@ -0,0 +1,47 @@
+class RouteSubscriber implements EventSubscriberInterface  {

double space before {

+++ b/core/modules/system/lib/Drupal/system/EventSubscriber/RouteSubscriber.phpundefined
@@ -0,0 +1,47 @@
+   * Implements EventSubscriberInterface::getSubscribedEvents().

+++ b/core/modules/system/lib/Drupal/system/Form/ThemeSettingsForm.phpundefined
@@ -0,0 +1,448 @@
+   * Implements \Drupal\Core\Form\FormInterface::getFormID().
...
+   * Overrides \Drupal\system\SystemConfigFormBase::buildForm().

inheritdoc

+++ b/core/modules/system/system.moduleundefined
@@ -726,28 +726,25 @@ function system_menu() {
+    'route_name' => 'system_theme_settings_global',

Regardless of the continuing discussion of what to do with MENU_DEFAULT_LOCAL_TASK, this route_name shouldn't be here.

+++ b/core/modules/color/lib/Drupal/color/Tests/ColorTest.phpundefined
@@ -48,6 +48,8 @@ function setUp() {
+    \Drupal::service('router.builder')->rebuild();

Just use $this->container->get('router_builder')

+++ b/core/modules/color/lib/Drupal/color/Tests/ColorTest.phpundefined
@@ -48,6 +48,8 @@ function setUp() {
+    menu_router_rebuild();

What is the reason we have to rebuild now and we haven't needed it before?

+++ b/core/modules/system/lib/Drupal/system/EventSubscriber/RouteSubscriber.phpundefined
+++ b/core/modules/system/lib/Drupal/system/EventSubscriber/RouteSubscriber.phpundefined
@@ -0,0 +1,47 @@

@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\EventSubscriber\RouteSubscriber.
+ */
+
+namespace Drupal\system\EventSubscriber;
+
+use Drupal\Core\Routing\RouteBuildEvent;
+use Drupal\Core\Routing\RoutingEvents;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
...
+
+/**
+ * Event subscriber for routes.
+ */
+class RouteSubscriber implements EventSubscriberInterface {
+
+  /**
+   * Implements EventSubscriberInterface::getSubscribedEvents().
+   */
+  static function getSubscribedEvents() {
+    $events[RoutingEvents::DYNAMIC] = 'createSystemThemeRoutes';
+    return $events;
+  }
+
+  /**
+   * Adds dynamic system theme routes.
+   *
+   * @param \Drupal\Core\Routing\RouteBuildEvent $event
+   *   The route building event.
+   */
+  public function createSystemThemeRoutes(RouteBuildEvent $event) {
+    $collection = $event->getRouteCollection();
+    foreach (list_themes() as $theme) {
+      if (!empty($theme->status)) {
+        $route = new Route('admin/appearance/settings/' . $theme->name, array(
+          '_form' => '\Drupal\system\Form\ThemeSettingsForm', 'theme_name' => $theme->name), array(
+          '_permission' => 'administer themes',
+        ));
+        $collection->add('system_theme_settings_' . $theme->name, $route);
+      }
+    }
+  }
+

As talked there is no reason to just create a single route with a parameter.

+++ b/core/modules/system/lib/Drupal/system/Form/ThemeSettingsForm.phpundefined
@@ -0,0 +1,448 @@
+   * @var \Drupal\Core\Extension\ModuleHandler
...
+  public function __construct(ConfigFactory $config_factory, ContextInterface $context, ModuleHandler $module_handler) {

ModuleHandlerInterface should be used here

#23: 1992606-23.patch queued for re-testing.

#28: 1992606-28.patch queued for re-testing.

#32: 1992606-32.patch queued for re-testing.

+++ b/core/modules/system/lib/Drupal/system/Form/ThemeSettingsForm.phpundefined
@@ -0,0 +1,448 @@
+   * @var \Drupal\Core\Extension\ModuleHandler

Let's document the interface.

+++ b/core/modules/system/lib/Drupal/system/Form/ThemeSettingsForm.phpundefined
@@ -0,0 +1,448 @@
+  public function __construct(ConfigFactory $config_factory, ContextInterface $context, ModuleHandlerInterface $module_handler) {
...
+    $this->moduleHandler = $module_handler;

It would be cool to document the ModuleHandler here as well.

+++ b/core/modules/system/lib/Drupal/system/Form/ThemeSettingsForm.phpundefined
@@ -0,0 +1,448 @@
+    $toggles = array(
+      'logo'                      => t('Logo'),
+      'name'                      => t('Site name'),
+      'slogan'                    => t('Site slogan'),
+      'node_user_picture'         => t('User pictures in posts'),
+      'comment_user_picture'      => t('User pictures in comments'),
+      'comment_user_verification' => t('User verification status in comments'),
+      'favicon'                   => t('Shortcut icon'),
+      'main_menu'                 => t('Main menu'),
+      'secondary_menu'            => t('Secondary menu'),
+    );

While you fix some things anyway: please remove this ugly whitespace.

Please revert that last interdiff and include this change instead:

diff --git a/core/lib/Drupal/Core/Controller/HtmlFormController.php b/core/lib/Drupal/Core/Controller/HtmlFormController.php
index 96530d5..68b6c31 100644
--- a/core/lib/Drupal/Core/Controller/HtmlFormController.php
+++ b/core/lib/Drupal/Core/Controller/HtmlFormController.php
@@ -57,10 +57,12 @@ public function content(Request $request, $_form) {
     $request->attributes->set('form', array());
     $request->attributes->set('form_state', $form_state);
     $args = $this->container->get('controller_resolver')->getArguments($request, array($form_object, 'buildForm'));
-    unset($args[0], $args[1]);
     $request->attributes->remove('form');
     $request->attributes->remove('form_state');
-    $form_state['build_info']['args'] = $args;
+
+    // Remove $form and $form_state from the arguments, and re-index them.
+    unset($args[0], $args[1]);
+    $form_state['build_info']['args'] = array_values($args);
 
     $form_id = _drupal_form_id($form_object, $form_state);
     $form = drupal_build_form($form_id, $form_state);

Thanks, this looks great now.

Needs a reroll

curl https://drupal.org/files/1992606-40.patch | git a
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100 40650  100 40650    0     0  26990      0  0:00:01  0:00:01 --:--:-- 30842
error: patch failed: core/lib/Drupal/Core/Controller/HtmlFormController.php:57
error: core/lib/Drupal/Core/Controller/HtmlFormController.php: patch does not apply
error: patch failed: core/modules/system/system.routing.yml:122
error: core/modules/system/system.routing.yml: patch does not apply
error: patch failed: core/modules/system/system.services.yml:6
error: core/modules/system/system.services.yml: patch does not apply

Looks good, thanks.

Needs a reroll

curl https://drupal.org/files/1992606-46.patch | git a
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100 40697  100 40697    0     0  20331      0  0:00:02  0:00:02 --:--:-- 22659
error: patch failed: core/modules/system/system.services.yml:9
error: core/modules/system/system.services.yml: patch does not apply

Working on re-roll now.

re-rolled.

removed tag

Thanks for the reroll!

Committed a93de78 and pushed to 8.x. Thanks!