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

@@ -15,14 +15,15 @@
 		"dibi/dibi": "~3.0"
 	},
 	"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.13.0",
 		"phpstan/phpstan-phpunit": "^0.10",
 		"phpstan/phpstan-strict-rules": "^0.10",
 		"phpunit/phpunit": "^7.0",
 		"satooshi/php-coveralls": "^1.0",
-		"slevomat/coding-standard": "^2.0"
+		"slevomat/coding-standard": "^4.5.2"
 	},
 	"autoload": {
 		"psr-4": {

phpcs.xml

@@ -0,0 +1,48 @@
+<?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.TypeHints.TypeHintDeclaration.MissingTraversableReturnTypeHintSpecification">
+		<exclude-pattern>tests/*</exclude-pattern>
+	</rule>
+	<rule ref="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingTraversableParameterTypeHintSpecification">
+		<exclude-pattern>tests/*</exclude-pattern>
+	</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>

ruleset.xml

@@ -11,7 +11,7 @@ class DibiFluentClassReflectionExtensionTest extends \PHPStan\Testing\TestCase
 	/** @var \PHPStan\Reflection\Dibi\DibiFluentClassReflectionExtension */
 	private $extension;
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		$this->broker = $this->createBroker();
 		$this->extension = new DibiFluentClassReflectionExtension();
@@ -36,13 +36,13 @@ public function dataHasMethod(): array
 	 * @param string $className
 	 * @param bool $result
 	 */
-	public function testHasMethod(string $className, bool $result)
+	public function testHasMethod(string $className, bool $result): void
 	{
 		$classReflection = $this->broker->getClass($className);
 		self::assertSame($result, $this->extension->hasMethod($classReflection, 'select'));
 	}
 
-	public function testGetMethod()
+	public function testGetMethod(): void
 	{
 		$classReflection = $this->broker->getClass(\Dibi\Fluent::class);
 		$methodReflection = $this->extension->getMethod($classReflection, 'select');