Merge branch '2.15' into 2.16

* 2.15:
  TokensAnalyzer::isUnarySuccessorOperator fix for array curly braces
  Fix: Alias should not be required
  Improve static analysis

Author: SpacePossum

README.rst

@@ -670,7 +670,7 @@ Choose from the list of available rules:
   - ``annotation-black-list`` (``array``): class level annotations tags that must be
     omitted to fix the class, even if all of the white list ones are used
     as well. (case insensitive); defaults to ``['@final', '@Entity',
-    '@ORM\\Entity']``
+    '@ORM\\Entity', '@ORM\\Mapping\\Entity', '@Mapping\\Entity']``
   - ``annotation-white-list`` (``array``): class level annotations tags that must be
     set in order to fix the class. (case insensitive); defaults to
     ``['@internal']``

src/Fixer/ClassNotation/FinalInternalClassFixer.php

@@ -155,7 +155,13 @@ protected function createConfigurationDefinition()
             (new FixerOptionBuilder('annotation-black-list', 'Class level annotations tags that must be omitted to fix the class, even if all of the white list ones are used as well. (case insensitive)'))
                 ->setAllowedTypes(['array'])
                 ->setAllowedValues($annotationsAsserts)
-                ->setDefault(['@final', '@Entity', '@ORM\Entity'])
+                ->setDefault([
+                    '@final',
+                    '@Entity',
+                    '@ORM\Entity',
+                    '@ORM\Mapping\Entity',
+                    '@Mapping\Entity',
+                ])
                 ->setNormalizer($annotationsNormalizer)
                 ->getOption(),
             (new FixerOptionBuilder('consider-absent-docblock-as-internal-class', 'Should classes without any DocBlock be fixed to final?'))

src/Fixer/Operator/IncrementStyleFixer.php

@@ -145,6 +145,7 @@ private function findEnd(Tokens $tokens, $index)
             '[',
             [CT::T_DYNAMIC_PROP_BRACE_OPEN],
             [CT::T_DYNAMIC_VAR_BRACE_OPEN],
+            [CT::T_ARRAY_INDEX_CURLY_BRACE_OPEN],
             [T_NS_SEPARATOR],
             [T_STATIC],
             [T_STRING],

src/Tokenizer/Tokens.php

@@ -24,6 +24,8 @@
  *
  * @author Dariusz Rumiński <dariusz.ruminski@gmail.com>
  *
+ * @extends \SplFixedArray<Token>
+ *
  * @method Token current()
  * @method Token offsetGet($index)
  */

src/Tokenizer/TokensAnalyzer.php

@@ -388,6 +388,7 @@ public function isUnarySuccessorOperator($index)
             ']',
             [T_STRING],
             [T_VARIABLE],
+            [CT::T_ARRAY_INDEX_CURLY_BRACE_CLOSE],
             [CT::T_DYNAMIC_PROP_BRACE_CLOSE],
             [CT::T_DYNAMIC_VAR_BRACE_CLOSE],
         ];

tests/Fixer/ClassNotation/FinalClassFixerTest.php

@@ -39,6 +39,8 @@ public function provideFixCases()
         return [
             ['<?php /** @Entity */ class MyEntity {}'],
             ['<?php use Doctrine\ORM\Mapping as ORM; /** @ORM\Entity */ class MyEntity {}'],
+            ['<?php use Doctrine\ORM\Mapping; /** @Mapping\Entity */ class MyEntity {}'],
+            ['<?php use Doctrine\ORM; /** @ORM\Mapping\Entity */ class MyEntity {}'],
             ['<?php /** @entity */ class MyEntity {}'],
             ['<?php use Doctrine\ORM\Mapping as ORM; /** @orm\entity */ class MyEntity {}'],
             ['<?php abstract class MyAbstract {}'],

tests/Fixer/ControlStructure/NoSuperfluousElseifFixerTest.php

@@ -235,4 +235,48 @@ public function provideFixCases()
             ],
         ];
     }
+
+    /**
+     * @param string $expected
+     * @param string $input
+     *
+     * @dataProvider provideFix70Cases
+     * @requires PHP 7.0
+     */
+    public function testFix70($expected, $input)
+    {
+        $this->doTest($expected, $input);
+    }
+
+    public function provideFix70Cases()
+    {
+        return [
+            [
+                '<?php
+
+                if ($foo) {
+                    return 1;
+                }
+                if ($bar) {
+                    return 2;
+                }
+                if ($baz) {
+                    throw new class extends Exception{};
+                } else {
+                    return 4;
+                }',
+                '<?php
+
+                if ($foo) {
+                    return 1;
+                } elseif ($bar) {
+                    return 2;
+                } else if ($baz) {
+                    throw new class extends Exception{};
+                } else {
+                    return 4;
+                }',
+            ],
+        ];
+    }
 }

tests/Fixer/ControlStructure/NoUselessElseFixerTest.php

@@ -708,6 +708,11 @@ public function provideConditionsWithoutBracesCases()
             'foreach($a as $b){throw new Exception($i);}',
         ];
 
+        if (\PHP_VERSION_ID >= 70000) {
+            $statements[] = 'throw new class extends Exception{};';
+            $statements[] = 'throw new class ($a, 9) extends Exception{ public function z($a, $b){ echo 7;} };';
+        }
+
         $ifTemplate = '<?php
             if ($a === false)
             {

tests/Fixer/Operator/IncrementStyleFixerTest.php

@@ -114,6 +114,10 @@ public function provideFixPreIncrementCases()
                 '<?php ++$a[0];',
                 '<?php $a[0]++;',
             ],
+            [
+                '<?php ++$a{0};',
+                '<?php $a{0}++;',
+            ],
             [
                 '<?php ++$a[$b];',
                 '<?php $a[$b]++;',
@@ -138,6 +142,7 @@ public function provideFixPreIncrementCases()
             ['<?php foo($a, ++$b);'],
             ['<?php $a[++$b];'],
             ['<?php echo ++$a;'],
+            ['<?= ++$a;'],
 
             [
                 '<?php class Test {

tests/Tokenizer/TokensAnalyzerTest.php

@@ -920,10 +920,14 @@ public function provideIsUnarySuccessorOperatorCases()
                 '<?php $foo->{"bar"}++;',
                 [6 => true],
             ],
-            [
+            'array access' => [
                 '<?php $a["foo"]++;',
                 [5 => true],
             ],
+            'array curly access' => [
+                '<?php $a{"foo"}++;',
+                [5 => true],
+            ],
         ];
     }