Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/testing-suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:

- name: Install Dependencies
run: |
git config --global --add safe.directory "*"
composer2 install --dev --prefer-dist --no-scripts --no-progress --optimize-autoloader --no-interaction -vvv
composer2 show
shell: bash
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Commit Message validator to validate the commit message adheres to the
[Conventional Commit Message structure](https://cheatography.com/albelop/cheat-sheets/conventional-commits/)
and that the commit message contains a Jira ticket number it relates to.
- Prevent installation of `phpro/grumphp-shim:2.18.0` to prevent error "symfony/cache" conflicts with extension `redis`
, see [github link](https://github.com/phpro/grumphp-shim/issues/30)

### Changed
- [BREAKING] The composer.json configurations `config.youwe-testing-suite.type` and `config.mediact-testing-suite.type`
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"php-cs-fixer/shim": "@stable",
"php-parallel-lint/php-parallel-lint": "^1.4",
"phpmd/phpmd": "^2.15 || 3.x-dev",
"phpro/grumphp-shim": "^2.15",
"phpro/grumphp-shim": "^2.15 !=2.18.0",
"phpstan/phpstan": "@stable",
"squizlabs/php_codesniffer": "^3.12.0",
"youwe/composer-dependency-installer": "^2.0",
Expand Down
14 changes: 12 additions & 2 deletions config/magento2/ruleset.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,15 @@
<!-- Use default Youwe coding standards for PHP projects. -->
<rule ref="../default" />
<!-- Magento coding standards -->
<rule ref="Magento2" />
</ruleset>
<rule ref="Magento2" >
<!-- Not all functions require doc blocks -->
<exclude name="Magento2.Annotation.MethodAnnotationStructure.NoCommentBlock"/>
<!-- Not all class properties require doc blocks -->
<exclude name="Magento2.Commenting.ClassPropertyPHPDocFormatting.Missing"/>
<!--
This conflicts with PSR12.ControlStructures.ControlStructureSpacing.FirstExpressionLine
Which is used when a line is too long.
-->
<exclude name="PSR2.ControlStructures.ControlStructureSpacing.SpacingAfterOpenBrace"/>
</rule>
</ruleset>