Update repository stub and add contract option stub

Author: bpocallaghan

resources/stubs/repository.contract.stub

@@ -0,0 +1,68 @@
+<?php
+
+namespace {{namespace}};
+
+use App\Models\{{model}};
+use Illuminate\Http\Request;
+use {{contractNamespace}}\{{contract}} as Contract;
+
+class {{class}} implements Contract
+{
+    /**
+     * The {{model}} instance.
+     *
+     * @var App\Models\{{model}};
+     */
+    protected ${{resourceLowercase}};
+
+    /**
+     * {{model}} constructor.
+     * @param {{model}} ${{resourceLowercase}}
+     */
+    public function __construct({{model}} ${{resourceLowercase}})
+    {
+        $this->{{resourceLowercase}} = ${{resourceLowercase}};
+    }
+
+    public function all()
+    {
+        return $this->{{resourceLowercase}}->all();
+    }
+
+    /**
+     * @param Request $request
+     * @return mixed
+     */
+    public function getColumn(Request $request)
+    {
+        // TODO: Implement getColumn() method.
+    }
+
+    /**
+     * @param Request $request
+     * @return mixed
+     */
+    public function getList(Request $request)
+    {
+        // TODO: Implement getList() method.
+    }
+
+    /**
+     * @param Request $request
+     * @return mixed
+     */
+    public function create(Request $request)
+    {
+        // TODO: Implement create() method.
+    }
+
+    /**
+     * @param Request $request
+     * @param         $id
+     * @return mixed
+     */
+    public function update(Request $request, $id)
+    {
+        // TODO: Implement update() method.
+    }
+}

resources/stubs/repository.stub

@@ -3,66 +3,11 @@
 namespace {{namespace}};
 
 use App\Models\{{model}};
-use Illuminate\Http\Request;
-use {{contractNamespace}}\{{contract}} as Contract;
 
-class {{class}} implements Contract
+class {{class}}
 {
-    /**
-     * The {{model}} instance.
-     *
-     * @var App\Models\{{model}};
-     */
-    protected ${{resourceLowercase}};
-
-    /**
-     * {{model}} constructor.
-     * @param {{model}} ${{resourceLowercase}}
-     */
-    public function __construct({{model}} ${{resourceLowercase}})
-    {
-        $this->{{resourceLowercase}} = ${{resourceLowercase}};
-    }
-
     public function all()
     {
-        return $this->{{resourceLowercase}}->all();
-    }
-
-    /**
-     * @param Request $request
-     * @return mixed
-     */
-    public function getColumn(Request $request)
-    {
-        // TODO: Implement getColumn() method.
-    }
-
-    /**
-     * @param Request $request
-     * @return mixed
-     */
-    public function getList(Request $request)
-    {
-        // TODO: Implement getList() method.
-    }
-
-    /**
-     * @param Request $request
-     * @return mixed
-     */
-    public function create(Request $request)
-    {
-        // TODO: Implement create() method.
-    }
-
-    /**
-     * @param Request $request
-     * @param         $id
-     * @return mixed
-     */
-    public function update(Request $request, $id)
-    {
-        // TODO: Implement update() method.
+        return {{model}}::all();
     }
 }

src/Commands/FileCommand.php

@@ -63,7 +63,6 @@ private function getFileName()
      */
     public function handle()
     {
-        // setup
         $this->setSettings();
         $this->getResourceName($this->getUrl(false));
 

src/Commands/GeneratorCommand.php

@@ -367,10 +367,7 @@ protected function getDefaultNamespace($rootNamespace)
     protected function getStub()
     {
         $key = $this->getOptionStubKey();
-
-        // get the stub path
         $stub = config('generators.stubs.' . $key);
-
         if ($stub === null) {
             $this->error('The stub does not exist in the config file - "' . $key . '"');
             exit;
@@ -389,7 +386,7 @@ protected function getOptionStubKey()
         $plain = $this->option('plain');
         $stub = $this->option('stub') . ($plain ? '_plain' : '');
 
-        // if no stub, we assume its the same as the type
+        // if no stub, we assume it's the same as the type
         if (is_null($this->option('stub'))) {
             $stub = $this->option('type') . ($plain ? '_plain' : '');
         }

src/Commands/RepositoryCommand.php

@@ -2,6 +2,8 @@
 
 namespace Bpocallaghan\Generators\Commands;
 
+use Symfony\Component\Console\Input\InputOption;
+
 class RepositoryCommand extends GeneratorCommand
 {
     /**
@@ -26,26 +28,31 @@ class RepositoryCommand extends GeneratorCommand
     protected $type = 'Repository';
 
     /**
-     * Add an extra option to use for generating the file
-     * @var string
+     * Execute the console command.
+     *
+     * @return void
      */
-    //protected $extraOption = 'contract';
+    public function handle()
+    {
+        if (!$this->option('contract')) {
+            parent::handle();
+        } else {
+            $this->call('generate:repository', [
+                'name' => $this->argumentName(),
+                '--stub' => 'repository_contract',
+            ]);
+        }
+    }
 
     /**
      * Get the console command options.
      *
      * @return array
      */
-    /*protected function getOptions()
+    protected function getOptions()
     {
         return array_merge([
-            [
-                'contract',
-                null,
-                InputOption::VALUE_OPTIONAL,
-                'The name of the contract interface to implement.',
-                'Contract'
-            ],
+            ['contract', 'c', InputOption::VALUE_NONE, 'Use the implements Contract Stub.'],
         ], parent::getOptions());
-    }*/
-}
+    }
+}

src/config/config.php

@@ -1,7 +1,6 @@
 <?php
 
 return [
-
     /*
     |--------------------------------------------------------------------------
     | The singular resource words that will not be pluralized
@@ -176,6 +175,7 @@
         'exception'              => base_path() . '/vendor/bpocallaghan/generators/resources/stubs/exception.stub',
         'middleware'             => base_path() . '/vendor/bpocallaghan/generators/resources/stubs/middleware.stub',
         'repository'             => base_path() . '/vendor/bpocallaghan/generators/resources/stubs/repository.stub',
+        'repository_contract'    => base_path() . '/vendor/bpocallaghan/generators/resources/stubs/repository.contract.stub',
         'contract'               => base_path() . '/vendor/bpocallaghan/generators/resources/stubs/contract.stub',
         'factory'                => base_path() . '/vendor/bpocallaghan/generators/resources/stubs/factory.stub',
         'test'                   => base_path() . '/vendor/bpocallaghan/generators/resources/stubs/test.stub',

tests/RepositoryCommandTest.php

@@ -21,4 +21,11 @@ public function generate_repository_with_option_test()
         $this->assertFileExists('app/Repositories/FooRepository.php');
         $this->assertFileExists('tests/Unit/Repositories/FooRepositoryTest.php');
     }
+
+    /** @test */
+    public function generate_repository_with_contract_stub()
+    {
+        $this->artisan('generate:repository BookingRepository --contract');
+        $this->assertFileExists('app/Repositories/BookingRepository.php');
+    }
 }