Use a single line spacing between class members and functions

rajyan · Jun 2, 2022 · 86cf1e5 · 86cf1e5
1 parent a6a4df6
commit 86cf1e5
Show file tree

Hide file tree

Showing 20 changed files with 13 additions and 34 deletions.
diff --git a/phpcs.xml b/phpcs.xml
@@ -96,6 +96,17 @@
 			</property>
 		</properties>
 	</rule>
+	<rule ref="SlevomatCodingStandard.Classes.ClassMemberSpacing">
+		<properties>
+			<property name="linesCountBetweenMembers" value="1"/>
+		</properties>
+	</rule>
+	<rule ref="SlevomatCodingStandard.Classes.MethodSpacing">
+		<properties>
+			<property name="minLinesCount" value="1"/>
+			<property name="maxLinesCount" value="1"/>
+		</properties>
+	</rule>
 	<rule ref="SlevomatCodingStandard.Classes.ModernClassNameReference"/>
 	<rule ref="SlevomatCodingStandard.Functions.StaticClosure"/>
 	<rule ref="SlevomatCodingStandard.Operators.DisallowEqualOperators"/>
@@ -124,13 +135,6 @@
 	<rule ref="SlevomatCodingStandard.Namespaces.UseSpacing"/>
 	<rule ref="SlevomatCodingStandard.PHP.UselessSemicolon"/>
 	<rule ref="SlevomatCodingStandard.PHP.UselessParentheses"/>
-	<rule ref="Squiz.WhiteSpace.FunctionSpacing">
-		<properties>
-			<property name="spacing" value="1" />
-			<property name="spacingBeforeFirst" value="1"/>
-			<property name="spacingAfterLast" value="1"/>
-		</properties>
-	</rule>
 	<rule ref="PSR1.Methods.CamelCapsMethodName.NotCamelCaps">
 		<exclude-pattern>src/Reflection/BetterReflection/SourceLocator/AutoloadSourceLocator.php</exclude-pattern>
 	</rule>

