Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 125b239

Browse files
author
Dan Wallis
authored
Resolve incompatibility between standards (#9)
1 parent 9a2b478 commit 125b239

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## 2.1.1
8+
### Fixed
9+
- Resolve incompatibility with `PSR12.ControlStructures.ControlStructureSpacing` (from the `Youwe` standard) and `PSR2.ControlStructures.ControlStructureSpacing` (from the `Magento2` standard).
10+
For details, see https://github.com/YouweGit/coding-standard-magento2/issues/6.
11+
712
## 2.1.0
813
### Changed
914
- Youwe ruleset will not check .phtml files anymore and only uses the Magento2 coding standards to check files on `phpcs`.
@@ -13,7 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1318
- Composer package youwe/coding-standard which is now included in the Youwe coding standards for Magento 2.
1419
- Comments for why the ruleset was added.
1520
- Coding standards for phtml templates.
16-
- Package [magento/magento-coding-standard](https://github.com/magento/magento-coding-standard) as a requirement.
21+
- Package [magento/magento-coding-standard](https://github.com/magento/magento-coding-standard) as a requirement.
1722
The version v25 is used as a base. If not compatible please update the `phpcs.xml` in project root.
1823

1924
### Removed

‎src/YouweMagento2/ruleset.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@
3838
Also most class properties are self-explanatory.
3939
-->
4040
<exclude name="Magento2.Commenting.ClassPropertyPHPDocFormatting" />
41+
42+
<!-- While we wait for https://github.com/magento/magento-coding-standard/pull/416 to be merged -->
43+
<!-- See also https://github.com/YouweGit/coding-standard-magento2/issues/6 -->
44+
<exclude name="PSR2.ControlStructures.ControlStructureSpacing" />
4145
</rule>
4246

4347
<rule ref="Squiz.WhiteSpace.MemberVarSpacing" >

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /