Merge branch '2.12' into 2.13

Author: keradus

src/Fixer/LanguageConstruct/IsNullFixer.php

@@ -136,12 +136,14 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
             $parentOperations = [T_IS_EQUAL, T_IS_NOT_EQUAL, T_IS_IDENTICAL, T_IS_NOT_IDENTICAL];
             $wrapIntoParentheses = $parentLeftToken->isGivenKind($parentOperations) || $parentRightToken->isGivenKind($parentOperations);
 
+            // possible trailing comma removed
+            $prevIndex = $tokens->getPrevMeaningfulToken($referenceEnd);
+            if ($tokens[$prevIndex]->equals(',')) {
+                $tokens->clearTokenAndMergeSurroundingWhitespace($prevIndex);
+            }
+
             if (!$isContainingDangerousConstructs) {
                 // closing parenthesis removed with leading spaces
-                $prevIndex = $tokens->getPrevMeaningfulToken($referenceEnd);
-                if ($tokens[$prevIndex]->equals(',')) {
-                    $tokens->clearTokenAndMergeSurroundingWhitespace($prevIndex);
-                }
                 $tokens->removeLeadingWhitespace($referenceEnd);
                 $tokens->clearAt($referenceEnd);
 

tests/Fixer/LanguageConstruct/IsNullFixerTest.php

@@ -224,7 +224,7 @@ public function provideFixCases()
                 '<?php if ((is_null($u) or $v) and ($w || is_null($x)) xor (!is_null($y) and $z)) echo "foo"; ?>',
             ],
 
-            // edge cases: contains dangerous constructs, wrapped into parentheses
+            // edge cases: $isContainingDangerousConstructs, $wrapIntoParentheses
             [
                 '<?php null === ($a ? $x : $y);',
                 '<?php is_null($a ? $x : $y);',
@@ -311,6 +311,20 @@ public function provideFix73Cases()
                 '<?php if ((null === $u or $v) and ($w || null === $x) xor (null !== $y and $z)) echo "foo"; ?>',
                 '<?php if ((is_null($u, ) or $v) and ($w || is_null($x, )) xor (!is_null($y, ) and $z)) echo "foo"; ?>',
             ],
+
+            // edge cases: $isContainingDangerousConstructs, $wrapIntoParentheses
+            [
+                '<?php null === ($a ? $x : $y );',
+                '<?php is_null($a ? $x : $y, );',
+            ],
+            [
+                '<?php $a === (null === $x);',
+                '<?php $a === is_null($x, );',
+            ],
+            [
+                '<?php $a === (null === ($a ? $x : $y ));',
+                '<?php $a === is_null($a ? $x : $y, );',
+            ],
         ];
     }
 }