diff --git a/config/install/geshifilter.settings.yml b/config/install/geshifilter.settings.yml index dbe0b45..2f2e0cc 100644 --- a/config/install/geshifilter.settings.yml +++ b/config/install/geshifilter.settings.yml @@ -1,5 +1,3 @@ -# Default settings for GeshiFilter - # Use a specific options for each filter format use_format_specific_options: false @@ -37,21 +35,21 @@ tags: 'code blockcode' # - 1 <> (). # - 2 [] ([cpp]). # - 4 [[]] ([[CPP]]). -# - 8 'Drupal 5', - 'COMMENT_SINGLE' => array(1 => '//', 2 => '#'), - 'COMMENT_MULTI' => array('/*' => '*/'), + 'COMMENT_SINGLE' => [1 => '//', 2 => '#'], + 'COMMENT_MULTI' => ['/*' => '*/'], 'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE, - 'QUOTEMARKS' => array("'", '"'), + 'QUOTEMARKS' => ["'", '"'], 'ESCAPE_CHAR' => '\\', - 'KEYWORDS' => array( - 1 => array( + 'KEYWORDS' => [ + 1 => [ 'include', 'require', 'include_once', 'require_once', 'for', 'foreach', 'as', 'if', 'elseif', 'else', 'while', 'do', 'endwhile', 'endif', 'switch', 'case', 'endswitch', 'endfor', 'endforeach', 'return', 'break', 'continue', - ), - 2 => array( + ], + 2 => [ 'null', '__LINE__', '__FILE__', 'false', '<?php', '?>', '<?', '<script language', '</script>', @@ -46,8 +46,8 @@ $language_data = array( 'PHP_OUTPUT_HANDLER_END', 'E_ERROR', 'E_WARNING', 'E_PARSE', 'E_NOTICE', 'E_CORE_ERROR', 'E_CORE_WARNING', 'E_COMPILE_ERROR', 'E_COMPILE_WARNING', 'E_USER_ERROR', 'E_USER_WARNING', 'E_USER_NOTICE', 'E_ALL', - ), - 3 => array( + ], + 3 => [ 'zlib_get_coding_type', 'zend_version', 'zend_logo_guid', 'yp_order', 'yp_next', 'yp_match', 'yp_master', 'yp_get_default_domain', 'yp_first', 'yp_errno', 'yp_err_string', 'yp_cat', 'yp_all', 'xml_set_unparsed_entity_decl_handler', 'xml_set_start_namespace_decl_handler', 'xml_set_processing_instruction_handler', 'xml_set_object', @@ -226,8 +226,8 @@ $language_data = array( 'aggregate_methods_by_list', 'aggregate_methods', 'aggregate', 'addslashes', 'addcslashes', 'acosh', 'acos', 'abs', '_', 'echo', 'print', 'global', 'static', 'exit', 'array', 'empty', 'eval', 'isset', 'unset', 'die', 'list', - ), - 5 => array( + ], + 5 => [ 'timer_start', 'timer_read', 'timer_stop', 'conf_path', 'drupal_unset_globals', 'conf_init', 'drupal_get_filename', 'variable_init', 'variable_get', 'variable_set', 'variable_del', 'page_get_cache', 'bootstrap_invoke_all', 'drupal_load', 'drupal_page_header', 'drupal_page_cache_header', @@ -547,8 +547,8 @@ $language_data = array( 'user_forms', 'watchdog_help', 'watchdog_menu', 'watchdog_cron', 'watchdog_user', 'watchdog_form_overview', 'watchdog_overview', 'watchdog_top', 'theme_watchdog_form_overview', 'watchdog_form_overview_submit', 'watchdog_event', '_watchdog_get_message_types', - ), - 6 => array( + ], + 6 => [ 'CACHE_PERMANENT', 'CACHE_TEMPORARY', 'CACHE_DISABLED', 'CACHE_NORMAL', 'CACHE_AGGRESSIVE', 'WATCHDOG_NOTICE', 'WATCHDOG_WARNING', 'WATCHDOG_ERROR', 'DRUPAL_BOOTSTRAP_CONFIGURATION', 'DRUPAL_BOOTSTRAP_EARLY_PAGE_CACHE', 'DRUPAL_BOOTSTRAP_DATABASE', 'DRUPAL_BOOTSTRAP_ACCESS', @@ -577,12 +577,12 @@ $language_data = array( 'PROFILE_PRIVATE', 'PROFILE_PUBLIC', 'PROFILE_PUBLIC_LISTINGS', 'PROFILE_HIDDEN', 'PREG_CLASS_SEARCH_EXCLUDE', 'PREG_CLASS_NUMBERS', 'PREG_CLASS_PUNCTUATION', 'PREG_CLASS_CJK', 'VERSION', 'USERNAME_MAX_LENGTH', 'EMAIL_MAX_LENGTH', - ), - ), - 'SYMBOLS' => array( + ], + ], + 'SYMBOLS' => [ '(', ')', '[', ']', '{', '}', '!', '@', '%', '&', '*', '|', '/', '<', '>', - ), - 'CASE_SENSITIVE' => array( + ], + 'CASE_SENSITIVE' => [ GESHI_COMMENTS => FALSE, 1 => FALSE, 2 => FALSE, @@ -590,90 +590,90 @@ $language_data = array( 4 => FALSE, 5 => FALSE, 6 => FALSE, - ), - 'STYLES' => array( - 'KEYWORDS' => array( + ], + 'STYLES' => [ + 'KEYWORDS' => [ 1 => 'color: #b1b100;', 2 => 'color: #000000; font-weight: bold;', 3 => 'color: #000066;', 5 => 'color: #000066;', 6 => 'color: #000000; font-weight: bold;', - ), - 'COMMENTS' => array( + ], + 'COMMENTS' => [ 1 => 'color: #808080; font-style: italic;', 2 => 'color: #808080; font-style: italic;', 'MULTI' => 'color: #808080; font-style: italic;', - ), - 'ESCAPE_CHAR' => array( + ], + 'ESCAPE_CHAR' => [ 0 => 'color: #000099; font-weight: bold;', - ), - 'BRACKETS' => array( + ], + 'BRACKETS' => [ 0 => 'color: #66cc66;', - ), - 'STRINGS' => array( + ], + 'STRINGS' => [ 0 => 'color: #ff0000;', - ), - 'NUMBERS' => array( + ], + 'NUMBERS' => [ 0 => 'color: #cc66cc;', - ), - 'METHODS' => array( + ], + 'METHODS' => [ 1 => 'color: #006600;', 2 => 'color: #006600;', - ), - 'SYMBOLS' => array( + ], + 'SYMBOLS' => [ 0 => 'color: #66cc66;', - ), - 'REGEXPS' => array( + ], + 'REGEXPS' => [ 0 => 'color: #0000ff;', 1 => 'color: #ff0000', - ), - 'SCRIPT' => array( + ], + 'SCRIPT' => [ 0 => '', 1 => '', 2 => '', 3 => '', - ), - ), - 'URLS' => array( + ], + ], + 'URLS' => [ 1 => '', 2 => '', 3 => 'http://www.php.net/{FNAME}', 4 => '', 5 => 'http://api.drupal.org/api/function/{FNAME}/5', 6 => 'http://api.drupal.org/api/constant/{FNAME}/5', - ), + ], 'OOLANG' => TRUE, - 'OBJECT_SPLITTERS' => array( + 'OBJECT_SPLITTERS' => [ 1 => '->', 2 => '::', - ), - 'REGEXPS' => array( + ], + 'REGEXPS' => [ 0 => "[\\$]{1,2}[a-zA-Z_][a-zA-Z0-9_]*", - 1 => array( + 1 => [ GESHI_SEARCH => "([a-zA-Z]+)(\n)(.*)(\n)(\\1;?)", GESHI_REPLACE => '\3', GESHI_BEFORE => '\1\2', GESHI_AFTER => '\4\5', GESHI_MODIFIERS => 'siU', - ), - ), + ], + ], 'STRICT_MODE_APPLIES' => GESHI_MAYBE, - 'SCRIPT_DELIMITERS' => array( - 0 => array( + 'SCRIPT_DELIMITERS' => [ + 0 => [ ' '?>', - ), - 1 => array( + ], + 1 => [ ' '?>', - ), - 2 => array( + ], + 2 => [ '<%' => '%>', - ), - ), - 'HIGHLIGHT_STRICT_BLOCK' => array( + ], + ], + 'HIGHLIGHT_STRICT_BLOCK' => [ 0 => TRUE, 1 => TRUE, 2 => TRUE, 3 => TRUE, - ), + ], 'TAB_WIDTH' => 2, -); +]; diff --git a/geshi-extra/drupal6.php b/geshi-extra/drupal6.php index e6d1a2c..c43d80e 100644 --- a/geshi-extra/drupal6.php +++ b/geshi-extra/drupal6.php @@ -18,21 +18,21 @@ * */ -$language_data = array( +$language_data = [ 'LANG_NAME' => 'Drupal 6', - 'COMMENT_SINGLE' => array(1 => '//', 2 => '#'), - 'COMMENT_MULTI' => array('/*' => '*/'), + 'COMMENT_SINGLE' => [1 => '//', 2 => '#'], + 'COMMENT_MULTI' => ['/*' => '*/'], 'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE, - 'QUOTEMARKS' => array("'", '"'), + 'QUOTEMARKS' => ["'", '"'], 'ESCAPE_CHAR' => '\\', - 'KEYWORDS' => array( - 1 => array( + 'KEYWORDS' => [ + 1 => [ 'include', 'require', 'include_once', 'require_once', 'for', 'foreach', 'as', 'if', 'elseif', 'else', 'while', 'do', 'endwhile', 'endif', 'switch', 'case', 'endswitch', 'endfor', 'endforeach', 'return', 'break', 'continue', - ), - 2 => array( + ], + 2 => [ 'null', '__LINE__', '__FILE__', 'false', '<?php', '?>', '<?', '<script language', '</script>', @@ -45,8 +45,8 @@ $language_data = array( 'PHP_OUTPUT_HANDLER_END', 'E_ERROR', 'E_WARNING', 'E_PARSE', 'E_NOTICE', 'E_CORE_ERROR', 'E_CORE_WARNING', 'E_COMPILE_ERROR', 'E_COMPILE_WARNING', 'E_USER_ERROR', 'E_USER_WARNING', 'E_USER_NOTICE', 'E_ALL', - ), - 3 => array( + ], + 3 => [ 'zlib_get_coding_type', 'zend_version', 'zend_logo_guid', 'yp_order', 'yp_next', 'yp_match', 'yp_master', 'yp_get_default_domain', 'yp_first', 'yp_errno', 'yp_err_string', 'yp_cat', 'yp_all', 'xml_set_unparsed_entity_decl_handler', 'xml_set_start_namespace_decl_handler', 'xml_set_processing_instruction_handler', 'xml_set_object', @@ -225,8 +225,8 @@ $language_data = array( 'aggregate_methods_by_list', 'aggregate_methods', 'aggregate', 'addslashes', 'addcslashes', 'acosh', 'acos', 'abs', '_', 'echo', 'print', 'global', 'static', 'exit', 'array', 'empty', 'eval', 'isset', 'unset', 'die', 'list', - ), - 5 => array( + ], + 5 => [ 'actions_do', 'actions_list', 'actions_get_all_actions', 'actions_actions_map', 'actions_function_lookup', 'actions_synchronize', 'actions_save', 'actions_load', 'actions_delete', '_batch_page', '_batch_start', '_batch_progress_page_js', '_batch_do', '_batch_progress_page_nojs', @@ -679,8 +679,8 @@ $language_data = array( 'template_preprocess_user_profile_category', 'user_edit', 'user_profile_form', 'user_profile_form_validate', 'user_profile_form_submit', 'user_edit_delete_submit', 'user_confirm_delete', 'user_confirm_delete_submit', 'user_edit_validate', 'user_edit_submit', 'user_page', - ), - 6 => array( + ], + 6 => [ 'CACHE_PERMANENT', 'CACHE_TEMPORARY', 'CACHE_DISABLED', 'CACHE_NORMAL', 'CACHE_AGGRESSIVE', 'WATCHDOG_EMERG', 'WATCHDOG_ALERT', 'WATCHDOG_CRITICAL', 'WATCHDOG_ERROR', 'WATCHDOG_WARNING', 'WATCHDOG_NOTICE', 'WATCHDOG_INFO', 'WATCHDOG_DEBUG', 'DRUPAL_BOOTSTRAP_CONFIGURATION', @@ -720,12 +720,12 @@ $language_data = array( 'DRUPAL_MAXIMUM_TEMP_FILE_AGE', 'UPDATE_DEFAULT_URL', 'UPDATE_CURRENT', 'UPDATE_NOT_SECURE', 'UPDATE_NOT_CURRENT', 'UPDATE_NOT_CHECKED', 'UPDATE_UNKNOWN', 'USERNAME_MAX_LENGTH', 'EMAIL_MAX_LENGTH', - ), - ), - 'SYMBOLS' => array( + ], + ], + 'SYMBOLS' => [ '(', ')', '[', ']', '{', '}', '!', '@', '%', '&', '*', '|', '/', '<', '>', - ), - 'CASE_SENSITIVE' => array( + ], + 'CASE_SENSITIVE' => [ GESHI_COMMENTS => FALSE, 1 => FALSE, 2 => FALSE, @@ -733,90 +733,90 @@ $language_data = array( 4 => FALSE, 5 => FALSE, 6 => FALSE, - ), - 'STYLES' => array( - 'KEYWORDS' => array( + ], + 'STYLES' => [ + 'KEYWORDS' => [ 1 => 'color: #b1b100;', 2 => 'color: #000000; font-weight: bold;', 3 => 'color: #000066;', 5 => 'color: #000066;', 6 => 'color: #000000; font-weight: bold;', - ), - 'COMMENTS' => array( + ], + 'COMMENTS' => [ 1 => 'color: #808080; font-style: italic;', 2 => 'color: #808080; font-style: italic;', 'MULTI' => 'color: #808080; font-style: italic;', - ), - 'ESCAPE_CHAR' => array( + ], + 'ESCAPE_CHAR' => [ 0 => 'color: #000099; font-weight: bold;', - ), - 'BRACKETS' => array( + ], + 'BRACKETS' => [ 0 => 'color: #66cc66;', - ), - 'STRINGS' => array( + ], + 'STRINGS' => [ 0 => 'color: #ff0000;', - ), - 'NUMBERS' => array( + ], + 'NUMBERS' => [ 0 => 'color: #cc66cc;', - ), - 'METHODS' => array( + ], + 'METHODS' => [ 1 => 'color: #006600;', 2 => 'color: #006600;', - ), - 'SYMBOLS' => array( + ], + 'SYMBOLS' => [ 0 => 'color: #66cc66;', - ), - 'REGEXPS' => array( + ], + 'REGEXPS' => [ 0 => 'color: #0000ff;', 1 => 'color: #ff0000', - ), - 'SCRIPT' => array( + ], + 'SCRIPT' => [ 0 => '', 1 => '', 2 => '', 3 => '', - ), - ), - 'URLS' => array( + ], + ], + 'URLS' => [ 1 => '', 2 => '', 3 => 'http://www.php.net/{FNAME}', 4 => '', 5 => 'http://api.drupal.org/api/function/{FNAME}/6', 6 => 'http://api.drupal.org/api/constant/{FNAME}/6', - ), + ], 'OOLANG' => TRUE, - 'OBJECT_SPLITTERS' => array( + 'OBJECT_SPLITTERS' => [ 1 => '->', 2 => '::', - ), - 'REGEXPS' => array( + ], + 'REGEXPS' => [ 0 => "[\\$]{1,2}[a-zA-Z_][a-zA-Z0-9_]*", - 1 => array( + 1 => [ GESHI_SEARCH => "([a-zA-Z]+)(\n)(.*)(\n)(\\1;?)", GESHI_REPLACE => '\3', GESHI_BEFORE => '\1\2', GESHI_AFTER => '\4\5', GESHI_MODIFIERS => 'siU', - ), - ), + ], + ], 'STRICT_MODE_APPLIES' => GESHI_MAYBE, - 'SCRIPT_DELIMITERS' => array( - 0 => array( + 'SCRIPT_DELIMITERS' => [ + 0 => [ ' '?>', - ), - 1 => array( + ], + 1 => [ ' '?>', - ), - 2 => array( + ], + 2 => [ '<%' => '%>', - ), - ), - 'HIGHLIGHT_STRICT_BLOCK' => array( + ], + ], + 'HIGHLIGHT_STRICT_BLOCK' => [ 0 => TRUE, 1 => TRUE, 2 => TRUE, 3 => TRUE, - ), + ], 'TAB_WIDTH' => 2, -); +]; diff --git a/geshifield/geshifield.install b/geshifield/geshifield.install index 592da50..2e65ee9 100644 --- a/geshifield/geshifield.install +++ b/geshifield/geshifield.install @@ -9,20 +9,20 @@ * Implements hook_field_schema(). */ function geshifield_field_schema($field) { - return array( - 'columns' => array( - 'sourcecode' => array( + return [ + 'columns' => [ + 'sourcecode' => [ 'type' => 'text', 'size' => 'big', 'not null' => FALSE, 'sortable' => TRUE, - ), - 'language' => array( + ], + 'language' => [ 'type' => 'varchar', 'length' => 255, 'not null' => FALSE, 'sortable' => TRUE, - ), - ), - ); + ], + ], + ]; } diff --git a/geshifield/geshifield.module b/geshifield/geshifield.module index 4b660d0..2ec686d 100644 --- a/geshifield/geshifield.module +++ b/geshifield/geshifield.module @@ -7,18 +7,18 @@ * @todo: is the GeSHi CSS file always loaded when needed? */ -use \Drupal\geshifilter\GeshiFilterProcess; +use Drupal\geshifilter\GeshiFilterProcess; /** * Implements hook_theme(). */ function geshifield_theme() { - return array( - 'geshifield_default' => array( + return [ + 'geshifield_default' => [ 'function' => 'geshifield_formatter_default', 'render element' => 'geshifield', - ), - ); + ], + ]; } /** @@ -40,9 +40,9 @@ function geshifield_formatter_default(array $variables) { if ($sourcecode) { $output .= GeshiFilterProcess::geshiProcess($sourcecode, $language); } - $elements = array(); - $elements[] = array( + $elements = []; + $elements[] = [ '#markup' => $output, - ); + ]; return $output; } diff --git a/geshifield/src/Plugin/Field/FieldFormatter/GeshiFieldDefaultFormatter.php b/geshifield/src/Plugin/Field/FieldFormatter/GeshiFieldDefaultFormatter.php index 845f396..4b9bf26 100644 --- a/geshifield/src/Plugin/Field/FieldFormatter/GeshiFieldDefaultFormatter.php +++ b/geshifield/src/Plugin/Field/FieldFormatter/GeshiFieldDefaultFormatter.php @@ -22,14 +22,14 @@ class GeshiFieldDefaultFormatter extends FormatterBase { * {@inheritdoc} */ public function viewElements(FieldItemListInterface $items, $langcode) { - $elements = array(); + $elements = []; foreach ($items as $delta => $item) { - $source = array( + $source = [ '#theme' => 'geshifield_default', '#language' => $item->language, '#sourcecode' => $item->sourcecode, - ); - $elements[$delta] = array('#markup' => drupal_render($source)); + ]; + $elements[$delta] = ['#markup' => drupal_render($source)]; } return $elements; diff --git a/geshifield/src/Plugin/Field/FieldType/GeshiFieldItem.php b/geshifield/src/Plugin/Field/FieldType/GeshiFieldItem.php index f7e3407..9c66161 100644 --- a/geshifield/src/Plugin/Field/FieldType/GeshiFieldItem.php +++ b/geshifield/src/Plugin/Field/FieldType/GeshiFieldItem.php @@ -28,20 +28,20 @@ class GeshiFieldItem extends FieldItemBase { * {@inheritdoc} */ public static function schema(FieldStorageDefinitionInterface $field) { - return array( - 'columns' => array( - 'sourcecode' => array( + return [ + 'columns' => [ + 'sourcecode' => [ 'type' => 'text', 'size' => 'big', 'not null' => FALSE, - ), - 'language' => array( + ], + 'language' => [ 'type' => 'varchar', 'length' => 256, 'not null' => FALSE, - ), - ), - ); + ], + ], + ]; } /** diff --git a/geshifield/src/Plugin/Field/FieldWidget/GeshiFieldDefaultWidget.php b/geshifield/src/Plugin/Field/FieldWidget/GeshiFieldDefaultWidget.php index 2fd157e..6704df3 100644 --- a/geshifield/src/Plugin/Field/FieldWidget/GeshiFieldDefaultWidget.php +++ b/geshifield/src/Plugin/Field/FieldWidget/GeshiFieldDefaultWidget.php @@ -5,7 +5,7 @@ namespace Drupal\geshifield\Plugin\Field\FieldWidget; use Drupal\Core\Field\FieldItemListInterface; use Drupal\Core\Field\WidgetBase; use Drupal\Core\Form\FormStateInterface; -use \Drupal\geshifilter\GeshiFilter; +use Drupal\geshifilter\GeshiFilter; /** * Plugin implementation of the 'geshifield_default' widget. @@ -26,17 +26,17 @@ class GeshiFieldDefaultWidget extends WidgetBase { public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) { $enabled_languages = GeshiFilter::getEnabledLanguages(); - $element['sourcecode'] = array( + $element['sourcecode'] = [ '#title' => $this->t('Code'), '#type' => 'textarea', '#default_value' => isset($items[$delta]->sourcecode) ? $items[$delta]->sourcecode : NULL, - ); - $element['language'] = array( + ]; + $element['language'] = [ '#title' => $this->t('Language'), '#type' => 'select', '#default_value' => isset($items[$delta]->language) ? $items[$delta]->language : NULL, '#options' => $enabled_languages, - ); + ]; return $element; } diff --git a/geshifield/src/Tests/GeshiFieldTest.php b/geshifield/src/Tests/GeshiFieldTest.php index 6f0efb8..83ba656 100644 --- a/geshifield/src/Tests/GeshiFieldTest.php +++ b/geshifield/src/Tests/GeshiFieldTest.php @@ -2,7 +2,7 @@ namespace Drupal\geshifield\Tests; -use \Drupal\geshifilter\GeshiFilter; +use Drupal\geshifilter\GeshiFilter; // Use of base class for the tests. use Drupal\simpletest\WebTestBase; @@ -36,13 +36,13 @@ class GeshiFieldTest extends WebTestBase { * * @var array */ - public static $modules = array( + public static $modules = [ 'node', 'geshifilter', 'filter', 'geshifield', 'field_ui', - ); + ]; /** * Code run before each and every test method. @@ -58,29 +58,29 @@ class GeshiFieldTest extends WebTestBase { $this->config->set('geshi_dir', '/libraries/geshi'); // Create a content type, as we will create nodes on test. - $settings = array( + $settings = [ // Override default type (a random name). 'type' => 'geshifilter_content_type', 'name' => 'Geshifilter Content', - ); + ]; $this->drupalCreateContentType($settings); - $this->adminUser = $this->drupalCreateUser(array(), NULL, TRUE); + $this->adminUser = $this->drupalCreateUser([], NULL, TRUE); // Log in with filter admin user. $this->drupalLogin($this->adminUser); // Add an text format with only geshi filter. - $this->createTextFormat('geshifilter_text_format', array('filter_geshifilter')); + $this->createTextFormat('geshifilter_text_format', ['filter_geshifilter']); // Set some default GeSHi filter admin settings. // Set default highlighting mode to "do nothing". $this->config->set('default_highlighting', GeshiFilter::DEFAULT_PLAINTEXT); $this->config->set('use_format_specific_options', FALSE); - $this->config->set('tag_styles', array( + $this->config->set('tag_styles', [ GeshiFilter::BRACKETS_ANGLE => GeshiFilter::BRACKETS_ANGLE, GeshiFilter::BRACKETS_SQUARE => GeshiFilter::BRACKETS_SQUARE, - )); + ]); $this->config->set('default_line_numbering', GeshiFilter::LINE_NUMBERS_DEFAULT_NONE); $this->config->save(); } @@ -94,7 +94,7 @@ class GeshiFieldTest extends WebTestBase { * Array with the machine names of filters to enable. */ protected function createTextFormat($format_name, array $filters) { - $edit = array(); + $edit = []; $edit['format'] = $format_name; $edit['name'] = $this->randomMachineName(); $edit['roles[' . DRUPAL_AUTHENTICATED_RID . ']'] = 1; @@ -102,7 +102,7 @@ class GeshiFieldTest extends WebTestBase { $edit['filters[' . $filter . '][status]'] = TRUE; } $this->drupalPostForm('admin/config/content/formats/add', $edit, t('Save configuration')); - $this->assertRaw(t('Added text format %format.', array('%format' => $edit['name'])), 'New filter created.'); + $this->assertRaw(t('Added text format %format.', ['%format' => $edit['name']]), 'New filter created.'); $this->drupalGet('admin/config/content/formats'); } @@ -128,12 +128,12 @@ class GeshiFieldTest extends WebTestBase { */ protected function addNode($title, $body, $sourcecode, $language) { // Create a node. - $node = array( + $node = [ 'title[0][value]' => $title, 'body[0][value]' => $body, 'field_geshi[0][sourcecode]' => $sourcecode, 'field_geshi[0][language]' => $language, - ); + ]; $this->drupalPostForm('node/add/geshifilter_content_type', $node, 'Save and publish'); $this->drupalGet('node/1'); } @@ -152,9 +152,9 @@ class GeshiFieldTest extends WebTestBase { * @param array $instance * Instance of the field. */ - private function addField($type, $name, $label, $values = array(), $instance = array()) { + private function addField($type, $name, $label, array $values = [], array $instance = []) { // Choose field type and name. - $edit = array(); + $edit = []; $edit['new_storage_type'] = $type; $edit['label'] = $label; $edit['field_name'] = $name; diff --git a/geshifilter.install b/geshifilter.install index e2d94df..c47ff1e 100644 --- a/geshifilter.install +++ b/geshifilter.install @@ -6,11 +6,11 @@ */ // Necessary for URL. -//use Drupal\geshifilter\Controller\GeshiFilterConflicts; +// use Drupal\geshifilter\Controller\GeshiFilterConflicts;. use Drupal\Core\Url; -use \Drupal\geshifilter\GeshiFilterCss; -use \Drupal\geshifilter\GeshiFilter; +use Drupal\geshifilter\GeshiFilterCss; +use Drupal\geshifilter\GeshiFilter; /** * Implements hook_install(). @@ -18,12 +18,12 @@ use \Drupal\geshifilter\GeshiFilter; function geshifilter_install() { drupal_set_message(t('GeSHi filter is installed. You should now @configure-geshi and enable it in the desired @text-formats.', - array( + [ // Geshifilter`s route seems to be unknown at this point, so use // Url::fromUri() with base: scheme instead Url::fromRoute(). '@configure-geshi' => \Drupal::l(t('configure the GeSHi filter'), Url::fromUri('base:admin/config/content/formats/geshifilter')), '@text-formats' => \Drupal::l(t('text formats'), Url::fromUri('base:admin/config/content/formats')), - ) + ] )); } @@ -32,61 +32,62 @@ function geshifilter_install() { */ function geshifilter_requirements($phase) { $config = \Drupal::config('geshifilter.settings'); - $requirements = array(); + $requirements = []; if ($phase == 'runtime') { // Check if GeSHi library is available. $geshi_library = GeshiFilter::loadGeshi(); if (!$geshi_library['loaded']) { - $requirements[] = array( + $requirements[] = [ 'title' => 'GeSHi filter', 'value' => t('GeSHi library not found.'), 'severity' => REQUIREMENT_ERROR, - ); + ]; } elseif (($version = explode('.', GESHI_VERSION)) && !($version[0] == '1' && $version[1] == '0')) { - $requirements[] = array( + $requirements[] = [ 'title' => 'GeSHi filter', 'value' => t('GeSHi library invalid version.'), - 'description' => t('The detected version of GeSHi library (%version) is not supported. A version from the 1.0.x branch is required.', array('%version' => GESHI_VERSION)), + 'description' => t('The detected version of GeSHi library (%version) is not supported. A version from the 1.0.x branch is required.', ['%version' => GESHI_VERSION]), 'severity' => REQUIREMENT_ERROR, - ); + ]; } else { - $requirements[] = array( + $requirements[] = [ 'title' => 'GeSHi filter', // GESHI_VERSION is defined in GeSHi library. 'value' => t('Found GeSHi library version %version', - array('%version' => GESHI_VERSION)), + ['%version' => GESHI_VERSION]), 'severity' => REQUIREMENT_OK, - ); + ]; } // Warn if GeSHi filter is configured to automatically managed external // stylesheet when it's not possible. if ($config->get('css_mode') == Geshifilter::CSS_CLASSES_AUTOMATIC && !GeshifilterCss::managedExternalStylesheetPossible()) { - $requirements[] = array( + $requirements[] = [ 'title' => 'GeSHi filter CSS mode', 'value' => t('GeSHi filter can not automatically manage an external style sheet when the download method is private.'), 'severity' => REQUIREMENT_ERROR, 'description' => t('Change the CSS mode of the GeSHi filter or change the download mode to public.', - array( + [ '!geshi' => URL::fromRoute('geshifilter.settings')->toString(), '!filesystem' => URL::fromRoute('system.file_system_settings')->toString(), - )), - ); + ]), + ]; } -// // Check for filter conflicts. -// if (count(GeshiFilterConflicts::listConflicts()) > 0) { -// $requirements[] = array( -// 'title' => 'GeSHi filter', -// 'value' => t('Some filter conflicts were detected.'), -// 'description' => \Drupal::l('View and resolve the detected filter conflicts', -// URL::fromRoute('geshifilter.settings_filter_conflicts')), -// 'severity' => REQUIREMENT_ERROR, -// ); -// } + // // Check for filter conflicts. + // if (count(GeshiFilterConflicts::listConflicts()) > 0) { + // $requirements[] = array( + // 'title' => 'GeSHi filter', + // 'value' => t('Some filter conflicts were detected.'), + // 'description' => \Drupal::l('View and resolve the detected + // filter conflicts', + // URL::fromRoute('geshifilter.settings_filter_conflicts')), + // 'severity' => REQUIREMENT_ERROR, + // ); + // }. } return $requirements; } diff --git a/geshifilter.links.menu.yml b/geshifilter.links.menu.yml index 4f9866d..94f9ecc 100644 --- a/geshifilter.links.menu.yml +++ b/geshifilter.links.menu.yml @@ -3,4 +3,4 @@ geshifilter.settings: title: 'Geshifilter' description: 'Configure Geshifilter module.' parent: system.admin_config_content - route_name: geshifilter.settings \ No newline at end of file + route_name: geshifilter.settings diff --git a/geshifilter.module b/geshifilter.module index e0e648f..0746b92 100644 --- a/geshifilter.module +++ b/geshifilter.module @@ -21,9 +21,9 @@ function geshifilter_help($route_name, RouteMatchInterface $route_match) { $output = '

