Merge branch 'release/v3.7.1'

llstarscreamll · Jun 19, 2017 · dbeef30 · dbeef30
2 parents a4c68fb + ca8995b
commit dbeef30
Show file tree

Hide file tree

Showing 189 changed files with 1,496 additions and 1,412 deletions.
diff --git a/Actions/GenerateAngular2ModuleAction.php b/Actions/GenerateAngular2ModuleAction.php
@@ -25,6 +25,9 @@ class GenerateAngular2ModuleAction
 {
     public function run(Collection $request)
     {
+        // prevent persist data generated from factories
+        \DB::beginTransaction();
+
         // generate the base folders
         $createAngular2DirsTask = new CreateAngular2DirsTask($request);
         $createAngular2DirsTask->run();
@@ -72,5 +75,7 @@ public function run(Collection $request)
         // generate utils
         $createNgUtilsTask = new CreateNgUtilsTask($request);
         $createNgUtilsTask->run();
+
+        \DB::rollback();
     }
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Release Notes
 
+## 3.7.1 (2017-06-18)
+
+### Fixed
+
+- Prevent persist data when Angular module test utils are generated from Laravel models factories.
+
+### Changed
+
+- Rename templates variable `$gen` to `$crud`.
+- Rename changelog, lisence and readme files.
+- Rename test folder to Tests.
+
 ## 3.7 (2017-06-14)
 
 ### Added

diff --git a/license.md → LICENSE.md b/license.md → LICENSE.md
diff --git a/Providers/ControllerGenerator.php b/Providers/ControllerGenerator.php
@@ -38,7 +38,7 @@ public function run()
         $content = view(
             $this->templatesDir().'.controller',
             [
-            'gen' => $this,
+            'crud' => $this,
             'fields' => $this->advanceFields($this->request),
             'foreign_keys' => $this->getForeignKeys($this->table_name),
             'request' => $this->request,

diff --git a/Providers/FormRequestGenerator.php b/Providers/FormRequestGenerator.php
@@ -45,7 +45,7 @@ public function run()
         $content = view(
             $this->templatesDir().'.formRequests.create-form-request',
             [
-            'gen' => $this,
+            'crud' => $this,
             'fields' => $this->advanceFields($this->request),
             'request' => $this->request,
             ]

diff --git a/Providers/LangGenerator.php b/Providers/LangGenerator.php
@@ -72,7 +72,7 @@ public function generateLangFiles()
         $content = view(
             $this->templatesDir().'.lang',
             [
-            'gen' => $this,
+            'crud' => $this,
             'fields' => $this->advanceFields($this->request),
             'request' => $this->request,
             ]

diff --git a/Providers/ModelFactoryGenerator.php b/Providers/ModelFactoryGenerator.php
@@ -45,7 +45,7 @@ public function run()
         $content = view(
             $this->templatesDir().'.model-factory',
             [
-            'gen' => $this,
+            'crud' => $this,
             'fields' => $this->advanceFields($this->request),
             'request' => $this->request,
             ]

diff --git a/Providers/ModelGenerator.php b/Providers/ModelGenerator.php
@@ -45,7 +45,7 @@ public function run()
         $content = view(
             $this->templatesDir().'.model',
             [
-            'gen' => $this,
+            'crud' => $this,
             'fields' => $this->advanceFields($this->request),
             'request' => $this->request,
             ]

diff --git a/Providers/RepositoryGenerator.php b/Providers/RepositoryGenerator.php
@@ -74,7 +74,7 @@ public function buildContract()
         $content = view(
             $this->templatesDir().'.repositoryInterface',
             [
-            'gen' => $this,
+            'crud' => $this,
             'fields' => $this->advanceFields($this->request),
             'request' => $this->request,
             ]
@@ -101,7 +101,7 @@ public function buildImplementation()
         $content = view(
             $this->templatesDir().'.repositoryEloquentImplementation',
             [
-            'gen' => $this,
+            'crud' => $this,
             'fields' => $this->advanceFields($this->request),
             'request' => $this->request,
             ]
@@ -128,7 +128,7 @@ public function buildCriteria()
         $content = view(
             $this->templatesDir().'.repositoryCriteria',
             [
-            'gen' => $this,
+            'crud' => $this,
             'fields' => $this->advanceFields($this->request),
             'request' => $this->request,
             ]

diff --git a/Providers/SeedersGenerator.php b/Providers/SeedersGenerator.php
@@ -67,7 +67,7 @@ public function generatePermissionSeeder()
         $content = view(
             $this->templatesDir().'.seeders.module-permissions-seeder',
             [
-            'gen' => $this,
+            'crud' => $this,
             'fields' => $this->advanceFields($this->request),
             'request' => $this->request,
             ]
@@ -88,7 +88,7 @@ public function generateFakeDataSeeder()
         $content = view(
             $this->templatesDir().'.seeders.module-fake-data-seeder',
             [
-            'gen' => $this,
+            'crud' => $this,
             'fields' => $this->advanceFields($this->request),
             'request' => $this->request,
             ]

diff --git a/Providers/ServiceGenerator.php b/Providers/ServiceGenerator.php
@@ -45,7 +45,7 @@ public function run()
         $content = view(
             $this->templatesDir().'.service',
             [
-            'gen' => $this,
+            'crud' => $this,
             'fields' => $this->advanceFields($this->request),
             'request' => $this->request,
             'foreign_keys' => $this->getForeignKeys($this->table_name),

diff --git a/Providers/TestsGenerator.php b/Providers/TestsGenerator.php
@@ -112,7 +112,7 @@ public function generatePageObject($test)
         $content = view(
             $this->templatesDir().'.pageObjects.'.$test,
             [
-            'gen' => $this,
+            'crud' => $this,
             'fields' => $this->advanceFields($this->request),
             'test' => $test,
             'request' => $this->request,
@@ -134,7 +134,7 @@ public function generateFunctionalTests($test)
         $content = view(
             $this->templatesDir().'.tests.'.$test,
             [
-            'gen' => $this,
+            'crud' => $this,
             'fields' => $this->advanceFields($this->request),
             'test' => $test,
             'request' => $this->request,

diff --git a/Providers/ViewsGenerator.php b/Providers/ViewsGenerator.php
@@ -55,7 +55,7 @@ public function run()
             $content = view(
                 $this->templatesDir().'.views.'.$this->request->get('UI_theme').'.'.$view,
                 [
-                'gen' => $this,
+                'crud' => $this,
                 'fields' => $this->advanceFields($this->request),
                 'request' => $this->request,
                 ]

diff --git a/Tasks/CreateActionsTask.php b/Tasks/CreateActionsTask.php
@@ -85,7 +85,7 @@ public function run()
             $template = $this->templatesDir().'.Porto/Actions/'.$file;
 
             $content = view($template, [
-                'gen' => $this,
+                'crud' => $this,
                 'fields' => $this->parsedFields
             ]);
 

diff --git a/Tasks/CreateApiControllerTask.php b/Tasks/CreateApiControllerTask.php
@@ -63,7 +63,7 @@ public function run()
         $template = $this->templatesDir().'.Porto/UI/API/Controllers/'.$file;
 
         $content = view($template, [
-            'gen' => $this,
+            'crud' => $this,
             'fields' => $this->parsedFields
             ]);
 

diff --git a/Tasks/CreateApiRequestsTask.php b/Tasks/CreateApiRequestsTask.php
@@ -86,7 +86,7 @@ public function run()
             $template = $this->templatesDir().'.Porto/UI/API/Requests/'.$file;
 
             $content = view($template, [
-                'gen' => $this,
+                'crud' => $this,
                 'fields' => $this->parsedFields
             ]);
 

diff --git a/Tasks/CreateApiRoutesTask.php b/Tasks/CreateApiRoutesTask.php
@@ -83,7 +83,7 @@ public function run()
             $routeFile = $this->apiRoutesFolder().'/'.$this->apiRouteFile($file, $plural);
             $template = $this->templatesDir().'.Porto/UI/API/Routes/'.$file;
 
-            $content = view($template, ['gen' => $this]);
+            $content = view($template, ['crud' => $this]);
 
             file_put_contents($routeFile, $content) === false
                 ? session()->push('error', "Error creating $file task file")

diff --git a/Tasks/CreateCodeceptionTestsTask.php b/Tasks/CreateCodeceptionTestsTask.php
@@ -104,7 +104,7 @@ private function configureCodeceptSuite(string $suite, string $modules)
     public function copyRootBoostrapFile()
     {
         $fileContents = view($this->templatesDir().'.Porto.tests._bootstrap', [
-            'gen' => $this,
+            'crud' => $this,
             'fields' => $this->parsedFields
         ]);
 
@@ -142,7 +142,7 @@ public function getHelperClassContents(): string
         $template = $this->templatesDir().'.Porto.tests._support.Helper.-container-Helper';
 
         return (string) view($template, [
-            'gen' => $this,
+            'crud' => $this,
             'fields' => $this->parsedFields
         ]);
     }
@@ -161,7 +161,7 @@ public function addMethodToHelper(string $helperFileContents): string
         $methodTemplate = $this->templatesDir().'.Porto.tests._support.Helper.helperFunction';
         $helperMethodName = "function init{$this->entityName()}Data";
         $fullMethod = "\n    ".view($methodTemplate, [
-            'gen' => $this,
+            'crud' => $this,
             'fields' => $this->parsedFields
         ]);
 
@@ -251,7 +251,7 @@ private function generateApiTests()
             $template = $this->templatesDir().'.Porto/tests/api/'.$file;
 
             $content = view($template, [
-                'gen' => $this,
+                'crud' => $this,
                 'fields' => $this->parsedFields
             ]);
 

diff --git a/Tasks/CreateComposerFileTask.php b/Tasks/CreateComposerFileTask.php
@@ -32,7 +32,7 @@ public function run(string $container)
         $composerFile = $this->containerFolder().'/composer.json';
         $template = $this->templatesDir().'.Porto/composer';
 
-        $content = view($template, ['gen' => $this]);
+        $content = view($template, ['crud' => $this]);
 
         file_put_contents($composerFile, $content) === false
             ? session()->push('error', 'Error creating composer file')

diff --git a/Tasks/CreateExceptionsTask.php b/Tasks/CreateExceptionsTask.php
@@ -61,7 +61,7 @@ public function run()
             $exceptionFile = $this->exceptionsFolder()."/{$this->entityName()}{$file}.php";
             $template = $this->templatesDir().'.Porto/Exceptions/'.$file;
 
-            $content = view($template, ['gen' => $this]);
+            $content = view($template, ['crud' => $this]);
 
             file_put_contents($exceptionFile, $content) === false
                 ? session()->push('error', "Error creating $file task file")

diff --git a/Tasks/CreateFormModelConfigTask.php b/Tasks/CreateFormModelConfigTask.php
@@ -61,7 +61,7 @@ public function run()
         $template = $this->templatesDir().'.Porto.Configs.form-model';
 
         $content = view($template, [
-            'gen' => $this,
+            'crud' => $this,
             'fields' => $this->parsedFields
         ]);
 

diff --git a/Tasks/CreateModelFactoryAction.php b/Tasks/CreateModelFactoryAction.php
@@ -63,7 +63,7 @@ public function run()
         $template = $this->templatesDir().'.Porto/Data/Factories/'.$file;
 
         $content = view($template, [
-            'gen' => $this,
+            'crud' => $this,
             'fields' => $this->parsedFields
             ]);
 

diff --git a/Tasks/CreateModelFactoryTask.php b/Tasks/CreateModelFactoryTask.php
@@ -63,7 +63,7 @@ public function run()
         $template = $this->templatesDir().'.Porto/Data/Factories/'.$file;
 
         $content = view($template, [
-            'gen' => $this,
+            'crud' => $this,
             'fields' => $this->parsedFields
             ]);
 

diff --git a/Tasks/CreateModelTask.php b/Tasks/CreateModelTask.php
@@ -61,7 +61,7 @@ public function run()
         $template = $this->templatesDir().'.Porto/Models/'.$file;
 
         $content = view($template, [
-            'gen' => $this,
+            'crud' => $this,
             'fields' => $this->parsedFields
             ]);
 

diff --git a/Tasks/CreateNgActionsTask.php b/Tasks/CreateNgActionsTask.php
@@ -59,7 +59,7 @@ public function run()
         $template = $this->templatesDir().'.Angular2/actions/actions';
 
         $content = view($template, [
-            'gen' => $this,
+            'crud' => $this,
             'fields' => $this->parsedFields
         ]);
 

diff --git a/Tasks/CreateNgComponentsTask.php b/Tasks/CreateNgComponentsTask.php
@@ -96,7 +96,7 @@ public function run()
             $template = $this->templatesDir().'.Angular2.components.'.$file;
 
             $content = view($template, [
-                'gen' => $this,
+                'crud' => $this,
                 'fields' => $this->parsedFields
             ]);
 

diff --git a/Tasks/CreateNgContainersTask.php b/Tasks/CreateNgContainersTask.php
@@ -96,7 +96,7 @@ public function run()
             $template = $this->templatesDir().'.Angular2.pages.'.$file;
 
             $content = view($template, [
-                'gen' => $this,
+                'crud' => $this,
                 'fields' => $this->parsedFields
             ]);
 

diff --git a/Tasks/CreateNgEffectsTask.php b/Tasks/CreateNgEffectsTask.php
@@ -77,7 +77,7 @@ public function run()
         $template = $this->templatesDir().'.Angular2/effects/effects';
 
         $content = view($template, [
-            'gen' => $this,
+            'crud' => $this,
             'fields' => $this->parsedFields
         ]);
 

diff --git a/Tasks/CreateNgModelTask.php b/Tasks/CreateNgModelTask.php
@@ -64,7 +64,7 @@ public function generateModel($template, $model)
         $template = $this->templatesDir().'.Angular2/models/'.$template;
 
         $content = view($template, [
-            'gen' => $this,
+            'crud' => $this,
             'fields' => $this->parsedFields
         ]);
 

diff --git a/Tasks/CreateNgModulesTask.php b/Tasks/CreateNgModulesTask.php
@@ -69,7 +69,7 @@ public function run()
             $template = $this->templatesDir().'.Angular2.'.$file;
 
             $content = view($template, [
-                'gen' => $this,
+                'crud' => $this,
                 'fields' => $this->parsedFields
             ]);
 

diff --git a/Tasks/CreateNgReducerTask.php b/Tasks/CreateNgReducerTask.php
@@ -59,7 +59,7 @@ public function run()
         $template = $this->templatesDir().'.Angular2/reducers/reducer';
 
         $content = view($template, [
-            'gen' => $this,
+            'crud' => $this,
             'fields' => $this->parsedFields
         ]);
 

diff --git a/Tasks/CreateNgRoutesTask.php b/Tasks/CreateNgRoutesTask.php
@@ -77,7 +77,7 @@ public function run()
         $template = $this->templatesDir().'.Angular2.routes.routes';
 
         $content = view($template, [
-            'gen' => $this,
+            'crud' => $this,
             'fields' => $this->parsedFields
         ]);
 

diff --git a/Tasks/CreateNgServiceTask.php b/Tasks/CreateNgServiceTask.php
@@ -72,7 +72,7 @@ public function run()
         $template = $this->templatesDir().'.Angular2/services/service';
 
         $content = view($template, [
-            'gen' => $this,
+            'crud' => $this,
             'fields' => $this->parsedFields
         ]);
 

diff --git a/Tasks/CreateNgTranslationsTask.php b/Tasks/CreateNgTranslationsTask.php
@@ -85,7 +85,7 @@ public function run()
             $template = $this->templatesDir().'.Angular2.translations.'.$file;
 
             $content = view($template, [
-                'gen' => $this,
+                'crud' => $this,
                 'fields' => $this->parsedFields
             ]);
 

diff --git a/Tasks/CreateNgUtilsTask.php b/Tasks/CreateNgUtilsTask.php
@@ -68,7 +68,7 @@ public function run()
             $template = $this->templatesDir().'.Angular2.utils.'.$file;
 
             $content = view($template, [
-                'gen' => $this,
+                'crud' => $this,
                 'request' => $this->request,
                 'fields' => $this->parsedFields
             ]);

diff --git a/Tasks/CreatePortoCriteriasTask.php b/Tasks/CreatePortoCriteriasTask.php
@@ -71,7 +71,7 @@ public function run()
             $template = $this->templatesDir().'.Porto/Data/Criterias/'.$file;
 
             $content = view($template, [
-                'gen' => $this,
+                'crud' => $this,
                 'fields' => $this->parsedFields
             ]);