Merge 4b1fec1 into 78940dd

PHP-CS-Fixer · Jan 26, 2018 · a6e00ed · a6e00ed
2 parents 78940dd + 4b1fec1
commit a6e00ed
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 14 deletions.
diff --git a/circle.yml b/circle.yml
@@ -14,6 +14,7 @@ dependencies:
         - brew update
         - brew tap homebrew/homebrew-php
         - brew install php71
+        - echo "memory_limit = 512M" > /opt/circleci/php/$(phpenv global)/etc/conf.d/memory.ini
         - curl -sS https://getcomposer.org/installer | php
         - php composer.phar global show hirak/prestissimo -q || php composer.phar global require --no-interaction --no-progress --optimize-autoloader hirak/prestissimo
     override:

diff --git a/src/Fixer/ControlStructure/YodaStyleFixer.php b/src/Fixer/ControlStructure/YodaStyleFixer.php
@@ -136,6 +136,12 @@ private function findComparisonEnd(Tokens $tokens, $index)
         $count = count($tokens);
         while ($index < $count) {
             $token = $tokens[$index];
+            if ($token->isGivenKind([T_WHITESPACE, T_COMMENT, T_DOC_COMMENT])) {
+                ++$index;
+
+                continue;
+            }
+
             if ($this->isOfLowerPrecedence($token)) {
                 break;
             }
@@ -175,20 +181,32 @@ private function findComparisonEnd(Tokens $tokens, $index)
     private function findComparisonStart(Tokens $tokens, $index)
     {
         --$index;
+        $nonBlockFound = false;
+
         while (0 <= $index) {
             $token = $tokens[$index];
+            if ($token->isGivenKind([T_WHITESPACE, T_COMMENT, T_DOC_COMMENT])) {
+                --$index;
+
+                continue;
+            }
+
             if ($this->isOfLowerPrecedence($token)) {
                 break;
             }
 
             $block = Tokens::detectBlockType($token);
             if (null === $block) {
                 --$index;
+                $nonBlockFound = true;
 
                 continue;
             }
 
-            if ($block['isStart']) {
+            if (
+                $block['isStart']
+                || ($nonBlockFound && Tokens::BLOCK_TYPE_CURLY_BRACE === $block['type']) // closing of structure not related to the comparison
+            ) {
                 break;
             }
 
@@ -400,10 +418,6 @@ private function isListStatement(Tokens $tokens, $index, $end)
      */
     private function isOfLowerPrecedence(Token $token)
     {
-        if ($token->isGivenKind([T_WHITESPACE, T_COMMENT, T_DOC_COMMENT])) {
-            return false;
-        }
-
         static $tokens;
 
         if (null === $tokens) {

diff --git a/tests/Fixer/ControlStructure/YodaStyleFixerTest.php b/tests/Fixer/ControlStructure/YodaStyleFixerTest.php
@@ -211,7 +211,7 @@ public function provideFixCases()
             ['<?php $j = 2 * $myVar % 3 === $a;'],
             ['<?php return $k === 2 * $myVar % 3;'],
             ['<?php $l = $c > 2;'],
-            ['<?php return $this->myObject->{$index}+$b === "";'],
+            ['<?php return $this->myObject1->{$index}+$b === "";'],
             ['<?php return $m[2]+1 == 2;'],
             // https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/693
             ['<?php return array(2) == $o;'],
@@ -267,16 +267,20 @@ public function provideFixCases()
                 '<?php return $this->myArray[$index]->a === "";',
             ],
             [
-                '<?php return "" === $this->myObject->  {$index};',
-                '<?php return $this->myObject->  {$index} === "";',
+                '<?php return "" === $this->myObject2->  {$index};',
+                '<?php return $this->myObject2->  {$index} === "";',
             ],
             [
-                '<?php return "" === $this->myObject->{$index}->a;',
-                '<?php return $this->myObject->{$index}->a === "";',
+                '<?php return "" === $this->myObject3->{$index}->a;',
+                '<?php return $this->myObject3->{$index}->a === "";',
             ],
             [
-                '<?php return "" === $this->myObject->$index->a;',
-                '<?php return $this->myObject->$index->a === "";',
+                '<?php return "" === $this->myObject4->{$index}->{$index}->a;',
+                '<?php return $this->myObject4->{$index}->{$index}->a === "";',
+            ],
+            [
+                '<?php return "" === $this->myObject4->$index->a;',
+                '<?php return $this->myObject4->$index->a === "";',
             ],
             [
                 '<?php return self::MY_CONST === self::$myVariable;',
@@ -363,8 +367,28 @@ public function provideFixCases()
                 '<?php $i = $this/*a*//*b*//*c*//*d*//*e*//*f*/->getStuff() === 2;',
             ],
             [
-                '<?php return "" === $this->myObject->{$index}->/*1*//*2*/b;',
-                '<?php return $this->myObject->{$index}->/*1*//*2*/b === "";',
+                '<?php return "" === $this->myObject5->{$index}->/*1*//*2*/b;',
+                '<?php return $this->myObject5->{$index}->/*1*//*2*/b === "";',
+            ],
+            [
+                '<?php
+                function hello() {}
+                1 === $a ? b() : c();
+                ',
+                '<?php
+                function hello() {}
+                $a === 1 ? b() : c();
+                ',
+            ],
+            [
+                '<?php
+                class A{}
+                1 === $a ? b() : c();
+                ',
+                '<?php
+                class A{}
+                $a === 1 ? b() : c();
+                ',
             ],
         ];
     }