From fb5b423255b88e8d1e0ce52f42c8f46b05fd5887 Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Mon, 28 Aug 2017 20:28:13 +0800 Subject: [PATCH] Fixed controller generator string replacements --- src/CrudMake.php | 8 ++++---- src/stubs/controller.model.stub | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/CrudMake.php b/src/CrudMake.php index d9c3062..434da7a 100644 --- a/src/CrudMake.php +++ b/src/CrudMake.php @@ -111,7 +111,7 @@ class CrudMake extends Command public function getControllerContent() { $stub = $this->files->get(__DIR__.'/stubs/controller.model.stub'); - return $this->replaceDummyStrings($stub)->replaceClass($stub); + return $this->replaceControllerDummyStrings($stub)->replaceClass($stub); } private function getMigrationContent() @@ -153,11 +153,11 @@ class CrudMake extends Command return $path; } - protected function replaceDummyStrings(&$stub) + protected function replaceControllerDummyStrings(&$stub) { $stub = str_replace( - ['DummyNamespace', 'DummyFullModelClass', 'DummyModelVariable', 'DummyModelClass'], - [$this->getNamespace($this->modelName), 'App\\'.$this->modelName, strtolower($this->modelName), $this->modelName], + ['master', 'Master'], + [strtolower($this->modelName), $this->modelName], $stub ); diff --git a/src/stubs/controller.model.stub b/src/stubs/controller.model.stub index 51ecbc4..acff50e 100644 --- a/src/stubs/controller.model.stub +++ b/src/stubs/controller.model.stub @@ -2,7 +2,7 @@ namespace App\Http\Controllers; -use DummyFullModelClass; +use App\Master; use Illuminate\Http\Request; use App\Http\Controllers\Controller; @@ -32,10 +32,10 @@ class DummyClassController extends Controller /** * Display the specified resource. * - * @param \DummyFullModelClass $DummyModelVariable + * @param \App\Master $master * @return \Illuminate\Http\Response */ - public function show(DummyModelClass $DummyModelVariable) + public function show(Master $master) { // } @@ -44,10 +44,10 @@ class DummyClassController extends Controller * Update the specified resource in storage. * * @param \Illuminate\Http\Request $request - * @param \DummyFullModelClass $DummyModelVariable + * @param \App\Master $master * @return \Illuminate\Http\Response */ - public function update(Request $request, DummyModelClass $DummyModelVariable) + public function update(Request $request, Master $master) { // } @@ -55,10 +55,10 @@ class DummyClassController extends Controller /** * Remove the specified resource from storage. * - * @param \DummyFullModelClass $DummyModelVariable + * @param \App\Master $master * @return \Illuminate\Http\Response */ - public function destroy(DummyModelClass $DummyModelVariable) + public function destroy(Master $master) { // }