Merge pull request #117 from stronk7/update_tools

Bump tools dependencies to new, just tagged, ones.

Author: kabalin

composer.json

@@ -40,44 +40,44 @@
       "type": "package",
       "package": {
         "name": "moodlehq/moodle-local_codechecker",
-        "version": "3.0.1",
+        "version": "3.0.2",
         "source": {
           "url": "https://github.com/moodlehq/moodle-local_codechecker.git",
           "type": "git",
-          "reference": "v3.0.1"
+          "reference": "v3.0.2"
         }
       }
     },
     {
       "type": "package",
       "package": {
         "name": "moodlehq/moodle-local_ci",
-        "version": "1.0.10",
+        "version": "1.0.11",
         "source": {
           "url": "https://github.com/moodlehq/moodle-local_ci.git",
           "type": "git",
-          "reference": "v1.0.10"
+          "reference": "v1.0.11"
         }
       }
     },
     {
       "type": "package",
       "package": {
         "name": "moodlehq/moodle-local_moodlecheck",
-        "version": "1.0.7",
+        "version": "1.0.8",
         "source": {
           "url": "https://github.com/moodlehq/moodle-local_moodlecheck.git",
           "type": "git",
-          "reference": "v1.0.7"
+          "reference": "v1.0.8"
         }
       }
     }
   ],
   "require": {
     "php": ">=7.0.8",
-    "moodlehq/moodle-local_codechecker": "^3.0.1",
-    "moodlehq/moodle-local_ci": "^1.0.10",
-    "moodlehq/moodle-local_moodlecheck": "^1.0.7",
+    "moodlehq/moodle-local_codechecker": "^3.0.2",
+    "moodlehq/moodle-local_ci": "^1.0.11",
+    "moodlehq/moodle-local_moodlecheck": "^1.0.8",
     "sebastian/phpcpd": "^3.0",
     "phpmd/phpmd": "^2.2",
     "symfony/dotenv": "^3.4",

composer.lock

@@ -15,6 +15,8 @@ The format of this change log follows the advice given at [Keep a CHANGELOG](htt
   to use PostgreSQL 10 (Moodle 4.0 new requirement).
 - ACTION REQUIRED: Existing integrations running tests with PostgreSQL now need to use version 10 or newer.
 - ACTION REQUIRED: Existing integrations running tests with MariaDB must avoid using the 10.6 version and use 10.5 instead. It comes with some changes making it incompatible with Moodle default installation. To achieve that, just look for any use of `image: mariadb:10` and change it to `image: mariadb:10.5`. This is being tracked @ [MDL-72131]( https://tracker.moodle.org/browse/MDL-72131) and, once fixed, it will be possible to go back to the original image.
+- Updated project dependencies to current [moodle-local_moodlecheck](https://github.com/moodlehq/moodle-local_moodlecheck) and [moodle-local_ci](https://github.com/moodlehq/moodle-local_ci) versions.
+- Updated version of [moodle-local_codechecker](https://github.com/moodlehq/moodle-local_codechecker) to v3.0.2.
 
 ## [3.1.0] - 2021-05-14
 ### Added

docs/CHANGELOG.md

@@ -76,7 +76,7 @@ public function testExecuteFail()
 } elseif (false) {
     $var = print_object(); // To verify moodle own sniff.
 
-}
+} // No EOL @ EOF on purpose to verify it's detected.
 EOT;
         $this->fs->dumpFile($this->pluginDir.'/fixable.php', $content);
 
@@ -88,7 +88,7 @@ public function testExecuteFail()
         $output = $this->getActualOutput();
         $this->assertRegExp('/E\.* 8\.* \/ 8 \(100%\)/', $output);                  // Progress.
         $this->assertRegExp('/\/fixable.php/', $output);                            // File.
-        $this->assertRegExp('/ (4|5) ERRORS AND 2 WARNINGS AFFECTING 5 /', $output); // Summary (php70 shows one less)
+        $this->assertRegExp('/ (4|5) ERRORS AND 2 WARNINGS AFFECTING 6 /', $output); // Summary (php70 shows one less)
         $this->assertRegexp('/moodle\.Files\.BoilerplateComment\.Wrong/', $output); // Moodle sniff.
         $this->assertRegexp('/print_object\(\) is forbidden/', $output);            // Moodle sniff.
         $this->assertRegexp('/FunctionUse\.RemovedFunctions\.ldap_sort/', $output); // PHPCompatibility sniff.

tests/Command/CodeCheckerCommandTest.php

@@ -45,4 +45,4 @@ public function add($a, $b) {
         // Let's add them.
         return $a + $b;
     }
-}
+}

tests/Fixture/moodle-local_ci/classes/math.php

@@ -73,4 +73,4 @@ public function test_local_ci_math_class() {
         $this->assertEquals(2, $math->add(4, -2));
         $this->assertEquals(0, $math->add(-4, 4));
     }
-}
+}