From 4d0ded5840f420dd3f0904cda926899a8d3c67b4 Mon Sep 17 00:00:00 2001
From: James Jeffery <jaysquare@gmail.com>
Date: Mon, 9 Oct 2017 18:17:46 -0700
Subject: [PATCH] Issue #2866242 by Munavijayalakshmi, amit.drupal, joelpittet,
greenSkin: Convert module to use short array syntax (new coding standard)
---
module_filter.install | 2 +-
module_filter.module | 34 +++++++++++------------
src/Form/ModuleFilterSettingsForm.php | 8 +++---
src/Form/ModuleFilterUpdateStatusForm.php | 20 ++++++-------
4 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/module_filter.install b/module_filter.install
index ebe1dfd..3af5125 100644
--- a/module_filter.install
+++ b/module_filter.install
@@ -10,7 +10,7 @@
*/
function module_filter_install() {
$state = \Drupal::state();
- $state->set('module_filter.recent', array('module_filter' => REQUEST_TIME));
+ $state->set('module_filter.recent', ['module_filter' => REQUEST_TIME]);
}
/**
diff --git a/module_filter.module b/module_filter.module
index dec95c1..18c009b 100644
--- a/module_filter.module
+++ b/module_filter.module
@@ -25,31 +25,31 @@ function module_filter_form_system_modules_alter(&$form, FormStateInterface $for
$form['filters']['text']['#default_value'] = $_GET['filter'];
}
- $status_defaults = array(
+ $status_defaults = [
((isset($_GET['enabled'])) ? $_GET['enabled'] : 1) ? 'enabled' : '',
((isset($_GET['disabled'])) ? $_GET['disabled'] : 1) ? 'disabled' : '',
((isset($_GET['unavailable'])) ? $_GET['unavailable'] : 1) ? 'unavailable' : '',
- );
- $form['filters']['status'] = array(
+ ];
+ $form['filters']['status'] = [
'#type' => 'container',
- '#attributes' => array(
- 'class' => array(
+ '#attributes' => [
+ 'class' => [
'module-filter-status',
- ),
- ),
- 'checkboxes' => array(
+ ],
+ ],
+ 'checkboxes' => [
'#type' => 'checkboxes',
'#default_value' => array_filter($status_defaults),
- '#options' => array(
+ '#options' => [
'enabled' => t('Enabled'),
'disabled' => t('Disabled'),
'unavailable' => t('Unavailable'),
- ),
- ),
- );
+ ],
+ ],
+ ];
$state = \Drupal::state();
- $recent = $state->get('module_filter.recent') ?: array();
+ $recent = $state->get('module_filter.recent') ?: [];
// Remove recent items older than a week.
$recent = array_filter($recent, function ($val) {
@@ -92,10 +92,10 @@ function module_filter_form_system_modules_alter(&$form, FormStateInterface $for
* Implements hook_form_FORM_ID_alter().
*/
function module_filter_form_system_modules_confirm_form_alter(&$form, FormStateInterface $form_state, $form_id) {
- $form['filters']['text'] = array(
+ $form['filters']['text'] = [
'#type' => 'value',
'#value' => isset($_GET['filter']) ? $_GET['filter'] : '',
- );
+ ];
$form['#submit'][] = 'module_filter_system_modules_redirect_submit';
}
@@ -164,7 +164,7 @@ function module_filter_preprocess_system_modules_details(&$variables) {
*/
function module_filter_system_modules_recent_enabled_submit($form, FormStateInterface $form_state) {
$state = \Drupal::state();
- $recent = $state->get('module_filter.recent') ?: array();
+ $recent = $state->get('module_filter.recent') ?: [];
// Drupal 8.3.0 simplified the module form structure which requires checking
// the version of Drupal and building the $modules array accordingly.
@@ -197,6 +197,6 @@ function module_filter_system_modules_redirect_submit($form, FormStateInterface
if ($text = $form_state->getValue('text')) {
/** @var \Drupal\Core\Url $redirect */
$route_name = ($redirect = $form_state->getRedirect()) ? $redirect->getRouteName() : 'system.modules_list';
- $form_state->setRedirect($route_name, array('filter' => $text));
+ $form_state->setRedirect($route_name, ['filter' => $text]);
}
}
diff --git a/src/Form/ModuleFilterSettingsForm.php b/src/Form/ModuleFilterSettingsForm.php
index 716eb80..fb1ec4b 100644
--- a/src/Form/ModuleFilterSettingsForm.php
+++ b/src/Form/ModuleFilterSettingsForm.php
@@ -24,18 +24,18 @@ class ModuleFilterSettingsForm extends ConfigFormBase {
$config = $this->config('module_filter.settings');
$form = parent::buildForm($form, $form_state);
- $form['modules'] = array(
+ $form['modules'] = [
'#type' => 'fieldset',
'#title' => $this->t('Extend'),
'#description' => $this->t('These are settings pertaining to the Extend pages of the site.'),
'#collapsible' => FALSE,
- );
- $form['modules']['tabs'] = array(
+ ];
+ $form['modules']['tabs'] = [
'#type' => 'checkbox',
'#title' => $this->t('Enhance the Extend page with tabs'),
'#description' => $this->t('Provides many enhancements to the Extend page including the use of tabs for packages.'),
'#default_value' => $config->get('tabs'),
- );
+ ];
return $form;
}
diff --git a/src/Form/ModuleFilterUpdateStatusForm.php b/src/Form/ModuleFilterUpdateStatusForm.php
index 04fd27a..eebca53 100644
--- a/src/Form/ModuleFilterUpdateStatusForm.php
+++ b/src/Form/ModuleFilterUpdateStatusForm.php
@@ -49,23 +49,23 @@ class ModuleFilterUpdateStatusForm extends FormBase {
$form['filters']['text']['#default_value'] = $_GET['filter'];
}
- $form['filters']['radios'] = array(
+ $form['filters']['radios'] = [
'#type' => 'container',
- '#attributes' => array(
- 'class' => array(
+ '#attributes' => [
+ 'class' => [
'module-filter-status',
- ),
- ),
- 'show' => array(
+ ],
+ ],
+ 'show' => [
'#type' => 'radios',
'#default_value' => 'all',
- '#options' => array(
+ '#options' => [
'all' => $this->t('All'),
'updates' => $this->t('Update available'),
'security' => $this->t('Security update'),
- ),
- ),
- );
+ ],
+ ],
+ ];
return $form;
}
--
GitLab