Merge branch '2.15' into 2.16

Author: keradus

.travis.yml

@@ -35,7 +35,7 @@ jobs:
                 - composer info -D | sort
             before_script:
                 - if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then COMMIT_RANGE=$TRAVIS_COMMIT_RANGE; else COMMIT_RANGE="HEAD~..HEAD"; fi;
-                - export COMMIT_SCA_FILES=`git diff --name-only --diff-filter=ACMRTUXB $COMMIT_RANGE`
+                - export CHANGED_PHP_FILES=`git diff --name-only --diff-filter=ACMRTUXB $COMMIT_RANGE | grep -E "\.php$"`
             script:
                 # @TODO remove at 3.0
                 - |
@@ -53,7 +53,7 @@ jobs:
                     && (echo "UNKNOWN FILES DETECTED" && travis_terminate 1) || echo "NO UNKNOWN FILES"
                 - ./check_trailing_spaces.sh || travis_terminate 1
                 - php -d auto_prepend_file=dev-tools/vendor/autoload.php ./dev-tools/tools/phpstan analyse
-                - if [ -n "$COMMIT_SCA_FILES" ]; then ./dev-tools/vendor/bin/phpmd `echo "$COMMIT_SCA_FILES" | grep -Ev "^tests/Fixtures" | xargs | sed 's/ /,/g'` text phpmd.xml || travis_terminate 1; fi
+                - if [ -n "$CHANGED_PHP_FILES" ]; then ./dev-tools/vendor/bin/phpmd `echo "$CHANGED_PHP_FILES" | xargs | sed 's/ /,/g'` text phpmd.xml || travis_terminate 1; fi
                 - ./dev-tools/tools/composer-require-checker check composer.json --config-file $(realpath .composer-require-checker.json) || travis_terminate 1
                 - composer normalize -d ./dev-tools ./../composer.json --dry-run
                 - ./dev-tools/check-shell-scripts.sh

src/Tokenizer/TokensAnalyzer.php

@@ -346,14 +346,14 @@ public function isConstantInvocation($index)
             }
         }
 
-        // check for `implements`/`use` list
+        // check for `extends`/`implements`/`use` list
         if ($this->tokens[$prevIndex]->equals(',')) {
             $checkIndex = $prevIndex;
             while ($this->tokens[$checkIndex]->equalsAny([',', [T_AS], [CT::T_NAMESPACE_OPERATOR], [T_NS_SEPARATOR], [T_STRING]])) {
                 $checkIndex = $this->tokens->getPrevMeaningfulToken($checkIndex);
             }
 
-            if ($this->tokens[$checkIndex]->isGivenKind([CT::T_GROUP_IMPORT_BRACE_OPEN, T_IMPLEMENTS, CT::T_USE_TRAIT])) {
+            if ($this->tokens[$checkIndex]->isGivenKind([T_EXTENDS, CT::T_GROUP_IMPORT_BRACE_OPEN, T_IMPLEMENTS, CT::T_USE_TRAIT])) {
                 return false;
             }
         }

tests/Fixtures/Integration/misc/PHP7_4.test

@@ -0,0 +1,82 @@
+--TEST--
+PHP 7.4 test.
+--RULESET--
+{
+    "@Symfony": true,
+    "array_syntax": false,
+    "braces": false,
+    "class_definition": false,
+    "no_null_property_initialization": true,
+    "no_unset_on_property": true,
+    "pow_to_exponentiation": true,
+    "trailing_comma_in_multiline_array": {"after_heredoc": true},
+    "visibility_required": false
+}
+--REQUIREMENTS--
+{"php": 70400}
+--EXPECT--
+<?php
+
+// https://wiki.php.net/rfc/numeric_literal_separator
+echo 10_0 ** 2;
+if (1_000 === $b);
+// https://wiki.php.net/rfc/null_coalesce_equal_operator
+$a ??= 1;
+$a ??= $b;
+// https://wiki.php.net/rfc/spread_operator_for_array
+$x = array(...$foo);
+$x = [...$foo];
+$x = array(...$foo, ...$bar);
+$x = [...$foo, ...$bar];
+$x = array(
+    ...$foo,
+    ...$bar,
+);
+$x = [
+    ...$foo,
+    ...$bar,
+];
+$x = array(...$foo, ...$bar);
+$x = [...$foo, ...$bar];
+// https://wiki.php.net/rfc/typed_properties_v2
+class Foo {
+    private ?int $foo;
+    protected string $bar;
+    public iterable $baz;
+    var ? Foo\Bar $qux;
+}
+// https://wiki.php.net/rfc/arrow_functions_v2
+$foo = fn ($v) => (string) $v;
+
+--INPUT--
+<?php
+// https://wiki.php.net/rfc/numeric_literal_separator
+echo pow(10_0, 2);
+if ($b === 1_000);
+// https://wiki.php.net/rfc/null_coalesce_equal_operator
+$a??=1;
+$a ??= $b;
+// https://wiki.php.net/rfc/spread_operator_for_array
+$x = array(...$foo, );
+$x = [...$foo, ];
+$x = array(...$foo , ...$bar);
+$x = [...$foo , ...$bar];
+$x = array(
+    ...$foo,
+    ...$bar
+);
+$x = [
+    ...$foo,
+    ...$bar
+];
+$x = array(...$foo,...$bar);
+$x = [...$foo,...$bar];
+// https://wiki.php.net/rfc/typed_properties_v2
+class Foo {
+    private ?int $foo;
+    protected string $bar;
+    public iterable $baz;
+    var ? Foo\Bar $qux;
+}
+// https://wiki.php.net/rfc/arrow_functions_v2
+$foo = fn ($v)=> (string)$v;

tests/Tokenizer/TokensAnalyzerTest.php

@@ -630,8 +630,8 @@ public function testIsConstantInvocation($source, array $expected)
     {
         $tokensAnalyzer = new TokensAnalyzer(Tokens::fromCode($source));
 
-        foreach ($expected as $index => $isLambda) {
-            static::assertSame($isLambda, $tokensAnalyzer->isConstantInvocation($index), 'Token at index '.$index.' should match the expected value.');
+        foreach ($expected as $index => $expectedValue) {
+            static::assertSame($expectedValue, $tokensAnalyzer->isConstantInvocation($index), 'Token at index '.$index.' should match the expected value.');
         }
     }
 
@@ -782,6 +782,10 @@ public function provideIsConstantInvocationCases()
                 '<?php foo(E_USER_DEPRECATED | E_DEPRECATED);',
                 [3 => true, 7 => true],
             ],
+            [
+                '<?php interface Foo extends Bar, Baz, Qux {}',
+                [7 => false, 10 => false, 13 => false],
+            ],
         ];
     }