silverstripe / cwp

src/PageTypes/EventHolderController.php

Indentation +41 added lines, -41 removed lines

@@ -19,53 +19,53 @@
  */
 class EventHolderController extends DatedUpdateHolderController
 {
-    public function getUpdateName()
-    {
-        $params = $this->parseParams();
-        if ($params['upcomingOnly']) {
-            return _t('CWP\\CWP\\PageTypes\\EventHolder.Upcoming', 'Upcoming events');
-        }
+	public function getUpdateName()
+	{
+		$params = $this->parseParams();
+		if ($params['upcomingOnly']) {
+			return _t('CWP\\CWP\\PageTypes\\EventHolder.Upcoming', 'Upcoming events');
+		}
 
-        return 'Events';
-    }
+		return 'Events';
+	}
 
-    /**
-     * Parse URL parameters.
-     *
-     * @param boolean $produceErrorMessages Set to false to omit session messages.
-     */
-    public function parseParams($produceErrorMessages = true)
-    {
-        $params = parent::parseParams($produceErrorMessages);
+	/**
+	 * Parse URL parameters.
+	 *
+	 * @param boolean $produceErrorMessages Set to false to omit session messages.
+	 */
+	public function parseParams($produceErrorMessages = true)
+	{
+		$params = parent::parseParams($produceErrorMessages);
 
-        // We need to set whether or not we're supposed to be displaying only upcoming events or all events.
-        $params['upcomingOnly'] = !($params['from'] || $params['to'] || $params['year'] || $params['month']);
+		// We need to set whether or not we're supposed to be displaying only upcoming events or all events.
+		$params['upcomingOnly'] = !($params['from'] || $params['to'] || $params['year'] || $params['month']);
 
-        return $params;
-    }
+		return $params;
+	}
 
-    /**
-     * Get the events based on the current query.
-     */
-    public function FilteredUpdates($pageSize = 20)
-    {
-        $params = $this->parseParams();
+	/**
+	 * Get the events based on the current query.
+	 */
+	public function FilteredUpdates($pageSize = 20)
+	{
+		$params = $this->parseParams();
 
-        $items = $this->Updates(
-            $params['tag'],
-            $params['from'],
-            $params['to'],
-            $params['year'],
-            $params['month']
-        );
+		$items = $this->Updates(
+			$params['tag'],
+			$params['from'],
+			$params['to'],
+			$params['year'],
+			$params['month']
+		);
 
-        if ($params['upcomingOnly']) {
-            $items = $items->filter(['Date:LessThan:Not' => DBDatetime::now()->Format('y-MM-dd')]);
-        }
+		if ($params['upcomingOnly']) {
+			$items = $items->filter(['Date:LessThan:Not' => DBDatetime::now()->Format('y-MM-dd')]);
+		}
 
-        // Apply pagination
-        $list = PaginatedList::create($items, $this->getRequest());
-        $list->setPageLength($pageSize);
-        return $list;
-    }
+		// Apply pagination
+		$list = PaginatedList::create($items, $this->getRequest());
+		$list->setPageLength($pageSize);
+		return $list;
+	}
 }

src/PageTypes/EventPage.php

Indentation +77 added lines, -77 removed lines

