Change controllers to receive route parameters in their signature rather than via $request->attributes

For views, we can just use: #2227555: Use route options instead of route defaults for view_argument_map

All the other changes looks certainly reasonable and should have been like that in the first place.

Reroll

Rerolled against a recent rename of a lot of classes and removed more dead code in ViewPreviewForm

1. +++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewFormControllerBase.php
   @@ -41,6 +37,17 @@ public function init(array &$form_state) {
   +    if (isset($display_id) && isset($form_state['display_id']) && ($display_id !== $form_state['display_id'])) {
   +      throw new \InvalidArgumentException('Mismatch between $form_state[\'display_id\'] and $display_id.');
   +    }
   +    $this->displayID = isset($form_state['display_id']) ? $form_state['display_id'] : $display_id;
   

   Is this exception just temporary for debugging?

2. +++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php
   @@ -127,13 +127,6 @@ protected function actions(array $form, array &$form_state) {
   -    // Rebuild the form with a pristine $view object.
   -    $view = $this->entity;
   -    // Attempt to load the view from temp store, otherwise create a new one.
   -    if (!$new_view = $this->tempStore->get($view->id())) {
   -      $new_view = new ViewUI($view);
   -    }
   -    $form_state['build_info']['args'][0] = $new_view;
   

   This seems to be a valid removal, given that the tempstore is converted as defined in the routing.yml file.

11: attributes-2238981-11.patch queued for re-testing.

See #2281619: Convert most direct usages within module code of routing related request attributes to use RouteMatchInterface instead, it also changes ViewFormBase.

Rerolled.

Rerolled.

Let's fix it.

This seems reasonable to me. The less controllers directly access $request, the better.

Minor nit alert:

+++ b/core/modules/field_ui/src/DisplayOverview.php
@@ -78,11 +78,8 @@ public function getFormId() {
   /**
    * {@inheritdoc}
    */
...
+  public function buildForm(array $form, FormStateInterface $form_state, $entity_type_id = NULL, $bundle = NULL, $view_mode_name = NULL) {
+    $this->mode = $view_mode_name;
     return parent::buildForm($form, $form_state, $entity_type_id, $bundle);

+++ b/core/modules/field_ui/src/FormDisplayOverview.php
@@ -77,11 +77,8 @@ public function getFormId() {
   /**
    * {@inheritdoc}
    */
...
+    $this->mode = $form_mode_name;
     return parent::buildForm($form, $form_state, $entity_type_id, $bundle);

Let's pass the mode into the parent buildForm so that {inheritdoc} is correct.

Sure, let's do that.

This could be it.

1. +++ b/core/modules/field_ui/src/DisplayOverview.php
   @@ -79,12 +79,9 @@ public function getFormId() {
   +  public function buildForm(array $form, FormStateInterface $form_state, $entity_type_id = NULL, $bundle = NULL, $view_mode_name = NULL) {
   

   Why not $view_mode_name = 'default' and save the ternary on the next line?

2. +++ b/core/modules/field_ui/src/FormDisplayOverview.php
   @@ -78,12 +78,9 @@ public function getFormId() {
   +  public function buildForm(array $form, FormStateInterface $form_state, $entity_type_id = NULL, $bundle = NULL, $form_mode_name = NULL) {
   

   $form_mode_name/$view_mode_name mismatch.

3. +++ b/core/modules/system/tests/modules/entity_test/src/Controller/EntityTestController.php
   @@ -67,14 +67,16 @@ public function testAdd($entity_type) {
   +    $entity = $request->attributes->get($_entity_type_id);
   

   Still have to get the entity out of the Request attributes here?

$form_mode_name/$view_mode_name mismatch.

ups

Still have to get the entity out of the Request attributes here?

Well, we have one controller for multiple entity types here.

$form_mode_name/$view_mode_name mismatch.

ups

Still have to get the entity out of the Request attributes here?

Well, we have one controller for multiple entity types here.

Sure, this sounds like a good idea.

Committed 6b26533 and pushed to 8.0.x. Thanks!