Skip to content

Commit d593b26

Browse files
committed
Added RequireMultiLineTernaryOperatorSniff to phpcs.xml
1 parent d239e45 commit d593b26

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

SlevomatCodingStandard/Sniffs/TypeHints/TypeHintDeclarationSniff.php

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,9 @@ private function checkParametersTypeHints(File $phpcsFile, int $functionPointer)
237237
} elseif ($this->definitionContainsJustTwoTypeHints($parameterTypeHintDefinition)) {
238238
if ($this->definitionContainsNullTypeHint($parameterTypeHintDefinition)) {
239239
$parameterTypeHintDefinitionParts = explode('|', $parameterTypeHintDefinition);
240-
$possibleParameterTypeHint = strtolower($parameterTypeHintDefinitionParts[0]) === 'null' ? $parameterTypeHintDefinitionParts[1] : $parameterTypeHintDefinitionParts[0];
240+
$possibleParameterTypeHint = strtolower($parameterTypeHintDefinitionParts[0]) === 'null'
241+
? $parameterTypeHintDefinitionParts[1]
242+
: $parameterTypeHintDefinitionParts[0];
241243
$nullableParameterTypeHint = true;
242244
if ($this->definitionContainsTraversableTypeHintSpeficication($possibleParameterTypeHint)) {
243245
$phpcsFile->addError(
@@ -297,7 +299,9 @@ private function checkParametersTypeHints(File $phpcsFile, int $functionPointer)
297299

298300
$phpcsFile->fixer->beginChangeset();
299301

300-
$parameterTypeHint = TypeHintHelper::isSimpleTypeHint($possibleParameterTypeHint) ? TypeHintHelper::convertLongSimpleTypeHintToShort($possibleParameterTypeHint) : $possibleParameterTypeHint;
302+
$parameterTypeHint = TypeHintHelper::isSimpleTypeHint($possibleParameterTypeHint)
303+
? TypeHintHelper::convertLongSimpleTypeHintToShort($possibleParameterTypeHint)
304+
: $possibleParameterTypeHint;
301305

302306
$tokens = $phpcsFile->getTokens();
303307
/** @var int $parameterPointer */
@@ -535,7 +539,9 @@ private function checkReturnTypeHints(File $phpcsFile, int $functionPointer): vo
535539
}
536540

537541
$phpcsFile->fixer->beginChangeset();
538-
$returnTypeHint = TypeHintHelper::isSimpleTypeHint($possibleReturnTypeHint) ? TypeHintHelper::convertLongSimpleTypeHintToShort($possibleReturnTypeHint) : $possibleReturnTypeHint;
542+
$returnTypeHint = TypeHintHelper::isSimpleTypeHint($possibleReturnTypeHint)
543+
? TypeHintHelper::convertLongSimpleTypeHintToShort($possibleReturnTypeHint)
544+
: $possibleReturnTypeHint;
539545
$phpcsFile->fixer->addContent($phpcsFile->getTokens()[$functionPointer]['parenthesis_closer'], sprintf(': %s%s', ($nullableReturnTypeHint ? '?' : ''), $returnTypeHint));
540546
$phpcsFile->fixer->endChangeset();
541547
}

build/phpcs.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,11 @@
7373
<rule ref="SlevomatCodingStandard.ControlStructures.DisallowContinueWithoutIntegerOperandInSwitch"/>
7474
<rule ref="SlevomatCodingStandard.ControlStructures.DisallowEqualOperators"/>
7575
<rule ref="SlevomatCodingStandard.ControlStructures.EarlyExit"/>
76+
<rule ref="SlevomatCodingStandard.ControlStructures.RequireMultiLineTernaryOperator">
77+
<properties>
78+
<property name="lineLengthLimit" value="180"/>
79+
</properties>
80+
</rule>
7681
<rule ref="SlevomatCodingStandard.ControlStructures.RequireNullCoalesceOperator"/>
7782
<rule ref="SlevomatCodingStandard.ControlStructures.RequireShortTernaryOperator"/>
7883
<rule ref="SlevomatCodingStandard.ControlStructures.RequireTernaryOperator"/>

0 commit comments

Comments
 (0)