Better namespace. (#9)

terabytesoftw · web-flow · commit ca0d97eb2303 · 2023-11-20T09:37:39.000-03:00
diff --git a/composer.json b/composer.json
@@ -22,12 +22,12 @@
     },
     "autoload": {
         "psr-4": {
-            "Yii\\PHPStan\\": "src"
+            "Yii2\\Extensions\\PHPStan\\": "src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Yii\\PHPStan\\Tests\\": "tests"
+            "Yii2\\Extensions\\PHPStan\\Tests\\": "tests"
         }
     },
     "extra": {
diff --git a/extension.neon b/extension.neon
@@ -11,34 +11,34 @@ parametersSchema:
 
 services:
     -
-        class: Yii\PHPStan\Reflection\ApplicationPropertiesClassReflectionExtension
+        class: Yii2\Extensions\PHPStan\Reflection\ApplicationPropertiesClassReflectionExtension
         tags: [phpstan.broker.propertiesClassReflectionExtension]
     -
-        class: Yii\PHPStan\Reflection\RequestMethodsClassReflectionExtension
+        class: Yii2\Extensions\PHPStan\Reflection\RequestMethodsClassReflectionExtension
         tags: [phpstan.broker.methodsClassReflectionExtension]
     -
-        class: Yii\PHPStan\Reflection\RequestPropertiesClassReflectionExtension
+        class: Yii2\Extensions\PHPStan\Reflection\RequestPropertiesClassReflectionExtension
         tags: [phpstan.broker.propertiesClassReflectionExtension]
     -
-        class: Yii\PHPStan\Reflection\ResponsePropertiesClassReflectionExtension
+        class: Yii2\Extensions\PHPStan\Reflection\ResponsePropertiesClassReflectionExtension
         tags: [phpstan.broker.propertiesClassReflectionExtension]
     -
-        class: Yii\PHPStan\Reflection\UserPropertiesClassReflectionExtension
+        class: Yii2\Extensions\PHPStan\Reflection\UserPropertiesClassReflectionExtension
         tags: [phpstan.broker.propertiesClassReflectionExtension]
     -
-        class: Yii\PHPStan\Type\ActiveQueryDynamicMethodReturnTypeExtension
+        class: Yii2\Extensions\PHPStan\Type\ActiveQueryDynamicMethodReturnTypeExtension
         tags: [phpstan.broker.dynamicMethodReturnTypeExtension]
     -
-        class: Yii\PHPStan\Type\ActiveRecordDynamicMethodReturnTypeExtension
+        class: Yii2\Extensions\PHPStan\Type\ActiveRecordDynamicMethodReturnTypeExtension
         tags: [phpstan.broker.dynamicMethodReturnTypeExtension]
     -
-        class: Yii\PHPStan\Type\HeaderCollectionDynamicMethodReturnTypeExtension
+        class: Yii2\Extensions\PHPStan\Type\HeaderCollectionDynamicMethodReturnTypeExtension
         tags: [phpstan.broker.dynamicMethodReturnTypeExtension]
     -
-        class: Yii\PHPStan\Type\ActiveRecordDynamicStaticMethodReturnTypeExtension
+        class: Yii2\Extensions\PHPStan\Type\ActiveRecordDynamicStaticMethodReturnTypeExtension
         tags: [phpstan.broker.dynamicStaticMethodReturnTypeExtension]
     -
-        class: Yii\PHPStan\Type\ContainerDynamicMethodReturnTypeExtension
+        class: Yii2\Extensions\PHPStan\Type\ContainerDynamicMethodReturnTypeExtension
         tags: [phpstan.broker.dynamicMethodReturnTypeExtension]
 
-    - Yii\PHPStan\ServiceMap(%yii2.config_path%)
+    - Yii2\Extensions\PHPStan\ServiceMap(%yii2.config_path%)
diff --git a/infection.json.dist b/infection.json.dist
diff --git a/psalm.xml b/psalm.xml
diff --git a/src/Reflection/ApplicationPropertiesClassReflectionExtension.php b/src/Reflection/ApplicationPropertiesClassReflectionExtension.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yii\PHPStan\Reflection;
+namespace Yii2\Extensions\PHPStan\Reflection;
 
 use PHPStan\Reflection\Annotations\AnnotationsPropertiesClassReflectionExtension;
 use PHPStan\Reflection\ClassReflection;
@@ -12,8 +12,8 @@
 use PHPStan\Reflection\PropertyReflection;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\ObjectType;
+use Yii2\Extensions\PHPStan\ServiceMap;
 use yii\base\Application as BaseApplication;
-use Yii\PHPStan\ServiceMap;
 use yii\web\Application as WebApplication;
 
 final class ApplicationPropertiesClassReflectionExtension implements PropertiesClassReflectionExtension
diff --git a/src/Reflection/ComponentPropertyReflection.php b/src/Reflection/ComponentPropertyReflection.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yii\PHPStan\Reflection;
+namespace Yii2\Extensions\PHPStan\Reflection;
 
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\PropertyReflection;
diff --git a/src/Reflection/RequestMethodsClassReflectionExtension.php b/src/Reflection/RequestMethodsClassReflectionExtension.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yii\PHPStan\Reflection;
+namespace Yii2\Extensions\PHPStan\Reflection;
 
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\MethodReflection;
diff --git a/src/Reflection/RequestPropertiesClassReflectionExtension.php b/src/Reflection/RequestPropertiesClassReflectionExtension.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yii\PHPStan\Reflection;
+namespace Yii2\Extensions\PHPStan\Reflection;
 
 use PHPStan\Analyser\OutOfClassScope;
 use PHPStan\Reflection\ClassReflection;
diff --git a/src/Reflection/ResponsePropertiesClassReflectionExtension.php b/src/Reflection/ResponsePropertiesClassReflectionExtension.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yii\PHPStan\Reflection;
+namespace Yii2\Extensions\PHPStan\Reflection;
 
 use PHPStan\Analyser\OutOfClassScope;
 use PHPStan\Reflection\ClassReflection;
diff --git a/src/Reflection/UserPropertiesClassReflectionExtension.php b/src/Reflection/UserPropertiesClassReflectionExtension.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yii\PHPStan\Reflection;
+namespace Yii2\Extensions\PHPStan\Reflection;
 
 use PHPStan\Reflection\Annotations\AnnotationsPropertiesClassReflectionExtension;
 use PHPStan\Reflection\ClassReflection;
diff --git a/src/ServiceMap.php b/src/ServiceMap.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yii\PHPStan;
+namespace Yii2\Extensions\PHPStan;
 
 use Closure;
 use InvalidArgumentException;
diff --git a/src/Type/ActiveQueryDynamicMethodReturnTypeExtension.php b/src/Type/ActiveQueryDynamicMethodReturnTypeExtension.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yii\PHPStan\Type;
+namespace Yii2\Extensions\PHPStan\Type;
 
 use PhpParser\Node\Arg;
 use PhpParser\Node\Expr\MethodCall;
diff --git a/src/Type/ActiveQueryObjectType.php b/src/Type/ActiveQueryObjectType.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yii\PHPStan\Type;
+namespace Yii2\Extensions\PHPStan\Type;
 
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\VerbosityLevel;
diff --git a/src/Type/ActiveRecordDynamicMethodReturnTypeExtension.php b/src/Type/ActiveRecordDynamicMethodReturnTypeExtension.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yii\PHPStan\Type;
+namespace Yii2\Extensions\PHPStan\Type;
 
 use PhpParser\Node\Arg;
 use PhpParser\Node\Expr\MethodCall;
diff --git a/src/Type/ActiveRecordDynamicStaticMethodReturnTypeExtension.php b/src/Type/ActiveRecordDynamicStaticMethodReturnTypeExtension.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yii\PHPStan\Type;
+namespace Yii2\Extensions\PHPStan\Type;
 
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Name;
diff --git a/src/Type/ActiveRecordObjectType.php b/src/Type/ActiveRecordObjectType.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yii\PHPStan\Type;
+namespace Yii2\Extensions\PHPStan\Type;
 
 use ArrayAccess;
 use PHPStan\ShouldNotHappenException;
diff --git a/src/Type/ContainerDynamicMethodReturnTypeExtension.php b/src/Type/ContainerDynamicMethodReturnTypeExtension.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yii\PHPStan\Type;
+namespace Yii2\Extensions\PHPStan\Type;
 
 use PhpParser\Node\Arg;
 use PhpParser\Node\Expr\MethodCall;
@@ -13,8 +13,8 @@
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
+use Yii2\Extensions\PHPStan\ServiceMap;
 use yii\di\Container;
-use Yii\PHPStan\ServiceMap;
 
 final class ContainerDynamicMethodReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
diff --git a/src/Type/HeaderCollectionDynamicMethodReturnTypeExtension.php b/src/Type/HeaderCollectionDynamicMethodReturnTypeExtension.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yii\PHPStan\Type;
+namespace Yii2\Extensions\PHPStan\Type;
 
 use PhpParser\Node\Arg;
 use PhpParser\Node\Expr\ConstFetch;
diff --git a/tests/ServiceMapTest.php b/tests/ServiceMapTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yii\PHPStan\Tests;
+namespace Yii2\Extensions\PHPStan\Tests;
 
 use InvalidArgumentException;
 use PhpParser\Node\Scalar\String_;
@@ -12,8 +12,8 @@
 use SplFileInfo;
 use SplObjectStorage;
 use SplStack;
-use Yii\PHPStan\ServiceMap;
-use Yii\PHPStan\Tests\Yii\MyActiveRecord;
+use Yii2\Extensions\PHPStan\ServiceMap;
+use Yii2\Extensions\PHPStan\Tests\Yii\MyActiveRecord;
 
 final class ServiceMapTest extends TestCase
 {
@@ -44,7 +44,9 @@ public function testThrowExceptionWhenServiceHasUnsupportedType(): void
         $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('Unsupported service definition for unsupported-type');
 
-        new ServiceMap(__DIR__ . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'yii-config-invalid-unsupported-type.php');
+        new ServiceMap(
+            __DIR__ . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'yii-config-invalid-unsupported-type.php'
+        );
     }
 
     /**
@@ -55,7 +57,9 @@ public function testThrowExceptionWhenServiceHasUnsupportedArray(): void
         $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('Cannot guess service definition for unsupported-array');
 
-        new ServiceMap(__DIR__ . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'yii-config-invalid-unsupported-array.php');
+        new ServiceMap(
+            __DIR__ . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'yii-config-invalid-unsupported-array.php'
+        );
     }
 
     /**
@@ -66,7 +70,9 @@ public function testThrowExceptionWhenComponentHasInvalidValue(): void
         $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('Invalid value for component with id customComponent. Expected object or array.');
 
-        new ServiceMap(__DIR__ . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'yii-config-invalid-component.php');
+        new ServiceMap(
+            __DIR__ . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'yii-config-invalid-component.php'
+        );
     }
 
     /**
@@ -76,18 +82,42 @@ public function testItLoadsServicesAndComponents(): void
     {
         $serviceMap = new ServiceMap(__DIR__ . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'yii-config-valid.php');
 
-        self::assertSame(MyActiveRecord::class, $serviceMap->getServiceClassFromNode(new String_('singleton-string')));
-        self::assertSame(MyActiveRecord::class, $serviceMap->getServiceClassFromNode(new String_(MyActiveRecord::class)));
-        self::assertSame(SplStack::class, $serviceMap->getServiceClassFromNode(new String_('singleton-closure')));
-        self::assertSame(SplObjectStorage::class, $serviceMap->getServiceClassFromNode(new String_('singleton-service')));
-        self::assertSame(SplFileInfo::class, $serviceMap->getServiceClassFromNode(new String_('singleton-nested-service-class')));
-
-        self::assertSame(SplStack::class, $serviceMap->getServiceClassFromNode(new String_('closure')));
-        self::assertSame(SplObjectStorage::class, $serviceMap->getServiceClassFromNode(new String_('service')));
-        self::assertSame(SplFileInfo::class, $serviceMap->getServiceClassFromNode(new String_('nested-service-class')));
-
-        self::assertSame(MyActiveRecord::class, $serviceMap->getComponentClassById('customComponent'));
-        self::assertSame(MyActiveRecord::class, $serviceMap->getComponentClassById('customInitializedComponent'));
+        $this->assertSame(
+            MyActiveRecord::class,
+            $serviceMap->getServiceClassFromNode(new String_('singleton-string')),
+        );
+        $this->assertSame(
+            MyActiveRecord::class,
+            $serviceMap->getServiceClassFromNode(new String_(MyActiveRecord::class)),
+        );
+        $this->assertSame(
+            SplStack::class,
+            $serviceMap->getServiceClassFromNode(new String_('singleton-closure')),
+        );
+        $this->assertSame(
+            SplObjectStorage::class,
+            $serviceMap->getServiceClassFromNode(new String_('singleton-service')),
+        );
+        $this->assertSame(
+            SplFileInfo::class,
+            $serviceMap->getServiceClassFromNode(new String_('singleton-nested-service-class')),
+        );
+
+        $this->assertSame(
+            SplStack::class,
+            $serviceMap->getServiceClassFromNode(new String_('closure')),
+        );
+        $this->assertSame(
+            SplObjectStorage::class,
+            $serviceMap->getServiceClassFromNode(new String_('service')),
+        );
+        $this->assertSame(
+            SplFileInfo::class,
+            $serviceMap->getServiceClassFromNode(new String_('nested-service-class')),
+        );
+
+        $this->assertSame(MyActiveRecord::class, $serviceMap->getComponentClassById('customComponent'));
+        $this->assertSame(MyActiveRecord::class, $serviceMap->getComponentClassById('customInitializedComponent'));
     }
 
     /**
diff --git a/tests/Yii/MyActiveRecord.php b/tests/Yii/MyActiveRecord.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yii\PHPStan\Tests\Yii;
+namespace Yii2\Extensions\PHPStan\Tests\Yii;
 
 use yii\db\ActiveRecord;
 
diff --git a/tests/Yii/MyController.php b/tests/Yii/MyController.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yii\PHPStan\Tests\Yii;
+namespace Yii2\Extensions\PHPStan\Tests\Yii;
 
 use SplObjectStorage;
 use Yii;
diff --git a/tests/assets/yii-config-valid.php b/tests/assets/yii-config-valid.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use Yii\PHPStan\Tests\Yii\MyActiveRecord;
+use Yii2\Extensions\PHPStan\Tests\Yii\MyActiveRecord;
 
 return [
     'components' => [

Original file line number	Diff line number	Diff line change
`@@ -11,34 +11,34 @@ parametersSchema:`
`11`	`11`
`12`	`12`	`services:`
`13`	`13`	`-`
`14`		`- class: Yii\PHPStan\Reflection\ApplicationPropertiesClassReflectionExtension`
	`14`	`+ class: Yii2\Extensions\PHPStan\Reflection\ApplicationPropertiesClassReflectionExtension`
`15`	`15`	`tags: [phpstan.broker.propertiesClassReflectionExtension]`
`16`	`16`	`-`
`17`		`- class: Yii\PHPStan\Reflection\RequestMethodsClassReflectionExtension`
	`17`	`+ class: Yii2\Extensions\PHPStan\Reflection\RequestMethodsClassReflectionExtension`
`18`	`18`	`tags: [phpstan.broker.methodsClassReflectionExtension]`
`19`	`19`	`-`
`20`		`- class: Yii\PHPStan\Reflection\RequestPropertiesClassReflectionExtension`
	`20`	`+ class: Yii2\Extensions\PHPStan\Reflection\RequestPropertiesClassReflectionExtension`
`21`	`21`	`tags: [phpstan.broker.propertiesClassReflectionExtension]`
`22`	`22`	`-`
`23`		`- class: Yii\PHPStan\Reflection\ResponsePropertiesClassReflectionExtension`
	`23`	`+ class: Yii2\Extensions\PHPStan\Reflection\ResponsePropertiesClassReflectionExtension`
`24`	`24`	`tags: [phpstan.broker.propertiesClassReflectionExtension]`
`25`	`25`	`-`
`26`		`- class: Yii\PHPStan\Reflection\UserPropertiesClassReflectionExtension`
	`26`	`+ class: Yii2\Extensions\PHPStan\Reflection\UserPropertiesClassReflectionExtension`
`27`	`27`	`tags: [phpstan.broker.propertiesClassReflectionExtension]`
`28`	`28`	`-`
`29`		`- class: Yii\PHPStan\Type\ActiveQueryDynamicMethodReturnTypeExtension`
	`29`	`+ class: Yii2\Extensions\PHPStan\Type\ActiveQueryDynamicMethodReturnTypeExtension`
`30`	`30`	`tags: [phpstan.broker.dynamicMethodReturnTypeExtension]`
`31`	`31`	`-`
`32`		`- class: Yii\PHPStan\Type\ActiveRecordDynamicMethodReturnTypeExtension`
	`32`	`+ class: Yii2\Extensions\PHPStan\Type\ActiveRecordDynamicMethodReturnTypeExtension`
`33`	`33`	`tags: [phpstan.broker.dynamicMethodReturnTypeExtension]`
`34`	`34`	`-`
`35`		`- class: Yii\PHPStan\Type\HeaderCollectionDynamicMethodReturnTypeExtension`
	`35`	`+ class: Yii2\Extensions\PHPStan\Type\HeaderCollectionDynamicMethodReturnTypeExtension`
`36`	`36`	`tags: [phpstan.broker.dynamicMethodReturnTypeExtension]`
`37`	`37`	`-`
`38`		`- class: Yii\PHPStan\Type\ActiveRecordDynamicStaticMethodReturnTypeExtension`
	`38`	`+ class: Yii2\Extensions\PHPStan\Type\ActiveRecordDynamicStaticMethodReturnTypeExtension`
`39`	`39`	`tags: [phpstan.broker.dynamicStaticMethodReturnTypeExtension]`
`40`	`40`	`-`
`41`		`- class: Yii\PHPStan\Type\ContainerDynamicMethodReturnTypeExtension`
	`41`	`+ class: Yii2\Extensions\PHPStan\Type\ContainerDynamicMethodReturnTypeExtension`
`42`	`42`	`tags: [phpstan.broker.dynamicMethodReturnTypeExtension]`
`43`	`43`
`44`		`- - Yii\PHPStan\ServiceMap(%yii2.config_path%)`
	`44`	`+ - Yii2\Extensions\PHPStan\ServiceMap(%yii2.config_path%)`