PhpUnitConstructFixer - multiple asserts bug

src/Fixer/PhpUnit/PhpUnitConstructFixer.php

@@ -203,14 +203,14 @@ $this->assertNotSame(null, $d);
         $firstParameterToken = $tokens[$sequenceIndexes[4]];
 
         if (!$firstParameterToken->isNativeConstant()) {
-            return null;
+            return $sequenceIndexes[4];
         }
 
         $sequenceIndexes[5] = $tokens->getNextMeaningfulToken($sequenceIndexes[4]);
 
         // return if first method argument is an expression, not value
         if (!$tokens[$sequenceIndexes[5]]->equals(',')) {
-            return null;
+            return $sequenceIndexes[5];
         }
 
         $tokens[$sequenceIndexes[2]] = new Token(array(T_STRING, $map[$firstParameterToken->getContent()]));

tests/Fixer/PhpUnit/PhpUnitConstructFixerTest.php

@@ -117,6 +117,14 @@ final class PhpUnitConstructFixerTest extends AbstractFixerTestCase
         "foo" . $bar#
     );',
             ),
+            array(
+                '<?php $this->assertSame("a", $a); $this->assertTrue($b);',
+                '<?php $this->assertSame("a", $a); $this->assertSame(true, $b);',
+            ),
+            array(
+                '<?php $this->assertSame(true || $a, $b); $this->assertTrue($c);',
+                '<?php $this->assertSame(true || $a, $b); $this->assertSame(true, $c);',
+            ),
         );
 
         return array_merge(