Updated coding standard

Author: ondrejmirtes

build.xml

@@ -41,11 +41,9 @@
 				passthru="true"
 				checkreturn="true"
 		>
-			<arg value="--standard=ruleset.xml"/>
 			<arg value="--extensions=php"/>
 			<arg value="--encoding=utf-8"/>
 			<arg value="--tab-width=4"/>
-			<arg value="--ignore=tests/*/data"/>
 			<arg value="-sp"/>
 			<arg path="src"/>
 			<arg path="tests"/>
@@ -59,11 +57,9 @@
 				passthru="true"
 				checkreturn="true"
 		>
-			<arg value="--standard=ruleset.xml"/>
 			<arg value="--extensions=php"/>
 			<arg value="--encoding=utf-8"/>
 			<arg value="--tab-width=4"/>
-			<arg value="--ignore=tests/*/data"/>
 			<arg value="-sp"/>
 			<arg path="src"/>
 			<arg path="tests"/>

composer.json

@@ -16,13 +16,14 @@
 		"doctrine/orm": "^2.5"
 	},
 	"require-dev": {
-		"consistence/coding-standard": "~0.13.0",
-		"jakub-onderka/php-parallel-lint": "^0.9.2",
+		"consistence/coding-standard": "^3.0.1",
+		"dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
+		"jakub-onderka/php-parallel-lint": "^1.0",
 		"phing/phing": "^2.16.0",
 		"phpstan/phpstan-phpunit": "^0.10",
 		"phpstan/phpstan-strict-rules": "^0.10",
 		"phpunit/phpunit": "^7.0",
-		"slevomat/coding-standard": "^2.0"
+		"slevomat/coding-standard": "^4.5.2"
 	},
 	"autoload": {
 		"psr-4": {

phpcs.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<ruleset name="PHPStan Doctrine">
+	<rule ref="vendor/consistence/coding-standard/Consistence/ruleset.xml">
+		<exclude name="Squiz.Functions.GlobalFunction.Found"/>
+		<exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameAfterKeyword"/>
+		<exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameInAnnotation"/>
+		<exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedExceptions"/>
+		<exclude name="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly"/>
+	</rule>
+	<rule ref="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses">
+		<properties>
+			<property name="caseSensitive" value="false"/>
+		</properties>
+	</rule>
+	<rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes">
+		<properties>
+			<property name="newlinesCountBetweenOpenTagAndDeclare" value="0"/>
+		</properties>
+	</rule>
+	<rule ref="SlevomatCodingStandard.TypeHints.TypeHintDeclaration">
+		<properties>
+			<property name="usefulAnnotations" type="array" value="
+				@dataProvider,
+				@requires
+			"/>
+		</properties>
+	</rule>
+	<rule ref="SlevomatCodingStandard.ControlStructures.AssignmentInCondition"/>
+	<rule ref="SlevomatCodingStandard.ControlStructures.DisallowEqualOperators"/>
+	<rule ref="SlevomatCodingStandard.ControlStructures.EarlyExit"/>
+	<rule ref="SlevomatCodingStandard.Classes.SuperfluousAbstractClassNaming"/>
+	<rule ref="SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming"/>
+	<!-- <rule ref="SlevomatCodingStandard.ControlStructures.DisallowShortTernaryOperator"/>-->
+	<!-- <rule ref="SlevomatCodingStandard.Namespaces.RequireOneNamespaceInFile"/> -->
+	<!-- <rule ref="SlevomatCodingStandard.PHP.ShortList"/> -->
+	<rule ref="SlevomatCodingStandard.Files.TypeNameMatchesFileName">
+		<properties>
+			<property name="rootNamespaces" type="array" value="src=>PHPStan,tests=>PHPStan"/>
+		</properties>
+	</rule>
+	<exclude-pattern>tests/*/data</exclude-pattern>
+</ruleset>

phpstan.neon

@@ -2,4 +2,3 @@ includes:
 	- vendor/phpstan/phpstan-strict-rules/rules.neon
 	- vendor/phpstan/phpstan-phpunit/extension.neon
 	- vendor/phpstan/phpstan-phpunit/rules.neon
-	- vendor/phpstan/phpstan-phpunit/strictRules.neon

ruleset.xml

@@ -12,9 +12,7 @@
 class EntityManagerGetRepositoryDynamicReturnTypeExtension implements \PHPStan\Type\DynamicMethodReturnTypeExtension
 {
 
-	/**
-	 * @var string
-	 */
+	/** @var string */
 	private $repositoryClass;
 
 	public function __construct(string $repositoryClass)

src/Type/Doctrine/EntityManagerGetRepositoryDynamicReturnTypeExtension.php

@@ -7,9 +7,7 @@
 class EntityRepositoryType extends ObjectType
 {
 
-	/**
-	 * @var string
-	 */
+	/** @var string */
 	private $entityClass;
 
 	public function __construct(string $entityClass, string $repositoryClass)

src/Type/Doctrine/EntityRepositoryType.php

@@ -1,8 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace Tests\PHPStan\Reflection\Doctrine;
-
-use PHPStan\Reflection\Doctrine\DoctrineSelectableClassReflectionExtension;
+namespace PHPStan\Reflection\Doctrine;
 
 final class DoctrineSelectableClassReflectionExtensionTest extends \PHPStan\Testing\TestCase
 {

tests/PHPStan/Reflection/Doctrine/DoctrineSelectableClassReflectionExtensionTest.php renamed to tests/Reflection/Doctrine/DoctrineSelectableClassReflectionExtensionTest.php

@@ -1,12 +1,11 @@
 <?php declare(strict_types = 1);
 
-namespace Tests\PHPStan\Type\Doctrine;
+namespace PHPStan\Type\Doctrine;
 
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
-use PHPStan\Type\Doctrine\DoctrineSelectableDynamicReturnTypeExtension;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use PHPUnit\Framework\TestCase;