Merge branch '2.15' into 2.16

* 2.15:
  YodaStyleFixer - fix precedence for T_MOD_EQUAL and T_COALESCE_EQUAL
  TernaryToNullCoalescingFixer - handle yield from

Author: SpacePossum

src/Fixer/ControlStructure/YodaStyleFixer.php

@@ -459,32 +459,34 @@ private function isOfLowerPrecedence(Token $token)
                 T_CONCAT_EQUAL, // .=
                 T_DIV_EQUAL,    // /=
                 T_DOUBLE_ARROW, // =>
+                T_ECHO,         // echo
                 T_GOTO,         // goto
                 T_LOGICAL_AND,  // and
                 T_LOGICAL_OR,   // or
                 T_LOGICAL_XOR,  // xor
                 T_MINUS_EQUAL,  // -=
+                T_MOD_EQUAL,    // %=
                 T_MUL_EQUAL,    // *=
+                T_OPEN_TAG,     // <?php
+                T_OPEN_TAG_WITH_ECHO,
                 T_OR_EQUAL,     // |=
                 T_PLUS_EQUAL,   // +=
+                T_POW_EQUAL,    // **=
+                T_PRINT,        // print
                 T_RETURN,       // return
-                T_SL_EQUAL,     // <<
+                T_SL_EQUAL,     // <<=
                 T_SR_EQUAL,     // >>=
                 T_THROW,        // throw
                 T_XOR_EQUAL,    // ^=
-                T_ECHO,
-                T_PRINT,
-                T_OPEN_TAG,
-                T_OPEN_TAG_WITH_ECHO,
             ];
 
-            if (\defined('T_POW_EQUAL')) {
-                $tokens[] = T_POW_EQUAL; // **=
-            }
-
             if (\defined('T_COALESCE')) {
                 $tokens[] = T_COALESCE; // ??
             }
+
+            if (\defined('T_COALESCE_EQUAL')) {
+                $tokens[] = T_COALESCE_EQUAL; // ??=
+            }
         }
 
         static $otherTokens = [

src/Fixer/Operator/TernaryToNullCoalescingFixer.php

@@ -201,6 +201,7 @@ private function hasChangingContent(Tokens $tokens)
             T_INC,
             T_STRING,
             T_YIELD,
+            T_YIELD_FROM,
         ];
 
         foreach ($tokens as $token) {

tests/Fixer/ControlStructure/YodaStyleFixerTest.php

@@ -590,6 +590,10 @@ function foo() {
                 '<?php $a **= 4 === $b ? 2 : 3;',
                 '<?php $a **= $b === 4 ? 2 : 3;',
             ],
+            [
+                '<?php $a %= 4 === $b ? 2 : 3;',
+                '<?php $a %= $b === 4 ? 2 : 3;',
+            ],
         ];
     }
 
@@ -928,6 +932,10 @@ public function providePHP74Cases()
                     'less_and_greater' => false,
                 ],
             ],
+            [
+                '<?php $a ??= 4 === $b ? 2 : 3;',
+                '<?php $a ??= $b === 4 ? 2 : 3;',
+            ],
         ];
     }
 }

tests/Fixer/Operator/TernaryToNullCoalescingFixerTest.php

@@ -62,6 +62,7 @@ public function provideFixCases()
             ['<?php $x = isset($a[foo()]) ? $a[foo()] : null;'],
             ['<?php $x = isset($a[$callback()]) ? $a[$callback()] : null;'],
             ['<?php $y = isset($a) ? 2**3 : 3**2;'],
+            ['<?php $x = function(){isset($a[yield from $a]) ? $a[yield from $a] : null;};'],
             // Fix cases.
             'Common fix case (I).' => [
                 '<?php $x = $a ?? null;',