fix: Enhance ActiveRecordDynamicStaticMethodReturnTypeExtension type inference for ActiveQuery support, and fix phpstan errors max lvl in tests. (#33)

Author: terabytesoftw

CHANGELOG.md

@@ -7,6 +7,7 @@
 - Bug #27: Enhance error handling in `ServiceMap` for invalid configuration structures and add corresponding test cases (@terabytesoftw)
 - Bug #28: Refactor component handling in `ServiceMap` to improve variable naming and streamline logic (@terabytesoftw)
 - Enh #29: Enable strict rules and bleeding edge analysis, and update `README.md` with strict configuration examples (@terabytesoftw)
+- Bug #33: Enhance `ActiveRecordDynamicStaticMethodReturnTypeExtension` type inference for `ActiveQuery` support, and fix phpstan errors max lvl in tests (@terabytesoftw)
 
 ## 0.2.2 June 04, 2025
 

src/type/ActiveRecordDynamicStaticMethodReturnTypeExtension.php

@@ -130,6 +130,10 @@ public function isStaticMethodSupported(MethodReflection $methodReflection): boo
         if (count($classNames) > 0) {
             $className = $classNames[0];
 
+            if ($className === ActiveQuery::class) {
+                return true;
+            }
+
             if ($this->reflectionProvider->hasClass($className)) {
                 $classReflection = $this->reflectionProvider->getClass($className);
 
@@ -165,6 +169,7 @@ public function getTypeFromStaticMethodCall(
         Scope $scope,
     ): Type {
         $className = $methodCall->class;
+
         $returnType = ParametersAcceptorSelector::selectFromArgs(
             $scope,
             $methodCall->getArgs(),
@@ -185,6 +190,12 @@ public function getTypeFromStaticMethodCall(
             return TypeCombinator::union(new NullType(), new ActiveRecordObjectType($name));
         }
 
-        return new ActiveQueryObjectType($name, false);
+        $classNames = $returnType->getObjectClassNames();
+
+        if (count($classNames) > 0 && $classNames[0] === ActiveQuery::class) {
+            return new ActiveQueryObjectType($name, false);
+        }
+
+        return $returnType;
     }
 }

tests/ServiceMapTest.php

@@ -62,65 +62,65 @@ public function testItLoadsServicesAndComponents(): void
 
         $serviceMap = new ServiceMap($fixturePath);
 
-        $this->assertNull(
+        self::assertNull(
             $serviceMap->getServiceClassFromNode(new String_('non-existent-service')),
             'ServiceMap should return \'null\' for a \'non-existent service\'.',
         );
-        $this->assertSame(
+        self::assertSame(
             MyActiveRecord::class,
             $serviceMap->getServiceClassFromNode(new String_('singleton-string')),
             'ServiceMap should resolve \'singleton-string\' to \'MyActiveRecord::class\'.',
         );
-        $this->assertSame(
+        self::assertSame(
             MyActiveRecord::class,
             $serviceMap->getServiceClassFromNode(new String_(MyActiveRecord::class)),
             'ServiceMap should resolve \'MyActiveRecord::class\' as a singleton string service.',
         );
-        $this->assertSame(
+        self::assertSame(
             SplStack::class,
             $serviceMap->getServiceClassFromNode(new String_('singleton-closure')),
             'ServiceMap should resolve \'singleton-closure\' to \'SplStack::class\'.',
         );
-        $this->assertSame(
+        self::assertSame(
             SplObjectStorage::class,
             $serviceMap->getServiceClassFromNode(new String_('singleton-service')),
             'ServiceMap should resolve \'singleton-service\' to \'SplObjectStorage::class\'.',
         );
-        $this->assertSame(
+        self::assertSame(
             SplFileInfo::class,
             $serviceMap->getServiceClassFromNode(new String_('singleton-nested-service-class')),
             'ServiceMap should resolve \'singleton-nested-service-class\' to \'SplFileInfo::class\'.',
         );
-        $this->assertSame(
+        self::assertSame(
             SplStack::class,
             $serviceMap->getServiceClassFromNode(new String_('closure')),
             'ServiceMap should resolve \'closure\' to \'SplStack::class\'.',
         );
-        $this->assertSame(
+        self::assertSame(
             SplObjectStorage::class,
             $serviceMap->getServiceClassFromNode(new String_('service')),
             'ServiceMap should resolve \'service\' to \'SplObjectStorage::class\'.',
         );
-        $this->assertSame(
+        self::assertSame(
             SplFileInfo::class,
             $serviceMap->getServiceClassFromNode(new String_('nested-service-class')),
             'ServiceMap should resolve \'nested-service-class\' to \'SplFileInfo::class\'.',
         );
-        $this->assertSame(
+        self::assertSame(
             MyActiveRecord::class,
             $serviceMap->getComponentClassById('customComponent'),
             'ServiceMap should resolve component id \'customComponent\' to \'MyActiveRecord::class\'.',
         );
-        $this->assertNull(
+        self::assertNull(
             $serviceMap->getComponentClassById('nonExistentComponent'),
             'ServiceMap should return \'null\' for a \'non-existent\' component id.',
         );
-        $this->assertSame(
+        self::assertSame(
             MyActiveRecord::class,
             $serviceMap->getComponentClassById('customInitializedComponent'),
             'ServiceMap should resolve component id \'customInitializedComponent\' to \'MyActiveRecord::class\'.',
         );
-        $this->assertNull(
+        self::assertNull(
             $serviceMap->getComponentClassById('assetManager'),
             'ServiceMap should return \'null\' for \'assetManager\' component id as it is not a class but an array.',
         );

tests/stub/MyController.php

@@ -47,7 +47,7 @@ public function actionMy(): void
 
         $record = MyActiveRecord::find()->where(['flag' => Yii::$app->request->post('flag', true)])->one();
 
-        if ($record) {
+        if ($record !== null) {
             $record->flag = false;
             $flag = $record[$offsetProp];
             $record[$offsetProp] = true;
@@ -56,14 +56,14 @@ public function actionMy(): void
 
         $record = MyActiveRecord::findOne(['condition']);
 
-        if ($record) {
+        if ($record !== null) {
             $flag = $record->flag;
             $flag = $record['flag'];
         }
 
         $record = MyActiveRecord::findBySql('');
 
-        if ($record = $record->one()) {
+        if (($record = $record->one()) !== null) {
             $flag = $record->flag;
             $flag = $record['flag'];
         }