' . t('The GeSHi filter module provides a filter for syntax highlighting of inline source code or blocks of source code based on the PHP library GeSHi (Generic Syntax Highlighter).

', - array( + [ ':GeSHi' => URL::fromUri('http://qbnz.com/highlighter/')->toString(), - )); + ]); if ($route_name == 'help.page.geshifilter') { $output .= '

' . t('The GeSHi filter module for Drupal requires the GeSHi library (version 1.0.x) to work. The GeSHi filter is actually @@ -31,17 +31,17 @@ function geshifilter_help($route_name, RouteMatchInterface $route_match) { drupal.org repository policies however, the GeSHi library is not included in the GeSHi filter package, so you should download and install the - GeSHi library separately.', array( + GeSHi library separately.', [ ':repositorypolicies' => URL::fromUri('http://drupal.org/node/66113')->toString(), ':geshi' => URL::fromUri('http://qbnz.com/highlighter/')->toString(), - )) + ]) . '

'; - $output .= t('

Quick overview of how to set up and use the GeSHi filter:

', array( + $output .= t('

Quick overview of how to set up and use the GeSHi filter:

', [ ':geshifilter_settings' => URL::fromRoute('geshifilter.settings')->toString(), ':geshifilter_languages' => URL::fromRoute('geshifilter.settings_languages_all')->toString(), ':inputformats' => URL::fromRoute('filter.admin_overview')->toString(), ':filtertips' => URL::fromRoute('filter.tips_all')->toString(), - )); + ]); } return $output; @@ -52,9 +52,9 @@ function geshifilter_help($route_name, RouteMatchInterface $route_match) { use. It is suggested to disable languages that are not relevant for you site not only to avoid unnecessary cluttering of the GeSHi filter configuration pages and the filter tips, but also to make the GeSHi - filter processing lighter.', array( + filter processing lighter.', [ ':filtertips' => URL::fromRoute('filter.tips_all')->toString(), - )) + ]) . '

'; if (!$config->get('use_format_specific_options', FALSE)) { $output .= '

' . t('You can also define the language specific tags here.') . '

'; @@ -67,23 +67,23 @@ function geshifilter_help($route_name, RouteMatchInterface $route_match) { * Implements hook_libraries_info(). */ function geshifilter_libraries_info() { - return array( - 'geshi' => array( + return [ + 'geshi' => [ 'title' => 'GeSHi - Generic Syntax Highlighter for PHP', 'vendor url' => 'http://sourceforge.net/projects/geshi', 'download url' => 'http://sourceforge.net/projects/geshi/files/geshi', - 'version arguments' => array( + 'version arguments' => [ 'file' => 'geshi.php', 'pattern' => "/define\('GESHI_VERSION', '(.*)'\);/", 'lines' => 50, - ), - 'files' => array( - 'php' => array( + ], + 'files' => [ + 'php' => [ 'geshi.php', - ), - ), - ), - ); + ], + ], + ], + ]; } /** @@ -94,6 +94,6 @@ function geshifilter_library_info_alter(&$libraries, $extension) { $css = drupal_realpath(GeshiFilterCss::languageCssPath()); $base = DRUPAL_ROOT; $name = substr($css, strlen($base)); - $libraries['geshifilter']['css']['component'][$name] = array(); + $libraries['geshifilter']['css']['component'][$name] = []; } } diff --git a/geshifilter.routing.yml b/geshifilter.routing.yml index 8b8ea63..4aebbb6 100644 --- a/geshifilter.routing.yml +++ b/geshifilter.routing.yml @@ -56,4 +56,4 @@ geshifilter.generate_css: _controller: '\Drupal\geshifilter\GeshiFilterCss::generateCss' _title: 'GeSHi Filter CSS' requirements: - _permission: 'administer site configuration' \ No newline at end of file + _permission: 'administer site configuration' diff --git a/migration_templates/migrate.migration.d7_geshifilter_settings.yml b/migration_templates/migrate.migration.d7_geshifilter_settings.yml index c32c245..6725308 100644 --- a/migration_templates/migrate.migration.d7_geshifilter_settings.yml +++ b/migration_templates/migrate.migration.d7_geshifilter_settings.yml @@ -924,4 +924,4 @@ process: language/zxbasic/tags: geshifilter_language_tags_zxbasic destination: plugin: config - config_name: geshifilter.settings \ No newline at end of file + config_name: geshifilter.settings diff --git a/src/Controller/GeshiFilterConflicts.php b/src/Controller/GeshiFilterConflicts.php index 406c7ef..33c1a00 100644 --- a/src/Controller/GeshiFilterConflicts.php +++ b/src/Controller/GeshiFilterConflicts.php @@ -15,14 +15,14 @@ class GeshiFilterConflicts extends ControllerBase { public function content() { $conflicts = self::listConflicts(); if (count($conflicts) == 0) { - $build = array( + $build = [ '#type' => 'markup', '#markup' => $this->t('No conflicts found.'), - ); + ]; return $build; } else { - return array(); + return []; } } @@ -36,6 +36,7 @@ class GeshiFilterConflicts extends ControllerBase { * no conflics. */ public static function listConflicts() { - return array(); + return []; } + } diff --git a/src/Form/GeshiFilterLanguagesForm.php b/src/Form/GeshiFilterLanguagesForm.php index dea9e2c..449c290 100644 --- a/src/Form/GeshiFilterLanguagesForm.php +++ b/src/Form/GeshiFilterLanguagesForm.php @@ -6,11 +6,11 @@ use Drupal\Core\Form\ConfigFormBase; use Drupal\Core\Form\FormStateInterface; -use \Drupal\geshifilter\GeshiFilterCss; +use Drupal\geshifilter\GeshiFilterCss; use Drupal\Core\Cache\Cache; -use \Drupal\geshifilter\GeshiFilter; +use Drupal\geshifilter\GeshiFilter; /** * Form used to set enable/disabled for languages. @@ -22,7 +22,7 @@ class GeshiFilterLanguagesForm extends ConfigFormBase { * * @var array */ - public static $modules = array('libraries', 'geshifilter'); + public static $modules = ['libraries', 'geshifilter']; /** * Object with configuration. @@ -56,7 +56,7 @@ class GeshiFilterLanguagesForm extends ConfigFormBase { $geshi_library = GeshiFilter::loadGeshi(); if (!$geshi_library['loaded']) { drupal_set_message($geshi_library['error message'], 'error'); - return array(); + return []; } $add_checkbox = TRUE; $add_tag_option = (!$config->get('use_format_specific_options')); @@ -139,7 +139,7 @@ class GeshiFilterLanguagesForm extends ConfigFormBase { if ($config->get('css_mode', GeshiFilter::CSS_INLINE) == GeshiFilter::CSS_CLASSES_AUTOMATIC) { GeshiFilterCss::generateLanguagesCssFile(); } - Cache::invalidateTags(array('geshifilter')); + Cache::invalidateTags(['geshifilter']); } /** @@ -159,19 +159,19 @@ class GeshiFilterLanguagesForm extends ConfigFormBase { */ protected function perLanguageSettings($view, $add_checkbox, $add_tag_option) { $config = $this->config('geshifilter.settings'); - $form = array(); - $header = array( + $form = []; + $header = [ $this->t('Language'), $this->t('GeSHi language code'), - ); + ]; if ($add_tag_option) { $header[] = $this->t('Tag/language attribute value'); } - $form['language'] = array( + $form['language'] = [ '#type' => 'table', '#header' => $header, '#empty' => $this->t('Nome language is available.'), - ); + ]; // Table body. $languages = GeshiFilter::getAvailableLanguages(); @@ -182,33 +182,33 @@ class GeshiFilterLanguagesForm extends ConfigFormBase { continue; } // Build language row. - $form['language'][$language] = array(); + $form['language'][$language] = []; // Add enable/disable checkbox. if ($add_checkbox) { - $form['language'][$language]['enabled'] = array( + $form['language'][$language]['enabled'] = [ '#type' => 'checkbox', '#default_value' => $enabled, '#title' => $language_data['fullname'], - ); + ]; } else { - $form['language'][$language]['fullname'] = array( + $form['language'][$language]['fullname'] = [ '#type' => 'markup', '#markup' => $language_data['fullname'], - ); + ]; } // Language code. - $form['language'][$language]['name'] = array( + $form['language'][$language]['name'] = [ '#type' => 'markup', '#markup' => $language, - ); + ]; // Add a textfield for tags. if ($add_tag_option) { - $form['language'][$language]['tags'] = array( + $form['language'][$language]['tags'] = [ '#type' => 'textfield', '#default_value' => $config->get("language.{$language}.tags", ''), '#size' => 20, - ); + ]; } } return $form; diff --git a/src/Form/GeshiFilterSettingsForm.php b/src/Form/GeshiFilterSettingsForm.php index ddbf3a9..e3c28b2 100644 --- a/src/Form/GeshiFilterSettingsForm.php +++ b/src/Form/GeshiFilterSettingsForm.php @@ -7,7 +7,7 @@ use Drupal\Core\Form\ConfigFormBase; use Drupal\Core\Form\FormStateInterface; -use \Drupal\geshifilter\GeshiFilterCss; +use Drupal\geshifilter\GeshiFilterCss; // Necessary for URL. use Drupal\Core\Url; @@ -15,7 +15,7 @@ use Drupal\Core\Url; use Drupal\Core\Cache\Cache; // Necessary for SafeMarkup::checkPlain(). -use \Drupal\geshifilter\GeshiFilter; +use Drupal\geshifilter\GeshiFilter; /** * Form with the settings for the module. @@ -49,48 +49,48 @@ class GeshiFilterSettingsForm extends ConfigFormBase { // GeSHi library settings (constant GESHI_VERSION is defined in GeSHi // library). - $form['library'] = array( + $form['library'] = [ '#type' => 'fieldset', - '#title' => defined('GESHI_VERSION') ? $this->t('GeSHi library version @version detected', array('@version' => GESHI_VERSION)) : $this->t('GeSHi library'), - '#description' => $this->t('The GeSHi filter requires the GeSHi library (which needs to be @downloaded and installed seperately).', array( + '#title' => defined('GESHI_VERSION') ? $this->t('GeSHi library version @version detected', ['@version' => GESHI_VERSION]) : $this->t('GeSHi library'), + '#description' => $this->t('The GeSHi filter requires the GeSHi library (which needs to be @downloaded and installed seperately).', [ '@downloaded' => \Drupal::l($this->t('downloaded'), Url::fromUri('http://qbnz.com/highlighter/')), - )), + ]), '#collapsible' => TRUE, '#collapsed' => $geshi_library['loaded'], - ); + ]; // If the GeSHi library is loaded, show all the options and settings. if ($geshi_library['loaded']) { // Option for flushing the GeSHi language definition cache. - $form['library']['language_definition_caching'] = array( + $form['library']['language_definition_caching'] = [ '#type' => 'item', '#title' => $this->t('GeSHi language definition caching'), '#description' => $this->t('The GeSHi library uses languages definition files to define the properties and highlight rules of the supported languages. In most scenarios these language definition files do not change and a lot of derivative data, such as the list of available languages or the CSS style sheet, can be cached for efficiency reasons. Sometimes however, this cache needs to be flushed and the languages definition files need to be reparsed, for example after an upgrade of the GeSHi library or after adding/editing some language definition files manually.'), - ); + ]; // Non-submitting button for flushing the GeSHi language definition file // cache. - $form['library']['language_definition_caching']['flush_language_definition_cache'] = array( + $form['library']['language_definition_caching']['flush_language_definition_cache'] = [ '#type' => 'button', '#value' => $this->t("Flush the GeSHi language definition cache"), '#executes_submit_callback' => TRUE, - '#submit' => array('::flushLanguageDefinitionCache'), - ); + '#submit' => ['::flushLanguageDefinitionCache'], + ]; // GeSHi filter tags and delimiters options. - $form['tag_options'] = array( + $form['tag_options'] = [ '#type' => 'fieldset', '#title' => $this->t('GeSHi filter tags and delimiters'), '#collapsible' => TRUE, - ); + ]; // Usage of format specific options. - $form['tag_options']['use_format_specific_options'] = array( + $form['tag_options']['use_format_specific_options'] = [ '#type' => 'checkbox', '#title' => $this->t('Use text format specific tag settings.'), '#default_value' => $config->get('use_format_specific_options', FALSE), - '#description' => $this->t('Enable seperate tag settings of the GeSHi filter for each @text-format instead of global tag settings.', array( + '#description' => $this->t('Enable seperate tag settings of the GeSHi filter for each @text-format instead of global tag settings.', [ '@text-format' => \Drupal::l($this->t('text format'), Url::fromRoute('filter.admin_overview')), - )), - ); + ]), + ]; // Generic tags settings. // @todo must validate the tag styles. if (!$config->get('use_format_specific_options', FALSE)) { @@ -99,77 +99,77 @@ class GeshiFilterSettingsForm extends ConfigFormBase { } // GeSHi filter highlighting options. - $form['highlighting_options'] = array( + $form['highlighting_options'] = [ '#type' => 'fieldset', '#title' => $this->t('Syntax highlighting options'), '#collapsible' => TRUE, - ); + ]; // Default language. $languages = GeshiFilter::getEnabledLanguages(); - $form['highlighting_options']['default_highlighting'] = array( + $form['highlighting_options']['default_highlighting'] = [ '#type' => 'select', '#title' => $this->t('Default highlighting mode'), '#default_value' => $config->get('default_highlighting'), - '#options' => array( - (string) $this->t('No highlighting') => array( + '#options' => [ + (string) $this->t('No highlighting') => [ GeshiFilter::DEFAULT_DONOTHING => $this->t('Do nothing'), GeshiFilter::DEFAULT_PLAINTEXT => $this->t('As plain text'), - ), + ], (string) $this->t('Languages') => $languages, - ), + ], '#description' => $this->t('Select the default highlighting mode to use when no language is defined with a language attribute in the tag.'), - ); + ]; // Default line numbering scheme. - $form['highlighting_options']['default_line_numbering'] = array( + $form['highlighting_options']['default_line_numbering'] = [ '#type' => 'select', '#title' => $this->t('Default line numbering'), '#default_value' => $config->get('default_line_numbering'), - '#options' => array( + '#options' => [ GeshiFilter::LINE_NUMBERS_DEFAULT_NONE => $this->t('no line numbers'), GeshiFilter::LINE_NUMBERS_DEFAULT_NORMAL => $this->t('normal line numbers'), - GeshiFilter::LINE_NUMBERS_DEFAULT_FANCY5 => $this->t('fancy line numbers (every @n lines)', array('@n' => GeshiFilter::LINE_NUMBERS_DEFAULT_FANCY5)), - GeshiFilter::LINE_NUMBERS_DEFAULT_FANCY10 => $this->t('fancy line numbers (every @n lines)', array('@n' => GeshiFilter::LINE_NUMBERS_DEFAULT_FANCY10)), - GeshiFilter::LINE_NUMBERS_DEFAULT_FANCY20 => $this->t('fancy line numbers (every @n lines)', array('@n' => GeshiFilter::LINE_NUMBERS_DEFAULT_FANCY20)), - ), - '#description' => $this->t('Select the default line numbering scheme: no line numbers, normal line numbers or fancy line numbers. With fancy line numbers every nth line number is highlighted. (GeSHi documentation: @line-numbers).', array( + GeshiFilter::LINE_NUMBERS_DEFAULT_FANCY5 => $this->t('fancy line numbers (every @n lines)', ['@n' => GeshiFilter::LINE_NUMBERS_DEFAULT_FANCY5]), + GeshiFilter::LINE_NUMBERS_DEFAULT_FANCY10 => $this->t('fancy line numbers (every @n lines)', ['@n' => GeshiFilter::LINE_NUMBERS_DEFAULT_FANCY10]), + GeshiFilter::LINE_NUMBERS_DEFAULT_FANCY20 => $this->t('fancy line numbers (every @n lines)', ['@n' => GeshiFilter::LINE_NUMBERS_DEFAULT_FANCY20]), + ], + '#description' => $this->t('Select the default line numbering scheme: no line numbers, normal line numbers or fancy line numbers. With fancy line numbers every nth line number is highlighted. (GeSHi documentation: @line-numbers).', [ '@line-numbers' => \Drupal::l($this->t('Line numbers'), Url::fromUri('http://qbnz.com/highlighter/geshi-doc.html#line-numbers')), - )), - ); + ]), + ]; // Highlight_string usage option. - $form['highlighting_options']['use_highlight_string_for_php'] = array( + $form['highlighting_options']['use_highlight_string_for_php'] = [ '#type' => 'checkbox', '#title' => $this->t('Use built-in PHP function highlight_string() for PHP source code.'), - '#description' => $this->t('When enabled, PHP source code will be syntax highlighted with the built-in PHP function @highlight-string instead of with the GeSHi library. GeSHi features, like line numbering and usage of an external CSS stylesheet for example, are not available.', array( + '#description' => $this->t('When enabled, PHP source code will be syntax highlighted with the built-in PHP function @highlight-string instead of with the GeSHi library. GeSHi features, like line numbering and usage of an external CSS stylesheet for example, are not available.', [ '@highlight-string' => \Drupal::l('highlight_string()', Url::fromUri('http://php.net/manual/en/function.highlight-string.php')), - )), + ]), '#default_value' => $config->get('use_highlight_string_for_php'), - ); + ]; // Option to disable Keyword URL's. - $form['highlighting_options']['enable_keyword_urls'] = array( + $form['highlighting_options']['enable_keyword_urls'] = [ '#type' => 'checkbox', '#title' => $this->t('Enable GeSHi keyword URLs'), - '#description' => $this->t('For some languages GeSHi can link language keywords (e.g. standard library functions) to their online documentation. (GeSHi documentation: @keyword-urls).', array( + '#description' => $this->t('For some languages GeSHi can link language keywords (e.g. standard library functions) to their online documentation. (GeSHi documentation: @keyword-urls).', [ '@keyword-urls' => \Drupal::l($this->t('Keyword URLs'), Url::fromUri('http://qbnz.com/highlighter/geshi-doc.html#keyword-urls')), - )), + ]), '#default_value' => $config->get('enable_keyword_urls'), - ); + ]; // Styling, layout and CSS. - $form['styling'] = array( + $form['styling'] = [ '#type' => 'fieldset', '#title' => $this->t('Styling, layout and CSS'), '#collapsible' => TRUE, - ); + ]; // CSS mode. - $form['styling']['css_mode'] = array( + $form['styling']['css_mode'] = [ '#type' => 'radios', '#title' => $this->t('CSS mode for syntax highlighting'), - '#options' => array( + '#options' => [ GeshiFilter::CSS_INLINE => $this->t('Inline CSS style attributes.'), GeshiFilter::CSS_CLASSES_AUTOMATIC => $this->t('Use CSS classes and an automatically managed external CSS style sheet.'), GeshiFilter::CSS_CLASSES_ONLY => $this->t('Only add CSS classes to the markup.'), - ), + ], '#default_value' => $config->get('css_mode', GeshiFilter::CSS_INLINE), '#description' => $this->t('Inline CSS is easier to set up, does not depend on an external style sheets and is consequently more robust to copy/paste @@ -182,55 +182,55 @@ class GeshiFilterSettingsForm extends ConfigFormBase { administrator or themer is responsible for adding the appropriate CSS rules to the pages (e.g. based on @css-defaults). (GeSHi documentation: @css-classes).', - array( + [ '@css-classes' => \Drupal::l($this->t('Using CSS Classes'), Url::fromUri('http://qbnz.com/highlighter/geshi-doc.html#using-css-classes') ), '@download-method' => \Drupal::l($this->t('download method'), Url::fromRoute('system.file_system_settings')), '@css-defaults' => \Drupal::l($this->t('these defaults'), Url::fromRoute('geshifilter.generate_css')), - ) + ] ), - ); + ]; // Code container. - $container_options = array( - GESHI_HEADER_PRE => $this->t('%val: uses a @cnt wrapper, efficient whitespace coding, no automatic line wrapping, generates invalid HTML with line numbering.', array( + $container_options = [ + GESHI_HEADER_PRE => $this->t('%val: uses a @cnt wrapper, efficient whitespace coding, no automatic line wrapping, generates invalid HTML with line numbering.', [ '%val' => 'GESHI_HEADER_PRE', '@cnt' => '
',
-        )),
-        GESHI_HEADER_DIV => $this->t('%val: uses a @cnt wrapper, enables automatic line wrapping.', array(
+        ]),
+        GESHI_HEADER_DIV => $this->t('%val: uses a @cnt wrapper, enables automatic line wrapping.', [
           '%val' => 'GESHI_HEADER_DIV',
           '@cnt' => '
',
-        )),
-      );
+        ]),
+      ];
       if (version_compare(GESHI_VERSION, '1.0.8', '>=')) {
         $container_options[GESHI_HEADER_PRE_VALID] = $this->t('%val: uses @pre
           wrappers, ensures valid HTML with line numbering, but generates more
           markup.',
-          array(
+          [
             '%val' => 'GESHI_HEADER_PRE_VALID',
             '@pre' => '
',
             '@li' => '
  • ',
-          )
+          ]
         );
-        $container_options[GESHI_HEADER_PRE_TABLE] = $this->t('%val: uses a @table construction for adding line numbers which avoids selection/copy/paste problems.', array(
+        $container_options[GESHI_HEADER_PRE_TABLE] = $this->t('%val: uses a @table construction for adding line numbers which avoids selection/copy/paste problems.', [
           '%val' => 'GESHI_HEADER_PRE_TABLE',
           '@table' => '',
-        ));
+        ]);
       }
       if (version_compare(GESHI_VERSION, '1.0.7.2', '>=')) {
-        $container_options[GESHI_HEADER_NONE] = $this->t('%val: uses no wrapper.', array('%val' => 'GESHI_HEADER_NONE'));
+        $container_options[GESHI_HEADER_NONE] = $this->t('%val: uses no wrapper.', ['%val' => 'GESHI_HEADER_NONE']);
       }
 
