Skip to content

Commit

Permalink
Merge pull request #247 from ergebnis/fix/heredoc-indentation
Browse files Browse the repository at this point in the history
Fix: Disable heredoc_indentation fixer
  • Loading branch information
ergebnis-bot authored Nov 10, 2020
2 parents 6019459 + d27789f commit fef2ad8
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 6 deletions.
15 changes: 13 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## Unreleased

For a full diff see [`2.5.2...main`][2.5.2...main].
For a full diff see [`2.5.3...main`][2.5.3...main].

## [`2.5.3`][2.5.3]

For a full diff see [`2.5.2...2.5.3`][2.5.2...2.5.3].

### Fixed

* Disabled `heredoc_indentaton` fixer ([#247]), by [@localheinz]

## [`2.5.2`][2.5.2]

Expand Down Expand Up @@ -139,6 +147,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
[2.5.0]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/2.5.0
[2.5.1]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/2.5.1
[2.5.2]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/2.5.2
[2.5.3]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/2.5.3

[d899e77...1.0.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/d899e77...1.0.0
[1.0.0...1.1.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/1.0.0...1.1.0
Expand All @@ -155,7 +164,8 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
[2.4.0...2.5.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/2.4.0...2.5.0
[2.5.0...2.5.1]: https://github.com/ergebnis/php-cs-fixer-config/compare/2.5.0...2.5.1
[2.5.1...2.5.2]: https://github.com/ergebnis/php-cs-fixer-config/compare/2.5.1...2.5.2
[2.5.2...main]: https://github.com/ergebnis/php-cs-fixer-config/compare/2.5.2...main
[2.5.2...2.5.3]: https://github.com/ergebnis/php-cs-fixer-config/compare/2.5.2...2.5.3
[2.5.3...main]: https://github.com/ergebnis/php-cs-fixer-config/compare/2.5.3...main

[#3]: https://github.com/ergebnis/php-cs-fixer-config/pull/3
[#14]: https://github.com/ergebnis/php-cs-fixer-config/pull/14
Expand All @@ -171,6 +181,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
[#220]: https://github.com/ergebnis/php-cs-fixer-config/pull/220
[#226]: https://github.com/ergebnis/php-cs-fixer-config/pull/226
[#241]: https://github.com/ergebnis/php-cs-fixer-config/pull/241
[#247]: https://github.com/ergebnis/php-cs-fixer-config/pull/247

[@dependabot]: https://github.com/apps/dependabot
[@linuxjuggler]: https://github.com/linuxjuggler
Expand Down
2 changes: 1 addition & 1 deletion src/RuleSet/Php73.php
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ final class Php73 extends AbstractRuleSet
'general_phpdoc_annotation_remove' => false,
'global_namespace_import' => false,
'header_comment' => false,
'heredoc_indentation' => true,
'heredoc_indentation' => false,
'heredoc_to_nowdoc' => true,
'implode_call' => true,
'include' => true,
Expand Down
2 changes: 1 addition & 1 deletion src/RuleSet/Php74.php
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ final class Php74 extends AbstractRuleSet
'general_phpdoc_annotation_remove' => false,
'global_namespace_import' => false,
'header_comment' => false,
'heredoc_indentation' => true,
'heredoc_indentation' => false,
'heredoc_to_nowdoc' => true,
'implode_call' => true,
'include' => true,
Expand Down
2 changes: 1 addition & 1 deletion test/Unit/RuleSet/Php73Test.php
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ final class Php73Test extends AbstractRuleSetTestCase
'general_phpdoc_annotation_remove' => false,
'global_namespace_import' => false,
'header_comment' => false,
'heredoc_indentation' => true,
'heredoc_indentation' => false,
'heredoc_to_nowdoc' => true,
'implode_call' => true,
'include' => true,
Expand Down
2 changes: 1 addition & 1 deletion test/Unit/RuleSet/Php74Test.php
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ final class Php74Test extends AbstractRuleSetTestCase
'general_phpdoc_annotation_remove' => false,
'global_namespace_import' => false,
'header_comment' => false,
'heredoc_indentation' => true,
'heredoc_indentation' => false,
'heredoc_to_nowdoc' => true,
'implode_call' => true,
'include' => true,
Expand Down

0 comments on commit fef2ad8

Please sign in to comment.