Merge pull request #63 from PHPCSStandards/feature/operators-isunaryplusminus-add-tests-php74-numeric-literals

Operators::isUnaryPlusMinus(): add tests with PHP 7.4 numeric literals using underscores

Author: jrfnl

Tests/Utils/Operators/IsUnaryPlusMinusTest.inc

@@ -146,6 +146,24 @@ $a =
     /* testSequenceUnaryEnd */
     + /*comment*/ 10;
 
+/* testPHP74NumericLiteralFloatContainingPlus */
+$a = 6.674_083e+11;
+
+/* testPHP74NumericLiteralFloatContainingMinus */
+$a = 6.674_083e-1_1;
+
+/* testPHP74NumericLiteralIntCalc1 */
+$a = 667_083 - 11;
+
+/* testPHP74NumericLiteralIntCalc2 */
+$a = 74_083 + 1_1;
+
+/* testPHP74NumericLiteralFloatCalc1 */
+$a = 6.674_08e3 - 1_1;
+
+/* testPHP74NumericLiteralFloatCalc2 */
+$a = 6.674_08e3 + 11;
+
 // Intentional parse error. This has to be the last test in the file.
 /* testParseError */
 $a = -

Tests/Utils/Operators/IsUnaryPlusMinusTest.php

@@ -10,7 +10,9 @@
 
 namespace PHPCSUtils\Tests\Utils\Operators;
 
+use PHPCSUtils\BackCompat\Helper;
 use PHPCSUtils\TestUtils\UtilityMethodTestCase;
+use PHPCSUtils\Utils\Numbers;
 use PHPCSUtils\Utils\Operators;
 
 /**
@@ -53,11 +55,30 @@ public function testNotPlusMinusToken()
      *
      * @param string $testMarker The comment which prefaces the target token in the test file.
      * @param bool   $expected   The expected boolean return value.
+     * @param bool   $maybeSkip  Whether the "should this test be skipped" check should be executed.
+     *                           Defaults to false.
      *
      * @return void
      */
-    public function testIsUnaryPlusMinus($testMarker, $expected)
+    public function testIsUnaryPlusMinus($testMarker, $expected, $maybeSkip = false)
     {
+        if ($maybeSkip === true) {
+            /*
+             * Skip the test if this is PHP 7.4 or a PHPCS version which backfills the token sequence
+             * to one token as in that case, the plus/minus token won't exist
+             */
+            $skipMessage = 'Test irrelevant as the target token won\'t exist';
+            if (\version_compare(\PHP_VERSION_ID, '70399', '>') === true) {
+                $this->markTestSkipped($skipMessage);
+            }
+
+            $phpcsVersion           = Helper::getVersion();
+            $minVersionWithBackfill = \min(\array_keys(Numbers::$unsupportedPHPCSVersions));
+            if (\version_compare($phpcsVersion, $minVersionWithBackfill, '>=') === true) {
+                $this->markTestSkipped($skipMessage);
+            }
+        }
+
         $stackPtr = $this->getTargetToken($testMarker, [\T_PLUS, \T_MINUS]);
         $result   = Operators::isUnaryPlusMinus(self::$phpcsFile, $stackPtr);
 
@@ -258,6 +279,33 @@ public function dataIsUnaryPlusMinus()
                 '/* testSequenceUnaryEnd */',
                 true,
             ],
+            'php-7.4-underscore-float-containing-plus' => [
+                '/* testPHP74NumericLiteralFloatContainingPlus */',
+                false,
+                true, // Skip for PHP 7.4 & PHPCS 3.5.3+.
+            ],
+            'php-7.4-underscore-float-containing-minus' => [
+                '/* testPHP74NumericLiteralFloatContainingMinus */',
+                false,
+                true, // Skip for PHP 7.4 & PHPCS 3.5.3+.
+            ],
+            'php-7.4-underscore-int-calculation-1' => [
+                '/* testPHP74NumericLiteralIntCalc1 */',
+                false,
+            ],
+            'php-7.4-underscore-int-calculation-2' => [
+                '/* testPHP74NumericLiteralIntCalc2 */',
+                false,
+            ],
+            'php-7.4-underscore-float-calculation-1' => [
+                '/* testPHP74NumericLiteralFloatCalc1 */',
+                false,
+            ],
+            'php-7.4-underscore-float-calculation-2' => [
+                '/* testPHP74NumericLiteralFloatCalc2 */',
+                false,
+            ],
+
             'parse-error' => [
                 '/* testParseError */',
                 false,