diff --git a/coder_sniffer/Drupal/ruleset.xml b/coder_sniffer/Drupal/ruleset.xml index ac74554e03d596a7bf21cd4c8c2ec83bec465b07..2eb97154926ccc6947b82146cadaa9fe4fa56cf5 100644 --- a/coder_sniffer/Drupal/ruleset.xml +++ b/coder_sniffer/Drupal/ruleset.xml @@ -121,11 +121,6 @@ <rule ref="PSR2.Namespaces.UseDeclaration" /> <rule ref="SlevomatCodingStandard.ControlStructures.RequireNullCoalesceOperator" /> - <rule ref="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses"> - <properties> - <property name="caseSensitive" value="true"/> - </properties> - </rule> <rule ref="SlevomatCodingStandard.PHP.ShortList" /> <rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes"> <exclude name="SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing"/> diff --git a/tests/Drupal/Classes/ClassCreateInstanceUnitTest.inc.fixed b/tests/Drupal/Classes/ClassCreateInstanceUnitTest.inc.fixed index 41618cb4a7841324e58124deca9f3b527a3353d8..09663bcd2a6c99e5b5027368d87dbc65c985cba9 100644 --- a/tests/Drupal/Classes/ClassCreateInstanceUnitTest.inc.fixed +++ b/tests/Drupal/Classes/ClassCreateInstanceUnitTest.inc.fixed @@ -1,7 +1,7 @@ <?php -use Vendor\DateTools; use Vendor\DateTools\DateInterval; +use Vendor\DateTools; $x = array(new Foo(), array()); $y = new Foo(); diff --git a/tests/Drupal/Classes/FullyQualifiedNamespaceUnitTest.inc.fixed b/tests/Drupal/Classes/FullyQualifiedNamespaceUnitTest.inc.fixed index 93fe2e4efc2d9ca764cb9cf962793ddf1da9b561..004f9eaa5d3d7684e30efe756a2e0287c2b48bc1 100644 --- a/tests/Drupal/Classes/FullyQualifiedNamespaceUnitTest.inc.fixed +++ b/tests/Drupal/Classes/FullyQualifiedNamespaceUnitTest.inc.fixed @@ -5,12 +5,12 @@ * Example. */ -use Test\Alias as TestAlias; -use Test\Bar; -use Test\Foo; -use Test\MultiLine as MultiLineAlias; use Test\MultiLineSecond; +use Test\Foo; use Test\NotUsed; +use Test\Bar; +use Test\Alias as TestAlias; +use Test\MultiLine as MultiLineAlias; /** * Example. diff --git a/tests/Drupal/Classes/UnusedUseStatementUnitTest.inc.fixed b/tests/Drupal/Classes/UnusedUseStatementUnitTest.inc.fixed index 89eefadaadb7509c614280aefafc87422da91a75..2c62051894b8f078dd39088f8d4a83f7b833fa42 100644 --- a/tests/Drupal/Classes/UnusedUseStatementUnitTest.inc.fixed +++ b/tests/Drupal/Classes/UnusedUseStatementUnitTest.inc.fixed @@ -2,12 +2,12 @@ namespace MyNamespace\Depth; -use Example\MyUrlHelper; -use MyNamespace\Depth\SomeClass as CoreSomeClass; +use Thing\NotUsed; +use Thing\Fail\ActuallyUsed; use Test\TraitTest; use Thing\DifferentName as UsedOtherName; -use Thing\Fail\ActuallyUsed; -use Thing\NotUsed; +use Example\MyUrlHelper; +use MyNamespace\Depth\SomeClass as CoreSomeClass; /** * Bla. diff --git a/tests/Drupal/Classes/UseGlobalClassUnitTest.inc.fixed b/tests/Drupal/Classes/UseGlobalClassUnitTest.inc.fixed index c46e66e98d255247bb5a4b7fc10eb255a132ba4a..a1518555eb78850ac19b4cf53a650a1b714609ea 100644 --- a/tests/Drupal/Classes/UseGlobalClassUnitTest.inc.fixed +++ b/tests/Drupal/Classes/UseGlobalClassUnitTest.inc.fixed @@ -5,9 +5,9 @@ * Example. */ -use Namespaced\MultiLine2 as MultiLineAlias2; use Namespaced\TestClass; use Namespaced\TestClassSecond as NamespacedAlias; +use Namespaced\MultiLine2 as MultiLineAlias2; use function count; /**