diff --git a/CHANGELOG.md b/CHANGELOG.md index a2485ba..d55e72f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,16 @@ 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). +## [3.0.3] +### Changed +- Magento phpmd.xml loosened some rules to be more inline with what is 'normal' in Magento. + - Added exclude patterns for *.phtml + - Added exclude for UnusedFormalParameter to allow unused parameters in a function + - Added exception for short variable name for $id + - PHPCS Excluded Magento2.Annotation.MethodAnnotationStructure.MethodAnnotation +### Fixed +- Updated property for LongVariable did not work. + ## [3.0.2] ### Changed - Constraint for `bitexpert/phpstan-magento` from '~0.30' to '>=0.30' to allow for installing newer PHPStan versions when needed. diff --git a/config/default/phpmd.xml b/config/default/phpmd.xml index e5b0135..3b4f75f 100644 --- a/config/default/phpmd.xml +++ b/config/default/phpmd.xml @@ -16,6 +16,8 @@ + + @@ -30,4 +32,4 @@ - \ No newline at end of file + diff --git a/config/magento2/phpmd.xml b/config/magento2/phpmd.xml index 51e4c08..aa93efa 100644 --- a/config/magento2/phpmd.xml +++ b/config/magento2/phpmd.xml @@ -18,10 +18,17 @@ - - - + + + + + + + + + + @@ -29,17 +36,20 @@ - - - - + + + + + + + - \ No newline at end of file + diff --git a/config/magento2/ruleset.xml b/config/magento2/ruleset.xml index 1222edc..0e07ddf 100644 --- a/config/magento2/ruleset.xml +++ b/config/magento2/ruleset.xml @@ -2,12 +2,20 @@ Youwe coding standard extensions for sniffing code in Magento 2 projects. + *.phtml + ./app/etc/config.php + /.ddev/* + ./env-dev.php + ./tests/* + + + diff --git a/templates/files/drupal/phpcs.xml b/templates/files/drupal/phpcs.xml index 5b89341..a30dea4 100644 --- a/templates/files/drupal/phpcs.xml +++ b/templates/files/drupal/phpcs.xml @@ -5,9 +5,9 @@ xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd" xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd"> PHPCS - + - \ No newline at end of file + diff --git a/templates/files/magento2/phpcs.xml b/templates/files/magento2/phpcs.xml index fdaf1b5..d8159f5 100644 --- a/templates/files/magento2/phpcs.xml +++ b/templates/files/magento2/phpcs.xml @@ -5,14 +5,7 @@ xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd" xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd"> PHPCS - + - - - app/etc/config.php - env-dev.php - deploy.php - pub/errors/* - .ddev