@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | /** |
| 17 | 17 | * @param array $filter |
| 18 | 18 | */ |
| 19 | - public function __construct( array $filter ) |
|
| 19 | + public function __construct(array $filter) |
|
| 20 | 20 | { |
| 21 | 21 | $this->filter = $filter; |
| 22 | 22 | } |
@@ -26,26 +26,26 @@ discard block |
||
| 26 | 26 | * @param $modelOrBuilder |
| 27 | 27 | * @return mixed |
| 28 | 28 | */ |
| 29 | - public function apply( $modelOrBuilder ) |
|
| 29 | + public function apply($modelOrBuilder) |
|
| 30 | 30 | { |
| 31 | - foreach( $this->filter as $filter ) |
|
| 31 | + foreach ($this->filter as $filter) |
|
| 32 | 32 | { |
| 33 | - $nElements = count( $filter ); |
|
| 33 | + $nElements = count($filter); |
|
| 34 | 34 | |
| 35 | 35 | // Apply filter based on then number of items in the array. |
| 36 | - if ( $nElements === 2 ) |
|
| 36 | + if ($nElements === 2) |
|
| 37 | 37 | { |
| 38 | 38 | $column = $filter[0]; |
| 39 | 39 | $operation = NULL; |
| 40 | 40 | $value = $filter[1]; |
| 41 | - } else if ( $nElements === 3 ) |
|
| 41 | + } else if ($nElements === 3) |
|
| 42 | 42 | { |
| 43 | 43 | $column = $filter[0]; |
| 44 | 44 | $operation = $filter[1]; |
| 45 | 45 | $value = $filter[2]; |
| 46 | 46 | } else continue; |
| 47 | 47 | |
| 48 | - $modelOrBuilder = $this->applyFilter( $modelOrBuilder, $column, $value, $operation ); |
|
| 48 | + $modelOrBuilder = $this->applyFilter($modelOrBuilder, $column, $value, $operation); |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | return $modelOrBuilder; |
@@ -58,10 +58,10 @@ discard block |
||
| 58 | 58 | * @param $value |
| 59 | 59 | * @param null $operation |
| 60 | 60 | */ |
| 61 | - private function applyFilter( $modelOrBuilder, $column, $value, $operation = NULL ) |
|
| 61 | + private function applyFilter($modelOrBuilder, $column, $value, $operation = NULL) |
|
| 62 | 62 | { |
| 63 | - if ( is_null( $operation ) ) $modelOrBuilder = $modelOrBuilder->where( $column, $value ); |
|
| 64 | - else $modelOrBuilder = $modelOrBuilder->where( $column, $operation, $value ); |
|
| 63 | + if (is_null($operation)) $modelOrBuilder = $modelOrBuilder->where($column, $value); |
|
| 64 | + else $modelOrBuilder = $modelOrBuilder->where($column, $operation, $value); |
|
| 65 | 65 | |
| 66 | 66 | return $modelOrBuilder; |
| 67 | 67 | } |
@@ -43,7 +43,9 @@ discard block |
||
| 43 | 43 | $column = $filter[0]; |
| 44 | 44 | $operation = $filter[1]; |
| 45 | 45 | $value = $filter[2]; |
| 46 | - } else continue; |
|
| 46 | + } else { |
|
| 47 | + continue; |
|
| 48 | + } |
|
| 47 | 49 | |
| 48 | 50 | $modelOrBuilder = $this->applyFilter( $modelOrBuilder, $column, $value, $operation ); |
| 49 | 51 | } |
@@ -60,8 +62,11 @@ discard block |
||
| 60 | 62 | */ |
| 61 | 63 | private function applyFilter( $modelOrBuilder, $column, $value, $operation = NULL ) |
| 62 | 64 | { |
| 63 | - if ( is_null( $operation ) ) $modelOrBuilder = $modelOrBuilder->where( $column, $value ); |
|
| 64 | - else $modelOrBuilder = $modelOrBuilder->where( $column, $operation, $value ); |
|
| 65 | + if ( is_null( $operation ) ) { |
|
| 66 | + $modelOrBuilder = $modelOrBuilder->where( $column, $value ); |
|
| 67 | + } else { |
|
| 68 | + $modelOrBuilder = $modelOrBuilder->where( $column, $operation, $value ); |
|
| 69 | + } |
|
| 65 | 70 | |
| 66 | 71 | return $modelOrBuilder; |
| 67 | 72 | } |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | * @param $orderBy |
| 19 | 19 | * @param string $direction |
| 20 | 20 | */ |
| 21 | - public function __construct( $orderBy, $direction = 'ASC' ) |
|
| 21 | + public function __construct($orderBy, $direction = 'ASC') |
|
| 22 | 22 | { |
| 23 | 23 | $this->orderBy = $orderBy; |
| 24 | 24 | $this->direction = $direction; |
@@ -29,9 +29,9 @@ discard block |
||
| 29 | 29 | * @param mixed $queryBuilder |
| 30 | 30 | * @return mixed |
| 31 | 31 | */ |
| 32 | - public function apply( $queryBuilder ) |
|
| 32 | + public function apply($queryBuilder) |
|
| 33 | 33 | { |
| 34 | - return $queryBuilder->orderBy( $this->orderBy, $this->direction ); |
|
| 34 | + return $queryBuilder->orderBy($this->orderBy, $this->direction); |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | { |
| 32 | 32 | // merge default config |
| 33 | 33 | $this->mergeConfigFrom( |
| 34 | - __DIR__.$this->configPath , 'repositories' |
|
| 34 | + __DIR__.$this->configPath, 'repositories' |
|
| 35 | 35 | ); |
| 36 | 36 | |
| 37 | 37 | // Bind the repositories. |
@@ -49,43 +49,43 @@ discard block |
||
| 49 | 49 | private function autoBindRepositories() |
| 50 | 50 | { |
| 51 | 51 | // Load config parameters needed. |
| 52 | - $repositoriesBasePath = config( 'repositories.repositories_path' ); |
|
| 53 | - $baseNamespace = rtrim( config( 'repositories.repository_interfaces_namespace' ), '\\' ) . '\\'; |
|
| 54 | - $skipRepositories = config( 'repositories.skip' ); |
|
| 55 | - $implementationBindings = config( 'repositories.bindings' ); |
|
| 56 | - $implementation = $this->findDefaultImplementation( $implementationBindings ); |
|
| 52 | + $repositoriesBasePath = config('repositories.repositories_path'); |
|
| 53 | + $baseNamespace = rtrim(config('repositories.repository_interfaces_namespace'), '\\').'\\'; |
|
| 54 | + $skipRepositories = config('repositories.skip'); |
|
| 55 | + $implementationBindings = config('repositories.bindings'); |
|
| 56 | + $implementation = $this->findDefaultImplementation($implementationBindings); |
|
| 57 | 57 | |
| 58 | - if ( \File::exists( $repositoriesBasePath ) ) |
|
| 58 | + if (\File::exists($repositoriesBasePath)) |
|
| 59 | 59 | { |
| 60 | - $allRepos = \File::files( $repositoriesBasePath ); |
|
| 60 | + $allRepos = \File::files($repositoriesBasePath); |
|
| 61 | 61 | |
| 62 | - foreach( $allRepos as $repo ) |
|
| 62 | + foreach ($allRepos as $repo) |
|
| 63 | 63 | { |
| 64 | - $interfaceName = pathinfo( $repo, PATHINFO_FILENAME ); |
|
| 65 | - if ( in_array( $interfaceName, $skipRepositories ) ) continue; |
|
| 64 | + $interfaceName = pathinfo($repo, PATHINFO_FILENAME); |
|
| 65 | + if (in_array($interfaceName, $skipRepositories)) continue; |
|
| 66 | 66 | else |
| 67 | 67 | { |
| 68 | - $commonName = str_replace( 'Interface', '', $interfaceName ); |
|
| 68 | + $commonName = str_replace('Interface', '', $interfaceName); |
|
| 69 | 69 | $interfaceFullClassName = $baseNamespace.$interfaceName; |
| 70 | 70 | |
| 71 | - foreach( $implementationBindings as $engine => $bindRepositories ) |
|
| 71 | + foreach ($implementationBindings as $engine => $bindRepositories) |
|
| 72 | 72 | { |
| 73 | - if ( $bindRepositories === 'default' ) continue; |
|
| 74 | - else if ( in_array( $interfaceName, $bindRepositories ) ) |
|
| 73 | + if ($bindRepositories === 'default') continue; |
|
| 74 | + else if (in_array($interfaceName, $bindRepositories)) |
|
| 75 | 75 | { |
| 76 | 76 | $implementation = $engine; |
| 77 | 77 | break; |
| 78 | 78 | } |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | - $fullClassName = $baseNamespace.ucfirst( camel_case( $implementation ) ).'\\'.$commonName; |
|
| 81 | + $fullClassName = $baseNamespace.ucfirst(camel_case($implementation)).'\\'.$commonName; |
|
| 82 | 82 | |
| 83 | - if ( class_exists( $fullClassName ) ) |
|
| 83 | + if (class_exists($fullClassName)) |
|
| 84 | 84 | { |
| 85 | 85 | // Bind the class. |
| 86 | - $this->app->bind( $interfaceFullClassName, function ( $app ) use ( $fullClassName ) |
|
| 86 | + $this->app->bind($interfaceFullClassName, function($app) use ($fullClassName) |
|
| 87 | 87 | { |
| 88 | - return $app->make( $fullClassName ); |
|
| 88 | + return $app->make($fullClassName); |
|
| 89 | 89 | }); |
| 90 | 90 | } |
| 91 | 91 | } |
@@ -98,14 +98,14 @@ discard block |
||
| 98 | 98 | * @param $implementations |
| 99 | 99 | * @return array|mixed|string |
| 100 | 100 | */ |
| 101 | - private function findDefaultImplementation( $implementations ) |
|
| 101 | + private function findDefaultImplementation($implementations) |
|
| 102 | 102 | { |
| 103 | - $filtered = array_filter( $implementations, function( $k ) { |
|
| 103 | + $filtered = array_filter($implementations, function($k) { |
|
| 104 | 104 | return $k === 'default'; |
| 105 | 105 | }); |
| 106 | 106 | |
| 107 | 107 | $default = array_keys($filtered); |
| 108 | - $default = is_array( $default ) ? $default[0] : $default; |
|
| 108 | + $default = is_array($default) ? $default[0] : $default; |
|
| 109 | 109 | |
| 110 | 110 | return $default ? $default : 'eloquent'; |
| 111 | 111 | } |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | */ |
| 116 | 116 | private function registerRepositoryGenerator() |
| 117 | 117 | { |
| 118 | - $this->app->singleton('command.repository', function ($app) |
|
| 118 | + $this->app->singleton('command.repository', function($app) |
|
| 119 | 119 | { |
| 120 | 120 | return $app['OkayBueno\Repositories\Commands\MakeRepositoryCommand']; |
| 121 | 121 | }); |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | */ |
| 130 | 130 | private function registerCriteriaGenerator() |
| 131 | 131 | { |
| 132 | - $this->app->singleton('command.criteria', function ($app) |
|
| 132 | + $this->app->singleton('command.criteria', function($app) |
|
| 133 | 133 | { |
| 134 | 134 | return $app['OkayBueno\Repositories\Commands\MakeCriteriaCommand']; |
| 135 | 135 | }); |
@@ -62,16 +62,18 @@ |
||
| 62 | 62 | foreach( $allRepos as $repo ) |
| 63 | 63 | { |
| 64 | 64 | $interfaceName = pathinfo( $repo, PATHINFO_FILENAME ); |
| 65 | - if ( in_array( $interfaceName, $skipRepositories ) ) continue; |
|
| 66 | - else |
|
| 65 | + if ( in_array( $interfaceName, $skipRepositories ) ) { |
|
| 66 | + continue; |
|
| 67 | + } else |
|
| 67 | 68 | { |
| 68 | 69 | $commonName = str_replace( 'Interface', '', $interfaceName ); |
| 69 | 70 | $interfaceFullClassName = $baseNamespace.$interfaceName; |
| 70 | 71 | |
| 71 | 72 | foreach( $implementationBindings as $engine => $bindRepositories ) |
| 72 | 73 | { |
| 73 | - if ( $bindRepositories === 'default' ) continue; |
|
| 74 | - else if ( in_array( $interfaceName, $bindRepositories ) ) |
|
| 74 | + if ( $bindRepositories === 'default' ) { |
|
| 75 | + continue; |
|
| 76 | + } else if ( in_array( $interfaceName, $bindRepositories ) ) |
|
| 75 | 77 | { |
| 76 | 78 | $implementation = $engine; |
| 77 | 79 | break; |