Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve incompatibility between standards #9

Merged
merged 1 commit into from
Mar 15, 2023
Merged

Resolve incompatibility between standards #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## 2.1.1
### Fixed
- Resolve incompatibility with `PSR12.ControlStructures.ControlStructureSpacing` (from the `Youwe` standard) and `PSR2.ControlStructures.ControlStructureSpacing` (from the `Magento2` standard).
For details, see https://github.com/YouweGit/coding-standard-magento2/issues/6.

## 2.1.0
### Changed
- Youwe ruleset will not check .phtml files anymore and only uses the Magento2 coding standards to check files on `phpcs`.
Expand All @@ -13,7 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Composer package youwe/coding-standard which is now included in the Youwe coding standards for Magento 2.
- Comments for why the ruleset was added.
- Coding standards for phtml templates.
- Package [magento/magento-coding-standard](https://github.com/magento/magento-coding-standard) as a requirement.
- Package [magento/magento-coding-standard](https://github.com/magento/magento-coding-standard) as a requirement.
The version v25 is used as a base. If not compatible please update the `phpcs.xml` in project root.

### Removed
Expand Down
4 changes: 4 additions & 0 deletions src/YouweMagento2/ruleset.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@
Also most class properties are self-explanatory.
-->
<exclude name="Magento2.Commenting.ClassPropertyPHPDocFormatting" />

<!-- While we wait for https://github.com/magento/magento-coding-standard/pull/416 to be merged -->
<!-- See also https://github.com/YouweGit/coding-standard-magento2/issues/6 -->
<exclude name="PSR2.ControlStructures.ControlStructureSpacing" />
</rule>

<rule ref="Squiz.WhiteSpace.MemberVarSpacing" >
Expand Down