From 2d1351aeac03e854a16623bcba7d65796c52b633 Mon Sep 17 00:00:00 2001 From: Wilmer Arambula Date: Mon, 20 Nov 2023 09:35:25 -0300 Subject: [PATCH] Better namespace. --- composer.json | 4 +- extension.neon | 22 +++---- infection.json.dist | 16 ----- psalm.xml | 14 ---- ...tionPropertiesClassReflectionExtension.php | 4 +- .../ComponentPropertyReflection.php | 2 +- ...RequestMethodsClassReflectionExtension.php | 2 +- ...uestPropertiesClassReflectionExtension.php | 2 +- ...onsePropertiesClassReflectionExtension.php | 2 +- ...UserPropertiesClassReflectionExtension.php | 2 +- src/ServiceMap.php | 2 +- ...eQueryDynamicMethodReturnTypeExtension.php | 2 +- src/Type/ActiveQueryObjectType.php | 2 +- ...RecordDynamicMethodReturnTypeExtension.php | 2 +- ...DynamicStaticMethodReturnTypeExtension.php | 2 +- src/Type/ActiveRecordObjectType.php | 2 +- ...tainerDynamicMethodReturnTypeExtension.php | 4 +- ...ectionDynamicMethodReturnTypeExtension.php | 2 +- tests/ServiceMapTest.php | 66 ++++++++++++++----- tests/Yii/MyActiveRecord.php | 2 +- tests/Yii/MyController.php | 2 +- tests/assets/yii-config-valid.php | 2 +- 22 files changed, 80 insertions(+), 80 deletions(-) delete mode 100644 infection.json.dist delete mode 100644 psalm.xml diff --git a/composer.json b/composer.json index 37790c3..f9746e4 100644 --- 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 index 2c86e71..a178917 100644 --- 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 deleted file mode 100644 index d06b334..0000000 --- a/infection.json.dist +++ /dev/null @@ -1,16 +0,0 @@ -{ - "source": { - "directories": [ - "src" - ] - }, - "logs": { - "text": "php:\/\/stderr", - "stryker": { - "report": "main" - } - }, - "mutators": { - "@default": true - } -} diff --git a/psalm.xml b/psalm.xml deleted file mode 100644 index 19f0435..0000000 --- a/psalm.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/src/Reflection/ApplicationPropertiesClassReflectionExtension.php b/src/Reflection/ApplicationPropertiesClassReflectionExtension.php index b3f9651..5f67bd0 100644 --- 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 index 19b6f5c..10a2682 100644 --- 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 index 4b614f6..125ef9e 100644 --- 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 index 09dfdb0..57a4ed9 100644 --- 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 index ca64717..442a377 100644 --- 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 index f75411b..621b7ec 100644 --- 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 index caa84de..d01e9bb 100644 --- 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 index 88b6625..b75663d 100644 --- 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 index d1d5d4d..e63cbd5 100644 --- 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 index f3b6638..9346e3a 100644 --- 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 index 7936305..26adea7 100644 --- 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 index 99f37e7..b25b146 100644 --- 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 index fba600e..dadfcd5 100644 --- 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 index d7d7842..da83128 100644 --- 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 index 5785df2..c1257f5 100644 --- 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 index c6c2a57..1461247 100644 --- 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 index 88e25aa..34d384d 100644 --- 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 index 2d86571..986aaf4 100644 --- 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' => [