All works except validators. Alpha 0.1!

Author: ProgMiner

FieldModel.php

@@ -2,56 +2,14 @@ namespace PHPDataGen\Model;
 
 class FieldModel {
 
-}
-/*
-    addField(
-        (new FieldBuilder())->
-            setName('name')->
-            setType('string')
-    )->
-
-    addField(
-        (new FieldBuilder())->
-            setName('editable')->
-            setType('bool')->
-            setDefault('false')
-    )->
-
-    addField(
-        (new FieldBuilder())->
-            setName('direct')->
-            setType('bool')->
-            setDefault('false')
-    )->
+    val name: string;
 
-    addField(
-        (new FieldBuilder())->
-            setName('type')->
-            setType('string')
-    )->
+    val editable: bool = false;
+    val direct:   bool = false;
 
-    addField(
-        (new FieldBuilder())->
-            setName('validators')->
-            setType('array')
-    )->
+    val type:       string;
+    val validators: array;
 
-    addField(
-        (new FieldBuilder())->
-            setName('hasDefault')->
-            setType('bool')->
-            setDefault('false')
-    )->
-
-    addField(
-        (new FieldBuilder())->
-            setName('filterDefault')->
-            setType('bool')->
-            setDefault('true')
-    )->
-
-    addField(
-        (new FieldBuilder())->
-            setName('default')
-    );
-*/
+    val filterDefault: bool = true;
+    val default:       string;
+}

FieldModel.php-data

@@ -1,12 +1,30 @@
-namespace Foo;
+class Test {
 
-use Foo\Bar;
-use Foo\Baz as A;
+    val A;
+    val A1: string;
+    val A2 = "Foo";
+    val A3 := "Fee";
+    val A4: string = "Bar";
+    val A5: string := "Baz";
 
-class Test extends \B implements Bar, A {
+    var B;
+    var B1: string;
+    var B2 = "Foo";
+    var B3 := "Fee";
+    var B4: string = "Bar";
+    var B5: string := "Baz";
 
-}
-
-class Test1 extends C {
+    direct val C;
+    direct val C1: string;
+    direct val C2 = "Foo";
+    direct val C3 := "Fee";
+    direct val C4: string = "Bar";
+    direct val C5: string := "Baz";
 
+    direct var D;
+    direct var D1: string;
+    direct var D2 = "Foo";
+    direct var D3 := "Fee";
+    direct var D4: string = "Bar";
+    direct var D5: string := "Baz";
 }

Test.php-data

@@ -58,11 +58,6 @@ class FieldBuilder {
      */
     protected $validators = [];
 
-    /**
-     * @var bool Has field default value?
-     */
-    protected $hasDefault = false;
-
     /**
      * @var bool Apply validators to default value?
      */
@@ -141,8 +136,11 @@ public function setFilterDefault(string $filterDefault): FieldBuilder {
      * @return static $this
      */
     public function setDefault(string $default): FieldBuilder {
+        if (isset($this->default)) {
+            throw new \Exception('Default value is already setted');
+        }
+
         $this->default = $default;
-        $this->hasDefault = true;
         return $this;
     }
 
@@ -174,7 +172,6 @@ public function build(): FieldModel {
         $model->direct = $this->direct;
         $model->type = new Type($this->type);
         $model->validators = $this->validators;
-        $model->hasDefault = $this->hasDefault;
         $model->filterDefault = $this->filterDefault;
         $model->default = $this->default;
 

app/Building/FieldBuilder.php

@@ -89,7 +89,7 @@ protected function compileClass(ClassModel $classModel, FileModel $fileModel): s
         $result .= "public function __construct(array \$init = []) {\n";
 
         foreach ($classModel->fields as $fieldModel) {
-            if (!$fieldModel->hasDefault) {
+            if (!isset($fieldModel->default)) {
                 continue;
             }
 

app/Compiler.php

@@ -54,11 +54,6 @@ class FieldModel {
      */
     public $validators = [];
 
-    /**
-     * @var bool Has field default value?
-     */
-    public $hasDefault = false;
-
     /**
      * @var bool Apply validators to default value?
      */

app/Model/FieldModel.php

@@ -125,13 +125,14 @@ public function step(Conveyor $conveyor): State {
 
         case 5:
             if (
-                    $conveyor->readOperator('direct') ||
-                    $conveyor->readOperator('val')    ||
-                    $conveyor->readOperator('var')
+                    $conveyor->readOperator('direct', false) ||
+                    $conveyor->readOperator('val',    false) ||
+                    $conveyor->readOperator('var',    false)
             ) {
-                $this->state = 6;
-
                 $this->field = new FieldState($this);
+                $this->field->step($conveyor);
+
+                $this->state = 6;
                 return $this->field;
             }
 
@@ -142,6 +143,13 @@ public function step(Conveyor $conveyor): State {
             }
 
             throw new \Exception('Close bracket not found');
+
+        case 6:
+            $this->builder->addField($this->field->getBuilder());
+            $this->field = null;
+
+            $this->state = 5;
+            return $this;
         }
     }
 }

app/Parsing/ClassState.php

@@ -95,13 +95,17 @@ public function move(int $offset) {
      * If required is true throws Exception
      *
      * @param string $operator Operator
+     * @param bool   $skip     Skip operator? Default is true
      * @param bool   $required Is operator required? Default is false
      *
      * @return Operator finded
      */
-    public function readOperator(string $operator, bool $required = false): bool {
+    public function readOperator(string $operator, bool $skip = true, bool $required = false): bool {
         if (strpos($this->next, $operator) === 0) {
-            $this->move(strlen($operator));
+            if ($skip) {
+                $this->move(strlen($operator));
+            }
+
             return true;
         }