Issue #1760188 by dawehner: Improve Wizard method default_display_options().

lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php

@@ -636,7 +636,7 @@ protected function instantiate_view($form, &$form_state) {
    */
   protected function build_display_options($form, $form_state) {
     // Display: Master
-    $display_options['default'] = $this->default_display_options($form, $form_state);
+    $display_options['default'] = $this->default_display_options();
     $display_options['default'] += array(
       'filters' => array(),
       'sorts' => array(),
@@ -715,10 +715,14 @@ protected function add_displays($view, $display_options, $form, $form_state) {
   /**
    * Assembles the default display options for the view.
    *
-   * Most subclasses will need to override this method to provide some fields
+   * Most wizards will need to override this method to provide some fields
    * or a different row plugin.
+   *
+   * @return array
+   *   Returns an array of display options, which are used in
+   *   ViewDisplay::$display_options.
    */
-  protected function default_display_options($form, $form_state) {
+  protected function default_display_options() {
     $display_options = array();
     $display_options['access']['type'] = 'none';
     $display_options['cache']['type'] = 'none';

lib/Views/comment/Plugin/views/wizard/Comment.php

@@ -124,8 +124,11 @@ protected  function display_options_row(&$display_options, $row_plugin, $row_opt
     }
   }
 
-  protected function default_display_options($form, $form_state) {
-    $display_options = parent::default_display_options($form, $form_state);
+  /**
+   * Overrides Drupal\views\Plugin\views\wizard\WizardPluginBase::default_display_options().
+   */
+  protected function default_display_options() {
+    $display_options = parent::default_display_options();
 
     // Add permission-based access control.
     $display_options['access']['type'] = 'perm';

lib/Views/file/Plugin/views/wizard/File.php

@@ -39,8 +39,11 @@ class File extends WizardPluginBase {
     'file_download_path' => TRUE
   );
 
-  protected function default_display_options($form, $form_state) {
-    $display_options = parent::default_display_options($form, $form_state);
+  /**
+   * Overrides Drupal\views\Plugin\views\wizard\WizardPluginBase::default_display_options().
+   */
+  protected function default_display_options() {
+    $display_options = parent::default_display_options();
 
     // Add permission-based access control.
     $display_options['access']['type'] = 'perm';

lib/Views/node/Plugin/views/wizard/Node.php

@@ -119,10 +119,10 @@ protected function build_form_style(&$form, &$form_state, $type) {
   }
 
   /**
-   * @override
+   * Overrides Drupal\views\Plugin\views\wizard\WizardPluginBase::default_display_options().
    */
-  protected function default_display_options($form, $form_state) {
-    $display_options = parent::default_display_options($form, $form_state);
+  protected function default_display_options() {
+    $display_options = parent::default_display_options();
 
     // Add permission-based access control.
     $display_options['access']['type'] = 'perm';

lib/Views/node/Plugin/views/wizard/NodeRevision.php

@@ -80,8 +80,11 @@ protected function row_style_options($type) {
     return $options;
   }
 
-  protected function default_display_options($form, $form_state) {
-    $display_options = parent::default_display_options($form, $form_state);
+  /**
+   * Overrides Drupal\views\Plugin\views\wizard\WizardPluginBase::default_display_options().
+   */
+  protected function default_display_options() {
+    $display_options = parent::default_display_options();
 
     // Add permission-based access control.
     $display_options['access']['type'] = 'perm';

lib/Views/taxonomy/Plugin/views/wizard/TaxonomyTerm.php

@@ -37,8 +37,11 @@ class TaxonomyTerm extends WizardPluginBase {
     )
   );
 
-  protected function default_display_options($form, $form_state) {
-    $display_options = parent::default_display_options($form, $form_state);
+  /**
+   * Overrides Drupal\views\Plugin\views\wizard\WizardPluginBase::default_display_options().
+   */
+  protected function default_display_options() {
+    $display_options = parent::default_display_options();
 
     // Add permission-based access control.
     $display_options['access']['type'] = 'perm';

lib/Views/user/Plugin/views/wizard/Users.php

@@ -58,8 +58,11 @@ class Users extends WizardPluginBase {
     )
   );
 
-  protected function default_display_options($form, $form_state) {
-    $display_options = parent::default_display_options($form, $form_state);
+  /**
+   * Overrides Drupal\views\Plugin\views\wizard\WizardPluginBase::default_display_options().
+   */
+  protected function default_display_options() {
+    $display_options = parent::default_display_options();
 
     // Add permission-based access control.
     $display_options['access']['type'] = 'perm';