Added return type for model ast visitors. (#6544)

hyperf · Feb 20, 2024 · 3246aca · 3246aca
1 parent a3ff1e7
commit 3246aca
Show file tree

Hide file tree

Showing 16 changed files with 62 additions and 5 deletions.
diff --git a/src/Commands/Ast/GenerateModelIDEVisitor.php b/src/Commands/Ast/GenerateModelIDEVisitor.php
@@ -64,6 +64,8 @@ public function enterNode(Node $node)
                 new Node\Identifier(self::toIDEClass($this->nsp . '\\' . $this->originClassName))
             );
         }
+
+        return null;
     }
 
     public function afterTraverse(array $nodes)

diff --git a/src/Commands/Ast/ModelRewriteGetterSetterVisitor.php b/src/Commands/Ast/ModelRewriteGetterSetterVisitor.php
@@ -42,6 +42,8 @@ public function beforeTraverse(array $nodes)
         $methods = PhpParser::getInstance()->getAllMethodsFromStmts($nodes);
 
         $this->collectMethods($methods);
+
+        return null;
     }
 
     public function afterTraverse(array $nodes)

diff --git a/src/Commands/Ast/ModelRewriteInheritanceVisitor.php b/src/Commands/Ast/ModelRewriteInheritanceVisitor.php
@@ -80,5 +80,7 @@ public function leaveNode(Node $node)
                 }
                 return $node;
         }
+
+        return null;
     }
 }
diff --git a/src/Commands/Ast/ModelRewriteKeyInfoVisitor.php b/src/Commands/Ast/ModelRewriteKeyInfoVisitor.php
@@ -85,6 +85,8 @@ public function afterTraverse(array $nodes)
                 }
             }
         }
+
+        return null;
     }
 
     protected function rewrite(string $property, ?Node\Stmt\Property $node = null): ?Node\Stmt\Property
@@ -124,7 +126,6 @@ protected function rewrite(string $property, ?Node\Stmt\Property $node = null):
 
     /**
      * @param bool|string $value
-     * @return Node\Scalar
      */
     protected function getExpr(string $property, $value): Node\Expr
     {

diff --git a/src/Commands/Ast/ModelRewriteSoftDeletesVisitor.php b/src/Commands/Ast/ModelRewriteSoftDeletesVisitor.php
@@ -73,6 +73,8 @@ public function afterTraverse(array $nodes)
                 }
             }
         }
+
+        return null;
     }
 
     protected function rewriteSoftDeletesUse(?Node\Stmt\Use_ $node = null): ?Node\Stmt\Use_

diff --git a/src/Commands/Ast/ModelRewriteTimestampsVisitor.php b/src/Commands/Ast/ModelRewriteTimestampsVisitor.php
@@ -76,6 +76,8 @@ public function afterTraverse(array $nodes)
                 }
             }
         }
+
+        return null;
     }
 
     protected function rewriteTimestamps(?Node\Stmt\Property $node = null): ?Node\Stmt\Property

diff --git a/tests/DatabaseGenMigrationCommandTest.php b/tests/DatabaseGenMigrationCommandTest.php
@@ -13,6 +13,7 @@
 
 use Hyperf\Database\Commands\Migrations\GenMigrateCommand;
 use Hyperf\Database\Migrations\MigrationCreator;
+use HyperfTest\Database\Stubs\ContainerStub;
 use Mockery;
 use PHPUnit\Framework\Attributes\CoversNothing;
 use PHPUnit\Framework\TestCase;
@@ -32,6 +33,8 @@ protected function setUp(): void
     {
         parent::setUp();
         ! defined('BASE_PATH') && define('BASE_PATH', __DIR__);
+
+        ContainerStub::unsetContainer();
     }
 
     protected function tearDown(): void

diff --git a/tests/DatabaseMigrationCreatorTest.php b/tests/DatabaseMigrationCreatorTest.php
@@ -13,6 +13,7 @@
 
 use Hyperf\Database\Migrations\MigrationCreator;
 use Hyperf\Support\Filesystem\Filesystem;
+use HyperfTest\Database\Stubs\ContainerStub;
 use HyperfTest\Database\Stubs\MigrationCreatorFakeMigration;
 use InvalidArgumentException;
 use Mockery;
