diff --git a/site_audit.module b/site_audit.module index 7c42bb5..beef6c6 100644 --- a/site_audit.module +++ b/site_audit.module @@ -31,12 +31,12 @@ function site_audit_help($route_name, RouteMatchInterface $route_match) { function site_audit_env_is_dev() { // Acquia. if (defined('AH_SITE_ENVIRONMENT')) { - return !in_array(PANTHEON_ENVIRONMENT, array('test', 'prod')); + return !in_array(PANTHEON_ENVIRONMENT, ['test', 'prod']); } // Pantheon. if (defined('PANTHEON_ENVIRONMENT')) { - return !in_array(PANTHEON_ENVIRONMENT, array('test', 'live')); + return !in_array(PANTHEON_ENVIRONMENT, ['test', 'live']); } return FALSE; diff --git a/src/Plugin/SiteAuditCheck/BestPracticesMultisite.php b/src/Plugin/SiteAuditCheck/BestPracticesMultisite.php index 2574a86..5efd75d 100644 --- a/src/Plugin/SiteAuditCheck/BestPracticesMultisite.php +++ b/src/Plugin/SiteAuditCheck/BestPracticesMultisite.php @@ -24,9 +24,9 @@ class BestPracticesMultisite extends SiteAuditCheckBase { * {@inheritdoc}. */ public function getResultFail() { - return $this->t('The following multi-site configuration(s) were detected: @list', array( + return $this->t('The following multi-site configuration(s) were detected: @list', [ '@list' => implode(', ', $this->registry->multisites), - )); + ]); } /** @@ -77,9 +77,9 @@ class BestPracticesMultisite extends SiteAuditCheckBase { */ public function calculateScore() { $handle = opendir(DRUPAL_ROOT . '/sites/'); - $this->registry->multisites = array(); + $this->registry->multisites = []; while (FALSE !== ($entry = readdir($handle))) { - if (!in_array($entry, array( + if (!in_array($entry, [ '.', '..', 'default', @@ -88,7 +88,7 @@ class BestPracticesMultisite extends SiteAuditCheckBase { 'README.txt', '.svn', '.DS_Store', - )) + ]) ) { if (is_dir(DRUPAL_ROOT . '/sites/' . $entry)) { $this->registry->multisites[] = $entry; diff --git a/src/Plugin/SiteAuditCheck/BestPracticesSitesSuperfluous.php b/src/Plugin/SiteAuditCheck/BestPracticesSitesSuperfluous.php index 7d83f6f..5defd84 100644 --- a/src/Plugin/SiteAuditCheck/BestPracticesSitesSuperfluous.php +++ b/src/Plugin/SiteAuditCheck/BestPracticesSitesSuperfluous.php @@ -41,9 +41,9 @@ class BestPracticesSitesSuperfluous extends SiteAuditCheckBase { * {@inheritdoc}. */ public function getResultWarn() { - return $this->t('The following extra files were detected: @list', array( + return $this->t('The following extra files were detected: @list', [ '@list' => implode(', ', $this->registry->superfluous), - )); + ]); } /** @@ -60,9 +60,9 @@ class BestPracticesSitesSuperfluous extends SiteAuditCheckBase { */ public function calculateScore() { $handle = opendir(DRUPAL_ROOT . '/sites/'); - $this->registry->superfluous = array(); + $this->registry->superfluous = []; while (FALSE !== ($entry = readdir($handle))) { - if (!in_array($entry, array( + if (!in_array($entry, [ '.', '..', 'default', @@ -72,7 +72,7 @@ class BestPracticesSitesSuperfluous extends SiteAuditCheckBase { 'example.settings.local.php', 'README.txt', '.DS_Store', - ))) { + ])) { if (is_file(DRUPAL_ROOT . '/sites/' . $entry)) { // Support multi-site directory aliasing for non-Pantheon sites. if ($entry != 'sites.php' || drush_get_option('vendor') == 'pantheon') { diff --git a/src/Plugin/SiteAuditCheck/CacheBinsAll.php b/src/Plugin/SiteAuditCheck/CacheBinsAll.php index fa522bb..0dfd71c 100644 --- a/src/Plugin/SiteAuditCheck/CacheBinsAll.php +++ b/src/Plugin/SiteAuditCheck/CacheBinsAll.php @@ -29,10 +29,10 @@ class CacheBinsAll extends SiteAuditCheckBase { * {@inheritdoc}. */ public function getResultInfo() { - $ret_val = array( + $ret_val = [ '#header' => ['Bin', 'Class'], '#theme' => 'table', - ); + ]; foreach ($this->registry->cache_bins_all as $bin => $class) { $ret_val['#rows'][] = [$bin, $class]; diff --git a/src/Plugin/SiteAuditCheck/CacheBinsDefault.php b/src/Plugin/SiteAuditCheck/CacheBinsDefault.php index 75ac145..dd054c5 100644 --- a/src/Plugin/SiteAuditCheck/CacheBinsDefault.php +++ b/src/Plugin/SiteAuditCheck/CacheBinsDefault.php @@ -29,10 +29,10 @@ class CacheBinsDefault extends SiteAuditCheckBase { * {@inheritdoc}. */ public function getResultInfo() { - $ret_val = array( + $ret_val = [ '#header' => ['Bin', 'Class'], '#theme' => 'table', - ); + ]; foreach ($this->registry->cache_default_backends as $bin => $class) { $ret_val['#rows'][] = [$bin, $class]; diff --git a/src/Plugin/SiteAuditCheck/CacheBinsUsed.php b/src/Plugin/SiteAuditCheck/CacheBinsUsed.php index f91aaf8..7ca6466 100644 --- a/src/Plugin/SiteAuditCheck/CacheBinsUsed.php +++ b/src/Plugin/SiteAuditCheck/CacheBinsUsed.php @@ -29,10 +29,10 @@ class CacheBinsUsed extends SiteAuditCheckBase { * {@inheritdoc}. */ public function getResultInfo() { - $ret_val = array( + $ret_val = [ '#header' => ['Service', 'Bin'], '#theme' => 'table', - ); + ]; foreach ($this->registry->cache_bins_used as $bin => $class) { $ret_val['#rows'][] = [$bin, $class]; diff --git a/src/Plugin/SiteAuditCheck/CachePageExpire.php b/src/Plugin/SiteAuditCheck/CachePageExpire.php index e83af79..de4cc4c 100644 --- a/src/Plugin/SiteAuditCheck/CachePageExpire.php +++ b/src/Plugin/SiteAuditCheck/CachePageExpire.php @@ -38,18 +38,18 @@ class CachePageExpire extends SiteAuditCheckBase { * {@inheritdoc}. */ public function getResultPass() { - return $this->t('Expiration of cached pages is set to @minutes min.', array( + return $this->t('Expiration of cached pages is set to @minutes min.', [ '@minutes' => round(\Drupal::config('system.performance')->get('cache.page.max_age') / 60), - )); + ]); } /** * {@inheritdoc}. */ public function getResultWarn() { - return $this->t('Expiration of cached pages only set to @minutes min.', array( + return $this->t('Expiration of cached pages only set to @minutes min.', [ '@minutes' => round(\Drupal::config('system.performance')->get('cache.page.max_age') / 60), - )); + ]); } /** diff --git a/src/Plugin/SiteAuditCheck/CachePreprocessCSS.php b/src/Plugin/SiteAuditCheck/CachePreprocessCSS.php index bf0358e..0bf477c 100644 --- a/src/Plugin/SiteAuditCheck/CachePreprocessCSS.php +++ b/src/Plugin/SiteAuditCheck/CachePreprocessCSS.php @@ -50,7 +50,7 @@ class CachePreprocessCSS extends SiteAuditCheckBase { * {@inheritdoc}. */ public function getAction() { - if (!in_array($this->score, array(SiteAuditCheckBase::AUDIT_CHECK_SCORE_PASS))) { + if (!in_array($this->score, [SiteAuditCheckBase::AUDIT_CHECK_SCORE_PASS])) { return $this->t('Go to /admin/config/development/performance and check "Aggregate and compress CSS files".'); } } diff --git a/src/Plugin/SiteAuditCheck/CachePreprocessJS.php b/src/Plugin/SiteAuditCheck/CachePreprocessJS.php index f45745d..809bc58 100644 --- a/src/Plugin/SiteAuditCheck/CachePreprocessJS.php +++ b/src/Plugin/SiteAuditCheck/CachePreprocessJS.php @@ -50,7 +50,7 @@ class CachePreprocessJS extends SiteAuditCheckBase { * {@inheritdoc}. */ public function getAction() { - if (!in_array($this->score, array(SiteAuditCheckBase::AUDIT_CHECK_SCORE_PASS))) { + if (!in_array($this->score, [SiteAuditCheckBase::AUDIT_CHECK_SCORE_PASS])) { return $this->t('Go to /admin/config/development/performance and check "Aggregate JavaScript files".'); } } diff --git a/src/Plugin/SiteAuditCheck/ContentDuplicateTitles.php b/src/Plugin/SiteAuditCheck/ContentDuplicateTitles.php index d8a4b15..ff17ed1 100644 --- a/src/Plugin/SiteAuditCheck/ContentDuplicateTitles.php +++ b/src/Plugin/SiteAuditCheck/ContentDuplicateTitles.php @@ -89,7 +89,7 @@ class ContentDuplicateTitles extends SiteAuditCheckBase { $query = \Drupal::database()->select('node_field_data', 'nfd'); $query->addExpression('COUNT(nfd.title)', 'duplicate_count'); - $query->fields('nfd', array('title', 'type')); + $query->fields('nfd', ['title', 'type']); $query->groupBy('nfd.title'); $query->groupBy('nfd.type'); $query->having('COUNT(nfd.title) > 1'); @@ -97,7 +97,7 @@ class ContentDuplicateTitles extends SiteAuditCheckBase { $result = $query->execute(); - $this->registry->nodes_duplicate_titles = array(); + $this->registry->nodes_duplicate_titles = []; $this->registry->nodes_duplicate_title_count = 0; $content_types = $content_types = \Drupal::service('entity_type.bundle.info')->getBundleInfo("node"); while ($row = $result->fetchAssoc()) { diff --git a/src/Plugin/SiteAuditCheck/ContentEntityTypesUnused.php b/src/Plugin/SiteAuditCheck/ContentEntityTypesUnused.php index 26e8f91..619b215 100644 --- a/src/Plugin/SiteAuditCheck/ContentEntityTypesUnused.php +++ b/src/Plugin/SiteAuditCheck/ContentEntityTypesUnused.php @@ -41,13 +41,13 @@ class ContentEntityTypesUnused extends SiteAuditCheckBase { * {@inheritdoc}. */ public function getResultWarn() { - $report = array(); + $report = []; foreach ($this->registry->content_types_unused as $entity_type => $bundle) { $report[] = $entity_type .= ': ' . implode(', ', $bundle); } - return $this->t('The following content entity types are unused: @content_types_unused', array( + return $this->t('The following content entity types are unused: @content_types_unused', [ '@content_types_unused' => implode('; ', $report), - )); + ]); } /** diff --git a/src/Plugin/SiteAuditCheck/ContentFieldCount.php b/src/Plugin/SiteAuditCheck/ContentFieldCount.php index 55cc5d7..f75c779 100644 --- a/src/Plugin/SiteAuditCheck/ContentFieldCount.php +++ b/src/Plugin/SiteAuditCheck/ContentFieldCount.php @@ -64,9 +64,9 @@ class ContentFieldCount extends SiteAuditCheckBase { * {@inheritdoc}. */ public function getResultWarn() { - return $this->t('There are @count total fields, which is higher than average', array( + return $this->t('There are @count total fields, which is higher than average', [ '@count' => count($this->registry->fields), - )); + ]); } /** @@ -85,11 +85,11 @@ class ContentFieldCount extends SiteAuditCheckBase { if (!isset($this->registry->fields)) { // it hasn't been calculated yet, so do it now $map = \Drupal::service('entity_field.manager')->getFieldMap(); - $this->registry->fields = array(); - $this->registry->default_fields = array( + $this->registry->fields = []; + $this->registry->default_fields = [ 'body', 'comment_body', - ); + ]; foreach ($map as $entity => $fields) { foreach ($fields as $field => $description) { if (preg_match('/^field\_/', $field) || in_array($field, $this->registry->default_fields)) { diff --git a/src/Plugin/SiteAuditCheck/ContentFieldInstances.php b/src/Plugin/SiteAuditCheck/ContentFieldInstances.php index a07752c..ee16a94 100644 --- a/src/Plugin/SiteAuditCheck/ContentFieldInstances.php +++ b/src/Plugin/SiteAuditCheck/ContentFieldInstances.php @@ -84,7 +84,7 @@ class ContentFieldInstances extends SiteAuditCheckBase { $this->checkInvokeCalculateScore('content_field_count'); } $map = \Drupal::service('entity_field.manager')->getFieldMap(); - $this->registry->field_instance_counts = array(); + $this->registry->field_instance_counts = []; foreach ($map as $entity => $fields) { $bundle_column_name = \Drupal::service('entity_type.manager')->getDefinition($entity)->getKey('bundle'); foreach ($fields as $field => $description) { diff --git a/src/Plugin/SiteAuditCheck/ContentFieldsUnused.php b/src/Plugin/SiteAuditCheck/ContentFieldsUnused.php index 5055954..0de7e63 100644 --- a/src/Plugin/SiteAuditCheck/ContentFieldsUnused.php +++ b/src/Plugin/SiteAuditCheck/ContentFieldsUnused.php @@ -42,13 +42,13 @@ class ContentFieldsUnused extends SiteAuditCheckBase { * {@inheritdoc}. */ public function getResultWarn() { - $report = array(); + $report = []; foreach ($this->registry->fields_unused as $bundle_name => $fields) { $report[] = $bundle_name .= ': ' . implode(', ', $fields); } - return $this->t('The following fields are unused: @report', array( + return $this->t('The following fields are unused: @report', [ '@report' => implode('; ', $report), - )); + ]); } /** @@ -64,7 +64,7 @@ class ContentFieldsUnused extends SiteAuditCheckBase { * {@inheritdoc}. */ public function calculateScore() { - $this->registry->fields_unused = array(); + $this->registry->fields_unused = []; foreach ($this->registry->field_instance_counts as $bundle_name => $entity_types) { foreach ($entity_types as $entity_type => $fields) { diff --git a/src/Plugin/SiteAuditCheck/ContentVocabularies.php b/src/Plugin/SiteAuditCheck/ContentVocabularies.php index 5dbc202..1bf056c 100644 --- a/src/Plugin/SiteAuditCheck/ContentVocabularies.php +++ b/src/Plugin/SiteAuditCheck/ContentVocabularies.php @@ -99,7 +99,7 @@ class ContentVocabularies extends SiteAuditCheckBase { $query->groupBy('vid'); $result = $query->execute(); - $this->registry->vocabulary_counts = $this->registry->vocabulary_unused = array(); + $this->registry->vocabulary_counts = $this->registry->vocabulary_unused = []; while ($row = $result->fetchAssoc()) { $label = $vocabularies[$row['vid']]['label']; diff --git a/src/Plugin/SiteAuditCheck/ContentVocabulariesUnused.php b/src/Plugin/SiteAuditCheck/ContentVocabulariesUnused.php index 38bfeb2..57823bd 100644 --- a/src/Plugin/SiteAuditCheck/ContentVocabulariesUnused.php +++ b/src/Plugin/SiteAuditCheck/ContentVocabulariesUnused.php @@ -43,9 +43,9 @@ class ContentVocabulariesUnused extends SiteAuditCheckBase { * {@inheritdoc}. */ public function getResultWarn() { - return $this->t('The following vocabularies are unused: @vocabularies_unused', array( + return $this->t('The following vocabularies are unused: @vocabularies_unused', [ '@vocabularies_unused' => implode(', ', $this->registry->vocabulary_unused), - )); + ]); } /** diff --git a/src/Plugin/SiteAuditCheck/CronEnabled.php b/src/Plugin/SiteAuditCheck/CronEnabled.php index ca32f75..03c4ae1 100644 --- a/src/Plugin/SiteAuditCheck/CronEnabled.php +++ b/src/Plugin/SiteAuditCheck/CronEnabled.php @@ -41,9 +41,9 @@ class CronEnabled extends SiteAuditCheckBase { return $this->t('Drupal Cron frequency is set to never, but has been executed within the past 24 hours (either manually or using drush cron).'); } // Default. - return $this->t('Cron is set to run every @minutes minutes.', array( + return $this->t('Cron is set to run every @minutes minutes.', [ '@minutes' => round($this->registry->cron_safe_threshold / 60), - )); + ]); } /** diff --git a/src/Plugin/SiteAuditCheck/CronLast.php b/src/Plugin/SiteAuditCheck/CronLast.php index 708a1fd..1419349 100644 --- a/src/Plugin/SiteAuditCheck/CronLast.php +++ b/src/Plugin/SiteAuditCheck/CronLast.php @@ -30,10 +30,10 @@ class CronLast extends SiteAuditCheckBase { */ public function getResultInfo() { if ($this->registry->cron_last) { - return $this->t('Cron last ran at @date (@ago ago)', array( + return $this->t('Cron last ran at @date (@ago ago)', [ '@date' => date('r', $this->registry->cron_last), '@ago' => \Drupal::service('date.formatter')->formatInterval(time() - $this->registry->cron_last), - )); + ]); } return $this->t('Cron has never run.'); } diff --git a/src/Plugin/SiteAuditCheck/DatabaseCollation.php b/src/Plugin/SiteAuditCheck/DatabaseCollation.php index 68ca2e8..8248661 100644 --- a/src/Plugin/SiteAuditCheck/DatabaseCollation.php +++ b/src/Plugin/SiteAuditCheck/DatabaseCollation.php @@ -79,9 +79,9 @@ class DatabaseCollation extends SiteAuditCheckBase { */ public function getAction() { if ($this->getScore() == SiteAuditCheckBase::AUDIT_CHECK_SCORE_WARN) { - return $this->t('In MySQL, use the command "!command" to convert the affected tables. Of course, test first and ensure your data will not be negatively affected.', array( + return $this->t('In MySQL, use the command "!command" to convert the affected tables. Of course, test first and ensure your data will not be negatively affected.', [ '!command' => 'ALTER TABLE table_name CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;', - )); + ]); } } @@ -93,7 +93,7 @@ class DatabaseCollation extends SiteAuditCheckBase { $query = \Drupal::database()->select('information_schema.TABLES', 'ist'); $query->addField('ist', 'TABLE_NAME', 'name'); $query->addField('ist', 'TABLE_COLLATION', 'collation'); - $query->condition('ist.TABLE_COLLATION', array('utf8_general_ci', 'utf8_unicode_ci', 'utf8_bin', 'utf8mb4_general_ci'), 'NOT IN'); + $query->condition('ist.TABLE_COLLATION', ['utf8_general_ci', 'utf8_unicode_ci', 'utf8_bin', 'utf8mb4_general_ci'], 'NOT IN'); $query->condition('ist.table_schema', $connection->getConnectionOptions()['database']); $result = $query->execute(); $count = 0; diff --git a/src/Plugin/SiteAuditCheck/DatabaseEngine.php b/src/Plugin/SiteAuditCheck/DatabaseEngine.php index 786e85b..cf2ac03 100644 --- a/src/Plugin/SiteAuditCheck/DatabaseEngine.php +++ b/src/Plugin/SiteAuditCheck/DatabaseEngine.php @@ -77,9 +77,9 @@ class DatabaseEngine extends SiteAuditCheckBase { */ public function getAction() { if ($this->score != SiteAuditCheckBase::AUDIT_CHECK_SCORE_PASS) { - return $this->t('Change the Storage Engine to InnoDB. See @url for details.', array( + return $this->t('Change the Storage Engine to InnoDB. See @url for details.', [ '@url' => 'http://dev.mysql.com/doc/refman/5.6/en/converting-tables-to-innodb.html', - )); + ]); } } diff --git a/src/Plugin/SiteAuditCheck/DatabaseFragmentation.php b/src/Plugin/SiteAuditCheck/DatabaseFragmentation.php index 4b8bee3..af2e094 100644 --- a/src/Plugin/SiteAuditCheck/DatabaseFragmentation.php +++ b/src/Plugin/SiteAuditCheck/DatabaseFragmentation.php @@ -73,7 +73,7 @@ class DatabaseFragmentation extends SiteAuditCheckBase { public function calculateScore() { $connection = \Drupal\Core\Database\Database::getConnection(); $query = \Drupal::database()->select('information_schema.TABLES', 'ist'); - $query->fields('ist', array('TABLE_NAME')); + $query->fields('ist', ['TABLE_NAME']); $query->addExpression('ROUND(DATA_LENGTH / 1024 / 1024)', 'data_length'); $query->addExpression('ROUND(INDEX_LENGTH / 1024 / 1024)', 'index_length'); $query->addExpression('ROUND(DATA_FREE / 1024 / 1024)', 'data_free'); diff --git a/src/Plugin/SiteAuditCheck/DatabaseRowCount.php b/src/Plugin/SiteAuditCheck/DatabaseRowCount.php index 134b830..20ab9f4 100644 --- a/src/Plugin/SiteAuditCheck/DatabaseRowCount.php +++ b/src/Plugin/SiteAuditCheck/DatabaseRowCount.php @@ -74,10 +74,10 @@ class DatabaseRowCount extends SiteAuditCheckBase { */ public function calculateScore() { $connection = \Drupal\Core\Database\Database::getConnection(); - $this->registry->rows_by_table = array(); + $this->registry->rows_by_table = []; $warning = FALSE; $query = \Drupal::database()->select('information_schema.TABLES', 'ist'); - $query->fields('ist', array('TABLE_NAME', 'TABLE_ROWS')); + $query->fields('ist', ['TABLE_NAME', 'TABLE_ROWS']); $query->condition('ist.TABLE_ROWS', 1000, '>'); $query->condition('ist.table_schema', $connection->getConnectionOptions()['database']); $query->orderBy('TABLE_ROWS', 'DESC'); diff --git a/src/Plugin/SiteAuditCheck/DatabaseSize.php b/src/Plugin/SiteAuditCheck/DatabaseSize.php index bb3cbf5..11f8041 100644 --- a/src/Plugin/SiteAuditCheck/DatabaseSize.php +++ b/src/Plugin/SiteAuditCheck/DatabaseSize.php @@ -32,9 +32,9 @@ class DatabaseSize extends SiteAuditCheckBase { * {@inheritdoc}. */ public function getResultInfo() { - return $this->t('Total size: @size_in_mbMB', array( + return $this->t('Total size: @size_in_mbMB', [ '@size_in_mb' => number_format($this->registry->table_size / 1048576, 2), - )); + ]); } /** diff --git a/src/Plugin/SiteAuditCheck/ExtensionsCount.php b/src/Plugin/SiteAuditCheck/ExtensionsCount.php index 4a07081..b52b6c4 100644 --- a/src/Plugin/SiteAuditCheck/ExtensionsCount.php +++ b/src/Plugin/SiteAuditCheck/ExtensionsCount.php @@ -34,18 +34,18 @@ class ExtensionsCount extends SiteAuditCheckBase { * {@inheritdoc}. */ public function getResultPass() { - return $this->t('There are @extension_count extensions enabled.', array( + return $this->t('There are @extension_count extensions enabled.', [ '@extension_count' => $this->registry->extension_count, - )); + ]); } /** * {@inheritdoc}. */ public function getResultWarn() { - return $this->t('There are @extension_count extensions enabled; that\'s higher than the average.', array( + return $this->t('There are @extension_count extensions enabled; that\'s higher than the average.', [ '@extension_count' => $this->registry->extension_count, - )); + ]); } /** @@ -54,7 +54,7 @@ class ExtensionsCount extends SiteAuditCheckBase { public function getAction() { if ($this->score != SiteAuditCheckBase::AUDIT_CHECK_SCORE_PASS) { $ret_val = $this->t('Consider the following options:') . PHP_EOL; - $options = array(); + $options = []; $options[] = $this->t('Disable unneeded or unnecessary extensions.'); $options[] = $this->t('Consolidate functionality if possible, or custom develop a solution specific to your needs.'); $options[] = $this->t('Avoid using modules that serve only one small purpose that is not mission critical.'); diff --git a/src/Plugin/SiteAuditCheck/ExtensionsDev.php b/src/Plugin/SiteAuditCheck/ExtensionsDev.php index fe04249..42184ba 100644 --- a/src/Plugin/SiteAuditCheck/ExtensionsDev.php +++ b/src/Plugin/SiteAuditCheck/ExtensionsDev.php @@ -43,9 +43,9 @@ class ExtensionsDev extends SiteAuditCheckBase { * {@inheritdoc}. */ public function getResultWarn() { - $ret_val = $this->t('The following development modules(s) are currently enabled: @list', array( + $ret_val = $this->t('The following development modules(s) are currently enabled: @list', [ '@list' => implode(', ', array_keys($this->registry->extensions_dev)), - )); + ]); $show_table = TRUE; if (site_audit_env_is_dev()) { $show_table = FALSE; @@ -92,12 +92,12 @@ class ExtensionsDev extends SiteAuditCheckBase { $this->registry->extensions = $modules = system_rebuild_module_data(); uasort($this->registry->extensions, 'system_sort_modules_by_info_name'); } - $this->registry->extensions_dev = array(); + $this->registry->extensions_dev = []; $extension_info = $this->registry->extensions; //uasort($extension_info, '_drush_pm_sort_extensions'); $dev_extensions = $this->getExtensions(); foreach ($extension_info as $key => $extension) { - $row = array(); + $row = []; // Not in the list of known development modules. if (!array_key_exists($extension->getName(), $dev_extensions)) { unset($extension_info[$key]); @@ -135,7 +135,7 @@ class ExtensionsDev extends SiteAuditCheckBase { * Keyed by module machine name, value is explanation. */ public function getExtensions() { - $developer_modules = array( + $developer_modules = [ 'ipsum' => $this->t('Development utility to generate fake content.'), 'testmodule' => $this->t('Internal test module.'), // Examples module. @@ -156,11 +156,11 @@ class ExtensionsDev extends SiteAuditCheckBase { 'simpletest_example' => $this->t('Development examples.'), 'tablesort_example' => $this->t('Development examples.'), 'tour_example' => $this->t('Development examples.'), - ); + ]; // From http://drupal.org/project/admin_menu admin_menu.inc in function // _admin_menu_developer_modules(). - $admin_menu_developer_modules = array( + $admin_menu_developer_modules = [ 'admin_devel' => $this->t('Debugging utility; degrades performance.'), 'cache_disable' => $this->t('Development utility and performance drain; degrades performance.'), 'coder' => $this->t('Debugging utility; potential security risk and unnecessary performance hit.'), @@ -196,7 +196,7 @@ can lead to performance problems or inconsistent behavior. Best practice is to store Views in code and deploy changes instead of allowing editing in live environments.'), 'views_theme_wizard' => $this->t('Development utility; unnecessary overhead, potential security risk.'), - ); + ]; return array_merge($admin_menu_developer_modules, $developer_modules); } diff --git a/src/Plugin/SiteAuditCheck/ExtensionsDuplicate.php b/src/Plugin/SiteAuditCheck/ExtensionsDuplicate.php index efdfed7..a6a8097 100644 --- a/src/Plugin/SiteAuditCheck/ExtensionsDuplicate.php +++ b/src/Plugin/SiteAuditCheck/ExtensionsDuplicate.php @@ -34,7 +34,7 @@ class ExtensionsDuplicate extends SiteAuditCheckBase { * {@inheritdoc}. */ public function getResultPass() { - return $this->t('No duplicate extensions were detected.', array()); + return $this->t('No duplicate extensions were detected.', []); } /** @@ -43,17 +43,17 @@ class ExtensionsDuplicate extends SiteAuditCheckBase { public function getResultWarn() { $ret_val = $this->t('The following duplicate extensions were found:'); - $paths = array(); + $paths = []; foreach ($this->registry->extensions_dupe as $name => $instances) { foreach ($instances as $instance) { $paths[$name][] = $instance['path']; } } - $headers = array( + $headers = [ $this->t('Name'), $this->t('Paths') - ); + ]; $rows = []; switch ($this->options['format']) { case 'html': @@ -81,7 +81,7 @@ class ExtensionsDuplicate extends SiteAuditCheckBase { } break; } - return array('#theme' => 'table', '#header' => $headers, '#rows' => $rows); + return ['#theme' => 'table', '#header' => $headers, '#rows' => $rows]; } /** @@ -97,7 +97,7 @@ class ExtensionsDuplicate extends SiteAuditCheckBase { * {@inheritdoc}. */ public function calculateScore() { - $this->registry->extensions_dupe = array(); + $this->registry->extensions_dupe = []; $drupal_root = DRUPAL_ROOT; $settings = \Drupal::service('settings'); $kernel = \Drupal::service('kernel'); @@ -108,15 +108,15 @@ class ExtensionsDuplicate extends SiteAuditCheckBase { $path_parts = explode('/', $path); $name = substr(array_pop($path_parts), 0, -9); // Safe duplicates. - if (in_array($name, array( + if (in_array($name, [ 'drupal_system_listing_compatible_test', 'drupal_system_listing_incompatible_test', 'aaa_update_test', - ))) { + ])) { continue; } if (!isset($this->registry->extensions_dupe[$name])) { - $this->registry->extensions_dupe[$name] = array(); + $this->registry->extensions_dupe[$name] = []; } $path = substr($path, strlen($drupal_root) + 1); $version = ''; @@ -130,10 +130,10 @@ class ExtensionsDuplicate extends SiteAuditCheckBase { } } } - $this->registry->extensions_dupe[$name][] = array( + $this->registry->extensions_dupe[$name][] = [ 'path' => $path, 'version' => $version, - ); + ]; } // Review the detected extensions. diff --git a/src/Plugin/SiteAuditCheck/ExtensionsUnrecommended.php b/src/Plugin/SiteAuditCheck/ExtensionsUnrecommended.php index 5356ecf..caca3fd 100644 --- a/src/Plugin/SiteAuditCheck/ExtensionsUnrecommended.php +++ b/src/Plugin/SiteAuditCheck/ExtensionsUnrecommended.php @@ -24,9 +24,9 @@ class ExtensionsUnrecommended extends SiteAuditCheckBase { * {@inheritdoc}. */ public function getResultFail() { - $ret_val = $this->t('The following unrecommended modules(s) currently exist in your codebase: @list', array( + $ret_val = $this->t('The following unrecommended modules(s) currently exist in your codebase: @list', [ '@list' => implode(', ', array_keys($this->registry->extensions_unrec)), - )); + ]); //if (drush_get_option('detail')) { if (TRUE) { //if (drush_get_option('html')) { @@ -63,16 +63,16 @@ class ExtensionsUnrecommended extends SiteAuditCheckBase { * {@inheritdoc}. */ public function getResultPass() { - return $this->t('No unrecommended extensions were detected; no action required.', array()); + return $this->t('No unrecommended extensions were detected; no action required.', []); } /** * {@inheritdoc}. */ public function getResultWarn() { - return $this->t('There are @extension_count extensions enabled; that\'s higher than the average.', array( + return $this->t('There are @extension_count extensions enabled; that\'s higher than the average.', [ '@extension_count' => $this->registry->extension_count, - )); + ]); } /** @@ -88,7 +88,7 @@ class ExtensionsUnrecommended extends SiteAuditCheckBase { * {@inheritdoc}. */ public function calculateScore() { - $this->registry->extensions_unrec = array(); + $this->registry->extensions_unrec = []; if (!isset($this->registry->extensions)) { $this->checkInvokeCalculateScore('extensions_count'); } @@ -97,7 +97,7 @@ class ExtensionsUnrecommended extends SiteAuditCheckBase { $unrecommended_extensions = $this->getExtensions(); foreach ($extension_info as $extension) { - $row = array(); + $row = []; $machine_name = $extension->getName(); @@ -127,17 +127,17 @@ class ExtensionsUnrecommended extends SiteAuditCheckBase { * Keyed by module machine name, value is explanation. */ public function getExtensions() { - $unrecommended_modules = array( + $unrecommended_modules = [ 'bad_judgement' => $this->t('Joke module, framework for anarchy.'), 'php' => $this->t('Executable code should never be stored in the database.'), - ); + ]; //if (drush_get_option('vendor') == 'pantheon') { TODO if (FALSE) { // Unsupported or redundant. - $pantheon_unrecommended_modules = array( + $pantheon_unrecommended_modules = [ 'memcache' => dt('Pantheon does not provide memcache; instead, redis is provided as a service to all customers; see http://helpdesk.getpantheon.com/customer/portal/articles/401317'), 'memcache_storage' => dt('Pantheon does not provide memcache; instead, redis is provided as a service to all customers; see http://helpdesk.getpantheon.com/customer/portal/articles/401317'), - ); + ]; $unrecommended_modules = array_merge($unrecommended_modules, $pantheon_unrecommended_modules); } return $unrecommended_modules; diff --git a/src/Plugin/SiteAuditCheck/SecurityMenuRouter.php b/src/Plugin/SiteAuditCheck/SecurityMenuRouter.php index 88e5f4b..1f4f6d4 100644 --- a/src/Plugin/SiteAuditCheck/SecurityMenuRouter.php +++ b/src/Plugin/SiteAuditCheck/SecurityMenuRouter.php @@ -24,9 +24,9 @@ class SecurityMenuRouter extends SiteAuditCheckBase { * {@inheritdoc}. */ public function getResultFail() { - $ret_val = $this->t('The following potentially malicious paths have been discovered: @list', array( + $ret_val = $this->t('The following potentially malicious paths have been discovered: @list', [ '@list' => implode(', ', array_keys($this->registry->menu_router)), - )); + ]); if (TRUE) { //if (drush_get_option('detail')) { if (TRUE) { //if (drush_get_option('html')) { @@ -66,7 +66,7 @@ class SecurityMenuRouter extends SiteAuditCheckBase { * {@inheritdoc}. */ public function getResultPass() { - return $this->t('No known potentially malicious entries were detected in the menu_router table.', array()); + return $this->t('No known potentially malicious entries were detected in the menu_router table.', []); } /** @@ -88,7 +88,7 @@ class SecurityMenuRouter extends SiteAuditCheckBase { */ public function calculateScore() { // DRUPAL SA-CORE-2014-005 Exploits. - $dangerous_callbacks = array( + $dangerous_callbacks = [ 'php_eval' => 'executes arbitrary PHP code', 'assert' => 'executes arbitrary PHP code', 'exec' => 'executes external programs', @@ -257,12 +257,12 @@ class SecurityMenuRouter extends SiteAuditCheckBase { 'show_source' => 'reads files', 'php_strip_whitespace' => 'reads files', 'get_meta_tags' => 'reads files', - ); + ]; $all_routes = \Drupal::service('router.route_provider')->getAllRoutes(); - $callback_keys = array( + $callback_keys = [ '_controller', '_title_callback', - ); + ]; foreach ($all_routes as $route) { $defaults = $route->getDefaults(); foreach ($callback_keys as $key) { @@ -273,7 +273,7 @@ class SecurityMenuRouter extends SiteAuditCheckBase { return $parameter->name; }, $parameters); $passed_arguments = array_intersect($parameters, array_keys($defaults)); - $arguments = array(); + $arguments = []; foreach ($passed_arguments as $argument) { $arguments[] = $argument . '=' . $defaults[$argument]; } diff --git a/src/Plugin/SiteAuditCheck/StatusSystem.php b/src/Plugin/SiteAuditCheck/StatusSystem.php index 8aea133..dca1316 100644 --- a/src/Plugin/SiteAuditCheck/StatusSystem.php +++ b/src/Plugin/SiteAuditCheck/StatusSystem.php @@ -36,7 +36,7 @@ class StatusSystem extends SiteAuditCheckBase { * {@inheritdoc}. */ public function getResultPass() { - $items = array(); + $items = []; foreach ($this->registry->requirements as $requirement) { // Default to REQUIREMENT_INFO if no severity is set. if (!isset($requirement['severity'])) { @@ -106,7 +106,7 @@ class StatusSystem extends SiteAuditCheckBase { drupal_load_updates(); // Check run-time requirements and status information. - $this->registry->requirements = \Drupal::moduleHandler()->invokeAll('requirements', array('runtime')); + $this->registry->requirements = \Drupal::moduleHandler()->invokeAll('requirements', ['runtime']); usort($this->registry->requirements, function($a, $b) { if (!isset($a['weight'])) { if (!isset($b['weight'])) { @@ -118,7 +118,7 @@ class StatusSystem extends SiteAuditCheckBase { }); $this->percentOverride = 0; - $requirements_with_severity = array(); + $requirements_with_severity = []; foreach ($this->registry->requirements as $key => $value) { if (isset($value['severity'])) { $requirements_with_severity[$key] = $value; diff --git a/src/Plugin/SiteAuditCheck/UsersRolesList.php b/src/Plugin/SiteAuditCheck/UsersRolesList.php index 277bac4..f86e7df 100644 --- a/src/Plugin/SiteAuditCheck/UsersRolesList.php +++ b/src/Plugin/SiteAuditCheck/UsersRolesList.php @@ -29,7 +29,7 @@ class UsersRolesList extends SiteAuditCheckBase { * {@inheritdoc}. */ public function getResultInfo() { - $counts = array(); + $counts = []; foreach ($this->registry->roles as $name => $count_users) { $counts[] = "$name: $count_users"; } diff --git a/src/Plugin/SiteAuditCheck/UsersWhoIsNumberOne.php b/src/Plugin/SiteAuditCheck/UsersWhoIsNumberOne.php index 9d7813c..50dd737 100644 --- a/src/Plugin/SiteAuditCheck/UsersWhoIsNumberOne.php +++ b/src/Plugin/SiteAuditCheck/UsersWhoIsNumberOne.php @@ -33,10 +33,10 @@ class UsersWhoIsNumberOne extends SiteAuditCheckBase { * {@inheritdoc}. */ public function getResultInfo() { - return $this->t('UID #1: @name, email: @mail', array( + return $this->t('UID #1: @name, email: @mail', [ '@name' => $this->registry->uid_1->get('name')->value, '@mail' => $this->registry->uid_1->get('mail')->value, - )); + ]); } /** diff --git a/src/Plugin/SiteAuditCheck/ViewsCacheOutput.php b/src/Plugin/SiteAuditCheck/ViewsCacheOutput.php index fdf32fa..74418ce 100644 --- a/src/Plugin/SiteAuditCheck/ViewsCacheOutput.php +++ b/src/Plugin/SiteAuditCheck/ViewsCacheOutput.php @@ -45,26 +45,26 @@ class ViewsCacheOutput extends SiteAuditCheckBase { * {@inheritdoc}. */ public function getResultWarn() { - return $this->t('The following Views are not caching rendered output: @views_without_output_caching', array( + return $this->t('The following Views are not caching rendered output: @views_without_output_caching', [ '@views_without_output_caching' => implode(', ', $this->registry->views_without_output_caching), - )); + ]); } /** * {@inheritdoc}. */ public function getAction() { - if (!in_array($this->score, array(SiteAuditCheckBase::AUDIT_CHECK_SCORE_INFO, SiteAuditCheckBase::AUDIT_CHECK_SCORE_PASS))) { + if (!in_array($this->score, [SiteAuditCheckBase::AUDIT_CHECK_SCORE_INFO, SiteAuditCheckBase::AUDIT_CHECK_SCORE_PASS])) { $ret_val = $this->t('Rendered output should be cached for as long as possible (if the query changes, the output will be refreshed).'); - $steps = array( + $steps = [ $this->t('Go to /admin/structure/views/'), $this->t('Edit the View in question'), $this->t('Select the Display'), $this->t('Click Advanced'), $this->t('Next to Caching, click to edit.'), $this->t('Caching: (something other than None)'), - ); + ]; $ret_val = [ '#theme' => 'item_list', '#title' => $this->t('Rendered output should be cached for as long as possible (if the query changes, the output will be refreshed).'), @@ -81,13 +81,13 @@ class ViewsCacheOutput extends SiteAuditCheckBase { * {@inheritdoc}. */ public function calculateScore() { - $this->registry->output_lifespan = array(); + $this->registry->output_lifespan = []; if (empty($this->registry->views)) { $this->checkInvokeCalculateScore('views_count'); } foreach ($this->registry->views as $view) { // Skip views used for administration purposes. - if (in_array($view->get('tag'), array('admin', 'commerce'))) { + if (in_array($view->get('tag'), ['admin', 'commerce'])) { continue; } foreach ($view->get('display') as $display_name => $display) { @@ -136,7 +136,7 @@ class ViewsCacheOutput extends SiteAuditCheckBase { } } - $this->registry->views_without_output_caching = array(); + $this->registry->views_without_output_caching = []; foreach ($this->registry->output_lifespan as $view_name => $view_data) { // Views with only master display. @@ -162,7 +162,7 @@ class ViewsCacheOutput extends SiteAuditCheckBase { } else { $uncached_view_string = $view_name; - $uncached_view_displays = array(); + $uncached_view_displays = []; foreach ($view_data['displays'] as $display_name => $display_data) { if ($display_data == 'none' || ($display_data == 'default' && $view_data['default'] == 'none')) { $uncached_view_displays[] = $display_name; diff --git a/src/Plugin/SiteAuditCheck/ViewsCacheResults.php b/src/Plugin/SiteAuditCheck/ViewsCacheResults.php index 3e9bfb8..c4fe5db 100644 --- a/src/Plugin/SiteAuditCheck/ViewsCacheResults.php +++ b/src/Plugin/SiteAuditCheck/ViewsCacheResults.php @@ -45,24 +45,24 @@ class ViewsCacheResults extends SiteAuditCheckBase { * {@inheritdoc}. */ public function getResultWarn() { - return $this->t('The following Views are not caching query results: @views_without_results_caching', array( + return $this->t('The following Views are not caching query results: @views_without_results_caching', [ '@views_without_results_caching' => implode(', ', $this->registry->views_without_results_caching), - )); + ]); } /** * {@inheritdoc}. */ public function getAction() { - if (!in_array($this->score, array(SiteAuditCheckBase::AUDIT_CHECK_SCORE_INFO, SiteAuditCheckBase::AUDIT_CHECK_SCORE_PASS))) { - $steps = array( + if (!in_array($this->score, [SiteAuditCheckBase::AUDIT_CHECK_SCORE_INFO, SiteAuditCheckBase::AUDIT_CHECK_SCORE_PASS])) { + $steps = [ $this->t('Go to /admin/structure/views/'), $this->t('Edit the View in question'), $this->t('Select the Display'), $this->t('Click Advanced'), $this->t('Next to Caching, click to edit.'), $this->t('Caching: (something other than None)'), - ); + ]; return [ '#theme' => 'item_list', @@ -78,13 +78,13 @@ class ViewsCacheResults extends SiteAuditCheckBase { * {@inheritdoc}. */ public function calculateScore() { - $this->registry->results_lifespan = array(); + $this->registry->results_lifespan = []; if (empty($this->registry->views)) { $this->checkInvokeCalculateScore('views_count'); } foreach ($this->registry->views as $view) { // Skip views used for administration purposes. - if (in_array($view->get('tag'), array('admin', 'commerce'))) { + if (in_array($view->get('tag'), ['admin', 'commerce'])) { continue; } foreach ($view->get('display') as $display_name => $display) { @@ -132,7 +132,7 @@ class ViewsCacheResults extends SiteAuditCheckBase { } } } - $this->registry->views_without_results_caching = array(); + $this->registry->views_without_results_caching = []; foreach ($this->registry->results_lifespan as $view_name => $view_data) { // Views with only master display. @@ -158,7 +158,7 @@ class ViewsCacheResults extends SiteAuditCheckBase { } else { $uncached_view_string = $view_name; - $uncached_view_displays = array(); + $uncached_view_displays = []; foreach ($view_data['displays'] as $display_name => $display_data) { if ($display_data == 'none' || ($display_data == 'default' && $view_data['default'] == 'none')) { $uncached_view_displays[] = $display_name; diff --git a/src/Plugin/SiteAuditCheck/ViewsCount.php b/src/Plugin/SiteAuditCheck/ViewsCount.php index 9a227a5..495af2e 100644 --- a/src/Plugin/SiteAuditCheck/ViewsCount.php +++ b/src/Plugin/SiteAuditCheck/ViewsCount.php @@ -39,9 +39,9 @@ class ViewsCount extends SiteAuditCheckBase { if (!$views_count) { return $this->t('There are no enabled views.'); } - return $this->t('There are @count_views enabled views.', array( + return $this->t('There are @count_views enabled views.', [ '@count_views' => count($this->registry->views), - )); + ]); } /** @@ -64,7 +64,7 @@ class ViewsCount extends SiteAuditCheckBase { * {@inheritdoc}. */ public function calculateScore() { - $this->registry->views = array(); + $this->registry->views = []; $all_views = \Drupal::service('entity_type.manager')->getListBuilder('view')->load(); foreach ($all_views['enabled'] as $view) { diff --git a/src/Plugin/SiteAuditCheck/Watchdog404.php b/src/Plugin/SiteAuditCheck/Watchdog404.php index 52a019a..65e5291 100644 --- a/src/Plugin/SiteAuditCheck/Watchdog404.php +++ b/src/Plugin/SiteAuditCheck/Watchdog404.php @@ -29,10 +29,10 @@ class Watchdog404 extends SiteAuditCheckBase { * {@inheritdoc}. */ public function getResultInfo() { - return $this->t('@count_404 pages not found (@percent_404%).', array( + return $this->t('@count_404 pages not found (@percent_404%).', [ '@count_404' => $this->registry->count_404, '@percent_404' => $this->registry->percent_404, - )); + ]); } /** diff --git a/src/Plugin/SiteAuditCheck/WatchdogAge.php b/src/Plugin/SiteAuditCheck/WatchdogAge.php index 16c805a..1730c52 100644 --- a/src/Plugin/SiteAuditCheck/WatchdogAge.php +++ b/src/Plugin/SiteAuditCheck/WatchdogAge.php @@ -33,17 +33,17 @@ class WatchdogAge extends SiteAuditCheckBase { public function getResultInfo() { // If two different days... if (date('Y-m-d', $this->ageOldest) != date('Y-m-d', $this->ageNewest)) { - return $this->t('From @from to @to (@days days)', array( + return $this->t('From @from to @to (@days days)', [ '@from' => date('r', $this->ageOldest), '@to' => date('r', $this->ageNewest), '@days' => round(($this->ageNewest - $this->ageOldest) / 86400, 2), - )); + ]); } // Same day; don't calculate number of days. - return $this->t('From @from to @to', array( + return $this->t('From @from to @to', [ '@from' => date('r', $this->ageOldest), '@to' => date('r', $this->ageNewest), - )); + ]); } /** diff --git a/src/Plugin/SiteAuditCheck/WatchdogCount.php b/src/Plugin/SiteAuditCheck/WatchdogCount.php index 6043e77..ee90c6c 100644 --- a/src/Plugin/SiteAuditCheck/WatchdogCount.php +++ b/src/Plugin/SiteAuditCheck/WatchdogCount.php @@ -33,9 +33,9 @@ class WatchdogCount extends SiteAuditCheckBase { if (!$this->registry->count_entries) { return $this->t('There are no dblog entries.'); } - return $this->t('There are @count_entries log entries.', array( + return $this->t('There are @count_entries log entries.', [ '@count_entries' => number_format($this->registry->count_entries), - )); + ]); } /** diff --git a/src/Plugin/SiteAuditCheck/WatchdogPhp.php b/src/Plugin/SiteAuditCheck/WatchdogPhp.php index 462a0ae..3b4ce0a 100644 --- a/src/Plugin/SiteAuditCheck/WatchdogPhp.php +++ b/src/Plugin/SiteAuditCheck/WatchdogPhp.php @@ -31,7 +31,7 @@ class WatchdogPhp extends SiteAuditCheckBase { * {@inheritdoc}. */ public function getResultInfo() { - $counts = array(); + $counts = []; foreach ($this->registry->php_counts as $severity => $count) { $counts[] = $severity . ': ' . $count; } @@ -67,7 +67,7 @@ class WatchdogPhp extends SiteAuditCheckBase { * {@inheritdoc}. */ public function calculateScore() { - $this->registry->php_counts = array(); + $this->registry->php_counts = []; $this->registry->php_count_total = 0; $this->registry->percent_php = 0; @@ -101,7 +101,7 @@ class WatchdogPhp extends SiteAuditCheckBase { * @see drush_watchdog_severity_levels() */ public function watchdog_severity_levels() { - return array( + return [ RfcLogLevel::EMERGENCY => 'emergency', RfcLogLevel::ALERT => 'alert', RfcLogLevel::CRITICAL => 'critical', @@ -110,7 +110,7 @@ class WatchdogPhp extends SiteAuditCheckBase { RfcLogLevel::NOTICE => 'notice', RfcLogLevel::INFO => 'info', RfcLogLevel::DEBUG => 'debug', - ); + ]; } } diff --git a/src/Plugin/SiteAuditCheckBase.php b/src/Plugin/SiteAuditCheckBase.php index 02b055b..4a249ff 100644 --- a/src/Plugin/SiteAuditCheckBase.php +++ b/src/Plugin/SiteAuditCheckBase.php @@ -275,7 +275,7 @@ abstract class SiteAuditCheckBase extends PluginBase implements SiteAuditCheckIn protected function checkInvokeCalculateScore($plugin_id) { $checkManager = \Drupal::service('plugin.manager.site_audit_check'); if (isset($opt_out)) { - $check = $checkManager->createInstance($plugin_id, array('registry' => $this->registry, 'opt_out' => $opt_out)); + $check = $checkManager->createInstance($plugin_id, ['registry' => $this->registry, 'opt_out' => $opt_out]); $check->calculateScore(); } } diff --git a/src/Plugin/SiteAuditReportBase.php b/src/Plugin/SiteAuditReportBase.php index b3474c7..6d566a6 100644 --- a/src/Plugin/SiteAuditReportBase.php +++ b/src/Plugin/SiteAuditReportBase.php @@ -100,7 +100,7 @@ abstract class SiteAuditReportBase extends PluginBase implements SiteAuditReport $percent_override = NULL; - $checks_to_skip = array(); + $checks_to_skip = []; $checks_to_perform = $this->getChecksList(); @@ -112,13 +112,13 @@ abstract class SiteAuditReportBase extends PluginBase implements SiteAuditReport if (empty($checks_to_perform)) { $this_def = $this->getPluginDefinition(); - //throw new \RuntimeException(t('No checks are available for report \'@id\'!', array('@id' => $this_def['id']))); + //throw new \RuntimeException(t('No checks are available for report \'@id\'!', ['@id' => $this_def['id']])); } $config = \Drupal::config('site_audit'); foreach ($checks_to_perform as $check_id) { $opt_out = $config->get('opt_out.' . $this->getPluginId() . $check_id) != NULL; - $check = $checkManager->createInstance($check_id, array('registry' => $this->registry, 'opt_out' => $opt_out, 'options' => $this->configuration)); + $check = $checkManager->createInstance($check_id, ['registry' => $this->registry, 'opt_out' => $opt_out, 'options' => $this->configuration]); // Calculate score. if ($check->getScore() != SiteAuditCheckBase::AUDIT_CHECK_SCORE_INFO) { @@ -170,7 +170,7 @@ abstract class SiteAuditReportBase extends PluginBase implements SiteAuditReport $checksInReport[$checkDefinition['id']] = $checkDefinition; } } - uasort($checksInReport, array($this, 'weightKeySort')); + uasort($checksInReport, [$this, 'weightKeySort']); $checks = []; foreach ($checksInReport AS $check) { diff --git a/src/Renderer/Json.php b/src/Renderer/Json.php index 1ef1292..50d43eb 100644 --- a/src/Renderer/Json.php +++ b/src/Renderer/Json.php @@ -7,19 +7,19 @@ use Drupal\site_audit\Renderer; class Json extends Renderer { public function render($detail = FALSE) { - $report = array( + $report = [ 'percent' => $this->report->getPercent(), 'label' => $this->report->getLabel(), - 'checks' => array(), - ); + 'checks' => [], + ]; foreach ($this->report->getChecks() as $check) { - $report['checks'][get_class($check)] = array( + $report['checks'][get_class($check)] = [ 'label' => $check->getLabel(), 'description' => $check->getDescription(), 'result' => $check->getResult(), 'action' => $check->renderAction(), 'score' => $check->getScore(), - ); + ]; } return json_encode($report); }