Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ 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.2.2]
### Fixed
- Default: Faulty `phpmd.xml` include path, referencing Pimcore ruleset instead of default.

## [3.2.1]
### Fixed
- Drupal: Faulty `phpmd.xml` include path.
Expand Down
2 changes: 1 addition & 1 deletion templates/files/default/phpmd.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
xsi:schemaLocation="http://pmd.github.io/schema/ruleset/2.0.0 https://pmd.github.io/schema/ruleset_2_0_0.xsd">
<description>PHPMD</description>
<!--<exclude-pattern>path/to/exclude/*</exclude-pattern>-->
<rule ref="./vendor/youwe/testing-suite/config/pimcore/phpmd.xml" />
<rule ref="./vendor/youwe/testing-suite/config/default/phpmd.xml" />
</ruleset>
15 changes: 8 additions & 7 deletions templates/files/pimcore/.php-cs-fixer.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<?php

declare(strict_types=1);

/**
* PHP CS Fixer configuration for this project. For documentation @see https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/master/doc/config.rst
* PHP CS Fixer configuration for this project. For documentation
* @see https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/master/doc/config.rst
*/

$finder = PhpCsFixer\Finder::create() // @phpstan-ignore class.notFound (class lives in phar file and can't be seen)
declare(strict_types=1);

$finder = PhpCsFixer\Finder::create() // @phpstan-ignore class.notFound (class lives in phar file and can't be seen)
->in(__DIR__)
->exclude([
...require(__DIR__ . '/vendor/youwe/testing-suite/config/pimcore/php-cs-fixer/excludes.php'),
Expand All @@ -18,14 +19,14 @@
// example: 'autogenerated_content',
]);

$config = new PhpCsFixer\Config(); // @phpstan-ignore class.notFound (class lives in phar file and can't be seen)
return $config // @phpstan-ignore class.notFound (class lives in phar file and can't be seen)
$config = new PhpCsFixer\Config(); // @phpstan-ignore class.notFound (class lives in phar file and can't be seen)
return $config // @phpstan-ignore class.notFound (class lives in phar file and can't be seen)
->setRules(array_merge_recursive(
require(__DIR__ . '/vendor/youwe/testing-suite/config/pimcore/php-cs-fixer/rules.php'),
[
/**
* Add your application specific overrides here
* @see https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/master/doc/ruleSets/index.rst for available rule sets
* @see https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/master/doc/ruleSets/index.rst for available rules
* @see https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/master/doc/rules/index.rst for individual rules
*/

Expand Down
Loading