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

Jump to bottom

Enhancement: Configure ordered_imports fixer #133

Merged
merged 1 commit into from
Jun 23, 2020
Merged

Enhancement: Configure ordered_imports fixer #133

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 13 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
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.1.0...main`][2.1.0...main].
For a full diff see [`2.2.0...main`][2.2.0...main].

## [`2.2.0`][2.2.0]

For a full diff see [`2.1.2...2.2.0`][2.1.2...2.2.0].

### Changed

* Configured `ordered_imports` fixer to group imports by kind ([#133]), by [@localheinz]

## [`2.1.0`][2.1.0]

Expand Down Expand Up @@ -67,6 +75,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
[1.1.3]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/1.1.3
[2.0.0]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/2.0.0
[2.1.0]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/2.1.0
[2.2.0]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/2.2.0

[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 @@ -75,14 +84,16 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
[1.1.2...1.1.3]: https://github.com/ergebnis/php-cs-fixer-config/compare/1.1.2...1.1.3
[1.1.3...2.0.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/1.1.3...2.0.0
[2.0.0...2.1.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/2.0.0...2.1.0
[2.1.0...main]: https://github.com/ergebnis/php-cs-fixer-config/compare/2.1.0...main
[2.1.2...2.2.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/2.1.2...2.2.0
[2.2.0...main]: https://github.com/ergebnis/php-cs-fixer-config/compare/2.2.0...main

[#3]: https://github.com/ergebnis/php-cs-fixer-config/pull/3
[#14]: https://github.com/ergebnis/php-cs-fixer-config/pull/14
[#17]: https://github.com/ergebnis/php-cs-fixer-config/pull/17
[#23]: https://github.com/ergebnis/php-cs-fixer-config/pull/23
[#50]: https://github.com/ergebnis/php-cs-fixer-config/pull/50
[#73]: https://github.com/ergebnis/php-cs-fixer-config/pull/73
[#133]: https://github.com/ergebnis/php-cs-fixer-config/pull/133

[@linuxjuggler]: https://github.com/linuxjuggler
[@localheinz]: https://github.com/localheinz
10 changes: 9 additions & 1 deletion src/RuleSet/Php71.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

namespace Ergebnis\PhpCsFixer\Config\RuleSet;

use PhpCsFixer\Fixer;

final class Php71 extends AbstractRuleSet
{
protected $name = 'ergebnis (PHP 7.1)';
Expand Down Expand Up @@ -212,7 +214,13 @@ final class Php71 extends AbstractRuleSet
'nullable_type_declaration_for_default_null_value' => true,
'object_operator_without_whitespace' => true,
'ordered_class_elements' => true,
'ordered_imports' => true,
'ordered_imports' => [
'imports_order' => [
Fixer\Import\OrderedImportsFixer::IMPORT_TYPE_CLASS,
Fixer\Import\OrderedImportsFixer::IMPORT_TYPE_CONST,
Fixer\Import\OrderedImportsFixer::IMPORT_TYPE_FUNCTION,
],
],
'ordered_interfaces' => true,
'php_unit_construct' => true,
'php_unit_dedicate_assert' => [
Expand Down
10 changes: 9 additions & 1 deletion src/RuleSet/Php73.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

namespace Ergebnis\PhpCsFixer\Config\RuleSet;

use PhpCsFixer\Fixer;

final class Php73 extends AbstractRuleSet
{
protected $name = 'ergebnis (PHP 7.3)';
Expand Down Expand Up @@ -212,7 +214,13 @@ final class Php73 extends AbstractRuleSet
'nullable_type_declaration_for_default_null_value' => true,
'object_operator_without_whitespace' => true,
'ordered_class_elements' => true,
'ordered_imports' => true,
'ordered_imports' => [
'imports_order' => [
Fixer\Import\OrderedImportsFixer::IMPORT_TYPE_CLASS,
Fixer\Import\OrderedImportsFixer::IMPORT_TYPE_CONST,
Fixer\Import\OrderedImportsFixer::IMPORT_TYPE_FUNCTION,
],
],
'ordered_interfaces' => true,
'php_unit_construct' => true,
'php_unit_dedicate_assert' => [
Expand Down
10 changes: 9 additions & 1 deletion test/Unit/RuleSet/Php71Test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

namespace Ergebnis\PhpCsFixer\Config\Test\Unit\RuleSet;

use PhpCsFixer\Fixer;

/**
* @internal
*
Expand Down Expand Up @@ -218,7 +220,13 @@ final class Php71Test extends AbstractRuleSetTestCase
'nullable_type_declaration_for_default_null_value' => true,
'object_operator_without_whitespace' => true,
'ordered_class_elements' => true,
'ordered_imports' => true,
'ordered_imports' => [
'imports_order' => [
Fixer\Import\OrderedImportsFixer::IMPORT_TYPE_CLASS,
Fixer\Import\OrderedImportsFixer::IMPORT_TYPE_CONST,
Fixer\Import\OrderedImportsFixer::IMPORT_TYPE_FUNCTION,
],
],
'ordered_interfaces' => true,
'php_unit_construct' => true,
'php_unit_dedicate_assert' => [
Expand Down
10 changes: 9 additions & 1 deletion test/Unit/RuleSet/Php73Test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

namespace Ergebnis\PhpCsFixer\Config\Test\Unit\RuleSet;

use PhpCsFixer\Fixer;

/**
* @internal
*
Expand Down Expand Up @@ -218,7 +220,13 @@ final class Php73Test extends AbstractRuleSetTestCase
'nullable_type_declaration_for_default_null_value' => true,
'object_operator_without_whitespace' => true,
'ordered_class_elements' => true,
'ordered_imports' => true,
'ordered_imports' => [
'imports_order' => [
Fixer\Import\OrderedImportsFixer::IMPORT_TYPE_CLASS,
Fixer\Import\OrderedImportsFixer::IMPORT_TYPE_CONST,
Fixer\Import\OrderedImportsFixer::IMPORT_TYPE_FUNCTION,
],
],
'ordered_interfaces' => true,
'php_unit_construct' => true,
'php_unit_dedicate_assert' => [
Expand Down