@@ -12,81 +12,81 @@
 
 class EventPage extends DatedUpdatePage
 {
-    private static $description = 'Describes an event occurring on a specific date.';
-
-    private static $default_parent = EventHolder::class;
-
-    private static $can_be_root = false;
-
-    private static $icon = 'cwp/cwp:images/icons/sitetree_images/event_page.png';
-
-    private static $singular_name = 'Event Page';
-
-    private static $plural_name = 'Event Pages';
-
-    private static $db = [
-        'StartTime' => 'Time',
-        'EndTime' => 'Time',
-        'Location' => 'Text',
-    ];
-
-    private static $table_name = 'EventPage';
-
-    public function fieldLabels($includerelations = true)
-    {
-        $labels = parent::fieldLabels($includerelations);
-        $labels['StartTime'] = _t('CWP\\CWP\\PageTypes\\DateUpdatePage.StartTimeFieldLabel', 'Start Time');
-        $labels['EndTime'] = _t('CWP\\CWP\\PageTypes\\DateUpdatePage.EndTimeFieldLabel', 'End Time');
-        $labels['Location'] = _t('CWP\\CWP\\PageTypes\\DateUpdatePage.LocationFieldLabel', 'Location');
-
-        return $labels;
-    }
-
-    /**
-     * Add the default for the Date being the current day.
-     */
-    public function populateDefaults()
-    {
-        if (!isset($this->Date) || $this->Date === null) {
-            $this->Date = DBDatetime::now()->Format('y-MM-dd');
-        }
-
-        if (!isset($this->StartTime) || $this->StartTime === null) {
-            $this->StartTime = '09:00:00';
-        }
-
-        if (!isset($this->EndTime) || $this->EndTime === null) {
-            $this->EndTime = '17:00:00';
-        }
-
-        parent::populateDefaults();
-    }
-
-    public function getCMSFields()
-    {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
-            $fields->removeByName('Date');
-
-            $dateTimeFields = array();
-
-            $dateTimeFields[] = $dateField = DateField::create('Date', 'Date');
-            $dateTimeFields[] = $startTimeField = TimeField::create(
-                'StartTime',
-                '  ' . $this->fieldLabel('StartTime')
-            );
-            $dateTimeFields[] = $endTimeField = TimeField::create('EndTime', $this->fieldLabel('EndTime'));
-
-            $fields->addFieldsToTab('Root.Main', [
-                $dateTimeField = FieldGroup::create('Date and time', $dateTimeFields),
-                $locationField = TextareaField::create('Location', $this->fieldLabel('Location'))
-            ], 'Abstract');
-            $locationField->setRows(4);
-        });
-        return parent::getCMSFields();
-    }
-
-    public function NiceLocation()
-    {
-        return nl2br(Convert::raw2xml($this->Location), true);
-    }
+	private static $description = 'Describes an event occurring on a specific date.';
+
+	private static $default_parent = EventHolder::class;
+
+	private static $can_be_root = false;
+
+	private static $icon = 'cwp/cwp:images/icons/sitetree_images/event_page.png';
+
+	private static $singular_name = 'Event Page';
+
+	private static $plural_name = 'Event Pages';
+
+	private static $db = [
+		'StartTime' => 'Time',
+		'EndTime' => 'Time',
+		'Location' => 'Text',
+	];
+
+	private static $table_name = 'EventPage';
+
+	public function fieldLabels($includerelations = true)
+	{
+		$labels = parent::fieldLabels($includerelations);
+		$labels['StartTime'] = _t('CWP\\CWP\\PageTypes\\DateUpdatePage.StartTimeFieldLabel', 'Start Time');
+		$labels['EndTime'] = _t('CWP\\CWP\\PageTypes\\DateUpdatePage.EndTimeFieldLabel', 'End Time');
+		$labels['Location'] = _t('CWP\\CWP\\PageTypes\\DateUpdatePage.LocationFieldLabel', 'Location');
+
+		return $labels;
+	}
+
+	/**
+	 * Add the default for the Date being the current day.
+	 */
+	public function populateDefaults()
+	{
+		if (!isset($this->Date) || $this->Date === null) {
+			$this->Date = DBDatetime::now()->Format('y-MM-dd');
+		}
+
+		if (!isset($this->StartTime) || $this->StartTime === null) {
+			$this->StartTime = '09:00:00';
+		}
+
+		if (!isset($this->EndTime) || $this->EndTime === null) {
+			$this->EndTime = '17:00:00';
+		}
+
+		parent::populateDefaults();
+	}
+
+	public function getCMSFields()
+	{
+		$this->beforeUpdateCMSFields(function (FieldList $fields) {
+			$fields->removeByName('Date');
+
+			$dateTimeFields = array();
+
+			$dateTimeFields[] = $dateField = DateField::create('Date', 'Date');
+			$dateTimeFields[] = $startTimeField = TimeField::create(
+				'StartTime',
+				'  ' . $this->fieldLabel('StartTime')
+			);
+			$dateTimeFields[] = $endTimeField = TimeField::create('EndTime', $this->fieldLabel('EndTime'));
+
+			$fields->addFieldsToTab('Root.Main', [
+				$dateTimeField = FieldGroup::create('Date and time', $dateTimeFields),
+				$locationField = TextareaField::create('Location', $this->fieldLabel('Location'))
+			], 'Abstract');
+			$locationField->setRows(4);
+		});
+		return parent::getCMSFields();
+	}
+
+	public function NiceLocation()
+	{
+		return nl2br(Convert::raw2xml($this->Location), true);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 
     public function getCMSFields()
     {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
+        $this->beforeUpdateCMSFields(function(FieldList $fields) {
             $fields->removeByName('Date');
 
             $dateTimeFields = array();

src/PageTypes/NewsPage.php

Indentation +39 added lines, -39 removed lines

@@ -9,55 +9,55 @@
 
 class NewsPage extends DatedUpdatePage
 {
-    private static $description = 'Describes an item of news';
+	private static $description = 'Describes an item of news';
 
-    private static $default_parent = 'NewsHolderPage';
+	private static $default_parent = 'NewsHolderPage';
 
-    private static $can_be_root = false;
+	private static $can_be_root = false;
 
-    private static $icon = 'cwp/cwp:images/icons/sitetree_images/news.png';
+	private static $icon = 'cwp/cwp:images/icons/sitetree_images/news.png';
 
-    private static $singular_name = 'News Page';
+	private static $singular_name = 'News Page';
 
-    private static $plural_name = 'News Pages';
+	private static $plural_name = 'News Pages';
 
-    private static $db = [
-        'Author' => 'Varchar(255)',
-    ];
+	private static $db = [
+		'Author' => 'Varchar(255)',
+	];
 
-    private static $has_one = [
-        'FeaturedImage' => Image::class,
-    ];
+	private static $has_one = [
+		'FeaturedImage' => Image::class,
+	];
 
-    private static $table_name = 'NewsPage';
+	private static $table_name = 'NewsPage';
 
-    public function fieldLabels($includerelations = true)
-    {
-        $labels = parent::fieldLabels($includerelations);
-        $labels['Author'] = _t('CWP\\CWP\\PageTypes\\DateUpdatePage.AuthorFieldLabel', 'Author');
-        $labels['FeaturedImageID'] = _t(
-            'CWP\\CWP\\PageTypes\\DateUpdatePage.FeaturedImageFieldLabel',
-            'Featured Image'
-        );
+	public function fieldLabels($includerelations = true)
+	{
+		$labels = parent::fieldLabels($includerelations);
+		$labels['Author'] = _t('CWP\\CWP\\PageTypes\\DateUpdatePage.AuthorFieldLabel', 'Author');
+		$labels['FeaturedImageID'] = _t(
+			'CWP\\CWP\\PageTypes\\DateUpdatePage.FeaturedImageFieldLabel',
+			'Featured Image'
+		);
 
-        return $labels;
-    }
+		return $labels;
+	}
 
-    public function getCMSFields()
-    {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
-            $fields->addFieldToTab(
-                'Root.Main',
-                TextField::create('Author', $this->fieldLabel('Author')),
-                'Abstract'
-            );
+	public function getCMSFields()
+	{
+		$this->beforeUpdateCMSFields(function (FieldList $fields) {
+			$fields->addFieldToTab(
+				'Root.Main',
+				TextField::create('Author', $this->fieldLabel('Author')),
+				'Abstract'
+			);
 
-            $fields->addFieldToTab(
-                'Root.Main',
-                UploadField::create('FeaturedImage', $this->fieldLabel('FeaturedImageID')),
-                'Abstract'
-            );
-        });
-        return parent::getCMSFields();
-    }
+			$fields->addFieldToTab(
+				'Root.Main',
+				UploadField::create('FeaturedImage', $this->fieldLabel('FeaturedImageID')),
+				'Abstract'
+			);
+		});
+		return parent::getCMSFields();
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 
     public function getCMSFields()
     {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
+        $this->beforeUpdateCMSFields(function(FieldList $fields) {
             $fields->addFieldToTab(
                 'Root.Main',
                 TextField::create('Author', $this->fieldLabel('Author')),

tests/Tasks/CleanupGeneratedPdfDailyTaskTest.php

Indentation +17 added lines, -17 removed lines

@@ -9,26 +9,26 @@
 
 class CleanupGeneratedPdfDailyTaskTest extends SapphireTest
 {
-    /**
-     * @var CleanupGeneratedPdfDailyTask
-     */
-    protected $task;
+	/**
+	 * @var CleanupGeneratedPdfDailyTask
+	 */
+	protected $task;
 
-    protected function setUp()
-    {
-        parent::setUp();
+	protected function setUp()
+	{
+		parent::setUp();
 
-        if (!interface_exists(CronTask::class)) {
-            $this->markTestSkipped('Test class requires the silverstripe/crontask module to be installed');
-        }
+		if (!interface_exists(CronTask::class)) {
+			$this->markTestSkipped('Test class requires the silverstripe/crontask module to be installed');
+		}
 
-        $this->task = new CleanupGeneratedPdfDailyTask();
-    }
+		$this->task = new CleanupGeneratedPdfDailyTask();
+	}
 
-    public function testCronScheduleIsConfigurable()
-    {
-        Config::modify()->set(CleanupGeneratedPdfDailyTask::class, 'schedule', '* 1 2 3 *');
+	public function testCronScheduleIsConfigurable()
+	{
+		Config::modify()->set(CleanupGeneratedPdfDailyTask::class, 'schedule', '* 1 2 3 *');
 
-        $this->assertSame('* 1 2 3 *', $this->task->getSchedule());
-    }
+		$this->assertSame('* 1 2 3 *', $this->task->getSchedule());
+	}
 }

src/Tasks/CleanupGeneratedPdfDailyTask.php

Indentation +33 added lines, -33 removed lines

@@ -7,7 +7,7 @@ 
 use SilverStripe\CronTask\Interfaces\CronTask;
 
 if (!interface_exists(CronTask::class)) {
-    return;
+	return;
 }
 
 /**
@@ -15,36 +15,36 @@ 
  */
 class CleanupGeneratedPdfDailyTask implements CronTask
 {
-    use Configurable;
-
-    /**
-     * The cron schedule for this task (default: midnight every day)
-     *
-     * @config
-     * @var string
-     */
-    private static $schedule = '0 0 * * *';
-
-    /**
-     * Whether this task is enabled (default false)
-     *
-     * @config
-     * @return bool
-     */
-    private static $enabled = false;
-
-    public function getSchedule()
-    {
-        return $this->config()->get('schedule');
-    }
-
-    public function process()
-    {
-        if (!$this->config()->get('enabled')) {
-            return;
-        }
-
-        $task = Injector::inst()->create(CleanupGeneratedPdfBuildTask::class);
-        $task->run(null);
-    }
+	use Configurable;
+
+	/**
+	 * The cron schedule for this task (default: midnight every day)
+	 *
+	 * @config
+	 * @var string
+	 */
+	private static $schedule = '0 0 * * *';
+
+	/**
+	 * Whether this task is enabled (default false)
+	 *
+	 * @config
+	 * @return bool
+	 */
+	private static $enabled = false;
+
+	public function getSchedule()
+	{
+		return $this->config()->get('schedule');
+	}
+
+	public function process()
+	{
+		if (!$this->config()->get('enabled')) {
+			return;
+		}
+
+		$task = Injector::inst()->create(CleanupGeneratedPdfBuildTask::class);
+		$task->run(null);
+	}
 }

src/Tasks/CleanupGeneratedPdfBuildTask.php

Indentation +16 added lines, -16 removed lines

@@ -7,24 +7,24 @@
 
 class CleanupGeneratedPdfBuildTask extends BuildTask
 {
-    protected $title = 'Cleanup generated PDFs';
+	protected $title = 'Cleanup generated PDFs';
 
-    protected $description = 'Removes generated PDFs on the site, forcing a regeneration of all exports to PDF '
-        . 'when users go to download them. This is most useful when templates have been changed so users should '
-        . 'receive a new copy';
+	protected $description = 'Removes generated PDFs on the site, forcing a regeneration of all exports to PDF '
+		. 'when users go to download them. This is most useful when templates have been changed so users should '
+		. 'receive a new copy';
 
-    public function run($request)
-    {
-        $path = sprintf('%s/%s', BASE_PATH, BasePage::config()->get('generated_pdf_path'));
-        if (!file_exists($path)) {
-            return false;
-        }
+	public function run($request)
+	{
+		$path = sprintf('%s/%s', BASE_PATH, BasePage::config()->get('generated_pdf_path'));
+		if (!file_exists($path)) {
+			return false;
+		}
 
-        exec(sprintf('if [ "$(ls -A %s 2> /dev/null)" != "" ]; then rm %s/*; fi', $path, $path), $output, $return_val);
+		exec(sprintf('if [ "$(ls -A %s 2> /dev/null)" != "" ]; then rm %s/*; fi', $path, $path), $output, $return_val);
 
-        // output any errors
-        if ($return_val != 0) {
-            user_error(sprintf('%s failed: ', get_class($this)) . implode("\n", $output), E_USER_ERROR);
-        }
-    }
+		// output any errors
+		if ($return_val != 0) {
+			user_error(sprintf('%s failed: ', get_class($this)) . implode("\n", $output), E_USER_ERROR);
+		}
+	}
 }

src/Search/CwpSearchPage.php

Indentation +9 added lines, -9 removed lines

@@ -11,16 +11,16 @@
  */
 class CwpSearchPage extends Page
 {
-    private static $hide_ancestor = CwpSearchPage::class;
+	private static $hide_ancestor = CwpSearchPage::class;
 
-    private static $table_name = 'CwpSearchPage';
+	private static $table_name = 'CwpSearchPage';
 
-    public function canViewStage($stage = Versioned::LIVE, $member = null)
-    {
-        if (Permission::checkMember($member, 'VIEW_DRAFT_CONTENT')) {
-            return true;
-        }
+	public function canViewStage($stage = Versioned::LIVE, $member = null)
+	{
+		if (Permission::checkMember($member, 'VIEW_DRAFT_CONTENT')) {
+			return true;
+		}
 
-        return parent::canViewStage($stage, $member);
-    }
+		return parent::canViewStage($stage, $member);
+	}
 }

src/PageTypes/SitemapPageController.php

Indentation +38 added lines, -38 removed lines

@@ -7,42 +7,42 @@
 
 class SitemapPageController extends PageController
 {
-    private static $allowed_actions = [
-        'showpage',
-    ];
-
-    private static $url_handlers = [
-        'page/$ID' => 'showpage',
-    ];
-
-    public function showpage($request)
-    {
-        $id = (int) $request->param('ID');
-        if (!$id) {
-            return false;
-        }
-        $page = SiteTree::get()->byId($id);
-
-        // does the page exist?
-        if (!($page && $page->exists())) {
-            return $this->httpError(404);
-        }
-
-        // can the page be viewed?
-        if (!$page->canView()) {
-            return $this->httpError(403);
-        }
-
-        $viewer = $this->customise([
-            'IsAjax' => $request->isAjax(),
-            'SelectedPage' => $page,
-            'Children' => $page->Children(),
-        ]);
-
-        if ($request->isAjax()) {
-            return $viewer->renderWith('SitemapNodeChildren');
-        }
-
-        return $viewer;
-    }
+	private static $allowed_actions = [
+		'showpage',
+	];
+
+	private static $url_handlers = [
+		'page/$ID' => 'showpage',
+	];
+
+	public function showpage($request)
+	{
+		$id = (int) $request->param('ID');
+		if (!$id) {
+			return false;
+		}
+		$page = SiteTree::get()->byId($id);
+
+		// does the page exist?
+		if (!($page && $page->exists())) {
+			return $this->httpError(404);
+		}
+
+		// can the page be viewed?
+		if (!$page->canView()) {
+			return $this->httpError(403);
+		}
+
+		$viewer = $this->customise([
+			'IsAjax' => $request->isAjax(),
+			'SelectedPage' => $page,
+			'Children' => $page->Children(),
+		]);
+
+		if ($request->isAjax()) {
+			return $viewer->renderWith('SitemapNodeChildren');
+		}
+
+		return $viewer;
+	}
 }

src/Search/CwpSearchEngine.php

Indentation +137 added lines, -137 removed lines

@@ -17,141 +17,141 @@
  */
 class CwpSearchEngine
 {
-    use Configurable;
-    use Extensible;
-    use Injectable;
-
-    /**
-     * Default search options
-     *
-     * @var array
-     * @config
-     */
-    private static $search_options = [
-        'hl' => 'true',
-    ];
-
-    /**
-     * Additional search options to send to search when spellcheck
-     * is included
-     *
-     * @var array
-     * @config
-     */
-    private static $spellcheck_options = [
-        'spellcheck' => 'true',
-        'spellcheck.collate' => 'true',
-        // spellcheck.dictionary can also be configured to use '_spellcheck'
-        // dictionary when indexing fields under the _spellcheckText column
-        'spellcheck.dictionary' => 'default',
-    ];
-
-    /**
-     * Build a SearchQuery for a new search
-     *
-     * @param string $keywords
-     * @param array $classes
-     * @return SearchQuery
-     */
-    protected function getSearchQuery($keywords, $classes)
-    {
-        $query = new SearchQuery();
-        $query->classes = $classes;
-        $query->search($keywords);
-        $query->exclude(SiteTree::class . '_ShowInSearch', 0);
-
-        // Artificially lower the amount of results to prevent too high resource usage.
-        // on subsequent canView check loop.
-        $query->limit(100);
-
-        // Allow user code to modify the search query before returning it
-        $this->extend('updateSearchQuery', $query);
-
-        return $query;
-    }
-
-    /**
-     * Get solr search options for this query
-     *
-     * @param bool $spellcheck True if we should include spellcheck support
-     * @return array
-     */
-    protected function getSearchOptions($spellcheck)
-    {
-        $options = $this->config()->get('search_options');
-        if ($spellcheck) {
-            $options = array_merge($options, $this->config()->get('spellcheck_options'));
-        }
-        return $options;
-    }
-
-    /**
-     * Get results for a search term
-     *
-     * @param string $keywords
-     * @param array $classes
-     * @param SolrIndex $searchIndex
-     * @param int $limit Max number of results for this page
-     * @param int $start Skip this number of records
-     * @param bool $spellcheck True to enable spellcheck
-     * @return CwpSearchResult
-     */
-    protected function getResult($keywords, $classes, $searchIndex, $limit = -1, $start = 0, $spellcheck = false)
-    {
-        // Prepare options
-        $query = $this->getSearchQuery($keywords, $classes);
-        $options = $this->getSearchOptions($spellcheck);
-
-        // Get results
-        $solrResult = $searchIndex->search(
-            $query,
-            $start,
-            $limit,
-            $options
-        );
-
-        return CwpSearchResult::create($keywords, $solrResult);
-    }
-
-    /**
-     * Get a CwpSearchResult for a given criterea
-     *
-     * @param string $keywords
-     * @param array $classes
-     * @param SolrIndex $searchIndex
-     * @param int $limit Max number of results for this page
-     * @param int $start Skip this number of records
-     * @param bool $followSuggestions True to enable suggested searches to be returned immediately
-     * @return CwpSearchResult|null
-     */
-    public function search($keywords, $classes, $searchIndex, $limit = -1, $start = 0, $followSuggestions = false)
-    {
-        if (empty($keywords)) {
-            return null;
-        }
-
-        try {
-            // Begin search
-            $result = $this->getResult($keywords, $classes, $searchIndex, $limit, $start, true);
-
-            // Return results if we don't need to refine this any further
-            if (!$followSuggestions || $result->hasResults() || !$result->getSuggestion()) {
-                return $result;
-            }
-
-            // Perform new search with the suggested terms
-            $suggested = $result->getSuggestion();
-            $newResult = $this->getResult($suggested, $classes, $searchIndex, $limit, $start, false);
-            $newResult->setOriginal($keywords);
-
-            // Compare new results to the original query
-            if ($newResult->hasResults()) {
-                return $newResult;
-            }
-
-            return $result;
-        } catch (Exception $e) {
-            Injector::inst()->get(LoggerInterface::class)->warning($e);
-        }
-    }
+	use Configurable;
+	use Extensible;
+	use Injectable;
+
+	/**
+	 * Default search options
+	 *
+	 * @var array
+	 * @config
+	 */
+	private static $search_options = [
+		'hl' => 'true',
+	];
+
+	/**
+	 * Additional search options to send to search when spellcheck
+	 * is included
+	 *
+	 * @var array
+	 * @config
+	 */
+	private static $spellcheck_options = [
+		'spellcheck' => 'true',
+		'spellcheck.collate' => 'true',
+		// spellcheck.dictionary can also be configured to use '_spellcheck'
+		// dictionary when indexing fields under the _spellcheckText column
+		'spellcheck.dictionary' => 'default',
+	];
+
+	/**
+	 * Build a SearchQuery for a new search
+	 *
+	 * @param string $keywords
+	 * @param array $classes
+	 * @return SearchQuery
+	 */
+	protected function getSearchQuery($keywords, $classes)
+	{
+		$query = new SearchQuery();
+		$query->classes = $classes;
+		$query->search($keywords);
+		$query->exclude(SiteTree::class . '_ShowInSearch', 0);
+
+		// Artificially lower the amount of results to prevent too high resource usage.
+		// on subsequent canView check loop.
+		$query->limit(100);
+
+		// Allow user code to modify the search query before returning it
+		$this->extend('updateSearchQuery', $query);
+
+		return $query;
+	}
+
+	/**
+	 * Get solr search options for this query
+	 *
+	 * @param bool $spellcheck True if we should include spellcheck support
+	 * @return array
+	 */
+	protected function getSearchOptions($spellcheck)
+	{
+		$options = $this->config()->get('search_options');
+		if ($spellcheck) {
+			$options = array_merge($options, $this->config()->get('spellcheck_options'));
+		}
+		return $options;
+	}
+
+	/**
+	 * Get results for a search term
+	 *
+	 * @param string $keywords
+	 * @param array $classes
+	 * @param SolrIndex $searchIndex
+	 * @param int $limit Max number of results for this page
+	 * @param int $start Skip this number of records
+	 * @param bool $spellcheck True to enable spellcheck
+	 * @return CwpSearchResult
+	 */
+	protected function getResult($keywords, $classes, $searchIndex, $limit = -1, $start = 0, $spellcheck = false)
+	{
+		// Prepare options
+		$query = $this->getSearchQuery($keywords, $classes);
+		$options = $this->getSearchOptions($spellcheck);
+
+		// Get results
+		$solrResult = $searchIndex->search(
+			$query,
+			$start,
+			$limit,
+			$options
+		);
+
+		return CwpSearchResult::create($keywords, $solrResult);
+	}
+
+	/**
+	 * Get a CwpSearchResult for a given criterea
+	 *
+	 * @param string $keywords
+	 * @param array $classes
+	 * @param SolrIndex $searchIndex
+	 * @param int $limit Max number of results for this page
+	 * @param int $start Skip this number of records
+	 * @param bool $followSuggestions True to enable suggested searches to be returned immediately
+	 * @return CwpSearchResult|null
+	 */
+	public function search($keywords, $classes, $searchIndex, $limit = -1, $start = 0, $followSuggestions = false)
+	{
+		if (empty($keywords)) {
+			return null;
+		}
+
+		try {
+			// Begin search
+			$result = $this->getResult($keywords, $classes, $searchIndex, $limit, $start, true);
+
+			// Return results if we don't need to refine this any further
+			if (!$followSuggestions || $result->hasResults() || !$result->getSuggestion()) {
+				return $result;
+			}
+
+			// Perform new search with the suggested terms
+			$suggested = $result->getSuggestion();
+			$newResult = $this->getResult($suggested, $classes, $searchIndex, $limit, $start, false);
+			$newResult->setOriginal($keywords);
+
+			// Compare new results to the original query
+			if ($newResult->hasResults()) {
+				return $newResult;
+			}
+
+			return $result;
+		} catch (Exception $e) {
+			Injector::inst()->get(LoggerInterface::class)->warning($e);
+		}
+	}
 }