Skip to content

Commit f4c7cbe

Browse files
stronk7stronk7
authored
Merge pull request #44 from junpataleta/MDLSITE-6594-revert
MDLSITE-6594 revert
2 parents f1f5538 + b429f5a commit f4c7cbe

File tree

4 files changed

+45
-45
lines changed

4 files changed

+45
-45
lines changed

‎CHANGELOG.md‎

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

88
## [Unreleased]
9+
### Revert
10+
- Revert the check for the only one-space rule before the assignment operator @ `Squiz.WhiteSpace.OperatorSpacing` as an interim solution while we revisit MDLSITE-6594.
911

1012
## [v3.3.2] - 2023-02-13
1113
### Added

‎moodle/Tests/MoodleStandardTest.php‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -704,49 +704,50 @@ public function test_squiz_operator_spacing() {
704704
// - line => array of contents for message / source problem matching.
705705
// - line => string of contents for message / source problem matching (only 1).
706706
$this->set_errors(array(
707-
7 => 0,
708-
8 => 'Expected 1 space before',
709-
9 => 'Expected 1 space after',
710-
10 => array('Expected 1 space before', 'Expected 1 space after'),
711-
11 => 'Expected 1 space before "=>"; 3 found',
712-
12 => 'Expected 1 space after "=>"; 3 found',
707+
6 => 0,
708+
7 => 'Expected 1 space before',
709+
8 => 'Expected 1 space after',
710+
9 => array('Expected 1 space before', 'Expected 1 space after'),
711+
10 => 0,
712+
11 => 'Expected 1 space after "=>"; 3 found',
713+
12 => 0,
713714
13 => 0,
714-
14 => 0,
715-
15 => 'Expected 1 space before',
716-
16 => 'Expected 1 space after',
717-
17 => array('Expected 1 space before', 'Expected 1 space after'),
718-
18 => 0,
719-
19 => 'Expected 1 space after "="; 2 found',
720-
20 => 'Expected 1 space before "="; 2 found',
715+
14 => 'Expected 1 space before',
716+
15 => 'Expected 1 space after',
717+
16 => array('Expected 1 space before', 'Expected 1 space after'),
718+
17 => 0,
719+
18 => 'Expected 1 space after "="; 2 found',
720+
19 => 0,
721+
20 => 0,
721722
21 => 0,
722-
22 => 0,
723-
23 => 'Expected 1 space before',
724-
24 => 'Expected 1 space after',
725-
25 => array('Expected 1 space before', 'Expected 1 space after'),
726-
26 => 0,
727-
27 => 'Expected 1 space after "+"; 2 found',
728-
28 => 'Expected 1 space before "+"; 2 found',
729-
29 => 0,
730-
30 => 'Expected 1 space before',
731-
31 => 'Expected 1 space after',
732-
32 => array('Expected 1 space before', 'Expected 1 space after'),
733-
33 => 0,
734-
34 => 'Expected 1 space after "-"; 2 found',
735-
35 => 'Expected 1 space before "-"; 2 found',
736-
36 => 0,
737-
37 => 'Expected 1 space before',
738-
38 => 'Expected 1 space after',
739-
39 => array('Expected 1 space before', 'Expected 1 space after'),
740-
40 => 0,
741-
41 => 'Expected 1 space after "*"; 2 found',
742-
42 => 'Expected 1 space before "*"; 2 found',
743-
43 => 0,
744-
44 => 'Expected 1 space before',
745-
45 => 'Expected 1 space after',
746-
46 => array('Expected 1 space before', 'Expected 1 space after'),
747-
47 => 0,
748-
48 => 'Expected 1 space after "/"; 2 found',
749-
49 => 'Expected 1 space before "/"; 2 found',
723+
22 => 'Expected 1 space before',
724+
23 => 'Expected 1 space after',
725+
24 => array('Expected 1 space before', 'Expected 1 space after'),
726+
25 => 0,
727+
26 => 'Expected 1 space after "+"; 2 found',
728+
27 => 'Expected 1 space before "+"; 2 found',
729+
28 => 0,
730+
29 => 'Expected 1 space before',
731+
30 => 'Expected 1 space after',
732+
31 => array('Expected 1 space before', 'Expected 1 space after'),
733+
32 => 0,
734+
33 => 'Expected 1 space after "-"; 2 found',
735+
34 => 'Expected 1 space before "-"; 2 found',
736+
35 => 0,
737+
36 => 'Expected 1 space before',
738+
37 => 'Expected 1 space after',
739+
38 => array('Expected 1 space before', 'Expected 1 space after'),
740+
39 => 0,
741+
40 => 'Expected 1 space after "*"; 2 found',
742+
41 => 'Expected 1 space before "*"; 2 found',
743+
42 => 0,
744+
43 => 'Expected 1 space before',
745+
44 => 'Expected 1 space after',
746+
45 => array('Expected 1 space before', 'Expected 1 space after'),
747+
46 => 0,
748+
47 => 'Expected 1 space after "/"; 2 found',
749+
48 => 'Expected 1 space before "/"; 2 found',
750+
49 => 0,
750751
50 => 0,
751752
51 => 0,
752753
52 => 0,
@@ -760,8 +761,7 @@ public function test_squiz_operator_spacing() {
760761
60 => 0,
761762
61 => 0,
762763
62 => 0,
763-
63 => 0,
764-
64 => 0
764+
63 => 0
765765
));
766766
$this->set_warnings(array());
767767

‎moodle/Tests/fixtures/squiz_whitespace_operatorspacing.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
phpcs:set Squiz.WhiteSpace.OperatorSpacing ignoreNewlines true
2-
phpcs:set Squiz.WhiteSpace.OperatorSpacing ignoreSpacingBeforeAssignments false
32
<?php
43
defined('MOODLE_INTERNAL') || die(); // Make this always the 1st line in all CS fixtures.
54

‎moodle/ruleset.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@
7373
<rule ref="Squiz.WhiteSpace.OperatorSpacing">
7474
<properties>
7575
<property name="ignoreNewlines" value="true"/>
76-
<property name="ignoreSpacingBeforeAssignments" value="false" />
7776
</properties>
7877
</rule>
7978
<rule ref="Squiz.WhiteSpace.ObjectOperatorSpacing">

0 commit comments

Comments
 (0)