Skip to content

Commit c13f9c0

Browse files
authored
Merge pull request #2122 from WordPress/feature/qa-dont-allow-cs-warnings
CS: minor tweaks/don't allow warnings
2 parents 20ce698 + 792a2b5 commit c13f9c0

File tree

3 files changed

+4
-16
lines changed

3 files changed

+4
-16
lines changed

.github/workflows/ruleset-checks-sniffs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@ jobs:
6868
# WordPress Coding Standards.
6969
# @link https://github.com/WordPress/WordPress-Coding-Standards
7070
# @link http://pear.php.net/package/PHP_CodeSniffer/
71-
- name: Run PHPCS ignoring warnings
71+
- name: Check the code style of the PHP files
7272
id: phpcs
73-
run: vendor/bin/phpcs --runtime-set ignore_warnings_on_exit 1 --report-full --report-checkstyle=./phpcs-report.xml
73+
run: vendor/bin/phpcs --report-full --report-checkstyle=./phpcs-report.xml
7474

7575
- name: Show PHPCS results in PR
7676
if: ${{ always() && steps.phpcs.outcome == 'failure' }}
77-
run: cs2pr ./phpcs-report.xml --graceful-warnings
77+
run: cs2pr ./phpcs-report.xml
7878

7979
# Validate the Ruleset XML files.
8080
# @link http://xmlsoft.org/xmllint.html

WordPress/AbstractFunctionParameterSniff.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,5 @@ abstract public function process_parameters( $stackPtr, $group_name, $matched_co
106106
* @return int|void Integer stack pointer to skip forward or void to continue
107107
* normal file processing.
108108
*/
109-
public function process_no_parameters( $stackPtr, $group_name, $matched_content ) {
110-
return;
111-
}
112-
109+
public function process_no_parameters( $stackPtr, $group_name, $matched_content ) {}
113110
}

WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,6 @@ public function getErrorList( $testFile = '' ) {
7272
267 => 1,
7373
);
7474

75-
/*
76-
Uncomment when "$blank_line_check" parameter will be "true" by default.
77-
78-
$ret[29] += 1;
79-
$ret[33] = 1;
80-
$ret[36] = 1;
81-
$ret[38] = 1;
82-
*/
83-
8475
return $ret;
8576

8677
case 'ControlStructureSpacingUnitTest.2.inc':

0 commit comments

Comments
 (0)