fixes && cleanup

Author: railken

.gitignore

@@ -1,7 +1,7 @@
 vendor/
 var/cache
 \.php_cs\.cache
-
+build/
 \.env
 
 composer\.lock

phpunit.xml

@@ -13,6 +13,11 @@
             <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./src</directory>
+        </whitelist>
+    </filter>
     <php>
         <env name="APP_ENV" value="testing"/>
     </php>

src/Api/Concerns/ApiTransformerTrait.php

@@ -17,7 +17,7 @@ public function setSelectedAttributes(array $selectedAttributes = [])
         return $this;
     }
 
-    public function getSelectedAttributes()
+    public function getSelectedAttributes(): array
     {
         return $this->selectedAttributes;
     }
@@ -29,7 +29,7 @@ public function setAuthorizedAttributes(array $authorizedAttributes = [])
         return $this;
     }
 
-    public function getAuthorizedAttributes()
+    public function getAuthorizedAttributes(): array
     {
         return $this->authorizedAttributes;
     }

src/Api/Contracts/TransformerContract.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Railken\LaraOre\Api\Contracts;
+
+interface TransformerContract
+{
+    public function setSelectedAttributes(array $selectedAttributes = []);
+
+    public function getSelectedAttributes(): array;
+
+    public function setAuthorizedAttributes(array $authorizedAttributes = []);
+
+    public function getAuthorizedAttributes(): array;
+}

src/Api/Http/Controllers/Controller.php

@@ -5,6 +5,7 @@
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Support\Facades\Auth;
 
@@ -25,7 +26,7 @@ class Controller extends BaseController
      */
     public function response($data = [], $status = 200, $headers = [], $options = 0)
     {
-        return response()->json($data, $status, $headers, $options);
+        return new JsonResponse($data, $status, $headers, $options);
     }
 
     /**

src/Api/Http/Controllers/RestController.php

@@ -7,8 +7,8 @@
 use Illuminate\Support\Facades\DB;
 use League\Fractal;
 use League\Fractal\Serializer\JsonApiSerializer;
-use League\Fractal\TransformerAbstract;
 use Railken\Bag;
+use Railken\LaraOre\Api\Contracts\TransformerContract;
 use Railken\Laravel\Manager\Contracts\EntityContract;
 use Railken\Laravel\Manager\Tokens;
 
@@ -116,7 +116,7 @@ public function getFractalTransformer()
         return new $classTransformer();
     }
 
-    public function initializeFractalTransformer(TransformerAbstract $transformer, EntityContract $entity = null, Request $request)
+    public function initializeFractalTransformer(TransformerContract $transformer, EntityContract $entity = null, Request $request)
     {
         if ($entity !== null) {
             $transformer->setSelectedAttributes($this->getSelectedAttributesByRequest($request));
@@ -131,7 +131,7 @@ public function getFractalManager(Request $request)
         $manager = new Fractal\Manager();
         $manager->setSerializer(new JsonApiSerializer());
 
-        if ($request->input('include')) {
+        if ($request->input('include') !== null) {
             $manager->parseIncludes($request->input('include'));
         }
 
@@ -140,16 +140,16 @@ public function getFractalManager(Request $request)
 
     public function getSelectedAttributesByRequest(Request $request)
     {
-        $select = collect(explode(',', $request->input('select', '')));
+        $select = collect(explode(',', strval($request->input('select', ''))));
 
         if ($select->count() > 0) {
-            $select = $this->keys->selectable->filter(function ($attr) use ($select) {
+            $select = $this->keys->get('selectable')->filter(function ($attr) use ($select) {
                 return $select->contains($attr);
             });
         }
 
         if ($select->count() == 0) {
-            $select = $this->keys->selectable;
+            $select = $this->keys->get('selectable');
         }
 
         return $select->toArray();

src/Api/Http/Middleware/AdminMiddleware.php

@@ -17,8 +17,15 @@ public function paginate($total, $page = 1, $take = 10)
     {
         $take = (int) $take;
         $page = (int) $page;
-        $take <= 0 && $take = 10;
-        $page <= 0 && $page = 1;
+
+        if ($take <= 0) {
+            $take = 10;
+        }
+
+        if ($page <= 0) {
+            $page = 1;
+        }
+
         $skip = ($page - 1) * $take;
         $last = $skip + $take;
         $first = $skip + 1;

src/Api/Http/Middleware/HandleErrorsMiddleware.php

@@ -2,36 +2,26 @@
 
 namespace Railken\LaraOre\Api\Support;
 
-use Illuminate\Support\Collection;
-
 class Sorter
 {
     /**
      * List of sorting values.
      *
-     * @var Collection
+     * @var array
      */
     protected $values;
 
     /**
      * List of sorting keys.
      *
-     * @var Collection
+     * @var array
      */
     protected $keys;
 
-    /**
-     * Construct.
-     */
-    public function __construct()
-    {
-        $this->values = new Collection();
-    }
-
     /**
      * Set keys.
      *
-     * @param Collection $keys
+     * @param array $keys
      *
      * @return $this
      */
@@ -68,7 +58,7 @@ public function add($name, $direction)
     /**
      * Retrieve all sorting values.
      *
-     * @return Collection
+     * @return array
      */
     public function get()
     {