Fix misc

windwalker-io · Nov 17, 2023 · 07fca78 · 07fca78
1 parent 1e34b80
commit 07fca78
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/src/Core/Generator/Builder/AbstractAstBuilder.php b/src/Core/Generator/Builder/AbstractAstBuilder.php
@@ -48,17 +48,7 @@ protected function getParser(): Parser
 
     protected function getLexer(): Emulative
     {
-        return $this->lexer ??= new Emulative(
-            [
-                'usedAttributes' => [
-                    'comments',
-                    'startLine',
-                    'endLine',
-                    'startTokenPos',
-                    'endTokenPos',
-                ],
-            ]
-        );
+        return $this->lexer ??= new Emulative();
     }
 
     public function createNodeFactory(): BuilderFactory
@@ -91,7 +81,7 @@ protected function convertCode(
 
         $parser = $this->getParser();
         $oldAst = $parser->parse($code);
-        $oldTokens = $this->getLexer()->getTokens();
+        $oldTokens = $parser->getTokens();
 
         $traverser->addVisitor($this->createVisitor($enterNode, $leaveNode));
         $newAst = $traverser->traverse($oldAst);

diff --git a/src/Core/Generator/Builder/EntityMemberBuilder.php b/src/Core/Generator/Builder/EntityMemberBuilder.php
@@ -591,6 +591,7 @@ protected function createPropertyStatement(mixed $createColumn): Node\Stmt\Prope
 
         if ($type === '?Chronos') {
             $this->addUse(CastNullable::class);
+            $this->addUse(ServerTimeCast::class);
             $prop->setAttribute('fullType', Chronos::class);
             $prop->setAttribute('fullType', ServerTimeCast::class);
             $prop->attrGroups[] = $this->attributeGroup(

diff --git a/views/code/form/{% pascal($name) %}Form.php.tpl b/views/code/form/{% pascal($name) %}Form.php.tpl
@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace {% $ns %};
 
+use Windwalker\Form\Attributes\Fieldset;
 use Windwalker\Form\Field\HiddenField;
 use Windwalker\Form\Attributes\FormDefine;
 use Windwalker\Form\Form;