Merge branch 'develop'

Author: socheatsok78

src/Console/stubs/repository.model.stub

@@ -12,7 +12,7 @@ class DummyClass extends Repository {
      *
      * @var \DummyFullModelClass
      */
-    protected $DummyModelVariable;
+    protected $repo;
 
     /**
      * Create a new repository instance.
@@ -21,7 +21,7 @@ class DummyClass extends Repository {
      * @return void
      */
     public function __construct(DummyModelClass $DummyModelVariable) {
-        $this->DummyModelVariable = $DummyModelVariable;
+        $this->repo = $DummyModelVariable;
     }
 
     /**
@@ -31,7 +31,7 @@ class DummyClass extends Repository {
      * @return \Illuminate\Database\Eloquent\Collection|static[]
      */
     public function all($columns = ['*']) {
-        // return $this->get($columns);
+        return $this->get($columns);
     }
 
     /**
@@ -41,7 +41,7 @@ class DummyClass extends Repository {
      * @return \DummyFullModelClass
      */
     public function get($columns = ['*']) {
-        // return $this->DummyModelVariable->get($columns);
+        return $this->repo->get($columns);
     }
 
     /**
@@ -51,7 +51,7 @@ class DummyClass extends Repository {
      * @return \DummyFullModelClass
      */
     public function find($id) {
-        // return $this->DummyModelVariable->findOrFail($id);
+        // return $this->repo->findOrFail($id);
     }
 
     /**
@@ -61,7 +61,7 @@ class DummyClass extends Repository {
      * @return bool
      */
     public function create(array $attributes) {
-        // return $this->DummyModelVariable->create($attributes);
+        // return $this->repo->create($attributes);
     }
 
     /**
@@ -72,7 +72,7 @@ class DummyClass extends Repository {
      * @return bool
      */
     public function update(array $attributes = []) {
-        // return $this->DummyModelVariable->update($attributes);
+        // return $this->repo->update($attributes);
     }
 
     /**
@@ -83,6 +83,6 @@ class DummyClass extends Repository {
      * @throws \Exception
      */
     public function delete($id) {
-        // return $this->DummyModelVariable->findOrFail($id)->delete();
+        // return $this->repo->findOrFail($id)->delete();
     }
 }

src/Repositories/Model.php

@@ -7,11 +7,11 @@
 abstract class Model implements RepositoryContract {
 
     /**
-     * The model instance.
+     * The repository instance.
      *
-     * @var string
+     * @var \Illuminate\Database\Eloquent\Model
      */
-    protected $model;
+    protected $repo;
 
     /**
      * Create a new repository instance.
@@ -38,7 +38,7 @@ public function all($columns = ['*']) {
      * @return \Illuminate\Database\Eloquent\Model
      */
     public function get($columns = ['*']) {
-        return $this->model->get($columns);
+        return $this->repo->get($columns);
     }
 
     /**
@@ -48,7 +48,7 @@ public function get($columns = ['*']) {
      * @return \Illuminate\Database\Eloquent\Model
      */
     public function find($id) {
-        return $this->model->findOrFail($id);
+        return $this->repo->findOrFail($id);
     }
 
     /**
@@ -58,7 +58,7 @@ public function find($id) {
      * @return bool
      */
     public function create(array $attributes) {
-        return $this->model->create($attributes);
+        return $this->repo->create($attributes);
     }
 
     /**
@@ -69,7 +69,7 @@ public function create(array $attributes) {
      * @return bool
      */
     public function update(array $attributes = []) {
-        return $this->model->update($attributes);
+        return $this->repo->update($attributes);
     }
 
     /**
@@ -80,7 +80,7 @@ public function update(array $attributes = []) {
      * @throws \Exception
      */
     public function delete($id) {
-        return $this->model->findOrFail($id)->delete();
+        return $this->repo->findOrFail($id)->delete();
     }
 
     /**
@@ -90,7 +90,7 @@ public function delete($id) {
      */
     public function getRouteKey()
     {
-        return $this->model->getAttribute($this->getRouteKeyName());
+        return $this->repo->getAttribute($this->getRouteKeyName());
     }
 
     /**
@@ -100,7 +100,7 @@ public function getRouteKey()
      */
     public function getRouteKeyName()
     {
-        return $this->model->getKeyName();
+        return $this->repo->getKeyName();
     }
 
     /**
@@ -111,7 +111,7 @@ public function getRouteKeyName()
      */
     public function resolveRouteBinding($value)
     {
-        return $this->model->where($this->getRouteKeyName(), $value)->first();
+        return $this->repo->where($this->getRouteKeyName(), $value)->first();
     }
 
     /**
@@ -121,7 +121,7 @@ public function resolveRouteBinding($value)
      */
     public function jsonSerialize()
     {
-        return $this->model->toArray();
+        return $this->repo->toArray();
     }
 
     /**
@@ -131,6 +131,6 @@ public function jsonSerialize()
      */
     public function __toString()
     {
-        return $this->model->toJson();
+        return $this->repo->toJson();
     }
 }