Start using rules from slevomat/coding-standard

mglaman · mglaman · commit a88d888a7341 · 2022-04-13T15:12:10.000-05:00
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -30,7 +30,7 @@ jobs:
       - name: "Install dependencies"
         run: "composer update --no-progress --prefer-dist"
       - name: "PHPCS"
-        run: "php vendor/bin/phpcs src"
+        run: "php vendor/bin/phpcs"
       - name: "PHPStan"
         run: "php vendor/bin/phpstan analyze"
   tests:
diff --git a/composer.json b/composer.json
@@ -25,6 +25,7 @@
         "phpstan/phpstan-deprecation-rules": "^1.0",
         "phpstan/phpstan-strict-rules": "^1.0",
         "phpunit/phpunit": "^6.5 || ^7.5 || ^8.0 || ^9",
+        "slevomat/coding-standard": "^7.1",
         "squizlabs/php_codesniffer": "^3.3",
         "symfony/phpunit-bridge": "^3.4.3 || ^4.4 || ^5.4 || ^6.0"
     },
diff --git a/phpcs.xml b/phpcs.xml
@@ -1,8 +1,26 @@
 <?xml version="1.0"?>
-<ruleset name="Modfied PSR2">
+<ruleset name="phpstan-drupal">
+	<config name="php_version" value="70400"/>
+	<arg name="colors"/>
+	<arg name="extensions" value="php"/>
+	<arg name="encoding" value="utf-8"/>
+	<arg name="ignore" value="tests/*/data" />
+	<file>src</file>
+	<!-- <file>tests/src</file> -->
 	<rule ref="PSR2"/>
 	<!-- The following rules should be kept excluded -->
 	<rule ref="Generic.Files.LineLength.TooLong">
 		<severity>0</severity>
 	</rule>
+	<rule ref="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses">
+		<properties>
+			<property name="caseSensitive" value="false"/>
+			<property name="psr12Compatible" value="true"/>
+		</properties>
+	</rule>
+	<rule ref="SlevomatCodingStandard.Namespaces.UnusedUses"/>
+	<rule ref="SlevomatCodingStandard.Namespaces.UselessAlias"/>
+	<rule ref="SlevomatCodingStandard.Namespaces.UseSpacing"/>
+	<rule ref="SlevomatCodingStandard.PHP.UselessSemicolon"/>
+	<rule ref="SlevomatCodingStandard.PHP.UselessParentheses"/>
 </ruleset>
diff --git a/src/Reflection/EntityFieldMethodsViaMagicReflectionExtension.php b/src/Reflection/EntityFieldMethodsViaMagicReflectionExtension.php
@@ -3,8 +3,8 @@
 namespace mglaman\PHPStanDrupal\Reflection;
 
 use PHPStan\Reflection\ClassReflection;
-use PHPStan\Reflection\MethodsClassReflectionExtension;
 use PHPStan\Reflection\MethodReflection;
+use PHPStan\Reflection\MethodsClassReflectionExtension;
 use PHPStan\Type\ObjectType;
 
 /**
diff --git a/src/Reflection/FieldItemListMethodReflection.php b/src/Reflection/FieldItemListMethodReflection.php
@@ -2,17 +2,11 @@
 
 namespace mglaman\PHPStanDrupal\Reflection;
 
-use Drupal\Core\Field\EntityReferenceFieldItemListInterface;
+use PHPStan\Reflection\ClassMemberReflection;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\MethodReflection;
-use PHPStan\Reflection\ClassMemberReflection;
-use PHPStan\Reflection\ReflectionProviderStaticAccessor;
 use PHPStan\Reflection\TrivialParametersAcceptor;
-use PHPStan\ShouldNotHappenException;
 use PHPStan\TrinaryLogic;
-use PHPStan\Type\NullType;
-use PHPStan\Type\ObjectType;
-use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
 
 /**
@@ -21,11 +15,9 @@
 class FieldItemListMethodReflection implements MethodReflection
 {
 
-    /** @var ClassReflection */
-    private $declaringClass;
+    private ClassReflection $declaringClass;
 