-      $form['styling']['code_container'] = array(
+      $form['styling']['code_container'] = [
         '#type' => 'radios',
         '#title' => $this->t('Code container, wrapping technique'),
         '#description' => $this->t('Define the wrapping technique to use for code blocks. (GeSHi documentation: @code-container).',
-          array('@code-container' => \Drupal::l($this->t('The Code Container'), Url::fromUri('http://qbnz.com/highlighter/geshi-doc.html#the-code-container')))
+          ['@code-container' => \Drupal::l($this->t('The Code Container'), Url::fromUri('http://qbnz.com/highlighter/geshi-doc.html#the-code-container'))]
         ),
         '#options' => $container_options,
         '#default_value' => $config->get('code_container'),
-      );
+      ];
     }
     return parent::buildForm($form, $form_state);
   }
@@ -277,7 +277,7 @@ class GeshiFilterSettingsForm extends ConfigFormBase {
         GeshiFilterCss::generateLanguagesCssFile();
       }
       // Always clear the filter cache.
-      Cache::invalidateTags(array('geshifilter'));
+      Cache::invalidateTags(['geshifilter']);
       parent::submitForm($form, $form_state);
     }
   }
@@ -303,41 +303,41 @@ class GeshiFilterSettingsForm extends ConfigFormBase {
    *   The form elements to choose tag settings.
    */
   private function generalHighlightTagsSettings() {
-    $form = array();
+    $form = [];
 
     // Generic tags.
-    $form["tags"] = array(
+    $form["tags"] = [
       '#type' => 'textfield',
       '#title' => $this->t('Generic syntax highlighting tags'),
       '#default_value' => $this->tags(),
       '#description' => $this->t('Tags that should activate the GeSHi syntax highlighting. Specify a space-separated list of tagnames.'),
-    );
+    ];
 
     // Container tag styles.
-    $form["tag_styles"] = array(
+    $form["tag_styles"] = [
       '#type' => 'checkboxes',
       '#title' => $this->t('Container tag style'),
-      '#options' => array(
+      '#options' => [
         GeshiFilter::BRACKETS_ANGLE => '' . htmlentities(' ... ') . '',
         GeshiFilter::BRACKETS_SQUARE => '[foo] ... [/foo]',
         GeshiFilter::BRACKETS_DOUBLESQUARE => '[[foo]] ... [[/foo]]',
-        GeshiFilter::BRACKETS_PHPBLOCK => $this->t('PHP style source code blocks: @php and @percent', array(
+        GeshiFilter::BRACKETS_PHPBLOCK => $this->t('PHP style source code blocks: @php and @percent', [
           '@php' => '',
           '@percent' => '<% ... %>',
-        )),
-      ),
+        ]),
+      ],
       '#default_value' => $this->tagStyles(),
       '#description' => $this->t('Select the container tag styles that should trigger GeSHi syntax highlighting.'),
-    );
+    ];
 
     // Setting to decode entities, see https://www.drupal.org/node/2047021.
     $config = $this->config('geshifilter.settings');
-    $form["decode_entities"] = array(
+    $form["decode_entities"] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Decode entities'),
       '#default_value' => $config->get('decode_entities'),
       '#description' => $this->t('Decode entities, for example, if the code has been typed in a WYSIWYG editor.'),
-    );
+    ];
     return $form;
   }
 
