sunnysideup / silverstripe-site-wide-search

src/Api/SearchApi.php

Spacing +33 added lines, -33 removed lines

@@ -218,23 +218,23 @@ 
         $this->initCache();
         $count = 0;
         // we should have these already.
-        foreach($this->objects as $item) {
-            if($item->canEdit()) {
+        foreach ($this->objects as $item) {
+            if ($item->canEdit()) {
                 $fields = $this->getAllValidFields($item->ClassName);
                 foreach ($fields as $field) {
                     $new = str_replace($word, $replace, $item->$field);
-                    if($new !== $item->$field) {
+                    if ($new !== $item->$field) {
                         $count++;
                         $item->$field = $new;
                         $isPublished = false;
-                        if($item->hasMethod('isPublished')) {
+                        if ($item->hasMethod('isPublished')) {
                             $isPublished = $item->isPublished();
                         }
                         $item->write();
-                        if($isPublished) {
+                        if ($isPublished) {
                             $item->publishRecursive();
                         }
-                        if ($this->debug) { DB::alteration_message('<h2>Match:  '.$item->ClassName.$item->ID.'</h2>'.$new.'<hr />');}
+                        if ($this->debug) { DB::alteration_message('<h2>Match:  ' . $item->ClassName . $item->ID . '</h2>' . $new . '<hr />'); }
                     }
                 }
             }
@@ -245,47 +245,47 @@ 
 
     protected function getMatches(?string $word = ''): array
     {
-        if ($this->debug) {$startOuter = microtime(true);}
+        if ($this->debug) {$startOuter = microtime(true); }
 
         $this->workOutExclusions();
         $this->workOutWords($word);
-        if ($this->debug) {DB::alteration_message('Words searched for ' . implode(', ', $this->words));}
+        if ($this->debug) {DB::alteration_message('Words searched for ' . implode(', ', $this->words)); }
         $array = [];
 
         if (count($this->words)) {
             foreach ($this->getAllDataObjects() as $className) {
-                if ($this->debug) {DB::alteration_message(' ... Searching in ' . $className);}
-                if (! in_array($className, $this->excludedClasses, true)) {
+                if ($this->debug) {DB::alteration_message(' ... Searching in ' . $className); }
+                if (!in_array($className, $this->excludedClasses, true)) {
                     $array[$className] = [];
                     $fields = $this->getAllValidFields($className);
                     $filterAny = [];
                     foreach ($fields as $field) {
-                        if (! in_array($field, $this->excludedFields, true)) {
-                            if ($this->debug) {DB::alteration_message(' ... ... Searching in ' . $className . '.' . $field);}
+                        if (!in_array($field, $this->excludedFields, true)) {
+                            if ($this->debug) {DB::alteration_message(' ... ... Searching in ' . $className . '.' . $field); }
                             $filterAny[$field . ':PartialMatch'] = $this->words;
                         }
                     }
 
                     if ([] !== $filterAny) {
-                        if ($this->debug) {$startInner = microtime(true); DB::alteration_message(' ... Filter: ' . implode(', ', array_keys($filterAny)));}
+                        if ($this->debug) {$startInner = microtime(true); DB::alteration_message(' ... Filter: ' . implode(', ', array_keys($filterAny))); }
                         $array[$className] = $className::get()
                             ->filterAny($filterAny)
                             ->limit($this->Config()->get('limit_of_count_per_data_object'))
                             ->column('ID')
                         ;
-                        if ($this->debug) {$elaps = microtime(true) - $startInner;DB::alteration_message('search for ' . $className . ' taken : ' . $elaps);}
+                        if ($this->debug) {$elaps = microtime(true) - $startInner; DB::alteration_message('search for ' . $className . ' taken : ' . $elaps); }
                     }
 
-                    if ($this->debug) {DB::alteration_message(' ... No fields in ' . $className);}
+                    if ($this->debug) {DB::alteration_message(' ... No fields in ' . $className); }
                 }
 
-                if ($this->debug) {DB::alteration_message(' ... Skipping ' . $className);}
+                if ($this->debug) {DB::alteration_message(' ... Skipping ' . $className); }
             }
         } else {
             $array = $this->getDefaultList();
         }
 
-        if ($this->debug) {$elaps = microtime(true) - $startOuter;DB::alteration_message('seconds taken find results: ' . $elaps);}
+        if ($this->debug) {$elaps = microtime(true) - $startOuter; DB::alteration_message('seconds taken find results: ' . $elaps); }
         return $array;
     }
 
@@ -294,14 +294,14 @@ 
         $back = $this->config()->get('hours_back_for_recent') ?? 24;
         $limit = $this->Config()->get('limit_per_class_for_recent') ?? 5;
         $threshold = strtotime('-' . $back . ' hours', DBDatetime::now()->getTimestamp());
-        if (! $threshold) {
+        if (!$threshold) {
             $threshold = time() - 86400;
         }
 
         $array = [];
         $classNames = $this->getAllDataObjects();
         foreach ($classNames as $className) {
-            if (! in_array($className, $this->excludedClasses, true)) {
+            if (!in_array($className, $this->excludedClasses, true)) {
                 $array[$className] = $className::get()
                     ->filter('LastEdited:GreaterThan', date('Y-m-d H:i:s', $threshold))
                     ->sort('LastEdited', 'DESC')
@@ -316,14 +316,14 @@ 
 
     protected function turnArrayIntoObjects(array $matches, ?int $limit = 0) : array
     {
-        if(empty($this->objects)) {
-            if(empty($limit)) {
+        if (empty($this->objects)) {
+            if (empty($limit)) {
                 $limit = (int) $this->Config()->get('limit_of_count_per_data_object');
             }
             $this->objects = [];
-            if ($this->debug) {DB::alteration_message('number of classes: ' . count($matches));}
+            if ($this->debug) {DB::alteration_message('number of classes: ' . count($matches)); }
             foreach ($matches as $className => $ids) {
-                if ($this->debug) {$start = microtime(true);DB::alteration_message(' ... number of matches for : ' . $className . ': ' . count($ids));}
+                if ($this->debug) {$start = microtime(true); DB::alteration_message(' ... number of matches for : ' . $className . ': ' . count($ids)); }
                 if (count($ids)) {
                     $className = (string) $className;
                     $items = $className::get()
@@ -336,7 +336,7 @@ 
                         }
                     }
                 }
-                if ($this->debug) {$elaps = microtime(true) - $start;DB::alteration_message('seconds taken to find objects in: ' . $className . ': ' . $elaps);}
+                if ($this->debug) {$elaps = microtime(true) - $start; DB::alteration_message('seconds taken to find objects in: ' . $className . ': ' . $elaps); }
             }
         }
 
@@ -351,7 +351,7 @@ 
         $finder = Injector::inst()->get(FindEditableObjects::class);
         $finder->initCache();
         $items = $this->turnArrayIntoObjects($matches);
-        foreach($items as $item) {
+        foreach ($items as $item) {
             $link = $finder->getLink($item, $this->excludedClasses);
             $cmsEditLink = $item->canEdit() ? $finder->getCMSEditLink($item, $this->excludedClasses) : '';
             $list->push(
@@ -396,7 +396,7 @@ 
             $testWords = array_unique($testWords);
             foreach ($testWords as $wordKey => $word) {
                 //match a exact field to full words / one word
-                $fullWords = ! (bool) $wordKey;
+                $fullWords = !(bool) $wordKey;
                 if (false === $done) {
                     $count = 0;
                     foreach ($fieldValues as $fieldValue) {
@@ -464,14 +464,14 @@ 
 
     protected function workOutWords(string $word = ''): array
     {
-        if($this->searchWholePhrase) {
+        if ($this->searchWholePhrase) {
             $this->words = [implode(' ', $this->words)];
         }
         if ($word) {
             $this->words[] = $word;
         }
 
-        if (! count($this->words)) {
+        if (!count($this->words)) {
             user_error('No word has been provided');
         }
 
@@ -483,8 +483,8 @@ 
 
     protected function getAllDataObjects(): array
     {
-        if ($this->debug) {DB::alteration_message('Base Class: ' . $this->baseClass);}
-        if (! isset($this->cache['AllDataObjects'][$this->baseClass])) {
+        if ($this->debug) {DB::alteration_message('Base Class: ' . $this->baseClass); }
+        if (!isset($this->cache['AllDataObjects'][$this->baseClass])) {
             $this->cache['AllDataObjects'][$this->baseClass] = array_values(
                 ClassInfo::subclassesFor($this->baseClass, false)
             );
@@ -496,7 +496,7 @@ 
 
     protected function getAllValidFields(string $className): array
     {
-        if (! isset($this->cache['AllValidFields'][$className])) {
+        if (!isset($this->cache['AllValidFields'][$className])) {
             $array = [];
             $fullList = Config::inst()->get($className, 'db');
             if (is_array($fullList)) {
@@ -522,7 +522,7 @@ 
 
     protected function getIndexedFields(string $className, array $dbFields): array
     {
-        if (! isset($this->cache['IndexedFields'][$className])) {
+        if (!isset($this->cache['IndexedFields'][$className])) {
             $this->cache['IndexedFields'][$className] = [];
             $indexes = Config::inst()->get($className, 'indexes');
             if (is_array($indexes)) {
@@ -557,7 +557,7 @@ 
 
     protected function isValidFieldType(string $className, string $fieldName, string $type): bool
     {
-        if (! isset($this->cache['ValidFieldTypes'][$type])) {
+        if (!isset($this->cache['ValidFieldTypes'][$type])) {
             $this->cache['ValidFieldTypes'][$type] = false;
             $singleton = Injector::inst()->get($className);
             $field = $singleton->dbObject($fieldName);

src/Admin/SearchAdmin.php

Spacing +4 added lines, -4 removed lines

@@ -63,7 +63,7 @@ 
             (new CheckboxField('SearchWholePhrase', 'Search exact phrase', $this->searchWholePhrase))
                 ->setDescription('If ticked, any item will be included that includes the whole phrase (e.g. New Zealand, rather than New OR Zealand)')
         );
-        if (! $this->getRequest()->requestVar('Keywords')) {
+        if (!$this->getRequest()->requestVar('Keywords')) {
             $resultsTitle = 'Recently Edited';
             $this->listHTML = $this->renderWith(self::class . '_Results');
         } else {
@@ -123,11 +123,11 @@ 
 
     public function SearchResults(): ?ArrayList
     {
-        $this->isQuickSearch = ! empty($this->rawData['QuickSearch']);
-        $this->searchWholePhrase = ! empty($this->rawData['SearchWholePhrase']);
+        $this->isQuickSearch = !empty($this->rawData['QuickSearch']);
+        $this->searchWholePhrase = !empty($this->rawData['SearchWholePhrase']);
         $this->keywords = trim($this->rawData['Keywords'] ?? '');
         $this->replace = trim($this->rawData['ReplaceWith'] ?? '');
-        if($this->replace) {
+        if ($this->replace) {
             return Injector::inst()->get(SearchApi ::class)
                 ->setBaseClass(DataObject::class)
                 ->setIsQuickSearch(false)