Add support for module_load_include into existing module_load_install…

… rector.
palantirnet · Dec 18, 2023 · ff33b93 · ff33b93
1 parent eab4674
commit ff33b93
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 32 deletions.
diff --git a/config/drupal-9/drupal-9.4-deprecations.php b/config/drupal-9/drupal-9.4-deprecations.php
@@ -4,5 +4,5 @@
 
 return static function (Rector\Config\RectorConfig $rectorConfig): void {
     // Change record https://www.drupal.org/node/3220952
-    $rectorConfig->rule(\DrupalRector\Drupal9\Rector\Deprecation\ModuleLoadInstallRector::class);
+    $rectorConfig->rule(\DrupalRector\Drupal9\Rector\Deprecation\ModuleLoadRector::class);
 };
diff --git a/...r/Deprecation/ModuleLoadInstallRector.php → ...9/Rector/Deprecation/ModuleLoadRector.php b/...r/Deprecation/ModuleLoadInstallRector.php → ...9/Rector/Deprecation/ModuleLoadRector.php
@@ -12,7 +12,7 @@
 /**
  * Replaces deprecated module_load_install call with ModuleHandler call.
  */
-class ModuleLoadInstallRector extends AbstractRector
+class ModuleLoadRector extends AbstractRector
 {
     /**
      * {@inheritdoc}
@@ -35,6 +35,12 @@ public function refactor(Node $node): ?Node\Expr\CallLike
             $args[] = new Node\Arg(new Node\Scalar\String_('install'));
 
             return $this->nodeFactory->createMethodCall($this->nodeFactory->createStaticCall('Drupal', 'moduleHandler'), 'loadInclude', $args);
+        } elseif ($this->getName($node->name) === 'module_load_include') {
+            $newArgs = $args = $node->getArgs();
+            $newArgs[0] = $args[1];
+            $newArgs[1] = $args[0];
+
+            return $this->nodeFactory->createMethodCall($this->nodeFactory->createStaticCall('Drupal', 'moduleHandler'), 'loadInclude', $newArgs);
         }
 
         return null;
@@ -46,10 +52,20 @@ public function getRuleDefinition(): RuleDefinition
             new CodeSample(
                 <<<'CODE_BEFORE'
 module_load_install('example');
+$type = 'install';
+$module = 'example';
+$name = 'name';
+module_load_include($type, $module, $name);
+module_load_include($type, $module);
 CODE_BEFORE
                 ,
                 <<<'CODE_AFTER'
-\Drupal\Core\Extension\ModuleHandler::loadInclude('example', 'install');
+\Drupal::moduleHandler()->loadInclude('example', 'install');
+$type = 'install';
+$module = 'example';
+$name = 'name';
+\Drupal::moduleHandler()->loadInclude($module, $type, $name);
+\Drupal::moduleHandler()->loadInclude($module, $type);
 CODE_AFTER
             ),
         ]);

diff --git a/tests/src/Drupal9/Rector/Deprecation/ModuleLoadInstallRector/fixture/basic.php.inc b/tests/src/Drupal9/Rector/Deprecation/ModuleLoadInstallRector/fixture/basic.php.inc
diff --git a/...allRector/ModuleLoadInstallRectorTest.php → ...ModuleLoadRector/ModuleLoadRectorTest.php b/...allRector/ModuleLoadInstallRectorTest.php → ...ModuleLoadRector/ModuleLoadRectorTest.php
@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Drupal9\Rector\Deprecation\ModuleLoadInstallRector;
+namespace Drupal9\Rector\Deprecation\ModuleLoadRector;
 
 use Iterator;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
-class ModuleLoadInstallRectorTest extends AbstractRectorTestCase
+class ModuleLoadRectorTest extends AbstractRectorTestCase
 {
     /**
      * @covers ::refactor

diff --git a/...dInstallRector/config/configured_rule.php → ...duleLoadRector/config/configured_rule.php b/...dInstallRector/config/configured_rule.php → ...duleLoadRector/config/configured_rule.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-use DrupalRector\Drupal9\Rector\Deprecation\ModuleLoadInstallRector;
+use DrupalRector\Drupal9\Rector\Deprecation\ModuleLoadRector;
 use DrupalRector\Tests\Rector\Deprecation\DeprecationBase;
 use Rector\Config\RectorConfig;
 
 return static function (RectorConfig $rectorConfig): void {
-    DeprecationBase::addClass(ModuleLoadInstallRector::class, $rectorConfig, false);
+    DeprecationBase::addClass(ModuleLoadRector::class, $rectorConfig, false);
 };
diff --git a/tests/src/Drupal9/Rector/Deprecation/ModuleLoadRector/fixture/basic.php.inc b/tests/src/Drupal9/Rector/Deprecation/ModuleLoadRector/fixture/basic.php.inc
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * A simple example using the minimum number of arguments.
+ */
+function simple_example() {
+    module_load_install('example');
+
+    $module = 'simple';
+    module_load_install($module);
+
+    $type = 'install';
+    $module = 'example';
+    $name = 'name';
+    module_load_include($type, $module, $name);
+    module_load_include($type, $module);
+
+    module_load_include('install', 'example', 'name');
+    module_load_include('install', 'example');
+}
+?>
+-----
+<?php
+
+/**
+ * A simple example using the minimum number of arguments.
+ */
+function simple_example() {
+    \Drupal::moduleHandler()->loadInclude('example', 'install');
+
+    $module = 'simple';
+    \Drupal::moduleHandler()->loadInclude($module, 'install');
+
+    $type = 'install';
+    $module = 'example';
+    $name = 'name';
+    \Drupal::moduleHandler()->loadInclude($module, $type, $name);
+    \Drupal::moduleHandler()->loadInclude($module, $type);
+
+    \Drupal::moduleHandler()->loadInclude('example', 'install', 'name');
+    \Drupal::moduleHandler()->loadInclude('example', 'install');
+}
+?>