Move classes to Drupal version scopes namespace

palantirnet · Nov 21, 2023 · 792217a · 792217a
1 parent 9684604
commit 792217a
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 12 deletions.
diff --git a/config/drupal-8/drupal-8.8-deprecations.php b/config/drupal-8/drupal-8.8-deprecations.php
@@ -4,8 +4,8 @@
 
 use DrupalRector\Drupal8\Rector\Deprecation\DrupalServiceRenameRector;
 use DrupalRector\Drupal8\Rector\Deprecation\FileDefaultSchemeRector;
+use DrupalRector\Drupal8\Rector\Deprecation\FunctionalTestDefaultThemePropertyRector;
 use DrupalRector\Drupal8\Rector\ValueObject\DrupalServiceRenameConfiguration;
-use DrupalRector\Rector\Class_\FunctionalTestDefaultThemePropertyRector;
 use DrupalRector\Rector\Deprecation\FunctionToServiceRector;
 use DrupalRector\Rector\Deprecation\MethodToMethodWithCheckRector;
 use DrupalRector\Rector\ValueObject\FunctionToServiceConfiguration;

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -101,11 +101,11 @@ parameters:
 			path: src/Drupal8/Rector/Deprecation/EntityManagerRector.php
 
 		-
-			message: "#^Call to an undefined method PHPStan\\\\Type\\\\Type\\:\\:getValue\\(\\)\\.$#"
+			message: "#^Doing instanceof PHPStan\\\\Type\\\\ObjectType is error\\-prone and deprecated\\. Use Type\\:\\:isObject\\(\\) or Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
 			count: 1
-			path: src/Drupal9/Rector/Deprecation/ExtensionPathRector.php
+			path: src/Drupal8/Rector/Deprecation/FunctionalTestDefaultThemePropertyRector.php
 
 		-
-			message: "#^Doing instanceof PHPStan\\\\Type\\\\ObjectType is error\\-prone and deprecated\\. Use Type\\:\\:isObject\\(\\) or Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
+			message: "#^Call to an undefined method PHPStan\\\\Type\\\\Type\\:\\:getValue\\(\\)\\.$#"
 			count: 1
-			path: src/Rector/Class_/FunctionalTestDefaultThemePropertyRector.php
+			path: src/Drupal9/Rector/Deprecation/ExtensionPathRector.php
diff --git a/...ctionalTestDefaultThemePropertyRector.php → ...ctionalTestDefaultThemePropertyRector.php b/...ctionalTestDefaultThemePropertyRector.php → ...ctionalTestDefaultThemePropertyRector.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace DrupalRector\Rector\Class_;
+namespace DrupalRector\Drupal8\Rector\Deprecation;
 
 use Drupal\Tests\BrowserTestBase;
 use PhpParser\Builder\Property;

diff --git a/...nalTestDefaultThemePropertyRectorTest.php → ...nalTestDefaultThemePropertyRectorTest.php b/...nalTestDefaultThemePropertyRectorTest.php → ...nalTestDefaultThemePropertyRectorTest.php
@@ -2,8 +2,9 @@
 
 declare(strict_types=1);
 
-namespace DrupalRector\Tests\Rector\Class_\FunctionalTestDefaultThemePropertyRector;
+namespace DrupalRector\Tests\Drupal8\Rector\Deprecation\FunctionalTestDefaultThemePropertyRector;
 
+use DrupalRector\Tests\Rector\Class_\FunctionalTestDefaultThemePropertyRector\Iterator;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
 final class FunctionalTestDefaultThemePropertyRectorTest extends AbstractRectorTestCase

diff --git a/...PropertyRector/config/configured_rule.php → ...PropertyRector/config/configured_rule.php b/...PropertyRector/config/configured_rule.php → ...PropertyRector/config/configured_rule.php
@@ -5,5 +5,5 @@
 use Rector\Config\RectorConfig;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->rule(\DrupalRector\Rector\Class_\FunctionalTestDefaultThemePropertyRector::class);
+    $rectorConfig->rule(\DrupalRector\Drupal8\Rector\Deprecation\FunctionalTestDefaultThemePropertyRector::class);
 };
diff --git a/...emePropertyRector/fixture/extends.php.inc → ...emePropertyRector/fixture/extends.php.inc b/...emePropertyRector/fixture/extends.php.inc → ...emePropertyRector/fixture/extends.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\DrupalRector\Rector\Class_\FunctionalTestDefaultThemePropertyRector\fixture;
+namespace DrupalRector\Tests\Drupal8\Rector\Deprecation\FunctionalTestDefaultThemePropertyRector\fixture;
 
 use Drupal\Tests\BrowserTestBase;
 
@@ -24,7 +24,7 @@ class FooTest extends Foo {
 -----
 <?php
 
-namespace Rector\Tests\DrupalRector\Rector\Class_\FunctionalTestDefaultThemePropertyRector\fixture;
+namespace DrupalRector\Tests\Drupal8\Rector\Deprecation\FunctionalTestDefaultThemePropertyRector\fixture;
 
 use Drupal\Tests\BrowserTestBase;
 

diff --git a/...PropertyRector/fixture/some_class.php.inc → ...PropertyRector/fixture/some_class.php.inc b/...PropertyRector/fixture/some_class.php.inc → ...PropertyRector/fixture/some_class.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\DrupalRector\Rector\Class_\FunctionalTestDefaultThemePropertyRector\fixture;
+namespace DrupalRector\Tests\Drupal8\Rector\Deprecation\FunctionalTestDefaultThemePropertyRector\fixture;
 
 use Drupal\Tests\BrowserTestBase;
 
@@ -16,7 +16,7 @@ class SomeClassTest extends BrowserTestBase {
 -----
 <?php
 
-namespace Rector\Tests\DrupalRector\Rector\Class_\FunctionalTestDefaultThemePropertyRector\fixture;
+namespace DrupalRector\Tests\Drupal8\Rector\Deprecation\FunctionalTestDefaultThemePropertyRector\fixture;
 
 use Drupal\Tests\BrowserTestBase;