Revert "Pick the PHPCSExtra CommaAfterLastSniff Sniff to moodle"

This reverts commit 1c295bb.

Now that PHPCSExtra 1.2.0 has been released, we can revert this commit
and switch back to use the upstream Sniff.

A few more modifications (composer...) come to point to the new
PHPCSExtra version.

Fixes moodlehq#82

composer.json

@@ -21,7 +21,7 @@
     "require": {
         "dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
         "phpcsstandards/php_codesniffer": "^3.7.2",
-        "phpcsstandards/phpcsextra": "^1.1.0",
+        "phpcsstandards/phpcsextra": "^1.2.0",
         "phpcompatibility/php-compatibility": "dev-develop#0a17f9ed"
     },
     "config": {

moodle/Tests/NormalizedArraysArraysCommaAfterLastTest.php

@@ -26,7 +26,7 @@
  * @copyright  2023 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  *
- * @covers MoodleHQ\MoodleCS\moodle\Sniffs\Arrays\CommaAfterLastSniff
+ * @covers \PHPCSExtra\NormalizedArrays\Sniffs\Arrays\CommaAfterLastSniff
  */
 class NormalizedArraysArraysCommaAfterLastTest extends MoodleCSBaseTestCase
 {
@@ -37,16 +37,16 @@ public function testNormalizedArraysArraysCommaAfterLast() {
 
         // Define the standard, sniff and fixture to use.
         $this->set_standard('moodle');
-        $this->set_sniff('moodle.Arrays.CommaAfterLast');
+        $this->set_sniff('NormalizedArrays.Arrays.CommaAfterLast');
         $this->set_fixture(__DIR__ . '/fixtures/normalizedarrays_arrays_commaafterlast.php');
 
         // Define expected results (errors and warnings). Format, array of:
         // - line => number of problems,  or
         // - line => array of contents for message / source problem matching.
         // - line => string of contents for message / source problem matching (only 1).
         $this->set_errors([
-            79 => '@Source: moodle.Arrays.CommaAfterLast.FoundSingleLine',
-            82 => '@Source: moodle.Arrays.CommaAfterLast.MissingMultiLine',
+            79 => '@Source: NormalizedArrays.Arrays.CommaAfterLast.FoundSingleLine',
+            82 => '@Source: NormalizedArrays.Arrays.CommaAfterLast.MissingMultiLine',
             87 => 1,
             95 => 1,
             97 => 1,

moodle/Tests/fixtures/normalizedarrays_arrays_commaafterlast.php

@@ -2,7 +2,7 @@
 defined('MOODLE_INTERNAL') || die(); // Make this always the 1st line in all CS fixtures.
 
 // Disabling this error as we do in our ruleset, so tests run the same.
-// phpcs:disable moodle.Arrays.CommaAfterLast.MissingMultiLineCloserSameLine
+// phpcs:disable NormalizedArrays.Arrays.CommaAfterLast.MissingMultiLineCloserSameLine
 
 // All these are good / valid code.
 

moodle/Tests/fixtures/normalizedarrays_arrays_commaafterlast.php.fixed

@@ -2,7 +2,7 @@
 defined('MOODLE_INTERNAL') || die(); // Make this always the 1st line in all CS fixtures.
 
 // Disabling this error as we do in our ruleset, so tests run the same.
-// phpcs:disable moodle.Arrays.CommaAfterLast.MissingMultiLineCloserSameLine
+// phpcs:disable NormalizedArrays.Arrays.CommaAfterLast.MissingMultiLineCloserSameLine
 
 // All these are good / valid code.
 

moodle/ruleset.xml

@@ -20,15 +20,10 @@
         Affects all major branches since Moodle 3.9.
 
         Require a comma after the last element in a multi-line array, but prevent in a single-line array definition
-
-        TODO: Enable this back and remove our copied Sniff below once PHPCSExtra v1.2.0 is released.
+    -->
     <rule ref="NormalizedArrays.Arrays.CommaAfterLast">
         <exclude name="NormalizedArrays.Arrays.CommaAfterLast.MissingMultiLineCloserSameLine" />
     </rule>
-    -->
-    <rule ref="moodle.Arrays.CommaAfterLast">
-        <exclude name="moodle.Arrays.CommaAfterLast.MissingMultiLineCloserSameLine" />
-    </rule>
 
     <rule ref="Generic.Classes.DuplicateClassName"/>
     <rule ref="Generic.Classes.OpeningBraceSameLine"/>