@@ -28,6 +29,11 @@ class DatabaseMigrationCreatorTest extends TestCase
 {
     use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 
+    protected function setUp(): void
+    {
+        ContainerStub::unsetContainer();
+    }
+
     protected function tearDown(): void
     {
         Mockery::close();

diff --git a/tests/DatabaseMigrationInstallCommandTest.php b/tests/DatabaseMigrationInstallCommandTest.php
@@ -13,6 +13,7 @@
 
 use Hyperf\Database\Commands\Migrations\InstallCommand;
 use Hyperf\Database\Migrations\MigrationRepositoryInterface;
+use HyperfTest\Database\Stubs\ContainerStub;
 use Mockery;
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use PHPUnit\Framework\Attributes\CoversNothing;
@@ -29,6 +30,11 @@ class DatabaseMigrationInstallCommandTest extends TestCase
 {
     use MockeryPHPUnitIntegration;
 
+    protected function setUp(): void
+    {
+        ContainerStub::unsetContainer();
+    }
+
     protected function tearDown(): void
     {
         Mockery::close();

diff --git a/tests/DatabaseMigrationMigrateCommandTest.php b/tests/DatabaseMigrationMigrateCommandTest.php
@@ -13,6 +13,7 @@
 
 use Hyperf\Database\Commands\Migrations\MigrateCommand;
 use Hyperf\Database\Migrations\Migrator;
+use HyperfTest\Database\Stubs\ContainerStub;
 use Mockery;
 use PHPUnit\Framework\Attributes\CoversNothing;
 use PHPUnit\Framework\TestCase;
@@ -33,6 +34,8 @@ protected function setUp(): void
     {
         parent::setUp();
         ! defined('BASE_PATH') && define('BASE_PATH', __DIR__);
+
+        ContainerStub::unsetContainer();
     }
 
     protected function tearDown(): void

diff --git a/tests/DatabaseMigrationRepositoryTest.php b/tests/DatabaseMigrationRepositoryTest.php
@@ -18,6 +18,7 @@
 use Hyperf\Database\Migrations\DatabaseMigrationRepository;
 use Hyperf\Database\Query\Builder;
 use Hyperf\Database\Schema\Builder as SchemaBuilder;
+use HyperfTest\Database\Stubs\ContainerStub;
 use Mockery;
 use PHPUnit\Framework\Attributes\CoversNothing;
 use PHPUnit\Framework\TestCase;
@@ -31,6 +32,11 @@ class DatabaseMigrationRepositoryTest extends TestCase
 {
     use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 
+    protected function setUp(): void
+    {
+        ContainerStub::unsetContainer();
+    }
+
     protected function tearDown(): void
     {
         Mockery::close();

diff --git a/tests/DatabaseMigrationResetCommandTest.php b/tests/DatabaseMigrationResetCommandTest.php
@@ -13,6 +13,7 @@
 
 use Hyperf\Database\Commands\Migrations\ResetCommand;
 use Hyperf\Database\Migrations\Migrator;
+use HyperfTest\Database\Stubs\ContainerStub;
 use Mockery;
 use PHPUnit\Framework\Attributes\CoversNothing;
 use PHPUnit\Framework\TestCase;
@@ -32,6 +33,8 @@ protected function setUp(): void
     {
         parent::setUp();
         ! defined('BASE_PATH') && define('BASE_PATH', __DIR__);
+
+        ContainerStub::unsetContainer();
     }
 
     protected function tearDown(): void

diff --git a/tests/DatabaseMigrationRollbackCommandTest.php b/tests/DatabaseMigrationRollbackCommandTest.php
@@ -13,6 +13,7 @@
 
 use Hyperf\Database\Commands\Migrations\RollbackCommand;
 use Hyperf\Database\Migrations\Migrator;
+use HyperfTest\Database\Stubs\ContainerStub;
 use Mockery;
 use PHPUnit\Framework\Attributes\CoversNothing;
 use PHPUnit\Framework\TestCase;
@@ -32,6 +33,8 @@ protected function setUp(): void
     {
         parent::setUp();
         ! defined('BASE_PATH') && define('BASE_PATH', __DIR__);
+
+        ContainerStub::unsetContainer();
     }
 
     protected function tearDown(): void

diff --git a/tests/DatabaseModelCustomCastingTest.php b/tests/DatabaseModelCustomCastingTest.php
@@ -18,6 +18,7 @@
 use Hyperf\Database\Exception\InvalidCastException;
 use Hyperf\Database\Model\CastsValue;
 use Hyperf\Database\Model\Model;
+use HyperfTest\Database\Stubs\ContainerStub;
 use Mockery;
 use PHPUnit\Framework\Attributes\CoversNothing;
 use PHPUnit\Framework\TestCase;
@@ -29,12 +30,13 @@
  * @coversNothing
  */
 #[CoversNothing]
-/**
- * @internal
- * @coversNothing
- */
 class DatabaseModelCustomCastingTest extends TestCase
 {
+    protected function setUp(): void
+    {
+        ContainerStub::unsetContainer();
+    }
+
     protected function tearDown(): void
     {
         Mockery::close();

diff --git a/tests/DatabaseMySqlQueryGrammarTest.php b/tests/DatabaseMySqlQueryGrammarTest.php
@@ -13,6 +13,7 @@
 
 use Hyperf\Database\Connection;
 use Hyperf\Database\Query\Grammars\MySqlGrammar;
+use HyperfTest\Database\Stubs\ContainerStub;
 use Mockery as m;
 use PHPUnit\Framework\TestCase;
 
@@ -22,6 +23,11 @@
  */
 class DatabaseMySqlQueryGrammarTest extends TestCase
 {
+    protected function setUp(): void
+    {
+        ContainerStub::unsetContainer();
+    }
+
     protected function tearDown(): void
     {
         m::close();

diff --git a/tests/Stubs/ContainerStub.php b/tests/Stubs/ContainerStub.php
@@ -19,6 +19,7 @@
 use Hyperf\Database\Connectors\MySqlConnector;
 use Hyperf\Di\Container;
 use Mockery;
+use ReflectionClass;
 
 class ContainerStub
 {
@@ -67,4 +68,11 @@ public static function getModelOption()
             ->setWithIde(false);
         return $option;
     }
+
+    public static function unsetContainer()
+    {
+        $ref = new ReflectionClass(ApplicationContext::class);
+        $c = $ref->getProperty('container');
+        $c->setValue(null);
+    }
 }