Refactor to ArrowFunction

Author: bbrala

src/Rector/AbstractDrupalCoreRector.php

@@ -4,20 +4,14 @@
 
 namespace DrupalRector\Rector;
 
-use Drupal\Core\Component\DeprecationHelper;
+use Drupal\Component\Utility\DeprecationHelper;
 use DrupalRector\Contract\DrupalCoreRectorInterface;
 use PhpParser\Node;
+use PhpParser\Node\Expr\ArrowFunction;
 use Rector\Core\Rector\AbstractRector;
-use Rector\Php72\NodeFactory\AnonymousFunctionFactory;
 
 abstract class AbstractDrupalCoreRector extends AbstractRector implements DrupalCoreRectorInterface
 {
-    private AnonymousFunctionFactory $anonymousFunctionFactory;
-
-    public function __construct(AnonymousFunctionFactory $anonymousFunctionFactory) {
-        $this->anonymousFunctionFactory = $anonymousFunctionFactory;
-    }
-
     public function refactor(Node $node)
     {
         if (version_compare(\Drupal::VERSION, $this->getVersion(), '<')) {
@@ -49,8 +43,8 @@ private function createBcCallOnCallLike(Node\Expr\CallLike $node, Node\Expr\Call
         return $this->nodeFactory->createStaticCall(DeprecationHelper::class, 'backwardsCompatibleCall', [
             $this->nodeFactory->createClassConstFetch(\Drupal::class, 'VERSION'),
             $this->getVersion(),
-            $this->anonymousFunctionFactory->create([], [new Node\Stmt\Return_($clonedNode)], null),
-            $this->anonymousFunctionFactory->create([], [new Node\Stmt\Return_($result)], null),
+            new ArrowFunction(['expr' => $clonedNode]),
+            new ArrowFunction(['expr' => $result]),
         ]);
     }
 

…pal/Core/Component/DeprecationHelper.php …/Component/Utility/DeprecationHelper.phpstubs/Drupal/Core/Component/DeprecationHelper.php renamed to stubs/Drupal/Core/Component/Utility/DeprecationHelper.php stubs/Drupal/Core/Component/DeprecationHelper.php renamed to stubs/Drupal/Core/Component/Utility/DeprecationHelper.php

@@ -1,31 +1,23 @@
 <?php
 
-function simple_example() {
+function simple_example()
+{
     $password = user_password();
     $other_password = user_password(8);
     $password_length = 12;
     $last_password = user_password($password_length);
 }
+
 ?>
 -----
 <?php
 
-function simple_example() {
-    $password = \Drupal\Component\Utility\DeprecationHelper::backwardsCompatibleCall(\Drupal::VERSION, '9.1.0', function () {
-        return user_password();
-    }, function () {
-        return \Drupal::service('password_generator')->generate();
-    });
-    $other_password = \Drupal\Component\Utility\DeprecationHelper::backwardsCompatibleCall(\Drupal::VERSION, '9.1.0', function () {
-        return user_password(8);
-    }, function () {
-        return \Drupal::service('password_generator')->generate(8);
-    });
+function simple_example()
+{
+    $password = \Drupal\Component\Utility\DeprecationHelper::backwardsCompatibleCall(\Drupal::VERSION, '9.1.0', fn() => user_password(), fn() => \Drupal::service('password_generator')->generate());
+    $other_password = \Drupal\Component\Utility\DeprecationHelper::backwardsCompatibleCall(\Drupal::VERSION, '9.1.0', fn() => user_password(8), fn() => \Drupal::service('password_generator')->generate(8));
     $password_length = 12;
-    $last_password = \Drupal\Component\Utility\DeprecationHelper::backwardsCompatibleCall(\Drupal::VERSION, '9.1.0', function () use ($password_length) {
-        return user_password($password_length);
-    }, function () use ($password_length) {
-        return \Drupal::service('password_generator')->generate($password_length);
-    });
+    $last_password = \Drupal\Component\Utility\DeprecationHelper::backwardsCompatibleCall(\Drupal::VERSION, '9.1.0', fn() => user_password($password_length), fn() => \Drupal::service('password_generator')->generate($password_length));
 }
+
 ?>