[Php83] Handle dynamic host and port values on CombineHostPortLdapUri…

…Rector (#5401) * [Php83] Handle dynamic host and port values on CombineHostPortLdapUriRector * [Php83] Handle dynamic host and port values on CombineHostPortLdapUriRector * [ci-review] Rector Rectify * [ci-review] Rector Rectify --------- Co-authored-by: GitHub Action <actions@github.com>
rectorphp · Dec 31, 2023 · fff370b · fff370b
1 parent e044d50
commit fff370b
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 11 deletions.
diff --git a/rules-tests/Php83/Rector/FuncCall/CombineHostPortLdapUriRector/Fixture/dynamic_value.php.inc b/rules-tests/Php83/Rector/FuncCall/CombineHostPortLdapUriRector/Fixture/dynamic_value.php.inc
@@ -0,0 +1,27 @@
+<?php
+
+namespace Rector\Tests\Php83\Rector\FuncCall\CombineHostPortLdapUriRector\Fixture;
+
+class DynamicValue
+{
+    public function run($host, $port)
+    {
+        $ldapconn = ldap_connect($host, $port);
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Php83\Rector\FuncCall\CombineHostPortLdapUriRector\Fixture;
+
+class DynamicValue
+{
+    public function run($host, $port)
+    {
+        $ldapconn = ldap_connect("{$host}:{$port}");
+    }
+}
+
+?>
diff --git a/rules/Php83/Rector/FuncCall/CombineHostPortLdapUriRector.php b/rules/Php83/Rector/FuncCall/CombineHostPortLdapUriRector.php
@@ -6,8 +6,11 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\FuncCall;
+use PhpParser\Node\Scalar\Encapsed;
+use PhpParser\Node\Scalar\EncapsedStringPart;
 use PhpParser\Node\Scalar\LNumber;
 use PhpParser\Node\Scalar\String_;
+use Rector\Core\NodeAnalyzer\ExprAnalyzer;
 use Rector\Core\Rector\AbstractRector;
 use Rector\Core\ValueObject\PhpVersionFeature;
 use Rector\VersionBonding\Contract\MinPhpVersionInterface;
@@ -20,6 +23,11 @@
  */
 final class CombineHostPortLdapUriRector extends AbstractRector implements MinPhpVersionInterface
 {
+    public function __construct(
+        private readonly ExprAnalyzer $exprAnalyzer
+    ) {
+    }
+
     public function getRuleDefinition(): RuleDefinition
     {
         return new RuleDefinition(
@@ -69,14 +77,16 @@ public function refactor(Node $node): ?Node
 
         if ($firstArg instanceof String_ && $secondArg instanceof LNumber) {
             $args[0]->value = new String_($firstArg->value . ':' . $secondArg->value);
-
-            unset($args[1]);
-            $node->args = $args;
-
-            return $node;
+        } elseif ($this->exprAnalyzer->isDynamicExpr($firstArg) && $this->exprAnalyzer->isDynamicExpr($secondArg)) {
+            $args[0]->value = new Encapsed([$firstArg, new EncapsedStringPart(':'), $secondArg]);
+        } else {
+            return null;
         }
 
-        return null;
+        unset($args[1]);
+        $node->args = $args;
+
+        return $node;
     }
 
     public function provideMinPhpVersion(): int

diff --git a/rules/TypeDeclaration/NodeAnalyzer/ReturnTypeAnalyzer/StrictScalarReturnTypeAnalyzer.php b/rules/TypeDeclaration/NodeAnalyzer/ReturnTypeAnalyzer/StrictScalarReturnTypeAnalyzer.php
@@ -4,6 +4,7 @@
 
 namespace Rector\TypeDeclaration\NodeAnalyzer\ReturnTypeAnalyzer;
 
+use PhpParser\Node\Expr\UnaryPlus;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Closure;
 use PhpParser\Node\Expr\ConstFetch;
@@ -70,10 +71,6 @@ private function isHardCodedExpression(Expr $expr): bool
         }
 
         // Negative numbers are wrapped in UnaryMinus, so check expression inside it
-        if (($expr instanceof UnaryMinus || $expr instanceof Expr\UnaryPlus) && $expr->expr instanceof Scalar) {
-            return true;
-        }
-
-        return false;
+        return ($expr instanceof UnaryMinus || $expr instanceof UnaryPlus) && $expr->expr instanceof Scalar;
     }
 }