Applied StyleCI changes, added php/larastan to attribution

[bookstack] / app / Entities / Tools / SearchOptions.php

diff --git a/app/Entities/Tools/SearchOptions.php b/app/Entities/Tools/SearchOptions.php
index 60e3a9b7876d971edd29c681643ec58a0fbab09d..39074fb3862e57ed43d5731c8224dab45954ed12 100644 (file)
--- a/app/Entities/Tools/SearchOptions.php
+++ b/app/Entities/Tools/SearchOptions.php
@@ -1,10 +1,11 @@
-<?php namespace BookStack\Entities\Tools;
+<?php
+
+namespace BookStack\Entities\Tools;

 
 use Illuminate\Http\Request;
 
 class SearchOptions
 {
 
 use Illuminate\Http\Request;
 
 class SearchOptions
 {

-

     /**
      * @var array
      */
     /**
      * @var array
      */


@@ -28,13 +29,14 @@ class SearchOptions
     /**
      * Create a new instance from a search string.
      */
     /**
      * Create a new instance from a search string.
      */

-    public static function fromString(string $search): SearchOptions
+    public static function fromString(string $search): self

     {
         $decoded = static::decode($search);
     {
         $decoded = static::decode($search);

-        $instance = new static();
+        $instance = new SearchOptions();

         foreach ($decoded as $type => $value) {
             $instance->$type = $value;
         }
         foreach ($decoded as $type => $value) {
             $instance->$type = $value;
         }

+

         return $instance;
     }
 
         return $instance;
     }
 


@@ -43,7 +45,7 @@ class SearchOptions
      * Will look for a classic string term and use that
      * Otherwise we'll use the details from an advanced search form.
      */
      * Will look for a classic string term and use that
      * Otherwise we'll use the details from an advanced search form.
      */

-    public static function fromRequest(Request $request): SearchOptions
+    public static function fromRequest(Request $request): self

     {
         if (!$request->has('search') && !$request->has('term')) {
             return static::fromString('');
     {
         if (!$request->has('search') && !$request->has('term')) {
             return static::fromString('');


@@ -53,7 +55,7 @@ class SearchOptions
             return static::fromString($request->get('term'));
         }
 
             return static::fromString($request->get('term'));
         }
 

-        $instance = new static();
+        $instance = new SearchOptions();

         $inputs = $request->only(['search', 'types', 'filters', 'exact', 'tags']);
         $instance->searches = explode(' ', $inputs['search'] ?? []);
         $instance->exacts = array_filter($inputs['exact'] ?? []);
         $inputs = $request->only(['search', 'types', 'filters', 'exact', 'tags']);
         $instance->searches = explode(' ', $inputs['search'] ?? []);
         $instance->exacts = array_filter($inputs['exact'] ?? []);


@@ -67,6 +69,7 @@ class SearchOptions
         if (isset($inputs['types']) && count($inputs['types']) < 4) {
             $instance->filters['type'] = implode('|', $inputs['types']);
         }
         if (isset($inputs['types']) && count($inputs['types']) < 4) {
             $instance->filters['type'] = implode('|', $inputs['types']);
         }

+

         return $instance;
     }
 
         return $instance;
     }
 


@@ -77,15 +80,15 @@ class SearchOptions
     {
         $terms = [
             'searches' => [],
     {
         $terms = [
             'searches' => [],

-            'exacts' => [],
-            'tags' => [],
-            'filters' => []
+            'exacts'   => [],
+            'tags'     => [],
+            'filters'  => [],

         ];
 
         $patterns = [
         ];
 
         $patterns = [

-            'exacts' => '/"(.*?)"/',
-            'tags' => '/\[(.*?)\]/',
-            'filters' => '/\{(.*?)\}/'
+            'exacts'  => '/"(.*?)"/',
+            'tags'    => '/\[(.*?)\]/',
+            'filters' => '/\{(.*?)\}/',

         ];
 
         // Parse special terms
         ];
 
         // Parse special terms


@@ -137,5 +140,4 @@ class SearchOptions
 
         return $string;
     }
 
         return $string;
     }

-
-}
\ No newline at end of file
+}