-    /** @var string */
-    private $methodName;
+    private string $methodName;
 
     public function __construct(ClassReflection $declaringClass, string $methodName)
     {
diff --git a/src/Rules/Classes/PluginManagerInspectionRule.php b/src/Rules/Classes/PluginManagerInspectionRule.php
@@ -6,7 +6,6 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Rules\Rule;
-use PHPStan\ShouldNotHappenException;
 use PHPStan\Type\ObjectType;
 
 /**
diff --git a/src/Rules/Deprecations/AccessDeprecatedConstant.php b/src/Rules/Deprecations/AccessDeprecatedConstant.php
@@ -4,7 +4,6 @@
 
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
-use PHPStan\Broker\Broker;
 use PHPStan\Reflection\FunctionReflection;
 use PHPStan\Reflection\ReflectionProvider;
 
diff --git a/src/Rules/Deprecations/GetDeprecatedServiceRule.php b/src/Rules/Deprecations/GetDeprecatedServiceRule.php
@@ -2,10 +2,10 @@
 
 namespace mglaman\PHPStanDrupal\Rules\Deprecations;
 
-use PhpParser\Node;
-use PHPStan\Analyser\Scope;
 use mglaman\PHPStanDrupal\Drupal\DrupalServiceDefinition;
 use mglaman\PHPStanDrupal\Drupal\ServiceMap;
+use PhpParser\Node;
+use PHPStan\Analyser\Scope;
 use PHPStan\Rules\Rule;
 
 final class GetDeprecatedServiceRule implements Rule
diff --git a/src/Rules/Deprecations/PluginAnnotationContextDefinitionsRule.php b/src/Rules/Deprecations/PluginAnnotationContextDefinitionsRule.php
@@ -5,7 +5,6 @@
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\ClassReflection;
-use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\ShouldNotHappenException;
 
 final class PluginAnnotationContextDefinitionsRule extends DeprecatedAnnotationsRuleBase
diff --git a/src/Rules/Deprecations/StaticServiceDeprecatedServiceRule.php b/src/Rules/Deprecations/StaticServiceDeprecatedServiceRule.php
@@ -2,10 +2,10 @@
 
 namespace mglaman\PHPStanDrupal\Rules\Deprecations;
 
-use PhpParser\Node;
-use PHPStan\Analyser\Scope;
 use mglaman\PHPStanDrupal\Drupal\DrupalServiceDefinition;
 use mglaman\PHPStanDrupal\Drupal\ServiceMap;
+use PhpParser\Node;
+use PHPStan\Analyser\Scope;
 use PHPStan\Rules\Rule;
 
 final class StaticServiceDeprecatedServiceRule implements Rule
diff --git a/src/Rules/Drupal/RenderCallbackRule.php b/src/Rules/Drupal/RenderCallbackRule.php
@@ -19,11 +19,8 @@
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\ThisType;
 use PHPStan\Type\Type;
-use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\UnionType;
 use PHPStan\Type\VerbosityLevel;
-use Drupal\Core\Render\PlaceholderGeneratorInterface;
-use Drupal\Core\Render\RendererInterface;
 
 final class RenderCallbackRule implements Rule
 {
diff --git a/src/Type/ContainerDynamicReturnTypeExtension.php b/src/Type/ContainerDynamicReturnTypeExtension.php
@@ -2,12 +2,12 @@
 
 namespace mglaman\PHPStanDrupal\Type;
 
+use mglaman\PHPStanDrupal\Drupal\DrupalServiceDefinition;
+use mglaman\PHPStanDrupal\Drupal\ServiceMap;
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Scalar\String_;
 use PhpParser\Node\VariadicPlaceholder;
 use PHPStan\Analyser\Scope;
-use mglaman\PHPStanDrupal\Drupal\DrupalServiceDefinition;
-use mglaman\PHPStanDrupal\Drupal\ServiceMap;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\ShouldNotHappenException;
diff --git a/src/Type/DrupalClassResolverDynamicReturnTypeExtension.php b/src/Type/DrupalClassResolverDynamicReturnTypeExtension.php
@@ -3,8 +3,8 @@
 namespace mglaman\PHPStanDrupal\Type;
 
 use Drupal\Core\DependencyInjection\ClassResolverInterface;
-use PhpParser\Node\Expr\MethodCall;
 use mglaman\PHPStanDrupal\Drupal\ServiceMap;
+use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
diff --git a/src/Type/DrupalServiceDynamicReturnTypeExtension.php b/src/Type/DrupalServiceDynamicReturnTypeExtension.php
@@ -3,18 +3,16 @@
 namespace mglaman\PHPStanDrupal\Type;
 
 use Drupal;
+use mglaman\PHPStanDrupal\Drupal\DrupalServiceDefinition;
+use mglaman\PHPStanDrupal\Drupal\ServiceMap;
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Scalar\String_;
 use PhpParser\Node\VariadicPlaceholder;
 use PHPStan\Analyser\Scope;
-use mglaman\PHPStanDrupal\Drupal\DrupalServiceDefinition;
-use mglaman\PHPStanDrupal\Drupal\ServiceMap;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\Type\DynamicStaticMethodReturnTypeExtension;
-use PHPStan\Type\ObjectType;
-use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
 
 class DrupalServiceDynamicReturnTypeExtension implements DynamicStaticMethodReturnTypeExtension
diff --git a/src/Type/EntityAccessControlHandlerReturnTypeExtension.php b/src/Type/EntityAccessControlHandlerReturnTypeExtension.php
@@ -2,14 +2,11 @@
 
 namespace mglaman\PHPStanDrupal\Type;
 
-use Drupal\Core\Access\AccessibleInterface;
 use Drupal\Core\Access\AccessResultInterface;
 use Drupal\Core\Entity\EntityAccessControlHandlerInterface;
-use PhpParser\Node\Arg;
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
-use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Type\BooleanType;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
diff --git a/src/Type/EntityQuery/ConfigEntityQueryType.php b/src/Type/EntityQuery/ConfigEntityQueryType.php
@@ -2,8 +2,6 @@
 
 namespace mglaman\PHPStanDrupal\Type\EntityQuery;
 
-use PHPStan\Type\ObjectType;
-
 /**
  * Type used to represent an entity query instance for config entity query.
  */
diff --git a/src/Type/EntityQuery/ContentEntityQueryType.php b/src/Type/EntityQuery/ContentEntityQueryType.php
@@ -2,8 +2,6 @@
 
 namespace mglaman\PHPStanDrupal\Type\EntityQuery;
 
-use PHPStan\Type\ObjectType;
-
 /**
  * Type used to represent an entity query instance for content entity query.
  */
diff --git a/src/Type/EntityQuery/EntityQueryExecuteWithoutAccessCheckType.php b/src/Type/EntityQuery/EntityQueryExecuteWithoutAccessCheckType.php
@@ -6,8 +6,6 @@
 
 use PHPStan\Type\ArrayType;
 
-use PHPStan\Type\StringType;
-
 final class EntityQueryExecuteWithoutAccessCheckType extends ArrayType
 {
 
diff --git a/src/Type/EntityTypeManagerGetStorageDynamicReturnTypeExtension.php b/src/Type/EntityTypeManagerGetStorageDynamicReturnTypeExtension.php
@@ -2,20 +2,14 @@
 
 namespace mglaman\PHPStanDrupal\Type;
 
-use Drupal\Core\Config\Entity\ConfigEntityStorageInterface;
-use Drupal\Core\Entity\ContentEntityStorageInterface;
 use mglaman\PHPStanDrupal\Drupal\EntityDataRepository;
-use mglaman\PHPStanDrupal\Type\EntityStorage\ConfigEntityStorageType;
-use mglaman\PHPStanDrupal\Type\EntityStorage\ContentEntityStorageType;
 use mglaman\PHPStanDrupal\Type\EntityStorage\EntityStorageType;
 use PhpParser\Node\Expr\BinaryOp\Concat;
 use PhpParser\Node\Expr\MethodCall;
-use PhpParser\Node\Scalar\String_;
 use PhpParser\Node\VariadicPlaceholder;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
-use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
