Altered mysql start command in workflows

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

diff --git a/app/Http/Controllers/Api/ApiController.php b/app/Http/Controllers/Api/ApiController.php
index 0a3d8945356cb9414fc592fb3c4f7668c272e4b7..3f049a08c8afaba8523448137624b80dc078a0d1 100644 (file)
--- a/app/Http/Controllers/Api/ApiController.php
+++ b/app/Http/Controllers/Api/ApiController.php
@@ -1,4 +1,6 @@
-<?php namespace BookStack\Http\Controllers\Api;
+<?php
+
+namespace BookStack\Http\Controllers\Api;

 
 use BookStack\Api\ListingResponseBuilder;
 use BookStack\Http\Controllers\Controller;
 
 use BookStack\Api\ListingResponseBuilder;
 use BookStack\Http\Controllers\Controller;


@@ -7,7 +9,6 @@ use Illuminate\Http\JsonResponse;
 
 abstract class ApiController extends Controller
 {
 
 abstract class ApiController extends Controller
 {

-

     protected $rules = [];
 
     /**
     protected $rules = [];
 
     /**


@@ -17,14 +18,20 @@ abstract class ApiController extends Controller
     protected function apiListingResponse(Builder $query, array $fields): JsonResponse
     {
         $listing = new ListingResponseBuilder($query, request(), $fields);
     protected function apiListingResponse(Builder $query, array $fields): JsonResponse
     {
         $listing = new ListingResponseBuilder($query, request(), $fields);

+

         return $listing->toResponse();
     }
 
     /**
      * Get the validation rules for this controller.
         return $listing->toResponse();
     }
 
     /**
      * Get the validation rules for this controller.

+     * Defaults to a $rules property but can be a rules() method.

      */
     public function getValdationRules(): array
     {
      */
     public function getValdationRules(): array
     {

+        if (method_exists($this, 'rules')) {
+            return $this->rules();
+        }
+

         return $this->rules;
     }
         return $this->rules;
     }

-}
\ No newline at end of file
+}