refactor(DisallowLongArraySyntax): Use upstream sniff directly (#3554286)

Author: klausi

coder_sniffer/Drupal/Sniffs/Arrays/DisallowLongArraySyntaxSniff.php

@@ -45,6 +45,7 @@
   </rule>
 
   <!-- Generic sniffs -->
+  <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
   <rule ref="Generic.CodeAnalysis.EmptyPHPStatement"/>
   <rule ref="Generic.CodeAnalysis.UselessOverridingMethod"/>
   <rule ref="Generic.Files.ByteOrderMark"/>

coder_sniffer/Drupal/ruleset.xml

@@ -24,41 +24,41 @@ $array = [
   ],
 ];
 
-$array = array(
+$array = [
   'data' => 'my-data',
   'animal' => 'squirrel',
-  'inline' => array(),
-  'inline3' => array('one', 'two', 'three'),
-  'inline_long_ok' => array('one', 'two', 'three', 'four', 'five'),
-  'inline_long_nok' => array('one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'ten', 'eleven', 'twelve'),
-  'nested' => array(),
-  'nested2' => array(
+  'inline' => [],
+  'inline3' => ['one', 'two', 'three'],
+  'inline_long_ok' => ['one', 'two', 'three', 'four', 'five'],
+  'inline_long_nok' => ['one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'ten', 'eleven', 'twelve'],
+  'nested' => [],
+  'nested2' => [
     'a',
-  ),
-  'nested3' => array(
+  ],
+  'nested3' => [
     'a' => 'a',
-    'b' => array(
+    'b' => [
       'c',
-    ),
-  ),
-);
+    ],
+  ],
+];
 
-$derivatives["entity:$entity_type_id"] = array(
-  'label' => t('Create @entity_type path alias', array('@entity_type' => $entity_type->getLowercaseLabel())),
+$derivatives["entity:$entity_type_id"] = [
+  'label' => t('Create @entity_type path alias', ['@entity_type' => $entity_type->getLowercaseLabel()]),
   'category' => t('Path'),
   'entity_type_id' => $entity_type_id,
-  'context' => array(
+  'context' => [
     'entity' => ContextDefinition::create("entity:$entity_type_id")
       ->setLabel($entity_type->getLabel())
       ->setRequired(TRUE)
-      ->setDescription(t('The @entity_type for which to create a path alias.', array('@entity_type' => $entity_type->getLowercaseLabel()))),
+      ->setDescription(t('The @entity_type for which to create a path alias.', ['@entity_type' => $entity_type->getLowercaseLabel()])),
     'alias' => ContextDefinition::create('string')
       ->setLabel(t('Path alias'))
       ->setRequired(TRUE)
       ->setDescription(t("Specify an alternative path by which the content can be accessed. For example, 'about' for an about page. Use a relative path and do not add a trailing slash.")),
-  ),
-  'provides' => array(),
-) + $base_plugin_definition;
+  ],
+  'provides' => [],
+] + $base_plugin_definition;
 
 $derivatives["entity:$entity_type_id"] = [
   'label' => t('Create @entity_type path alias', ['@entity_type' => $entity_type->getLowercaseLabel()]),
@@ -77,31 +77,31 @@ $derivatives["entity:$entity_type_id"] = [
   'provides' => [],
 ] + $base_plugin_definition;
 
-$a = array('1', '2', array(
+$a = ['1', '2', [
   '3',
-),
-);
+],
+];
 
 $a = ['1', '2', [
   '3',
 ],
 ];
 
-$a = array(
+$a = [
   'x' => 'y',
-);
+];
 
 $backend->expects($this->exactly(1))
   ->method('get')
   ->will($this->onConsecutiveCalls(
-    (object) array(
-      'data' => array(
-        'hook' => array(
-          'module_handler_test' => array(),
-          'module_handler_test_missing' => array(),
-        ),
-      ),
-    )
+    (object) [
+      'data' => [
+        'hook' => [
+          'module_handler_test' => [],
+          'module_handler_test_missing' => [],
+        ],
+      ],
+    ]
   ));
 
 $backend->expects($this->exactly(1))
@@ -121,14 +121,14 @@ $backend->expects($this->exactly(1))
  * Nested closure in an array should not throw errors.
  */
 function mymodule_libraries_info() {
-  $libraries['some-library'] = array(
+  $libraries['some-library'] = [
     'xautoload' => function ($adapter) {
       /** @var \Drupal\xautoload\Adapter\LocalDirectoryAdapter $adapter */
       // Scan sites/all/libraries/some-library/composer.json to look for
       // autoload information.
       $adapter->composerJson('composer.json');
     },
-  );
+  ];
   return $libraries;
 }
 

tests/Drupal/Arrays/ArrayUnitTest.inc.fixed

@@ -54,7 +54,7 @@ test();
  */
 function example_custom_block_view($delta = '') {
   // This example is adapted from node.module.
-  $block = array();
+  $block = [];
 
   switch ($delta) {
     case 'my_block':