@@ -367,7 +367,7 @@ class GeshiFilterSettingsForm extends ConfigFormBase {
       return $tags;
     }
     else {
-      return array();
+      return [];
     }
   }
 
diff --git a/src/GeshiFilter.php b/src/GeshiFilter.php
index 1ada1e9..e464488 100644
--- a/src/GeshiFilter.php
+++ b/src/GeshiFilter.php
@@ -2,8 +2,6 @@
 
 namespace Drupal\geshifilter;
 
-use GeSHi;
-
 /**
  * Contains constantas and some helper functions.
  */
@@ -59,7 +57,7 @@ class GeshiFilter {
    * Attributes valid to set title.
    */
   const ATTRIBUTE_TITLE = 'title';
-  
+
   /**
    * Attributes valid to set special lines(lines to highlight).
    */
@@ -158,12 +156,12 @@ class GeshiFilter {
     if (!$available_languages) {
       // Not in cache: build the array of available_languages.
       $geshi_library = GeshiFilter::loadGeshi();
-      $available_languages = array();
+      $available_languages = [];
       if ($geshi_library['loaded']) {
-        $dirs = array(
+        $dirs = [
           $geshi_library['library path'] . '/geshi',
           drupal_get_path('module', 'geshifilter') . '/geshi-extra',
-        );
+        ];
         foreach ($dirs as $dir) {
           foreach (file_scan_directory($dir, '/.[pP][hH][pP]$/i') as $filename => $fileinfo) {
             // Short name.
@@ -174,7 +172,7 @@ class GeshiFilter {
             $fullname = $geshi->get_language_name();
             unset($geshi);
             // Store.
-            $available_languages[$name] = array('language_path' => $dir, 'fullname' => $fullname);
+            $available_languages[$name] = ['language_path' => $dir, 'fullname' => $fullname];
           }
         }
         ksort($available_languages);
@@ -198,7 +196,7 @@ class GeshiFilter {
     $config = \Drupal::config('geshifilter.settings');
     static $enabled_languages = NULL;
     if ($enabled_languages === NULL) {
-      $enabled_languages = array();
+      $enabled_languages = [];
       $languages = self::getAvailableLanguages();
       foreach ($languages as $language => $language_data) {
         if ($config->get('language.' . $language . ".enabled")) {
@@ -220,7 +218,7 @@ class GeshiFilter {
    *   libraries_load().
    */
   public static function loadGeshi() {
-    $library = array();
+    $library = [];
     // Try include geshi from composer.
     if (class_exists('GeSHi')) {
       $library['loaded'] = TRUE;
diff --git a/src/GeshiFilterCss.php b/src/GeshiFilterCss.php
index 5e5fe7e..2f67e3e 100644
--- a/src/GeshiFilterCss.php
+++ b/src/GeshiFilterCss.php
@@ -22,7 +22,7 @@ class GeshiFilterCss {
    *   Return the css to show.
    */
   public static function generateCss() {
-    $headers = array();
+    $headers = [];
     $headers['Content-type'] = 'text/css';
     $css = self::generateLanguagesCssRules();
     $response = new Response($css, 200, $headers);
@@ -104,13 +104,13 @@ class GeshiFilterCss {
 
       $ret = file_save_data($stylesheet, $stylesheet_filename, FILE_EXISTS_REPLACE);
       if ($ret) {
-        drupal_set_message(t('(Re)generated external CSS style sheet %file.', array('%file' => $ret->getFilename())));
+        drupal_set_message(t('(Re)generated external CSS style sheet %file.', ['%file' => $ret->getFilename()]));
       }
       else {
         drupal_set_message(t('Could not generate external CSS file. Check the settings of your file system.',
-          array(
+          [
             '!filesystem' => Url::fromRoute('system.file_system_settings')->toString(),
-          )), 'error');
+          ]), 'error');
       }
       // Remember for which list of languages the CSS file was generated.
       \Drupal::state()->set('cssfile_languages', $languages_hash);
diff --git a/src/GeshiFilterProcess.php b/src/GeshiFilterProcess.php
index a826d6c..b056694 100644
--- a/src/GeshiFilterProcess.php
+++ b/src/GeshiFilterProcess.php
@@ -61,7 +61,7 @@ class GeshiFilterProcess {
    * @return string
    *   The sourcecode after process by Geshi.
    */
-  public static function geshiProcess($source_code, $lang, $line_numbering = 0, $linenumbers_start = 1, $inline_mode = FALSE, $title = NULL, $special_lines = array()) {
+  public static function geshiProcess($source_code, $lang, $line_numbering = 0, $linenumbers_start = 1, $inline_mode = FALSE, $title = NULL, array $special_lines = []) {
     $config = \Drupal::config('geshifilter.settings');
     // Load GeSHi library (if not already).
     $geshi_library = GeshiFilter::loadGeshi();
@@ -89,9 +89,8 @@ class GeshiFilterProcess {
       // To counter a change between GeSHi version 1.0.7.22 and 1.0.8 (svn
       // commit 1610), we use both the language and overall_class for the class,
       // to mimic the 1.0.8 behavior, which is backward compatible.
-
-      // $language and $overall_class are protected with $geshi, with no get functions,
-      // recreate them manually.
+      // $language and $overall_class are protected with $geshi, with no get
+      // functions, recreate them manually.
       $overall_class = 'geshifilter-' . $lang;
       $code_class = "{$lang} {$overall_class}";
       $source_code = 'highlight_lines_extra($special_lines);
-      
+
       // Block source code mode.
       $geshi->set_header_type((int) $config->get('code_container', GESHI_HEADER_PRE));
       if ($line_numbering == 1) {
@@ -158,13 +157,16 @@ class GeshiFilterProcess {
    *   When to write all styles inline or from a css.
    * @param string $title
    *   The title to use in code.
+   * @param array $special_lines
+   *   An array with the number of lines to highlight.
+   *
    * @paran array $special_lines
    *   Lines to highlight.
    *
    * @return string
    *   The sourcecode after process by Geshi.
    */
-  public static function processSourceCode($source_code, $lang, $line_numbering = 0, $linenumbers_start = 1, $inline_mode = FALSE, $title = NULL, $special_lines = array()) {
+  public static function processSourceCode($source_code, $lang, $line_numbering = 0, $linenumbers_start = 1, $inline_mode = FALSE, $title = NULL, array $special_lines = []) {
     $config = \Drupal::config('geshifilter.settings');
     // Process.
     if ($lang == 'php' && $config->get('use_highlight_string_for_php', FALSE)) {
diff --git a/src/Plugin/Filter/GeshiFilterFilter.php b/src/Plugin/Filter/GeshiFilterFilter.php
index e18ca01..944340e 100644
--- a/src/Plugin/Filter/GeshiFilterFilter.php
+++ b/src/Plugin/Filter/GeshiFilterFilter.php
@@ -23,7 +23,7 @@ use Drupal\filter\FilterProcessResult;
 // Necessary for URL.
 use Drupal\Core\Url;
 
-use \Drupal\geshifilter\GeshiFilter;
+use Drupal\geshifilter\GeshiFilter;
 use Drupal\geshifilter\GeshiFilterProcess;
 
 /**
@@ -98,26 +98,26 @@ class GeshiFilterFilter extends FilterBase {
       $tags_string = implode('|', $tags);
       // Pattern for matching the prepared "..." stuff.
       $pattern = '#\\[geshifilter-(' . $tags_string . ')([^\\]]*)\\](.*?)(\\[/geshifilter-\1\\])#s';
-      $text = preg_replace_callback($pattern, array(
+      $text = preg_replace_callback($pattern, [
         $this,
         'replaceCallback',
-      ), $text);
+      ], $text);
 
       // Create the object with result.
       $result = new FilterProcessResult($text);
 
       // Add the css file when necessary.
       if ($this->config->get('css_mode') == GeshiFilter::CSS_CLASSES_AUTOMATIC) {
-        $result->setAttachments(array(
-          'library' => array(
+        $result->setAttachments([
+          'library' => [
             'geshifilter/geshifilter',
-          ),
-        ));
+          ],
+        ]);
       }
 
       // Add cache tags, so we can re-create the node when some geshifilter
       // settings change.
-      $cache_tags = array('geshifilter');
+      $cache_tags = ['geshifilter'];
       $result->addCacheTags($cache_tags);
     }
     catch (\Exception $e) {
@@ -151,22 +151,22 @@ class GeshiFilterFilter extends FilterBase {
     if (in_array(GeshiFilter::BRACKETS_ANGLE, $tag_styles)) {
       // Prepare .. blocks.
       $pattern = '#(<)(' . $tags_string . ')((\s+[^>]*)*)(>)(.*?)(|$)#s';
-      $text = preg_replace_callback($pattern, array($this, 'prepareCallback'), $text);
+      $text = preg_replace_callback($pattern, [$this, 'prepareCallback'], $text);
     }
     if (in_array(GeshiFilter::BRACKETS_SQUARE, $tag_styles)) {
       // Prepare [foo]..[/foo] blocks.
       $pattern = '#((? blocks.
       $pattern = '#[\[<](\?php|\?PHP|%)(.+?)((\?|%)[\]>]|$)#s';
-      $text = preg_replace_callback($pattern, array($this, 'preparePhpCallback'), $text);
+      $text = preg_replace_callback($pattern, [$this, 'preparePhpCallback'], $text);
     }
     return $text;
   }
@@ -183,7 +183,7 @@ class GeshiFilterFilter extends FilterBase {
   public function tips($long = FALSE) {
     // Get the supported tag styles.
     $tag_styles = array_filter($this->tagStyles());
-    $tag_style_examples = array();
+    $tag_style_examples = [];
     $bracket_open = NULL;
     $bracket_close = NULL;
     if (in_array(GeshiFilter::BRACKETS_ANGLE, $tag_styles)) {
@@ -222,20 +222,20 @@ class GeshiFilterFilter extends FilterBase {
 
       // Syntax highlighting tags.
       $output = '
    ' . $this->t('Syntax highlighting of source code can be enabled with the following tags:') . '
    ';
-      $items = array();
+      $items = [];
       // Seneric tags.
-      $tags = array();
+      $tags = [];
       foreach ($generic_code_tags as $tag) {
         $tags[] = $bracket_open . $tag . $bracket_close;
       }
-      $items[] = $this->t('Generic syntax highlighting tags: @tags.', array('@tags' => Markup::create(implode(', ', $tags))));
+      $items[] = $this->t('Generic syntax highlighting tags: @tags.', ['@tags' => Markup::create(implode(', ', $tags))]);
       // Language tags.
-      $tags = array();
+      $tags = [];
       foreach ($language_tags as $tag) {
-        $tags[] = $this->t('@tag for @lang source code', array(
+        $tags[] = $this->t('@tag for @lang source code', [
           '@tag' => Markup::create($bracket_open . $tag . $bracket_close),
           '@lang' => $languages[$tag_to_lang[$tag]],
-        ));
+        ]);
       }
       $items[] = '
  • ' . $this->t('Language specific syntax highlighting tags:') . implode(', ', $tags) . '
    • ';
       // PHP specific delimiters.
@@ -247,10 +247,10 @@ class GeshiFilterFilter extends FilterBase {
 
       // Options and tips.
       $output .= '
    ' . $this->t('Options and tips:') . '
    ';
-      $items = array();
+      $items = [];
 
       // Info about language attribute to language mapping.
-      $att_to_full = array();
+      $att_to_full = [];
       foreach ($languages as $langcode => $fullname) {
         $att_to_full[$langcode] = $fullname;
       }
@@ -258,21 +258,21 @@ class GeshiFilterFilter extends FilterBase {
         $att_to_full[$tag] = $languages[$lang];
       }
       ksort($att_to_full);
-      $att_for_full = array();
+      $att_for_full = [];
       foreach ($att_to_full as $att => $fullname) {
-        $att_for_full[] = $this->t('"@langcode" (for @fullname)', array('@langcode' => $att, '@fullname' => $fullname));
+        $att_for_full[] = $this->t('"@langcode" (for @fullname)', ['@langcode' => $att, '@fullname' => $fullname]);
       }
       $items[] = $this->t('The language for the generic syntax highlighting tags can be
         specified with one of the attribute(s): %attributes. The possible values
-        are: @languages.', array(
+        are: @languages.', [
           '%attributes' => implode(', ', $lang_attributes),
           '@languages' => Markup::create(implode(', ', $att_for_full)),
-        )
+        ]
       );
 
       // Tag style options.
       if (count($tag_style_examples) > 1) {
-        $items[] = $this->t('The supported tag styles are: @tag_styles.', array('@tag_styles' => Markup::create(implode(', ', $tag_style_examples))));
+        $items[] = $this->t('The supported tag styles are: @tag_styles.', ['@tag_styles' => Markup::create(implode(', ', $tag_style_examples))]);
       }
 
       // Line numbering options.
@@ -283,14 +283,14 @@ class GeshiFilterFilter extends FilterBase {
         number can be specified with the attribute "%start", which implicitly
         enables normal line numbering. For fancy line numbering the interval
         for the highlighted line numbers can be specified with the attribute
-        "%interval", which implicitly enables fancy line numbering.', array(
+        "%interval", which implicitly enables fancy line numbering.', [
           '%linenumbers' => GeshiFilter::ATTRIBUTE_LINE_NUMBERING,
           '%off' => 'off',
           '%normal' => 'normal',
           '%fancy' => 'fancy',
           '%start' => GeshiFilter::ATTRIBUTE_LINE_NUMBERING_START,
           '%interval' => GeshiFilter::ATTRIBUTE_FANCY_N,
-        )
+        ]
       );
 
       // Block versus inline.
@@ -299,20 +299,20 @@ class GeshiFilterFilter extends FilterBase {
         displayed as a code block. Otherwise it will be displayed inline.');
 
       // Code block title.
-      $items[] = $this->t('A title can be added to a code block with the attribute "%title".', array(
+      $items[] = $this->t('A title can be added to a code block with the attribute "%title".', [
         '%title' => GeshiFilter::ATTRIBUTE_TITLE,
-      ));
+      ]);
 
-      $render = array(
+      $render = [
         '#theme' => 'item_list',
         '#items' => $items,
         '#type' => 'ul',
-      );
+      ];
       $output .= render($render);
 
       // Defaults.
       $output .= '
    ' . $this->t('Defaults:') . '
    ';
-      $items = array();
+      $items = [];
       $default_highlighting = $this->config->get('default_highlighting');
       switch ($default_highlighting) {
         case GeshiFilter::DEFAULT_DONOTHING:
@@ -327,11 +327,11 @@ class GeshiFilterFilter extends FilterBase {
 
         default:
           $description = $this->t('the default language used for syntax highlighting is
-            "%default_lang"', array('%default_lang' => $default_highlighting));
+            "%default_lang"', ['%default_lang' => $default_highlighting]);
           break;
       }
       $items[] = $this->t('Default highlighting mode for generic syntax highlighting
-        tags: @description.', array('@description' => $description));
+        tags: @description.', ['@description' => $description]);
       $default_line_numbering = $this->config->get('default_line_numbering');
       switch ($default_line_numbering) {
         case GeshiFilter::LINE_NUMBERS_DEFAULT_NONE:
@@ -343,31 +343,31 @@ class GeshiFilterFilter extends FilterBase {
           break;
 
         default:
-          $description = $this->t('fancy line numbers (every @n lines)', array('@n' => $default_line_numbering));
+          $description = $this->t('fancy line numbers (every @n lines)', ['@n' => $default_line_numbering]);
           break;
       }
-      $items[] = $this->t('Default line numbering: @description.', array('@description' => $description));
-      $render = array(
+      $items[] = $this->t('Default line numbering: @description.', ['@description' => $description]);
+      $render = [
         '#theme' => 'item_list',
         '#items' => $items,
         '#type' => 'ul',
-      );
+      ];
       $output .= render($render);
     }
     else {
       // Get the available tags.
       list($generic_code_tags, $language_tags, $tag_to_lang) = $this->getTags();
-      $tags = array();
+      $tags = [];
       foreach ($generic_code_tags as $tag) {
         $tags[] = '' . $bracket_open . SafeMarkup::checkPlain($tag) . $bracket_close . '';
       }
       foreach ($language_tags as $tag) {
         $tags[] = '' . $bracket_open . SafeMarkup::checkPlain($tag) . $bracket_close . '';
       }
-      $output = $this->t('You can enable syntax highlighting of source code with the following tags: @tags.', array('@tags' => Markup::create(implode(', ', $tags))));
+      $output = $this->t('You can enable syntax highlighting of source code with the following tags: @tags.', ['@tags' => Markup::create(implode(', ', $tags))]);
       // Tag style options.
       if (count($tag_style_examples) > 1) {
-        $output .= ' ' . $this->t('The supported tag styles are: @tag_styles.', array('@tag_styles' => Markup::create(implode(', ', $tag_style_examples))));
+        $output .= ' ' . $this->t('The supported tag styles are: @tag_styles.', ['@tag_styles' => Markup::create(implode(', ', $tag_style_examples))]);
       }
       if (in_array(GeshiFilter::BRACKETS_PHPBLOCK, $tag_styles)) {
         $output .= ' ' . $this->t('PHP source code can also be enclosed in <?php ... ?> or <% ... %>.');
@@ -381,7 +381,7 @@ class GeshiFilterFilter extends FilterBase {
    *
    * @param array $form
    *   A minimally prepopulated form array.
-   * @param FormStateInterface $form_state
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
    *   The state of the (entire) configuration form.
    *
    * @return array
@@ -396,24 +396,24 @@ class GeshiFilterFilter extends FilterBase {
       // Tags and attributes.
       $form['general_tags'] = $this->generalHighlightTagsSettings();
       // Per language tags.
-      $form['per_language_settings'] = array(
+      $form['per_language_settings'] = [
         '#type' => 'fieldset',
         '#title' => $this->t('Per language tags'),
         '#collapsible' => TRUE,
         'table' => $this->perLanguageSettings('enabled', FALSE, TRUE),
-      );
+      ];
       // Validate the tags
       // $form['#validate'][] = '::validateForm';.
     }
     else {
-      $form['info'] = array(
+      $form['info'] = [
         '#markup' => '
    ' . $this->t('GeSHi filter is configured to use global tag
           settings. For separate settings per text format, enable this option in
-          the general GeSHi filter settings.', array(
+          the general GeSHi filter settings.', [
             ':geshi_admin_url' => Url::fromRoute('geshifilter.settings')->toString(),
-          )
+          ]
         ) . '
    ',
-      );
+      ];
     }
     return $form;
   }
@@ -493,8 +493,8 @@ class GeshiFilterFilter extends FilterBase {
    */
   protected function getTags() {
     $generic_code_tags = GeshiFilter::tagSplit($this->tags());
-    $language_tags = array();
-    $tag_to_lang = array();
+    $language_tags = [];
+    $tag_to_lang = [];
     $enabled_languages = GeshiFilter::getEnabledLanguages();
     foreach ($enabled_languages as $language => $fullname) {
       $lang_tags = GeshiFilter::tagSplit($this->languageTags($language));
@@ -504,49 +504,49 @@ class GeshiFilterFilter extends FilterBase {
       }
     }
 
-    return array(
+    return [
       $generic_code_tags,
       $language_tags,
       $tag_to_lang,
-    );
+    ];
   }
 
   /**
    * Helper function for some settings form fields.
    */
   protected function generalHighlightTagsSettings() {
-    $form = array();
+    $form = [];
 
     // Generic tags.
-    $form["tags"] = array(
+    $form["tags"] = [
       '#type' => 'textfield',
       '#title' => $this->t('Generic syntax highlighting tags'),
       '#default_value' => $this->tags(),
       '#description' => $this->t('Tags that should activate the GeSHi syntax highlighting. Specify a space-separated list of tagnames.'),
-    );
+    ];
     // Container tag styles.
-    $form["tag_styles"] = array(
+    $form["tag_styles"] = [
       '#type' => 'checkboxes',
       '#title' => $this->t('Container tag style'),
-      '#options' => array(
+      '#options' => [
         GeshiFilter::BRACKETS_ANGLE => '' . htmlentities(' ... ') . '',
         GeshiFilter::BRACKETS_SQUARE => '' . htmlentities('[foo] ... [/foo]') . '',
         GeshiFilter::BRACKETS_DOUBLESQUARE => '' . htmlentities('[[foo]] ... [[/foo]]') . '',
-        GeshiFilter::BRACKETS_PHPBLOCK => $this->t('PHP style source code blocks: @php and @percent', array(
+        GeshiFilter::BRACKETS_PHPBLOCK => $this->t('PHP style source code blocks: @php and @percent', [
           '@php' => '',
           '@percent' => '<% ... %>',
-        )),
-      ),
+        ]),
+      ],
       '#default_value' => $this->tagStyles(),
       '#description' => $this->t('Select the container tag styles that should trigger GeSHi syntax highlighting.'),
-    );
+    ];
     // Decode entities.
-    $form["decode_entities"] = array(
+    $form["decode_entities"] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Decode entities'),
       '#default_value' => $this->settings['general_tags']['decode_entities'],
       '#description' => $this->t('Decode entities, for example, if the code has been typed in a WYSIWYG editor.'),
-    );
+    ];
     return $form;
   }
 
@@ -567,19 +567,19 @@ class GeshiFilterFilter extends FilterBase {
    *   An array with form elements for languages.
    */
   protected function perLanguageSettings($view, $add_checkbox, $add_tag_option) {
-    $form = array();
-    $header = array(
+    $form = [];
+    $header = [
       $this->t('Language'),
       $this->t('GeSHi language code'),
-    );
+    ];
     if ($add_tag_option) {
       $header[] = $this->t('Tag/language attribute value');
     }
-    $form['language'] = array(
+    $form['language'] = [
       '#type' => 'table',
       '#header' => $header,
       '#empty' => $this->t('Nome language is available.'),
-    );
+    ];
 
     // Table body.
     $languages = GeshiFilter::getAvailableLanguages();
@@ -590,33 +590,33 @@ class GeshiFilterFilter extends FilterBase {
         continue;
       }
       // Build language row.
-      $form['language'][$language] = array();
+      $form['language'][$language] = [];
       // Add enable/disable checkbox.
       if ($add_checkbox) {
-        $form['language'][$language]['enabled'] = array(
+        $form['language'][$language]['enabled'] = [
           '#type' => 'checkbox',
           '#default_value' => $enabled,
           '#title' => $language_data['fullname'],
-        );
+        ];
       }
       else {
-        $form['language'][$language]['fullname'] = array(
+        $form['language'][$language]['fullname'] = [
           '#type' => 'markup',
           '#markup' => $language_data['fullname'],
-        );
+        ];
       }
       // Language code.
-      $form['language'][$language]['name'] = array(
+      $form['language'][$language]['name'] = [
         '#type' => 'markup',
         '#markup' => $language,
-      );
+      ];
       // Add a textfield for tags.
       if ($add_tag_option) {
-        $form['language'][$language]['tags'] = array(
+        $form['language'][$language]['tags'] = [
           '#type' => 'textfield',
           '#default_value' => $this->settings['per_language_settings']['table']['language'][$language]['tags'],
           '#size' => 20,
-        );
+        ];
       }
     }
     return $form;
@@ -768,13 +768,13 @@ class GeshiFilterFilter extends FilterBase {
 
     $language_attributes = GeshiFilter::whitespaceExplode(GeshiFilter::ATTRIBUTES_LANGUAGE);
     $attributes_preg_string = implode('|', array_merge(
-      $language_attributes, array(
+      $language_attributes, [
         GeshiFilter::ATTRIBUTE_LINE_NUMBERING,
         GeshiFilter::ATTRIBUTE_LINE_NUMBERING_START,
         GeshiFilter::ATTRIBUTE_FANCY_N,
         GeshiFilter::ATTRIBUTE_TITLE,
         GeshiFilter::ATTRIBUTE_SPECIAL_LINES,
-      )
+      ]
     ));
     $enabled_languages = GeshiFilter::getEnabledLanguages();
 
@@ -840,13 +840,13 @@ class GeshiFilterFilter extends FilterBase {
       }
     }
     // Return parsed results.
-    return array(
+    return [
       'language' => $lang,
       'line_numbering' => $line_numbering,
       'linenumbers_start' => $linenumbers_start,
       'title' => $title,
       'special_lines' => $special_lines,
-    );
+    ];
   }
 
   /**
@@ -910,7 +910,7 @@ class GeshiFilterFilter extends FilterBase {
     }
     // Return escaped code block.
     return '[geshifilter-' . $tag_name . $tag_attributes . ']'
-      . str_replace(array("\r", "\n"), array('', '
'), SafeMarkup::checkPlain($content))
+      . str_replace(["\r", "\n"], ['', '
'], SafeMarkup::checkPlain($content))
       . '[/geshifilter-' . $tag_name . ']';
   }
 
@@ -920,12 +920,12 @@ class GeshiFilterFilter extends FilterBase {
    * @param array $match
    *   An array with the pieces from matched string.
    */
-  public function preparePhpCallback($match) {
+  public function preparePhpCallback(array $match) {
     if ($this->decodeEntities()) {
       $match[2] = $this->unencode($match[2]);
     }
     return '[geshifilter-questionmarkphp]'
-    . str_replace(array("\r", "\n"), array('', '
'), SafeMarkup::checkPlain($match[2]))
+    . str_replace(["\r", "\n"], ['', '
'], SafeMarkup::checkPlain($match[2]))
     . '[/geshifilter-questionmarkphp]';
   }
 
diff --git a/src/Tests/GeshiFilterAdministrationTest.php b/src/Tests/GeshiFilterAdministrationTest.php
index d8ed885..b584f69 100644
--- a/src/Tests/GeshiFilterAdministrationTest.php
+++ b/src/Tests/GeshiFilterAdministrationTest.php
@@ -5,7 +5,7 @@ namespace Drupal\geshifilter\Tests;
 // Use of base class for the tests.
 use Drupal\simpletest\WebTestBase;
 
-use \Drupal\geshifilter\GeshiFilter;
+use Drupal\geshifilter\GeshiFilter;
 
 /**
  * Test for administrative interface of GeshiFilter.
@@ -33,7 +33,7 @@ class GeshiFilterAdministrationTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('geshifilter', 'filter');
+  public static $modules = ['geshifilter', 'filter'];
 
   /**
    * Configuration object.
@@ -52,11 +52,11 @@ class GeshiFilterAdministrationTest extends WebTestBase {
     $this->config = \Drupal::configFactory()->getEditable('geshifilter.settings');
 
     // Create a filter admin user.
-    $permissions = array(
+    $permissions = [
       'administer filters',
       'access administration pages',
       'administer site configuration',
-    );
+    ];
     $this->filterAdminUser = $this->drupalCreateUser($permissions);
 
     // Log in with filter admin user.
@@ -69,10 +69,10 @@ class GeshiFilterAdministrationTest extends WebTestBase {
     // Set default highlighting mode to "do nothing".
     $this->config->set('default_highlighting', GeshiFilter::DEFAULT_PLAINTEXT);
     $this->config->set('use_format_specific_options', FALSE);
-    $this->config->set('tag_styles', array(
+    $this->config->set('tag_styles', [
       GeshiFilter::BRACKETS_ANGLE => GeshiFilter::BRACKETS_ANGLE,
       GeshiFilter::BRACKETS_SQUARE => GeshiFilter::BRACKETS_SQUARE,
-    ));
+    ]);
     $this->config->set('default_line_numbering', GeshiFilter::LINE_NUMBERS_DEFAULT_NONE);
     $this->config->save();
   }
@@ -91,17 +91,17 @@ class GeshiFilterAdministrationTest extends WebTestBase {
     $this->config->save();
 
     // A language tag should differ from the generic tags.
-    $form_values = array(
+    $form_values = [
       'language[php][tags]' => 'php generictag',
-    );
+    ];
     $this->drupalPostForm('admin/config/content/formats/geshifilter/languages/all', $form_values, t('Save configuration'));
     $this->assertText(t('The language tags should differ between languages and from the generic tags.'), t('Language tags should differ from generic tags (with generic tag options)'));
 
     // Language tags should differ between languages.
-    $form_values = array(
+    $form_values = [
       'language[php][tags]' => 'php languagetag',
       'language[python][tags]' => 'languagetag python',
-    );
+    ];
     $this->drupalPostForm('admin/config/content/formats/geshifilter/languages/all', $form_values, t('Save configuration'));
     $this->assertText(t('The language tags should differ between languages and from the generic tags.'), t('Language tags should differ between languages (with generic tag options)'));
 
@@ -147,7 +147,7 @@ class GeshiFilterAdministrationTest extends WebTestBase {
    *   Array with the machine names of filters to enable.
    */
   protected function createTextFormat($format_name, array $filters) {
-    $edit = array();
+    $edit = [];
     $edit['format'] = $format_name;
     $edit['name'] = $this->randomMachineName();
     $edit['roles[' . DRUPAL_AUTHENTICATED_RID . ']'] = 1;
@@ -155,7 +155,7 @@ class GeshiFilterAdministrationTest extends WebTestBase {
       $edit['filters[' . $filter . '][status]'] = TRUE;
     }
     $this->drupalPostForm('admin/config/content/formats/add', $edit, t('Save configuration'));
-    $this->assertRaw(t('Added text format %format.', array('%format' => $edit['name'])), 'New filter created.');
+    $this->assertRaw(t('Added text format %format.', ['%format' => $edit['name']]), 'New filter created.');
     $this->drupalGet('admin/config/content/formats');
   }
 
@@ -163,7 +163,7 @@ class GeshiFilterAdministrationTest extends WebTestBase {
    * Tests for GeshiFilterLanguageForm.
    */
   public function testLanguagesForm() {
-    $edit = array();
+    $edit = [];
     $edit['language[xml][enabled]'] = TRUE;
     $edit['language[xml][tags]'] = "";
     $this->drupalPostForm('admin/config/content/formats/geshifilter/languages/all', $edit, t('Save configuration'));
diff --git a/src/Tests/GeshiFilterCssTest.php b/src/Tests/GeshiFilterCssTest.php
index dfda983..016de90 100644
--- a/src/Tests/GeshiFilterCssTest.php
+++ b/src/Tests/GeshiFilterCssTest.php
@@ -31,9 +31,9 @@ class GeshiFilterCssTest extends WebTestBase {
    *
    * @var object
    */
-  public static $modules = array('node', 'geshifilter', 'filter',
+  public static $modules = ['node', 'geshifilter', 'filter',
     'file',
-  );
+  ];
 
   /**
    * Configuration object.
@@ -54,26 +54,26 @@ class GeshiFilterCssTest extends WebTestBase {
     // And set the path to the geshi library.
     $this->config->set('geshi_dir', '/libraries/geshi');
 
-    $settings = array(
+    $settings = [
       // Override default type (a random name).
       'type' => 'geshifilter_content_type',
       'name' => 'Geshifilter Content',
-    );
+    ];
     $this->drupalCreateContentType($settings);
 
     // Create a filter admin user.
-    $permissions = array(
+    $permissions = [
       'administer filters',
       'access administration pages',
       'administer site configuration',
-    );
+    ];
     $this->filterAdminUser = $this->drupalCreateUser($permissions);
 
     // Log in with filter admin user.
     $this->drupalLogin($this->filterAdminUser);
 
     // Add an text format with only geshi filter.
-    $this->createTextFormat('geshifilter_text_format', array('filter_geshifilter'));
+    $this->createTextFormat('geshifilter_text_format', ['filter_geshifilter']);
   }
 
   /**
@@ -84,22 +84,22 @@ class GeshiFilterCssTest extends WebTestBase {
     $this->drupalGet('admin/config/content/formats/geshifilter/generate_css');
     $this->assertRaw('GeSHi Dynamically Generated Stylesheet', 'Test for geshifilter generate css');
 
-    $form_values = array(
+    $form_values = [
       'css_mode' => 2,
-    );
+    ];
     $this->drupalPostForm('admin/config/content/formats/geshifilter', $form_values, t('Save configuration'));
 
     // Create a node.
-    $node = array(
+    $node = [
       'title' => 'Test for GeShi Filter',
-      'body' => array(
-        array(
+      'body' => [
+        [
           'value' => 'dfgdfg echo("hi"); dfgdg',
           'format' => 'geshifilter_text_format',
-        ),
-      ),
+        ],
+      ],
       'type' => 'geshifilter_content_type',
-    );
+    ];
     $this->drupalCreateNode($node);
     $this->drupalGet('node/1');
     $this->assertRaw('/assets/css/geshifilter.css', 'The CSS file /assets/css/geshifilter.css is present.');
@@ -115,7 +115,7 @@ class GeshiFilterCssTest extends WebTestBase {
    *   Array with the machine names of filters to enable.
    */
   protected function createTextFormat($format_name, array $filters) {
-    $edit = array();
+    $edit = [];
     $edit['format'] = $format_name;
     $edit['name'] = $this->randomMachineName();
     $edit['roles[' . DRUPAL_AUTHENTICATED_RID . ']'] = 1;
@@ -123,7 +123,7 @@ class GeshiFilterCssTest extends WebTestBase {
       $edit['filters[' . $filter . '][status]'] = TRUE;
     }
     $this->drupalPostForm('admin/config/content/formats/add', $edit, t('Save configuration'));
-    $this->assertRaw(t('Added text format %format.', array('%format' => $edit['name'])), 'New filter created.');
+    $this->assertRaw(t('Added text format %format.', ['%format' => $edit['name']]), 'New filter created.');
     $this->drupalGet('admin/config/content/formats');
   }
 
diff --git a/src/Tests/GeshiFilterTest.php b/src/Tests/GeshiFilterTest.php
index 1a6c0b6..fe283d9 100644
--- a/src/Tests/GeshiFilterTest.php
+++ b/src/Tests/GeshiFilterTest.php
@@ -5,9 +5,9 @@ namespace Drupal\geshifilter\Tests;
 // Use of base class for the tests.
 use Drupal\simpletest\WebTestBase;
 
-use \Drupal\geshifilter\GeshiFilter;
+use Drupal\geshifilter\GeshiFilter;
 
-use \Drupal\geshifilter\GeshiFilterProcess;
+use Drupal\geshifilter\GeshiFilterProcess;
 
 /**
  * Tests for GeshiFilter in node content.
@@ -45,7 +45,7 @@ class GeshiFilterTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'geshifilter', 'filter');
+  public static $modules = ['node', 'geshifilter', 'filter'];
 
   /**
    * The number of current node.
@@ -70,38 +70,38 @@ class GeshiFilterTest extends WebTestBase {
     $this->config->set('geshi_dir', '/libraries/geshi');
 
     // Create a content type, as we will create nodes on test.
-    $settings = array(
+    $settings = [
       // Override default type (a random name).
       'type' => 'geshifilter_content_type',
       'name' => 'Geshifilter Content',
-    );
+    ];
     $this->drupalCreateContentType($settings);
 
     // Create a filter admin user.
-    $permissions = array(
+    $permissions = [
       'administer filters',
       'administer nodes',
       'access administration pages',
       'create geshifilter_content_type content',
       'edit any geshifilter_content_type content',
       'administer site configuration',
-    );
+    ];
     $this->filterAdminUser = $this->drupalCreateUser($permissions);
 
     // Log in with filter admin user.
     $this->drupalLogin($this->filterAdminUser);
 
     // Add an text format with only geshi filter.
-    $this->createTextFormat('geshifilter_text_format', array('filter_geshifilter'));
+    $this->createTextFormat('geshifilter_text_format', ['filter_geshifilter']);
 
     // Set some default GeSHi filter admin settings.
     // Set default highlighting mode to "do nothing".
     $this->config->set('default_highlighting', GeshiFilter::DEFAULT_PLAINTEXT);
     $this->config->set('use_format_specific_options', FALSE);
-    $this->config->set('tag_styles', array(
+    $this->config->set('tag_styles', [
       GeshiFilter::BRACKETS_ANGLE => GeshiFilter::BRACKETS_ANGLE,
       GeshiFilter::BRACKETS_SQUARE => GeshiFilter::BRACKETS_SQUARE,
-    ));
+    ]);
     $this->config->set('default_line_numbering', GeshiFilter::LINE_NUMBERS_DEFAULT_NONE);
     $this->config->save();
 
@@ -116,7 +116,7 @@ class GeshiFilterTest extends WebTestBase {
    *   Array with the machine names of filters to enable.
    */
   protected function createTextFormat($format_name, array $filters) {
-    $edit = array();
+    $edit = [];
     $edit['format'] = $format_name;
     $edit['name'] = $this->randomMachineName();
     $edit['roles[' . DRUPAL_AUTHENTICATED_RID . ']'] = 1;
@@ -124,7 +124,7 @@ class GeshiFilterTest extends WebTestBase {
       $edit['filters[' . $filter . '][status]'] = TRUE;
     }
     $this->drupalPostForm('admin/config/content/formats/add', $edit, t('Save configuration'));
-    $this->assertRaw(t('Added text format %format.', array('%format' => $edit['name'])), 'New filter created.');
+    $this->assertRaw(t('Added text format %format.', ['%format' => $edit['name']]), 'New filter created.');
     $this->drupalGet('admin/config/content/formats');
   }
 
@@ -146,16 +146,16 @@ class GeshiFilterTest extends WebTestBase {
    */
   protected function assertGeshiFilterHighlighting($body, array $check_list, $description, $invert = FALSE) {
     // Create a node.
-    $node = array(
+    $node = [
       'title' => 'Test for GeShi Filter',
-      'body' => array(
-        array(
+      'body' => [
+        [
           'value' => $body . "\n" . $this->randomMachineName(100),
           'format' => 'geshifilter_text_format',
-        ),
-      ),
+        ],
+      ],
       'type' => 'geshifilter_content_type',
-    );
+    ];
     $this->drupalCreateNode($node);
 
     $this->drupalGet('node/' . $this->node);
@@ -194,38 +194,38 @@ class GeshiFilterTest extends WebTestBase {
 
     // Check language argument.
     $this->assertGeshiFilterHighlighting('' . $source_code . '',
-      array(array($source_code, 'cpp', 0, 1, FALSE)),
+      [[$source_code, 'cpp', 0, 1, FALSE]],
       t('Checking type="..." argument'));
     $this->assertGeshiFilterHighlighting('' . $source_code . '',
-      array(array($source_code, 'cpp', 0, 1, FALSE)),
+      [[$source_code, 'cpp', 0, 1, FALSE]],
       t('Checking lang="..." argument'));
     $this->assertGeshiFilterHighlighting('' . $source_code . '',
-      array(array($source_code, 'cpp', 0, 1, FALSE)),
+      [[$source_code, 'cpp', 0, 1, FALSE]],
       t('Checking language="..." argument'));
 
     // Check some languages.
-    $languages = array('c', 'cpp', 'java');
+    $languages = ['c', 'cpp', 'java'];
     foreach ($languages as $lang) {
       $this->assertGeshiFilterHighlighting('' .
-        $source_code . '', array(array($source_code, $lang, 0, 1, FALSE)),
-        t('Checking language="@lang"', array('@lang' => $lang)));
+        $source_code . '', [[$source_code, $lang, 0, 1, FALSE]],
+        t('Checking language="@lang"', ['@lang' => $lang]));
     }
 
     // Check line_numbering argument.
     $this->assertGeshiFilterHighlighting('' . $source_code . '',
-      array(array($source_code, 'cpp', 0, 1, FALSE)),
+      [[$source_code, 'cpp', 0, 1, FALSE]],
       t('Checking linenumbers="off" argument'));
     $this->assertGeshiFilterHighlighting('' . $source_code . '',
-      array(array($source_code, 'cpp', 1, 1, FALSE)),
+      [[$source_code, 'cpp', 1, 1, FALSE]],
       t('Checking linenumbers="normal" argument'));
     $this->assertGeshiFilterHighlighting('' . $source_code . '',
-      array(array($source_code, 'cpp', 1, 27, FALSE)),
+      [[$source_code, 'cpp', 1, 27, FALSE]],
       t('Checking start="27" argument'));
     $this->assertGeshiFilterHighlighting('' . $source_code . '',
-      array(array($source_code, 'cpp', 5, 1, FALSE)),
+      [[$source_code, 'cpp', 5, 1, FALSE]],
       t('Checking linenumbers="fancy" argument'));
     $this->assertGeshiFilterHighlighting('' . $source_code . '',
-      array(array($source_code, 'cpp', 3, 1, FALSE)),
+      [[$source_code, 'cpp', 3, 1, FALSE]],
       t('Checking fancy="3" argument'));
   }
 
@@ -236,25 +236,25 @@ class GeshiFilterTest extends WebTestBase {
     $this->config->set('tags', 'code');
     $this->config->set('language.cpp.enabled', TRUE);
     // Enable only angle brackets.
-    $this->config->set('tag_styles', array(
+    $this->config->set('tag_styles', [
       GeshiFilter::BRACKETS_ANGLE => GeshiFilter::BRACKETS_ANGLE,
-    ));
+    ]);
     $this->config->save();
 
     $source_code = "//C++ source code\nfor (int i=0; i<10; ++i) {\n  fun(i);\n  bar.foo(x, y);\n server->start(&pool); \n}";
     // This should be filtered.
     $this->assertGeshiFilterHighlighting('' . $source_code . '',
-      array(array($source_code, 'cpp', 0, 1, FALSE)),
+      [[$source_code, 'cpp', 0, 1, FALSE]],
       t('Checking angle brackets style in GeshiFilter::BRACKETS_ANGLE mode'));
     // This should not be filtered.
     $this->assertGeshiFilterHighlighting('[code language="cpp"]' . $source_code . '[/code]',
-      array(array($source_code, NULL, 0, 1, FALSE)),
+      [[$source_code, NULL, 0, 1, FALSE]],
       t('Checking [foo] brackets style in GeshiFilter::BRACKETS_ANGLE mode'));
     $this->assertGeshiFilterHighlighting('[[code language="cpp"]]' . $source_code . '[[/code]]',
-      array(array($source_code, NULL, 0, 1, FALSE)),
+      [[$source_code, NULL, 0, 1, FALSE]],
       t('Checking [[foo]] brackets style in GeshiFilter::BRACKETS_ANGLE mode'));
     $this->assertGeshiFilterHighlighting('',
-      array(array($source_code, NULL, 0, 1, FALSE)),
+      [[$source_code, NULL, 0, 1, FALSE]],
       t('Checking php code blocks in GeshiFilter::BRACKETS_ANGLE mode'));
   }
 
@@ -266,23 +266,23 @@ class GeshiFilterTest extends WebTestBase {
     $this->config->set('language.cpp.enabled', TRUE);
     $source_code = "//C++ source code\nfor (int i=0; i<10; ++i) {\n  fun(i);\n  bar.foo(x, y);\n server->start(&pool); \n}";
     // Enable only square brackets.
-    $this->config->set('tag_styles', array(
+    $this->config->set('tag_styles', [
       GeshiFilter::BRACKETS_SQUARE => GeshiFilter::BRACKETS_SQUARE,
-    ));
+    ]);
     $this->config->save();
     // This should be filtered.
     $this->assertGeshiFilterHighlighting('[code language="cpp"]' . $source_code . '[/code]',
-      array(array($source_code, 'cpp', 0, 1, FALSE)),
+      [[$source_code, 'cpp', 0, 1, FALSE]],
       t('Checking [foo] brackets style in GeshiFilter::BRACKETS_SQUARE mode'));
     // This should not be filtered.
     $this->assertGeshiFilterHighlighting('' . $source_code . '',
-      array(array($source_code, NULL, 0, 1, FALSE)),
+      [[$source_code, NULL, 0, 1, FALSE]],
       t('Checking angle brackets style in GeshiFilter::BRACKETS_SQUARE mode'));
     $this->assertGeshiFilterHighlighting('[[code language="cpp"]]' . $source_code . '[[/code]]',
-      array(array($source_code, NULL, 0, 1, FALSE)),
+      [[$source_code, NULL, 0, 1, FALSE]],
       t('Checking [[foo]] brackets style in GeshiFilter::BRACKETS_SQUARE mode'));
     $this->assertGeshiFilterHighlighting('',
-      array(array($source_code, NULL, 0, 1, FALSE)),
+      [[$source_code, NULL, 0, 1, FALSE]],
       t('Checking php code blocks in GeshiFilter::BRACKETS_SQUARE mode'));
   }
 
@@ -294,24 +294,24 @@ class GeshiFilterTest extends WebTestBase {
     $this->config->set('language.cpp.enabled', TRUE);
     $source_code = "//C++ source code\nfor (int i=0; i<10; ++i) {\n  fun(i);\n  bar.foo(x, y);\n server->start(&pool); \n}";
     // Enable only double square brackets.
-    $this->config->set('tag_styles', array(
+    $this->config->set('tag_styles', [
       GeshiFilter::BRACKETS_DOUBLESQUARE => GeshiFilter::BRACKETS_DOUBLESQUARE,
-    ));
+    ]);
     $this->config->save();
 
     // This should be filtered.
     $this->assertGeshiFilterHighlighting('[[code language="cpp"]]' . $source_code . '[[/code]]',
-      array(array($source_code, 'cpp', 0, 1, FALSE)),
+      [[$source_code, 'cpp', 0, 1, FALSE]],
       t('Checking [[foo]] brackets style in GeshiFilter::BRACKETS_DOUBLESQUARE mode'));
     // This should not be filtered.
     $this->assertGeshiFilterHighlighting('' . $source_code . '',
-      array(array($source_code, NULL, 0, 1, FALSE)),
+      [[$source_code, NULL, 0, 1, FALSE]],
       t('Checking angle brackets style in GeshiFilter::BRACKETS_DOUBLESQUARE mode'));
     $this->assertGeshiFilterHighlighting('[code language="cpp"]' . $source_code . '[/code]',
-      array(array($source_code, NULL, 0, 1, FALSE)),
+      [[$source_code, NULL, 0, 1, FALSE]],
       t('Checking [foo] brackets style in GeshiFilter::BRACKETS_DOUBLESQUARE mode'));
     $this->assertGeshiFilterHighlighting('',
-      array(array($source_code, NULL, 0, 1, FALSE)),
+      [[$source_code, NULL, 0, 1, FALSE]],
       t('Checking php code blocks in GeshiFilter::BRACKETS_DOUBLESQUARE mode'));
   }
 
@@ -323,24 +323,24 @@ class GeshiFilterTest extends WebTestBase {
     $this->config->set('language.cpp.enabled', TRUE);
     $source_code = "//C++ source code\nfor (int i=0; i<10; ++i) {\n  fun(i);\n  bar.foo(x, y);\n server->start(&pool); \n}";
     // Enable only double square brackets.
-    $this->config->set('tag_styles', array(
+    $this->config->set('tag_styles', [
       GeshiFilter::BRACKETS_PHPBLOCK => GeshiFilter::BRACKETS_PHPBLOCK,
-    ));
+    ]);
     $this->config->save();
 
     // This should be filtered.
     $this->assertGeshiFilterHighlighting('',
-      array(array($source_code, 'php', 0, 1, FALSE)),
+      [[$source_code, 'php', 0, 1, FALSE]],
       t('Checking php code blocks in GeshiFilter::BRACKETS_PHPBLOCK mode'));
     // This should not be filtered.
     $this->assertGeshiFilterHighlighting('' . $source_code . '',
-      array(array($source_code, NULL, 0, 1, FALSE)),
+      [[$source_code, NULL, 0, 1, FALSE]],
       t('Checking angle brackets style in GeshiFilter::BRACKETS_PHPBLOCK mode'));
     $this->assertGeshiFilterHighlighting('[code language="cpp"]' . $source_code . '[/code]',
-      array(array($source_code, NULL, 0, 1, FALSE)),
+      [[$source_code, NULL, 0, 1, FALSE]],
       t('Checking [foo] brackets style in GeshiFilter::BRACKETS_PHPBLOCK mode'));
     $this->assertGeshiFilterHighlighting('[[code language="cpp"]]' . $source_code . '[[/code]]',
-      array(array($source_code, NULL, 0, 1, FALSE)),
+      [[$source_code, NULL, 0, 1, FALSE]],
       t('Checking [[foo]] brackets style in GeshiFilter::BRACKETS_PHPBLOCK mode'));
   }
 
@@ -360,10 +360,10 @@ class GeshiFilterTest extends WebTestBase {
     $source_code = "//C++-ish source code\nfor (int i=0; i<10; ++i) {\n  fun(i);\n  bar.foo(x, y);\n server->start(&pool); \n}";
     // Test the tags.
     $this->assertGeshiFilterHighlighting('' . $source_code . '',
-      array(array($source_code, 'cpp', 0, 1, FALSE)),
+      [[$source_code, 'cpp', 0, 1, FALSE]],
       t('Checking ..'));
     $this->assertGeshiFilterHighlighting('' . $source_code . '',
-      array(array($source_code, 'csharp', 0, 1, FALSE)),
+      [[$source_code, 'csharp', 0, 1, FALSE]],
       t('Checking ..'));
   }
 
@@ -383,10 +383,10 @@ class GeshiFilterTest extends WebTestBase {
     $source_code = "//C++-ish source code\nfor (int i=0; i<10; ++i) {\n  fun(i);\n  bar.foo(x, y);\n server->start(&pool); \n}";
     // Test the tags.
     $this->assertGeshiFilterHighlighting('' . $source_code . '',
-      array(array($source_code, 'cpp', 0, 1, FALSE)),
+      [[$source_code, 'cpp', 0, 1, FALSE]],
       t('Source code in ... should work when ... is also enabled'));
     $this->assertGeshiFilterHighlighting('' . $source_code . '',
-      array(array($source_code, 'csharp', 0, 1, FALSE)),
+      [[$source_code, 'csharp', 0, 1, FALSE]],
       t('Source code in ... should work when ... is also enabled'));
   }
 
@@ -405,15 +405,15 @@ class GeshiFilterTest extends WebTestBase {
     $source_code = "//C++-ish source code\nfor (int i=0; i!=10; ++i) {\n  fun(i);\n  bar.foo(x, y);\n}";
     // Tests.
     $this->assertGeshiFilterHighlighting('' . $source_code . '',
-      array(array('' . $source_code . '', FALSE, 0, 1, FALSE)),
+      [['' . $source_code . '', FALSE, 0, 1, FALSE]],
       t('Do nothing mode should not touch given source code')
     );
     $this->assertGeshiFilterHighlighting('' . $source_code . '',
-      array(array($source_code, 'cpp', 0, 1, FALSE)),
+      [[$source_code, 'cpp', 0, 1, FALSE]],
       t('Highlighting with language="cpp" should work when default is "do nothing"')
     );
     $this->assertGeshiFilterHighlighting('' . $source_code . '',
-      array(array($source_code, 'cpp', 0, 1, FALSE)),
+      [[$source_code, 'cpp', 0, 1, FALSE]],
       t('Highlighting with ... should work when default is "do nothing"')
     );
   }
@@ -425,20 +425,20 @@ class GeshiFilterTest extends WebTestBase {
     $source_code = "for (int i=0; i!=10; ++i) {\n  fun(i);\n  bar.foo(x, y);\n}";
     // No title set.
     $this->assertGeshiFilterHighlighting('' . $source_code . '',
-      array(array('geshifilter-title', FALSE, 0, 0, 0)),
+      [['geshifilter-title', FALSE, 0, 0, 0]],
       t('Setting the title attritbute on code block.'),
      TRUE
     );
     // Title set.
     $this->assertGeshiFilterHighlighting('' . $source_code . '',
-      array(
-        array('
    Foo the bar!
    ',
+      [
+        ['
    Foo the bar!
    ',
           FALSE,
           0,
           0,
           0,
-        ),
-      ),
+        ],
+      ],
       t('Setting the title attritbute on code block.')
     );
   }
@@ -450,20 +450,20 @@ class GeshiFilterTest extends WebTestBase {
     $source_code = "for (int i=0; i!=10; ++i) { fun(i); }";
     // No title set.
     $this->assertGeshiFilterHighlighting('' . $source_code . '',
-      array(array('', FALSE, 0, 0, 0)),
+      [['', FALSE, 0, 0, 0]],
       t('Setting the title attritbute on inline code.')
     );
     // Title set.
     $this->assertGeshiFilterHighlighting('' . $source_code . '',
-      array(
-        array(
+      [
+        [
           '',
           FALSE,
           0,
           0,
           0,
-        ),
-      ),
+        ],
+      ],
       t('Setting the title attritbute on inline code.')
     );
   }
@@ -476,16 +476,16 @@ class GeshiFilterTest extends WebTestBase {
     $this->config->set('language.ini.enabled', TRUE);
     $source_code = "[section]\nserver=192.0.2.62  ; IP address\nport=12345";
     // Enable square brackets.
-    $this->config->set('tag_styles', array(
+    $this->config->set('tag_styles', [
       GeshiFilter::BRACKETS_SQUARE => GeshiFilter::BRACKETS_SQUARE,
-    ));
+    ]);
     $this->config->save();
     // This should be filtered.
     $this->assertGeshiFilterHighlighting('[code]' . $source_code . '[/code]',
-      array(array($source_code, 'text', 0, 1, FALSE)),
+      [[$source_code, 'text', 0, 1, FALSE]],
       t('Checking if [code][section]...[/code] works'));
     $this->assertGeshiFilterHighlighting('[code language="ini"]' . $source_code . '[/code]',
-      array(array($source_code, 'ini', 0, 1, FALSE)),
+      [[$source_code, 'ini', 0, 1, FALSE]],
       t('Checking if [code language="ini"][section]...[/code] works'));
   }
 
@@ -501,16 +501,16 @@ class GeshiFilterTest extends WebTestBase {
     $source = '';
 
     // Create a node.
-    $node = array(
+    $node = [
       'title' => 'Test for Custom Filter',
-      'body' => array(
-        array(
+      'body' => [
+        [
           'value' => $source,
           'format' => 'geshifilter_text_format',
-        ),
-      ),
+        ],
+      ],
       'type' => 'geshifilter_content_type',
-    );
+    ];
     $this->drupalCreateNode($node);
     $this->drupalGet('node/1');
     // The same string must be on page, not double encoded.