Merge branch '53-Entity-generator_2.0' into 'master'

#53:

Closes #53

See merge request components/laravel-entity-generator!79

Author: astorozhevsky

composer.json

@@ -14,7 +14,7 @@
     "laravel/framework": ">=5.4.0",
     "guzzlehttp/guzzle": "~6.0",
     "tymon/jwt-auth": "0.5.* || 1.0.*@beta",
-    "ronasit/laravel-helpers": ">=1.3"
+    "ronasit/laravel-helpers": "2.0.0-beta"
   },
   "require-dev": {
     "fzaninotto/faker": "~1.4",

src/Commands/MakeEntityCommand.php

@@ -184,7 +184,7 @@ protected function checkConfigs()
         $newConfig = $this->outputNewConfig($packageConfigs, $projectConfigs);
 
         if ($newConfig !== $projectConfigs) {
-            $this->info('Config has been updated');
+            $this->comment('Config has been updated');
             Config::set('entity-generator', $newConfig);
             file_put_contents(config_path('entity-generator.php'), "<?php\n\nreturn" . $this->customVarExport($newConfig) . ';');
         }
@@ -200,7 +200,7 @@ protected function outputNewConfig($packageConfigs, $projectConfigs)
         $differences = array_diff_key($newConfig, $flattenedProjectConfigs);
 
         foreach ($differences as $differenceKey => $differenceValue) {
-            $this->info("Key '{$differenceKey}' was missing in your config, we added it with the value '{$differenceValue}'");
+            $this->comment("Key '{$differenceKey}' was missing in your config, we added it with the value '{$differenceValue}'");
         }
 
         return array_undot($newConfig);
@@ -332,4 +332,4 @@ protected function validateOnlyApiOption()
             }
         }
     }
-}
+}

stubs/controller.blade.php

@@ -35,7 +35,8 @@ public function create(Create{{$entity}}Request $request, {{$entity}}Service $se
     public function get(Get{{$entity}}Request $request, {{$entity}}Service $service, $id)
     {
         $result = $service
-            ->withRelations($request->input('with', []))
+            ->with($request->input('with', []))
+            ->withCount($request->input('with_count', []))
             ->find($id);
 
         return response()->json($result);
@@ -67,4 +68,4 @@ public function delete(Delete{{$entity}}Request $request, {{$entity}}Service $se
     }
 
 @endif
-}
+}

stubs/request.blade.php

@@ -8,7 +8,7 @@
 
 class {{$method}}{{$entity}}Request extends Request
 {
-    public function rules()
+    public function rules(): array
     {
 @if(!empty($parameters))
         return [

stubs/service.blade.php

@@ -1,5 +1,6 @@
 namespace App\Services;
 
+use Illuminate\Support\Arr;
 use RonasIT\Support\Services\EntityService;
 use App\Repositories\{{$entity}}Repository;
 {{--
@@ -25,14 +26,15 @@ public function __construct()
     public function search($filters)
     {
         return $this->repository
+            ->with(Arr::get($filters, 'with', []))
+            ->withCount(Arr::get($filters, 'with_count', []))
             ->searchQuery($filters)
 @foreach($fields['simple_search'] as $field)
             ->filterBy('{{$field}}')
 @endforeach
 @if(!empty($fields['search_by_query']))
             ->filterByQuery(['{!! implode('\', \'', $fields['search_by_query']) !!}'])
 @endif
-            ->with()
             ->getSearchResults();
     }
 }