Skip to content

Commit d0bd783

Browse files
committed
Bump various dependencies
- moodle-cs 3.4.8
1 parent 07d0f27 commit d0bd783

File tree

5 files changed

+54
-36
lines changed

5 files changed

+54
-36
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
],
5656
"require": {
5757
"php": ">=7.4",
58-
"moodlehq/moodle-cs": "^3.4.7",
58+
"moodlehq/moodle-cs": "^3.4.8",
5959
"moodlehq/moodle-local_ci": "^1.0.30",
6060
"moodlehq/moodle-local_moodlecheck": "^1.3.2",
6161
"sebastian/phpcpd": "^6.0.3",

composer.lock

Lines changed: 33 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
99
The format of this change log follows the advice given at [Keep a CHANGELOG](http://keepachangelog.com).
1010

1111
## [Unreleased]
12+
### Changed
13+
- Updated project dependencies to current [moodle-cs v3.4.8](https://github.com/moodlehq/moodle-cs) release.
14+
1215
### Fixed
1316
- Fixed a problem with the `grunt` command running the `stylelint` tasks against the whole Moodle directory (including both core and other optional plugins installed). Now only the plugin being checked is effectively analysed.
1417

tests/Command/CodeCheckerCommandTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ abstract private function somefunc() { // To verify PHPCompatibility sniff.
9797
$this->assertMatchesRegularExpression('/E\.* 10\.* \/ 10 \(100%\)/', $output); // Progress.
9898
$this->assertMatchesRegularExpression('/\/fixable.php/', $output); // File.
9999
$this->assertMatchesRegularExpression('/ 11 ERRORS AND 1 WARNING AFFECTING 8 /', $output); // Summary.
100-
$this->assertMatchesRegularExpression('/moodle\.Files\.BoilerplateComment\.Wrong/', $output); // Moodle sniff.
100+
$this->assertMatchesRegularExpression('/BoilerplateComment\.NoBoilerplateComment/', $output); // Moodle sniff.
101101
$this->assertMatchesRegularExpression('/Expected MOODLE_INTERNAL check/', $output); // Moodle sniff.
102102
$this->assertMatchesRegularExpression('/print_error\(\) has been deprecated/', $output); // Moodle sniff.
103103
$this->assertMatchesRegularExpression('/Usage of ELSEIF not allowed; use ELSE IF/', $output); // Squiz sniff.
@@ -109,7 +109,7 @@ abstract private function somefunc() { // To verify PHPCompatibility sniff.
109109
$this->assertMatchesRegularExpression('/AbstractPrivateMethods\.Found/', $output); // PHPCompatibility sniff.
110110
$this->assertMatchesRegularExpression('/Opening brace must be the last content/', $output); // Generic sniff.
111111
$this->assertMatchesRegularExpression('/Files\.EndFileNewline\.NotFound/', $output); // Generic of file.
112-
$this->assertMatchesRegularExpression('/PHPCBF CAN FIX THE 3 MARKED SNIFF/', $output); // PHPCBF note.
112+
$this->assertMatchesRegularExpression('/PHPCBF CAN FIX THE 4 MARKED SNIFF/', $output); // PHPCBF note.
113113
$this->assertMatchesRegularExpression('/Time:.*Memory:/', $output); // Time.
114114

115115
// Also verify display info is correct.

tests/Command/CodeFixerCommandTest.php

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,28 @@ public function testExecute()
7878
$output = $commandTester->getDisplay();
7979
$this->assertMatchesRegularExpression('/F\.* 10\.* \/ 10 \(100%\)/', $output); // Progress.
8080
$this->assertMatchesRegularExpression('/\/fixable.php/', $output); // File.
81-
$this->assertMatchesRegularExpression('/A TOTAL OF 1 ERROR WERE FIXED IN 1 FILE/', $output); // Summary.
81+
$this->assertMatchesRegularExpression('/A TOTAL OF 2 ERRORS WERE FIXED IN 1 FILE/', $output); // Summary.
8282
$this->assertMatchesRegularExpression('/Time:.*Memory:/', $output); // Time.
8383

8484
// Also verify display info is correct.
8585
$this->assertMatchesRegularExpression('/RUN Code Beautifier and Fixer/', $commandTester->getDisplay());
8686

8787
$expected = <<<'EOT'
8888
<?php
89+
// This file is part of Moodle - https://moodle.org/
90+
//
91+
// Moodle is free software: you can redistribute it and/or modify
92+
// it under the terms of the GNU General Public License as published by
93+
// the Free Software Foundation, either version 3 of the License, or
94+
// (at your option) any later version.
95+
//
96+
// Moodle is distributed in the hope that it will be useful,
97+
// but WITHOUT ANY WARRANTY; without even the implied warranty of
98+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
99+
// GNU General Public License for more details.
100+
//
101+
// You should have received a copy of the GNU General Public License
102+
// along with Moodle. If not, see <https://www.gnu.org/licenses/>.
89103
90104
if (true) {
91105

0 commit comments

Comments
 (0)