Tidy minor issues

Author: craigAtCD

src/Http/Controllers/Api/Controller.php

@@ -80,8 +80,6 @@ public function __construct(Request $request)
         $this->request = $request;
         $this->uriParser = new UriParser($request, config('laravel-api-controller.parameters.filter'));
         $this->user = auth()->user();
-        $str = 'providers';
-
     }
 
 

src/Repository/BaseRepository.php

@@ -244,9 +244,9 @@ public function get(array $columns = ['*'])
      * @param array $columns
      *
      * @throws ModelNotFoundException
-     * @return Collection|Model
+     * @return Model
      */
-    public function getById($id, array $columns = ['*'])
+    public function getById($id, array $columns = ['*']) : Model
     {
         $this->unsetClauses();
 

src/Traits/Parser.php

@@ -221,44 +221,28 @@ protected function setWhereClause($where) : void
 	 */
 	protected function parseFieldParams() : array
     {
-        $attributes = $this->model->attributesToArray();
+
         $fields = $this->request->has('fields') && ! empty($this->request->input('fields')) ? explode(',', $this->request->input('fields')) : $this->defaultFields;
         foreach ($fields as $k => $field) {
 			if (
 				$field === '*'  ||
-				in_array($field, $this->getTableColumns()) /* ||
-				array_key_exists($field, $attributes) */
+				in_array($field, $this->getTableColumns())
 			) {
                 continue;
             }
-            if (strpos($field, '.') > 0) {
-                //@TODO check if mapped field exists
-				//@todo
-				// $fieldParts = explode(".", $field);
-				// $join = $fieldParts[0];
-				// $joinField = $fieldParts[1];
-				// $sub = $this->model->{$join}()->getRelated();
-
-       			// \dd($this->model->{$join}()->getRelated());
-
-                unset($fields[$k]);
-                continue;
-			}
-
 			unset($fields[$k]);
-
         }
 
         return $fields;
 	}
 
 	/**
-	 * Parses an includes fields and returns as an array or null if none
-	 * @param $include - the table definer
+	 * Parses an includes fields and returns as an array
+	 * @param string $include - the table definer
 	 *
-	 * @return array|null
+	 * @return array
 	 */
-	protected function getIncludesFields($include) : ?array
+	protected function getIncludesFields(string $include) : array
 	{
 		$fields = $this->request->has('fields') && ! empty($this->request->input('fields')) ? explode(',', $this->request->input('fields')) : $this->defaultFields;
 		foreach($fields as $k =>$field){

src/Traits/Response.php

@@ -84,7 +84,7 @@ protected function respondWithMany($items)
     /**
      * Created Response.
      *
-     * @param int|array    $id      id of insterted data
+     * @param mixed  $id      id of insterted data
      * @param string $message message to respond with
      *
      * @return Res