Improve use of ternary expressions

src/Libero/Sniffs/ControlStructures/RequireTernaryOperatorSniff.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Libero\CodingStandard\Libero\Sniffs\ControlStructures;
+
+use Exception;
+use PHP_CodeSniffer\Files\File;
+use SlevomatCodingStandard\Sniffs\ControlStructures\RequireTernaryOperatorSniff as BaseRequireTernaryOperatorSniff;
+use function strpos;
+
+// This is only present to catch exceptions.
+
+final class RequireTernaryOperatorSniff extends BaseRequireTernaryOperatorSniff
+{
+    public function process(File $phpcsFile, $stackPtr) : void
+    {
+        try {
+            parent::process($phpcsFile, $stackPtr);
+        } catch (Exception $e) {
+            if (false === strpos($e->getMessage(), 'without curly braces is not supported')) {
+                throw $e;
+            }
+        }
+    }
+}

src/Libero/ruleset.xml

@@ -91,6 +91,8 @@
     <rule ref="SlevomatCodingStandard.ControlStructures.LanguageConstructWithParentheses"/>
     <rule ref="SlevomatCodingStandard.ControlStructures.NewWithParentheses"/>
     <rule ref="SlevomatCodingStandard.ControlStructures.RequireNullCoalesceOperator"/>
+    <rule ref="SlevomatCodingStandard.ControlStructures.RequireShortTernaryOperator"/>
+    <rule ref="SlevomatCodingStandard.ControlStructures.UselessTernaryOperator"/>
     <rule ref="SlevomatCodingStandard.Functions.StaticClosure"/>
     <rule ref="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses"/>
     <rule ref="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly">

tests/cases/php/null-coalesce

@@ -32,11 +32,7 @@ $bar = $bar ?? 'bar';
 
 $bar = $bar['baz'] ?? 'baz';
 
-if (isset($foo)) {
-    $bar = $foo;
-} else {
-    $bar = 'foo';
-}
+$bar = $foo ?? 'foo';
 
 $fooBar = isset($foo, $bar) ? 'foo' : 'bar';
 

tests/cases/php/parentheses-useless

@@ -6,7 +6,7 @@ Parentheses must not be used unnecessarily
 declare(strict_types=1);
 
 $foo = ('bar');
-$baz = ($qux !== null) ? true : false;
+$baz = ($qux !== null) ? true : null;
 $quux = ($quuz) ? 1 : 0;
 $corge = (true || false) ? 0 : 1;
 
@@ -22,7 +22,7 @@ switch ($grault) {
 declare(strict_types=1);
 
 $foo = 'bar';
-$baz = $qux !== null ? true : false;
+$baz = $qux !== null ? true : null;
 $quux = $quuz ? 1 : 0;
 $corge = (true || false) ? 0 : 1;
 

tests/cases/php/ternary

@@ -0,0 +1,37 @@
+---DESCRIPTION---
+Ternary expressions should be used
+---CONTENTS---
+<?php
+
+declare(strict_types=1);
+
+$foo = static function ($bar) : string {
+    if ($bar) {
+        return $bar;
+    } else {
+        return 'baz';
+    }
+};
+
+$qux = static function ($quux) : string {
+    if ($quux) {
+        return 'quuz';
+    } else {
+        return 'corge';
+    }
+};
+
+---FIXED---
+<?php
+
+declare(strict_types=1);
+
+$foo = static function ($bar) : string {
+    return $bar ?: 'baz';
+};
+
+$qux = static function ($quux) : string {
+    return $quux ? 'quuz' : 'corge';
+};
+
+---

tests/cases/php/ternary-useless

@@ -0,0 +1,29 @@
+---DESCRIPTION---
+Ternary expressions must not be used unnecessarily
+---CONTENTS---
+<?php
+
+declare(strict_types=1);
+
+$foo = static function ($bar) : bool {
+    return $bar ? $bar : false;
+};
+
+$baz = static function ($qux) : bool {
+    return $qux === false ? false : true;
+};
+
+---FIXED---
+<?php
+
+declare(strict_types=1);
+
+$foo = static function ($bar) : bool {
+    return $bar ?: false;
+};
+
+$baz = static function ($qux) : bool {
+    return $qux !== false;
+};
+
+---