diff --git a/src/Bosnadev/Repositories/Eloquent/Repository.php b/src/Bosnadev/Repositories/Eloquent/Repository.php index 303fe46..6e365a7 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; } @@ -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 */ diff --git a/src/Bosnadev/Repositories/Providers/RepositoryProvider.php b/src/Bosnadev/Repositories/Providers/RepositoryProvider.php index 59f6cce..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( @@ -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']);