Code cleanup

Author: Torann

LICENSE

@@ -1,5 +1,5 @@
 The BSD 2-Clause License
-Copyright (c) 2014-2018, Daniel Stainback
+Copyright (c) 2014-2020, Daniel Stainback
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

src/Contracts/RepositoryContract.php

@@ -40,8 +40,8 @@ public function findOrFail($id);
     /**
      * Find data by field and value
      *
-     * @param      $field
-     * @param      $value
+     * @param       $field
+     * @param       $value
      * @param array $columns
      *
      * @return Model|Collection

src/Repositories/AbstractRepository.php

@@ -199,7 +199,7 @@ public function find($id, $columns = ['*'])
      * Find a model by its primary key or throw an exception.
      *
      * @param string $id
-     * @param  array $columns
+     * @param array  $columns
      *
      * @return \Illuminate\Database\Eloquent\Model
      *
@@ -269,8 +269,7 @@ public function findWhere(array $where, $columns = ['*'])
             if (is_array($value)) {
                 list($field, $condition, $val) = $value;
                 $this->query->where($field, $condition, $val);
-            }
-            else {
+            } else {
                 $this->query->where($field, '=', $value);
             }
         }
@@ -327,9 +326,21 @@ public function getOrderBy()
      */
     public function getSearchableKeys()
     {
+        $return = $this->getSearchable();
+
         return array_values(array_map(function ($value, $key) {
             return (is_array($value) || is_numeric($key) === false) ? $key : $value;
-        }, $this->searchable, array_keys($this->searchable)));
+        }, $return, array_keys($return)));
+    }
+
+    /**
+     * Return searchable array.
+     *
+     * @return array
+     */
+    public function getSearchable()
+    {
+        return $this->searchable;
     }
 
     /**
@@ -352,7 +363,7 @@ public function search($queries)
             // Keep track of what tables have been joined and their aliases
             $joined = [];
 
-            foreach ($this->searchable as $param => $columns) {
+            foreach ($this->getSearchable() as $param => $columns) {
                 // It doesn't always have to map to something
                 $param = is_numeric($param) ? $columns : $param;
 
@@ -363,7 +374,7 @@ public function search($queries)
                 if ($value === '' || $value === null) continue;
 
                 // Columns should be an array
-                $columns = (array)$columns;
+                $columns = (array) $columns;
 
                 // Loop though the columns and look for relationships
                 foreach ($columns as $key => $column) {
@@ -401,8 +412,7 @@ public function search($queries)
                             $this->createSearchClause($q, $param, $column, $value, 'or');
                         }
                     });
-                }
-                else {
+                } else {
                     $this->createSearchClause($query, $param, $columns[0], $value);
                 }
             }
@@ -482,10 +492,10 @@ public function pluck($value, $key = null)
     /**
      * Retrieve all data of repository, paginated
      *
-     * @param int       $per_page
-     * @param array     $columns
-     * @param  string   $page_name
-     * @param  int|null $page
+     * @param int      $per_page
+     * @param array    $columns
+     * @param string   $page_name
+     * @param int|null $page
      *
      * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
      */
@@ -511,10 +521,10 @@ public function paginate($per_page = null, $columns = ['*'], $page_name = 'page'
     /**
      * Retrieve all data of repository, paginated
      *
-     * @param  int      $per_page
-     * @param  array    $columns
-     * @param  string   $page_name
-     * @param  int|null $page
+     * @param int      $per_page
+     * @param array    $columns
+     * @param string   $page_name
+     * @param int|null $page
      *
      * @return \Illuminate\Contracts\Pagination\Paginator
      */
@@ -716,7 +726,7 @@ protected function appendTableName($column)
         }
 
         // Remove alias prefix indicator
-        if (substr($column, 0, 2) === '_.') {
+        if (preg_match('/^_\./', $column) != false) {
             return preg_replace('/^_\./', '', $column);
         }
 
@@ -736,11 +746,9 @@ protected function createSearchClause(Builder $query, $param, $column, $value, $
     {
         if ($param === 'query') {
             $query->where($this->appendTableName($column), self::$searchOperator, '%' . $value . '%', $boolean);
-        }
-        elseif (is_array($value)) {
+        } elseif (is_array($value)) {
             $query->whereIn($this->appendTableName($column), $value, $boolean);
-        }
-        else {
+        } else {
             $query->where($this->appendTableName($column), '=', $value, $boolean);
         }
     }

src/Traits/Cacheable.php

@@ -68,18 +68,18 @@ public function skippedCache()
     /**
      * Get Cache key for the method
      *
-     * @param  string $method
-     * @param  mixed  $args
-     * @param  string  $tag
+     * @param string $method
+     * @param mixed  $args
+     * @param string $tag
      *
      * @return string
      */
     public function getCacheKey($method, $args = null, $tag)
     {
         // Sort through arguments
-        foreach($args as &$a) {
+        foreach ($args as &$a) {
             if ($a instanceof Model) {
-                $a = get_class($a).'|'.$a->getKey();
+                $a = get_class($a) . '|' . $a->getKey();
             }
         }
 
@@ -100,7 +100,7 @@ public function getCacheKey($method, $args = null, $tag)
      * @param string   $method
      * @param array    $args
      * @param \Closure $callback
-     * @param  int     $time
+     * @param int      $time
      *
      * @return mixed
      */