Reorganize models

Author: jasonmccreary

src/Generators/ControllerGenerator.php

@@ -2,9 +2,8 @@
 
 namespace Blueprint\Generators;
 
-use Blueprint\Column;
 use Blueprint\Contracts\Generator;
-use Blueprint\Controller;
+use Blueprint\Models\Controller;
 use Illuminate\Support\Str;
 
 class ControllerGenerator implements Generator
@@ -23,7 +22,7 @@ public function output(array $tree): array
 
         $stub = $this->files->get(STUBS_PATH . '/controller/class.stub');
 
-        /** @var \Blueprint\Controller $controller */
+        /** @var \Blueprint\Models\Controller $controller */
         foreach ($tree['controllers'] as $controller) {
             $path = $this->getPath($controller);
             $this->files->put(

src/Generators/FactoryGenerator.php

@@ -3,7 +3,7 @@
 namespace Blueprint\Generators;
 
 use Blueprint\Contracts\Generator;
-use Blueprint\Model;
+use Blueprint\Models\Model;
 
 class FactoryGenerator implements Generator
 {
@@ -23,7 +23,7 @@ public function output(array $tree): array
 
         $stub = $this->files->get(STUBS_PATH . '/factory.stub');
 
-        /** @var \Blueprint\Model $model */
+        /** @var \Blueprint\Models\Model $model */
         foreach ($tree['models'] as $model) {
             $path = $this->getPath($model);
             $this->files->put(
@@ -55,7 +55,7 @@ protected function buildDefinition(Model $model)
     {
         $definition = '';
 
-        /** @var \Blueprint\Column $column */
+        /** @var \Blueprint\Models\Column $column */
         foreach ($model->columns() as $column) {
             if ($column->name() === 'id') {
                 continue;

src/Generators/MigrationGenerator.php

@@ -3,7 +3,7 @@
 namespace Blueprint\Generators;
 
 use Blueprint\Contracts\Generator;
-use Blueprint\Model;
+use Blueprint\Models\Model;
 use Illuminate\Support\Str;
 
 class MigrationGenerator implements Generator
@@ -24,7 +24,7 @@ public function output(array $tree): array
 
         $stub = $this->files->get(STUBS_PATH . '/migration.stub');
 
-        /** @var \Blueprint\Model $model */
+        /** @var \Blueprint\Models\Model $model */
         foreach ($tree['models'] as $model) {
             $path = $this->getPath($model);
             $this->files->put(
@@ -51,7 +51,7 @@ protected function buildDefinition(Model $model)
     {
         $definition = '';
 
-        /** @var \Blueprint\Column $column */
+        /** @var \Blueprint\Models\Column $column */
         foreach ($model->columns() as $column) {
             $dataType = $column->dataType();
             if ($column->name() === 'id') {

src/Generators/ModelGenerator.php

@@ -2,9 +2,9 @@
 
 namespace Blueprint\Generators;
 
-use Blueprint\Column;
 use Blueprint\Contracts\Generator;
-use Blueprint\Model;
+use Blueprint\Models\Column;
+use Blueprint\Models\Model;
 
 class ModelGenerator implements Generator
 {
@@ -22,7 +22,7 @@ public function output(array $tree): array
 
         $stub = $this->files->get(STUBS_PATH . '/model/class.stub');
 
-        /** @var \Blueprint\Model $model */
+        /** @var \Blueprint\Models\Model $model */
         foreach ($tree['models'] as $model) {
             $path = $this->getPath($model);
             $this->files->put(

src/Generators/Statements/EventGenerator.php

@@ -23,7 +23,7 @@ public function output(array $tree): array
 
         $stub = $this->files->get(STUBS_PATH . '/event.stub');
 
-        /** @var \Blueprint\Controller $controller */
+        /** @var \Blueprint\Models\Controller $controller */
         foreach ($tree['controllers'] as $controller) {
             foreach ($controller->methods() as $method => $statements) {
                 foreach ($statements as $statement) {

src/Generators/Statements/FormRequestGenerator.php

@@ -2,9 +2,8 @@
 
 namespace Blueprint\Generators\Statements;
 
-use Blueprint\Column;
 use Blueprint\Contracts\Generator;
-use Blueprint\Model;
+use Blueprint\Models\Model;
 use Blueprint\Models\Statements\ValidateStatement;
 use Blueprint\Translators\Rules;
 use Illuminate\Support\Str;
@@ -33,7 +32,7 @@ public function output(array $tree): array
 
         $this->registerModels($tree['models']);
 
-        /** @var \Blueprint\Controller $controller */
+        /** @var \Blueprint\Models\Controller $controller */
         foreach ($tree['controllers'] as $controller) {
             foreach ($controller->methods() as $method => $statements) {
                 foreach ($statements as $statement) {
@@ -124,7 +123,7 @@ private function splitField($field)
 
     private function validationRules(string $qualifier, string $column)
     {
-        /** @var Model $model */
+        /** @var \Blueprint\Models\Model $model */
         $model = $this->modelForContext($qualifier);
 
         if (!is_null($model) && $model->hasColumn($column)) {

src/Generators/Statements/JobGenerator.php

@@ -23,7 +23,7 @@ public function output(array $tree): array
 
         $stub = $this->files->get(STUBS_PATH . '/job.stub');
 
-        /** @var \Blueprint\Controller $controller */
+        /** @var \Blueprint\Models\Controller $controller */
         foreach ($tree['controllers'] as $controller) {
             foreach ($controller->methods() as $method => $statements) {
                 foreach ($statements as $statement) {

src/Generators/Statements/MailGenerator.php

@@ -23,7 +23,7 @@ public function output(array $tree): array
 
         $stub = $this->files->get(STUBS_PATH . '/mail.stub');
 
-        /** @var \Blueprint\Controller $controller */
+        /** @var \Blueprint\Models\Controller $controller */
         foreach ($tree['controllers'] as $controller) {
             foreach ($controller->methods() as $method => $statements) {
                 foreach ($statements as $statement) {

src/Generators/Statements/ViewGenerator.php

@@ -23,7 +23,7 @@ public function output(array $tree): array
 
         $stub = $this->files->get(STUBS_PATH . '/view.stub');
 
-        /** @var \Blueprint\Controller $controller */
+        /** @var \Blueprint\Models\Controller $controller */
         foreach ($tree['controllers'] as $controller) {
             foreach ($controller->methods() as $method => $statements) {
                 foreach ($statements as $statement) {

src/Lexers/ControllerLexer.php

@@ -3,9 +3,7 @@
 namespace Blueprint\Lexers;
 
 use Blueprint\Contracts\Lexer;
-use Blueprint\Controller;
-use Blueprint\Models\Statements\QueryStatement;
-use Blueprint\Models\Statements\RenderStatement;
+use Blueprint\Models\Controller;
 
 class ControllerLexer implements Lexer
 {