diff --git a/src/Node/ClassMethod.php b/src/Node/ClassMethod.php
@@ -12,7 +12,6 @@ public function __construct(
 	{
 	}
 
-
 	public function getNode(): \PhpParser\Node\Stmt\ClassMethod
 	{
 		return $this->node;

diff --git a/src/Reflection/ParametersAcceptorSelector.php b/src/Reflection/ParametersAcceptorSelector.php
@@ -226,6 +226,7 @@ private static function hasTemplateOrLateResolvableType(Type $type): bool
 
 		return $has;
 	}
+
 	/**
 	 * @param array<int|string, Type> $types
 	 * @param ParametersAcceptor[] $parametersAcceptors

diff --git a/src/Rules/Methods/StaticMethodCallCheck.php b/src/Rules/Methods/StaticMethodCallCheck.php
@@ -44,6 +44,7 @@ public function __construct(
 	)
 	{
 	}
+
 	/**
 	 * @param Name|Expr $class
 	 * @return array{RuleError[], MethodReflection|null}

diff --git a/src/Rules/Operators/InvalidAssignVarRule.php b/src/Rules/Operators/InvalidAssignVarRule.php
@@ -58,7 +58,6 @@ public function processNode(Node $node, Scope $scope): array
 		return [];
 	}
 
-
 	private function containsNonAssignableExpression(Expr $expr): bool
 	{
 		if ($expr instanceof Expr\Variable) {

diff --git a/src/Type/Constant/ConstantIntegerType.php b/src/Type/Constant/ConstantIntegerType.php
@@ -32,7 +32,6 @@ public function getValue(): int
 		return $this->value;
 	}
 
-
 	public function isSuperTypeOf(Type $type): TrinaryLogic
 	{
 		if ($type instanceof self) {

diff --git a/src/Type/IntegerRangeType.php b/src/Type/IntegerRangeType.php
@@ -146,19 +146,16 @@ public function getMin(): ?int
 		return $this->min;
 	}
 
-
 	public function getMax(): ?int
 	{
 		return $this->max;
 	}
 
-
 	public function describe(VerbosityLevel $level): string
 	{
 		return sprintf('int<%s, %s>', $this->min ?? 'min', $this->max ?? 'max');
 	}
 
-
 	public function shift(int $amount): Type
 	{
 		if ($amount === 0) {
@@ -193,7 +190,6 @@ public function shift(int $amount): Type
 		return self::fromInterval($min, $max);
 	}
 
-
 	public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 	{
 		if ($type instanceof parent) {
@@ -207,7 +203,6 @@ public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-
 	public function isSuperTypeOf(Type $type): TrinaryLogic
 	{
 		if ($type instanceof self || $type instanceof ConstantIntegerType) {
@@ -267,7 +262,6 @@ public function equals(Type $type): bool
 		return $type instanceof self && $this->min === $type->min && $this->max === $type->max;
 	}
 
-
 	public function generalize(GeneralizePrecision $precision): Type
 	{
 		return new parent();

diff --git a/src/Type/JustNullableTypeTrait.php b/src/Type/JustNullableTypeTrait.php
@@ -29,7 +29,6 @@ public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-
 	public function isSuperTypeOf(Type $type): TrinaryLogic
 	{
 		if ($type instanceof self) {

diff --git a/src/Type/ObjectWithoutClassType.php b/src/Type/ObjectWithoutClassType.php
@@ -146,7 +146,6 @@ public function getSubtractedType(): ?Type
 		return $this->subtractedType;
 	}
 
-
 	public function traverse(callable $cb): Type
 	{
 		$subtractedType = $this->subtractedType !== null ? $cb($this->subtractedType) : null;

diff --git a/src/Type/Php/FilterVarDynamicReturnTypeExtension.php b/src/Type/Php/FilterVarDynamicReturnTypeExtension.php
@@ -153,7 +153,6 @@ public function getTypeFromFunctionCall(
 		return $type;
 	}
 
-
 	private function determineExactType(Type $in, int $filterValue): ?Type
 	{
 		if (($filterValue === $this->getConstant('FILTER_VALIDATE_BOOLEAN') && $in instanceof BooleanType)
@@ -208,7 +207,6 @@ private function getDefault(Node\Arg $expression, Scope $scope): ?Type
 		return null;
 	}
 
-
 	private function hasFlag(int $flag, ?Node\Arg $expression, Scope $scope): bool
 	{
 		if ($expression === null) {

diff --git a/src/Type/Php/IsArrayFunctionTypeSpecifyingExtension.php b/src/Type/Php/IsArrayFunctionTypeSpecifyingExtension.php
@@ -24,7 +24,6 @@ public function __construct(private bool $explicitMixed)
 	{
 	}
 
-
 	public function isFunctionSupported(FunctionReflection $functionReflection, FuncCall $node, TypeSpecifierContext $context): bool
 	{
 		return strtolower($functionReflection->getName()) === 'is_array'

diff --git a/src/Type/Php/SimpleXMLElementClassPropertyReflectionExtension.php b/src/Type/Php/SimpleXMLElementClassPropertyReflectionExtension.php
@@ -18,7 +18,6 @@ public function hasProperty(ClassReflection $classReflection, string $propertyNa
 		return $classReflection->getName() === 'SimpleXMLElement' || $classReflection->isSubclassOf('SimpleXMLElement');
 	}
 
-
 	public function getProperty(ClassReflection $classReflection, string $propertyName): PropertyReflection
 	{
 		return new SimpleXMLElementProperty($classReflection, new BenevolentUnionType([new ObjectType($classReflection->getName()), new NullType()]));

diff --git a/tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php b/tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php
@@ -6896,7 +6896,6 @@ public function dataWhileLoopVariables(): array
 		];
 	}
 
-
 	public function dataForLoopVariables(): array
 	{
 		return [
@@ -6933,8 +6932,6 @@ public function dataForLoopVariables(): array
 		];
 	}
 
-
-
 	/**
 	 * @dataProvider dataLoopVariables
 	 * @dataProvider dataForeachLoopVariables

diff --git a/tests/PHPStan/Command/ErrorFormatter/BaselineNeonErrorFormatterTest.php b/tests/PHPStan/Command/ErrorFormatter/BaselineNeonErrorFormatterTest.php
@@ -135,7 +135,6 @@ public function testFormatErrors(
 		$this->assertSame(trim(Neon::encode(['parameters' => ['ignoreErrors' => $expected]], Neon::BLOCK)), trim($this->getOutputContent()), sprintf('%s: output do not match', $message));
 	}
 
-
 	public function testFormatErrorMessagesRegexEscape(): void
 	{
 		$formatter = new BaselineNeonErrorFormatter(new SimpleRelativePathHelper(self::DIRECTORY_PATH));

diff --git a/tests/PHPStan/Rules/Arrays/OffsetAccessAssignmentRuleTest.php b/tests/PHPStan/Rules/Arrays/OffsetAccessAssignmentRuleTest.php
@@ -129,7 +129,6 @@ public function testAssignNewOffsetToStubbedClass(): void
 		$this->analyse([__DIR__ . '/data/new-offset-stub.php'], []);
 	}
 
-
 	public function testRuleWithNullsafeVariant(): void
 	{
 		if (PHP_VERSION_ID < 80000) {

diff --git a/tests/PHPStan/Rules/Comparison/ElseIfConstantConditionRuleTest.php b/tests/PHPStan/Rules/Comparison/ElseIfConstantConditionRuleTest.php
@@ -34,7 +34,6 @@ protected function shouldTreatPhpDocTypesAsCertain(): bool
 		return $this->treatPhpDocTypesAsCertain;
 	}
 
-
 	public function testRule(): void
 	{
 		$this->treatPhpDocTypesAsCertain = true;

diff --git a/tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php b/tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php
@@ -420,7 +420,6 @@ public function testFputCsv(): void
 		]);
 	}
 
-
 	public function testPutCsvWithStringable(): void
 	{
 		if (PHP_VERSION_ID < 80000) {

diff --git a/tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php b/tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php
@@ -2418,7 +2418,6 @@ public function testGenericsInferCollectionLevel8(): void
 		]);
 	}
 
-
 	public function testBug6904(): void
 	{
 		if (PHP_VERSION_ID < 80100) {
@@ -2432,7 +2431,6 @@ public function testBug6904(): void
 		$this->analyse([__DIR__ . '/data/bug-6904.php'], []);
 	}
 
-
 	public function testBug6917(): void
 	{
 		$this->checkThisOnly = false;
@@ -2469,7 +2467,6 @@ public function testUnresolvableParameter(): void
 		]);
 	}
 
-
 	public function testConditionalComplexTemplates(): void
 	{
 		$this->checkThisOnly = false;

diff --git a/tests/PHPStan/Rules/Methods/ReturnTypeRuleTest.php b/tests/PHPStan/Rules/Methods/ReturnTypeRuleTest.php
@@ -629,7 +629,6 @@ public function testBug6023(): void
 		$this->analyse([__DIR__ . '/data/bug-6023.php'], []);
 	}
 
-
 	public function testBug5065(): void
 	{
 		$this->checkExplicitMixed = false;

diff --git a/tests/PHPStan/Rules/Properties/AccessPropertiesRuleTest.php b/tests/PHPStan/Rules/Properties/AccessPropertiesRuleTest.php
@@ -673,7 +673,6 @@ public function testBug4808(): void
 		$this->analyse([__DIR__ . '/data/bug-4808.php'], []);
 	}
 
-
 	public function testBug5868(): void
 	{
 		if (PHP_VERSION_ID < 80000) {