Updated polymorphic database relation types to simpler version

[bookstack] / app / Http / Controllers / Api / ApiController.php

diff --git a/app/Http/Controllers/Api/ApiController.php b/app/Http/Controllers/Api/ApiController.php
index 4971c0cdebf24dbe89b1108287a44fa1f650d7c9..9652654be4d79a364d956149943cc266af7a6a18 100644 (file)
--- a/app/Http/Controllers/Api/ApiController.php
+++ b/app/Http/Controllers/Api/ApiController.php
@@ -1,20 +1,41 @@
-<?php namespace BookStack\Http\Controllers\Api;
+<?php
+
+namespace BookStack\Http\Controllers\Api;

 
 use BookStack\Api\ListingResponseBuilder;
 use BookStack\Http\Controllers\Controller;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\JsonResponse;
 
 
 use BookStack\Api\ListingResponseBuilder;
 use BookStack\Http\Controllers\Controller;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\JsonResponse;
 

-class ApiController extends Controller
+abstract class ApiController extends Controller

 {
 {

+    protected $rules = [];

 
     /**
      * Provide a paginated listing JSON response in a standard format
      * taking into account any pagination parameters passed by the user.
      */
 
     /**
      * Provide a paginated listing JSON response in a standard format
      * taking into account any pagination parameters passed by the user.
      */

-    protected function apiListingResponse(Builder $query, array $fields): JsonResponse
+    protected function apiListingResponse(Builder $query, array $fields, array $modifiers = []): JsonResponse

     {
     {

-        $listing = new ListingResponseBuilder($query, $fields);
+        $listing = new ListingResponseBuilder($query, request(), $fields);
+
+        foreach ($modifiers as $modifier) {
+            $listing->modifyResults($modifier);
+        }
+

         return $listing->toResponse();
     }
         return $listing->toResponse();
     }

-}
\ No newline at end of file
+
+    /**
+     * Get the validation rules for this controller.
+     * Defaults to a $rules property but can be a rules() method.
+     */
+    public function getValidationRules(): array
+    {
+        if (method_exists($this, 'rules')) {
+            return $this->rules();
+        }
+
+        return $this->rules;
+    }
+}