From 65fb6b8d3580bc96c363ee07f3f362ca2d08c2fc Mon Sep 17 00:00:00 2001 From: BreakerYouko Date: Tue, 31 Jan 2017 18:02:49 +0100 Subject: [PATCH 1/4] Update RepositoryProvider.php L5.4 Update fix --- src/Bosnadev/Repositories/Providers/RepositoryProvider.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Bosnadev/Repositories/Providers/RepositoryProvider.php b/src/Bosnadev/Repositories/Providers/RepositoryProvider.php index 59f6cce..68526d1 100644 --- a/src/Bosnadev/Repositories/Providers/RepositoryProvider.php +++ b/src/Bosnadev/Repositories/Providers/RepositoryProvider.php @@ -104,7 +104,7 @@ protected function registerBindings() protected function registerMakeRepositoryCommand() { // Make repository command. - $this->app['command.repository.make'] = $this->app->share( + $this->app->singleton('command.repository.make', function($app) { return new MakeRepositoryCommand($app['RepositoryCreator'], $app['Composer']); @@ -118,7 +118,7 @@ function($app) protected function registerMakeCriteriaCommand() { // Make criteria command. - $this->app['command.criteria.make'] = $this->app->share( + $this->app->singleton('command.criteria.make', function($app) { return new MakeCriteriaCommand($app['CriteriaCreator'], $app['Composer']); From 9f999296c84fc072ac1ccd51c79c6b3ea2ba1313 Mon Sep 17 00:00:00 2001 From: BreakerYouko Date: Thu, 2 Mar 2017 12:18:54 +0100 Subject: [PATCH 2/4] Update RepositoryProvider.php config path fix --- src/Bosnadev/Repositories/Providers/RepositoryProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Bosnadev/Repositories/Providers/RepositoryProvider.php b/src/Bosnadev/Repositories/Providers/RepositoryProvider.php index 68526d1..12076b5 100644 --- a/src/Bosnadev/Repositories/Providers/RepositoryProvider.php +++ b/src/Bosnadev/Repositories/Providers/RepositoryProvider.php @@ -33,7 +33,7 @@ class RepositoryProvider extends ServiceProvider public function boot() { // Config path. - $config_path = __DIR__ . '/../../../config/repositories.php'; + $config_path = __DIR__ . '/../../../../config/repositories.php'; // Publish config. $this->publishes( From d77021284f25fb046e3682b6c5cbbbaf6c7f6dd9 Mon Sep 17 00:00:00 2001 From: BreakerYouko Date: Fri, 3 Mar 2017 14:39:01 +0100 Subject: [PATCH 3/4] Update Repository.php replaced lists to pluck method --- src/Bosnadev/Repositories/Eloquent/Repository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Bosnadev/Repositories/Eloquent/Repository.php b/src/Bosnadev/Repositories/Eloquent/Repository.php index 303fe46..a6c6aa6 100644 --- a/src/Bosnadev/Repositories/Eloquent/Repository.php +++ b/src/Bosnadev/Repositories/Eloquent/Repository.php @@ -93,7 +93,7 @@ public function with(array $relations) public function lists($value, $key = null) { $this->applyCriteria(); - $lists = $this->model->lists($value, $key); + $lists = $this->model->pluck($value, $key); if (is_array($lists)) { return $lists; } From a6b5c71c82fafd1d30faee91c93bd7a487f7cd69 Mon Sep 17 00:00:00 2001 From: BreakerYouko Date: Fri, 3 Mar 2017 14:44:44 +0100 Subject: [PATCH 4/4] Update Repository.php added whereIn() and entity() method --- .../Repositories/Eloquent/Repository.php | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/Bosnadev/Repositories/Eloquent/Repository.php b/src/Bosnadev/Repositories/Eloquent/Repository.php index a6c6aa6..6e365a7 100644 --- a/src/Bosnadev/Repositories/Eloquent/Repository.php +++ b/src/Bosnadev/Repositories/Eloquent/Repository.php @@ -244,7 +244,28 @@ public function findWhere($where, $columns = ['*'], $or = false) return $model->get($columns); } + /** + * @param $attribute + * @param array $values + * @param $columns + * @return mixed + */ + public function whereIn($attribute, array $values, $columns = ['*']) + { + $this->applyCriteria(); + return $this->model->whereIn($attribute, $values)->get($columns); + } + /** + * Returns clean entity of model + * @return \Illuminate\Database\Eloquent\Model + */ + public function entity() + { + return $this->newModel; + } + + /** * @return \Illuminate\Database\Eloquent\Builder * @throws RepositoryException */