Merge branch 'main' into 9648

Author: Soean

composer.json

@@ -19,7 +19,7 @@
         "composer/xdebug-handler": "^3.0.5",
         "doctrine/inflector": "^2.1",
         "illuminate/container": "12.39.*",
-        "nette/utils": "^4.1",
+        "nette/utils": "^4.1.3",
         "nikic/php-parser": "^5.7",
         "ondram/ci-detector": "^4.2",
         "phpstan/phpdoc-parser": "^2.3",

phpstan.neon

@@ -467,3 +467,11 @@ parameters:
                 - rules/TypeDeclaration/Rector/FunctionLike/AddClosureParamTypeForArrayMapRector.php
                 - rules/TypeDeclaration/Rector/FunctionLike/AddClosureParamTypeForArrayReduceRector.php
                 - src/NodeTypeResolver/PHPStan/Type/TypeFactory.php
+
+        -
+            message: '#Parameter \#1 \$value of static method Webmozart\\Assert\\Assert\:\:isInstanceOfAny\(\) expects object, PhpParser\\Node\\ComplexType\|PhpParser\\Node\\Identifier\|PhpParser\\Node\\Name\|null given#'
+            path: rules/DeadCode/Rector/FunctionLike/NarrowWideUnionReturnTypeRector.php
+
+        -
+            message: '#Unable to resolve the template type T in call to static method Webmozart\\Assert\\Assert\:\:isInstanceOfAny\(\)#'
+            path: rules/DeadCode/Rector/FunctionLike/NarrowWideUnionReturnTypeRector.php

rules-tests/Php70/Rector/Ternary/TernaryToNullCoalescingRector/Fixture/keep_right_parentheses.php.inc

@@ -0,0 +1,27 @@
+<?php
+
+namespace Rector\Tests\Php70\Rector\Ternary\TernaryToNullCoalescingRector\Fixture;
+
+class KeepRightParentheses
+{
+    public function run($port, $scheme)
+    {
+        $port = isset($port) ? $port : (($scheme == 'https') ? '443' : '80');
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Php70\Rector\Ternary\TernaryToNullCoalescingRector\Fixture;
+
+class KeepRightParentheses
+{
+    public function run($port, $scheme)
+    {
+        $port = $port ?? (($scheme == 'https') ? '443' : '80');
+    }
+}
+
+?>

rules/Carbon/NodeFactory/CarbonCallFactory.php

@@ -37,8 +37,8 @@ public function createFromDateTimeString(
             $methodCall = $this->createModifyMethodCall(
                 $carbonCall,
                 new Int_((int) $match['count']),
-                (string) $match['unit'],
-                (string) $match['operator']
+                $match['unit'],
+                $match['operator']
             );
             if ($methodCall instanceof MethodCall) {
                 $carbonCall = $methodCall;

rules/CodingStyle/Rector/Catch_/CatchExceptionNameMatchingTypeRector.php

@@ -170,7 +170,7 @@ private function resolveNewVariableName(string $typeShortName): string
             lcfirst($typeShortName),
             self::STARTS_WITH_ABBREVIATION_REGEX,
             static function (array $matches): string {
-                $output = isset($matches[1]) ? strtolower($matches[1]) : '';
+                $output = isset($matches[1]) ? strtolower((string) $matches[1]) : '';
                 $output .= $matches[2] ?? '';
 
                 return $output . ($matches[3] ?? '');

rules/Php70/Rector/Ternary/TernaryToNullCoalescingRector.php

@@ -13,8 +13,10 @@
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Expr\Isset_;
 use PhpParser\Node\Expr\Ternary;
+use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\PhpParser\Node\Value\ValueResolver;
 use Rector\Rector\AbstractRector;
+use Rector\ValueObject\Application\File;
 use Rector\ValueObject\PhpVersionFeature;
 use Rector\VersionBonding\Contract\MinPhpVersionInterface;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -162,9 +164,43 @@ private function processTernaryWithIsset(Ternary $ternary, Isset_ $isset): ?Coal
             return null;
         }
 
+        if ($ternary->else instanceof Ternary && $this->isTernaryParenthesized($this->file, $ternary->cond, $ternary)) {
+            $ternary->else->setAttribute(AttributeKey::WRAPPED_IN_PARENTHESES, true);
+        }
+
         return new Coalesce($ternary->if, $ternary->else);
     }
 
+    private function isTernaryParenthesized(File $file, Expr $expr, Ternary $ternary): bool
+    {
+        $oldTokens = $file->getOldTokens();
+        $endTokenPost = $ternary->getEndTokenPos();
+
+        if (isset($oldTokens[$endTokenPost]) && (string) $oldTokens[$endTokenPost] === ')') {
+            $startTokenPos = $ternary->else->getStartTokenPos();
+            $previousEndTokenPost = $expr->getEndTokenPos();
+
+            while ($startTokenPos > $previousEndTokenPost) {
+                --$startTokenPos;
+
+                if (! isset($oldTokens[$startTokenPos])) {
+                    return false;
+                }
+
+                // handle space before open parentheses
+                if (trim((string) $oldTokens[$startTokenPos]) === '') {
+                    continue;
+                }
+
+                return (string) $oldTokens[$startTokenPos] === '(';
+            }
+
+            return false;
+        }
+
+        return false;
+    }
+
     private function isNullMatch(Expr $possibleNullExpr, Expr $firstNode, Expr $secondNode): bool
     {
         if (! $this->valueResolver->isNull($possibleNullExpr)) {