silverstripe / cwp

src/Model/QuickLink.php

Indentation +116 added lines, -116 removed lines

@@ -11,120 +11,120 @@
 
 class Quicklink extends DataObject
 {
-    private static $db = [
-        'Name' => 'Varchar(255)',
-        'ExternalLink' => 'Varchar(255)',
-        'SortOrder' => 'Int',
-    ];
-
-    private static $has_one = [
-        'Parent' => BaseHomePage::class,
-        'InternalLink' => SiteTree::class,
-    ];
-
-    private static $summary_fields = [
-        'Name' => 'Name',
-        'InternalLink.Title' => 'Internal Link',
-        'ExternalLink' => 'External Link',
-    ];
-
-    private static $table_name = 'Quicklink';
-
-    public function fieldLabels($includerelations = true)
-    {
-        $labels = parent::fieldLabels($includerelations);
-        $labels['Name'] = _t('Quicklink.NameLabel', 'Name');
-        $labels['ExternalLink'] = _t('Quicklink.ExternalLinkLabel', 'External Link');
-        $labels['SortOrder'] = _t('Quicklink.SortOrderLabel', 'Sort Order');
-        $labels['ParentID'] = _t('Quicklink.ParentRelationLabel', 'Parent');
-        $labels['InternalLinkID'] = _t('Quicklink.InternalLinkLabel', 'Internal Link');
-
-        return $labels;
-    }
-
-    public function getLink()
-    {
-        if ($this->ExternalLink) {
-            $url = parse_url($this->ExternalLink);
-
-            // if no scheme set in the link, default to http
-            if (!isset($url['scheme'])) {
-                return 'http://' . $this->ExternalLink;
-            }
-
-            return $this->ExternalLink;
-        } elseif ($this->InternalLinkID) {
-            return $this->InternalLink()->Link();
-        }
-    }
-
-    public function canCreate($member = null, $context = [])
-    {
-        return $this->Parent()->canCreate($member, $context);
-    }
-
-    public function canEdit($member = null)
-    {
-        return $this->Parent()->canEdit($member);
-    }
-
-    public function canDelete($member = null)
-    {
-        return $this->Parent()->canDelete($member);
-    }
-
-    public function canView($member = null)
-    {
-        return $this->Parent()->canView($member);
-    }
-
-    public function getCMSFields()
-    {
-        $fields = parent::getCMSFields();
-
-        $fields->removeByName('ParentID');
-
-        $externalLinkField = $fields->fieldByName('Root.Main.ExternalLink');
-
-        $fields->removeByName('ExternalLink');
-        $fields->removeByName('InternalLinkID');
-        $fields->removeByName('SortOrder');
-        $externalLinkField->addExtraClass('noBorder');
-
-        $fields->addFieldToTab('Root.Main', CompositeField::create(
-            array(
-                TreeDropdownField::create(
-                    'InternalLinkID',
-                    $this->fieldLabel('InternalLinkID'),
-                    SiteTree::class
-                ),
-                $externalLinkField,
-                $wrap = CompositeField::create(
-                    $extraLabel = LiteralField::create(
-                        'NoteOverride',
-                        _t(
-                            __CLASS__ . '.Note',
-                            // @todo remove the HTML from this translation
-                            '<div class="message good notice">Note:  If you specify an External Link, '
-                            . 'the Internal Link will be ignored.</div>'
-                        )
-                    )
-                )
-            )
-        ));
-        $fields->insertBefore(
-            LiteralField::create(
-                'Note',
-                _t(
-                    __CLASS__ . '.Note2',
-                    // @todo remove the HTML from this translation
-                    '<p>Use this to specify a link to a page either on this site '
-                    . '(Internal Link) or another site (External Link).</p>'
-                )
-            ),
-            'Name'
-        );
-
-        return $fields;
-    }
+	private static $db = [
+		'Name' => 'Varchar(255)',
+		'ExternalLink' => 'Varchar(255)',
+		'SortOrder' => 'Int',
+	];
+
+	private static $has_one = [
+		'Parent' => BaseHomePage::class,
+		'InternalLink' => SiteTree::class,
+	];
+
+	private static $summary_fields = [
+		'Name' => 'Name',
+		'InternalLink.Title' => 'Internal Link',
+		'ExternalLink' => 'External Link',
+	];
+
+	private static $table_name = 'Quicklink';
+
+	public function fieldLabels($includerelations = true)
+	{
+		$labels = parent::fieldLabels($includerelations);
+		$labels['Name'] = _t('Quicklink.NameLabel', 'Name');
+		$labels['ExternalLink'] = _t('Quicklink.ExternalLinkLabel', 'External Link');
+		$labels['SortOrder'] = _t('Quicklink.SortOrderLabel', 'Sort Order');
+		$labels['ParentID'] = _t('Quicklink.ParentRelationLabel', 'Parent');
+		$labels['InternalLinkID'] = _t('Quicklink.InternalLinkLabel', 'Internal Link');
+
+		return $labels;
+	}
+
+	public function getLink()
+	{
+		if ($this->ExternalLink) {
+			$url = parse_url($this->ExternalLink);
+
+			// if no scheme set in the link, default to http
+			if (!isset($url['scheme'])) {
+				return 'http://' . $this->ExternalLink;
+			}
+
+			return $this->ExternalLink;
+		} elseif ($this->InternalLinkID) {
+			return $this->InternalLink()->Link();
+		}
+	}
+
+	public function canCreate($member = null, $context = [])
+	{
+		return $this->Parent()->canCreate($member, $context);
+	}
+
+	public function canEdit($member = null)
+	{
+		return $this->Parent()->canEdit($member);
+	}
+
+	public function canDelete($member = null)
+	{
+		return $this->Parent()->canDelete($member);
+	}
+
+	public function canView($member = null)
+	{
+		return $this->Parent()->canView($member);
+	}
+
+	public function getCMSFields()
+	{
+		$fields = parent::getCMSFields();
+
+		$fields->removeByName('ParentID');
+
+		$externalLinkField = $fields->fieldByName('Root.Main.ExternalLink');
+
+		$fields->removeByName('ExternalLink');
+		$fields->removeByName('InternalLinkID');
+		$fields->removeByName('SortOrder');
+		$externalLinkField->addExtraClass('noBorder');
+
+		$fields->addFieldToTab('Root.Main', CompositeField::create(
+			array(
+				TreeDropdownField::create(
+					'InternalLinkID',
+					$this->fieldLabel('InternalLinkID'),
+					SiteTree::class
+				),
+				$externalLinkField,
+				$wrap = CompositeField::create(
+					$extraLabel = LiteralField::create(
+						'NoteOverride',
+						_t(
+							__CLASS__ . '.Note',
+							// @todo remove the HTML from this translation
+							'<div class="message good notice">Note:  If you specify an External Link, '
+							. 'the Internal Link will be ignored.</div>'
+						)
+					)
+				)
+			)
+		));
+		$fields->insertBefore(
+			LiteralField::create(
+				'Note',
+				_t(
+					__CLASS__ . '.Note2',
+					// @todo remove the HTML from this translation
+					'<p>Use this to specify a link to a page either on this site '
+					. '(Internal Link) or another site (External Link).</p>'
+				)
+			),
+			'Name'
+		);
+
+		return $fields;
+	}
 }

src/Search/CwpSearchPageController.php

Indentation +20 added lines, -20 removed lines

@@ -11,25 +11,25 @@
  */
 class CwpSearchPageController extends PageController
 {
-    /**
-     * Create the dummy search record for this page
-     *
-     * @return CwpSearchPage
-     */
-    protected function generateSearchRecord()
-    {
-        $searchPage = CwpSearchPage::create();
-        $searchPage->URLSegment = 'search';
-        $searchPage->Title = _t('SearchForm.SearchResults', 'Search Results');
-        $searchPage->ID = -1;
-        return $searchPage;
-    }
+	/**
+	 * Create the dummy search record for this page
+	 *
+	 * @return CwpSearchPage
+	 */
+	protected function generateSearchRecord()
+	{
+		$searchPage = CwpSearchPage::create();
+		$searchPage->URLSegment = 'search';
+		$searchPage->Title = _t('SearchForm.SearchResults', 'Search Results');
+		$searchPage->ID = -1;
+		return $searchPage;
+	}
 
-    public function __construct($dataRecord = null)
-    {
-        if (!$dataRecord) {
-            $dataRecord = $this->generateSearchRecord();
-        }
-        parent::__construct($dataRecord);
-    }
+	public function __construct($dataRecord = null)
+	{
+		if (!$dataRecord) {
+			$dataRecord = $this->generateSearchRecord();
+		}
+		parent::__construct($dataRecord);
+	}
 }

src/Search/CwpSearchEngine.php

Indentation +134 added lines, -134 removed lines

@@ -16,138 +16,138 @@
  */
 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_ShowInSearch', 0);
-        $query->exclude('File_ShowInSearch', 0);
-
-        // Artificially lower the amount of results to prevent too high resource usage.
-        // on subsequent canView check loop.
-        $query->limit(100);
-        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()->search_options;
-        if ($spellcheck) {
-            $options = array_merge($options, $this->config()->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;
-            } else {
-                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_ShowInSearch', 0);
+		$query->exclude('File_ShowInSearch', 0);
+
+		// Artificially lower the amount of results to prevent too high resource usage.
+		// on subsequent canView check loop.
+		$query->limit(100);
+		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()->search_options;
+		if ($spellcheck) {
+			$options = array_merge($options, $this->config()->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;
+			} else {
+				return $result;
+			}
+		} catch (Exception $e) {
+			Injector::inst()->get(LoggerInterface::class)->warning($e);
+		}
+	}
 }

src/Search/CwpSearchResult.php

Indentation +200 added lines, -200 removed lines

@@ -11,204 +11,204 @@
  */
 class CwpSearchResult extends ViewableData
 {
-    private static $casting = [
-        'Original' => 'Text',
-        'OriginalLink' => 'Text',
-        'Suggestion' => 'Text',
-        'SuggestionLink' => 'Text',
-        'Query' => 'Text',
-        'SearchLink' => 'Text',
-        'RSSLink' => 'Text',
-        'AtomLink' => 'Text',
-    ];
-
-    /**
-     * List of results
-     *
-     * @var PaginatedList
-     */
-    protected $matches;
-
-    /**
-     * Search terms for these results
-     *
-     * @var string
-     */
-    protected $query;
-
-    /**
-     * Suggested search keywords
-     * Used when this search has suggested terms, but following suggestions isn't enabled
-     *
-     * @var string
-     */
-    protected $suggestion;
-
-    /**
-     * Original terms superceded by these result.
-     * Used when a prior search had suggested terms, and follow suggestions is enabled.
-     *
-     * @var PaginatedList
-     */
-    protected $original;
-
-    /**
-     * Create a new CwpSearchResult
-     *
-     * @param string $terms
-     * @param ArrayData $results Result from SolrIndex
-     */
-    public function __construct($terms = '', ArrayData $results = null)
-    {
-        $this->query = $terms;
-        if ($results) {
-            // Clean up the results.
-            $matches = $results->Matches;
-            foreach ($matches as $result) {
-                if (!$result->canView()) {
-                    $matches->remove($result);
-                }
-            }
-
-            $this->matches = $matches;
-            $this->suggestion = $results->SuggestionNice;
-        }
-    }
-
-    /**
-     * Get search results
-     *
-     * @return PaginatedList
-     */
-    public function getResults()
-    {
-        return $this->matches;
-    }
-
-    /**
-     * Check if there are found results
-     *
-     * @return bool
-     */
-    public function hasResults()
-    {
-        return $this->matches && $this->matches->exists();
-    }
-
-    /**
-     * Get search keywords matching these results
-     *
-     * @return string
-     */
-    public function getQuery()
-    {
-        return $this->query;
-    }
-
-    /**
-     * Get suggested search keywords
-     *
-     * @return string
-     */
-    public function getSuggestion()
-    {
-        return $this->suggestion;
-    }
-
-    /**
-     * Get original search keywords superceded by these results
-     *
-     * @return string
-     */
-    public function getOriginal()
-    {
-        return $this->original;
-    }
-
-    /**
-     * Set original keywords
-     *
-     * @param string $original
-     */
-    public function setOriginal($original)
-    {
-        $this->original = $original;
-    }
-
-    /**
-     * Get the link to the suggested search
-     *
-     * @param string $format Optional output format
-     * @return string
-     */
-    public function getSuggestionLink($format = null)
-    {
-        return $this->getLink($this->suggestion, $format);
-    }
-
-    /**
-     * Gets the link to the given search
-     *
-     * @param string $format Optional output format
-     * @return string
-     */
-    public function getSearchLink($format = null)
-    {
-        return $this->getLink($this->query, $format);
-    }
-
-    /**
-     * Gets the link to the original search, with suggestions disabled
-     *
-     * @param string $format Optional output format
-     * @return string
-     */
-    public function getOriginalLink($format = null)
-    {
-        return $this->getLink($this->original, $format) . "&suggestions=0";
-    }
-
-    /**
-     * Get link to these results in RSS format
-     *
-     * @return string
-     */
-    public function getRSSLink()
-    {
-        return $this->getLink($this->query, 'rss');
-    }
-
-    /**
-     * Get link to these results in atom format
-     *
-     * @return string
-     */
-    public function getAtomLink()
-    {
-        return $this->getLink($this->query, 'atom');
-    }
-
-    /**
-     * Get a search link for given terms
-     *
-     * @param string $terms
-     * @return string|null
-     */
-    protected function getLink($terms, $format = null)
-    {
-        if (!$terms) {
-            return null;
-        }
-        $link = 'search/SearchForm?Search='.rawurlencode($terms);
-        if ($format) {
-            $link .= '&format='.rawurlencode($format);
-        }
-        return $link;
-    }
-
-    public function hasField($field)
-    {
-        // Fix customise not detecting custom field getters
-        return array_key_exists($field, $this->config()->casting);
-    }
+	private static $casting = [
+		'Original' => 'Text',
+		'OriginalLink' => 'Text',
+		'Suggestion' => 'Text',
+		'SuggestionLink' => 'Text',
+		'Query' => 'Text',
+		'SearchLink' => 'Text',
+		'RSSLink' => 'Text',
+		'AtomLink' => 'Text',
+	];
+
+	/**
+	 * List of results
+	 *
+	 * @var PaginatedList
+	 */
+	protected $matches;
+
+	/**
+	 * Search terms for these results
+	 *
+	 * @var string
+	 */
+	protected $query;
+
+	/**
+	 * Suggested search keywords
+	 * Used when this search has suggested terms, but following suggestions isn't enabled
+	 *
+	 * @var string
+	 */
+	protected $suggestion;
+
+	/**
+	 * Original terms superceded by these result.
+	 * Used when a prior search had suggested terms, and follow suggestions is enabled.
+	 *
+	 * @var PaginatedList
+	 */
+	protected $original;
+
+	/**
+	 * Create a new CwpSearchResult
+	 *
+	 * @param string $terms
+	 * @param ArrayData $results Result from SolrIndex
+	 */
+	public function __construct($terms = '', ArrayData $results = null)
+	{
+		$this->query = $terms;
+		if ($results) {
+			// Clean up the results.
+			$matches = $results->Matches;
+			foreach ($matches as $result) {
+				if (!$result->canView()) {
+					$matches->remove($result);
+				}
+			}
+
+			$this->matches = $matches;
+			$this->suggestion = $results->SuggestionNice;
+		}
+	}
+
+	/**
+	 * Get search results
+	 *
+	 * @return PaginatedList
+	 */
+	public function getResults()
+	{
+		return $this->matches;
+	}
+
+	/**
+	 * Check if there are found results
+	 *
+	 * @return bool
+	 */
+	public function hasResults()
+	{
+		return $this->matches && $this->matches->exists();
+	}
+
+	/**
+	 * Get search keywords matching these results
+	 *
+	 * @return string
+	 */
+	public function getQuery()
+	{
+		return $this->query;
+	}
+
+	/**
+	 * Get suggested search keywords
+	 *
+	 * @return string
+	 */
+	public function getSuggestion()
+	{
+		return $this->suggestion;
+	}
+
+	/**
+	 * Get original search keywords superceded by these results
+	 *
+	 * @return string
+	 */
+	public function getOriginal()
+	{
+		return $this->original;
+	}
+
+	/**
+	 * Set original keywords
+	 *
+	 * @param string $original
+	 */
+	public function setOriginal($original)
+	{
+		$this->original = $original;
+	}
+
+	/**
+	 * Get the link to the suggested search
+	 *
+	 * @param string $format Optional output format
+	 * @return string
+	 */
+	public function getSuggestionLink($format = null)
+	{
+		return $this->getLink($this->suggestion, $format);
+	}
+
+	/**
+	 * Gets the link to the given search
+	 *
+	 * @param string $format Optional output format
+	 * @return string
+	 */
+	public function getSearchLink($format = null)
+	{
+		return $this->getLink($this->query, $format);
+	}
+
+	/**
+	 * Gets the link to the original search, with suggestions disabled
+	 *
+	 * @param string $format Optional output format
+	 * @return string
+	 */
+	public function getOriginalLink($format = null)
+	{
+		return $this->getLink($this->original, $format) . "&suggestions=0";
+	}
+
+	/**
+	 * Get link to these results in RSS format
+	 *
+	 * @return string
+	 */
+	public function getRSSLink()
+	{
+		return $this->getLink($this->query, 'rss');
+	}
+
+	/**
+	 * Get link to these results in atom format
+	 *
+	 * @return string
+	 */
+	public function getAtomLink()
+	{
+		return $this->getLink($this->query, 'atom');
+	}
+
+	/**
+	 * Get a search link for given terms
+	 *
+	 * @param string $terms
+	 * @return string|null
+	 */
+	protected function getLink($terms, $format = null)
+	{
+		if (!$terms) {
+			return null;
+		}
+		$link = 'search/SearchForm?Search='.rawurlencode($terms);
+		if ($format) {
+			$link .= '&format='.rawurlencode($format);
+		}
+		return $link;
+	}
+
+	public function hasField($field)
+	{
+		// Fix customise not detecting custom field getters
+		return array_key_exists($field, $this->config()->casting);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -199,9 +199,9 @@
         if (!$terms) {
             return null;
         }
-        $link = 'search/SearchForm?Search='.rawurlencode($terms);
+        $link = 'search/SearchForm?Search=' . rawurlencode($terms);
         if ($format) {
-            $link .= '&format='.rawurlencode($format);
+            $link .= '&format=' . rawurlencode($format);
         }
         return $link;
     }

src/Search/CwpSearchPage.php

Indentation +8 added lines, -8 removed lines

@@ -11,14 +11,14 @@
  */
 class CwpSearchPage extends Page
 {
-    private static $hide_ancestor = CwpSearchPage::class;
+	private static $hide_ancestor = CwpSearchPage::class;
 
-    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/Extensions/TaxonomyTermExtension.php

Indentation +4 added lines, -4 removed lines

@@ -8,9 +8,9 @@
 class TaxonomyTermExtension extends DataExtension
 {
 
-    private static $api_access = true;
+	private static $api_access = true;
 
-    private static $belongs_many_many = array(
-        'Pages' => BasePage::class
-    );
+	private static $belongs_many_many = array(
+		'Pages' => BasePage::class
+	);
 }

src/Extensions/SynonymsSiteConfig.php

Indentation +42 added lines, -42 removed lines

@@ -16,52 +16,52 @@
 class SynonymsSiteConfig extends DataExtension
 {
 
-    private static $db = array(
-        'SearchSynonyms' => 'Text', // fulltextsearch synonyms.txt content
-    );
+	private static $db = array(
+		'SearchSynonyms' => 'Text', // fulltextsearch synonyms.txt content
+	);
 
-    public function updateCMSFields(FieldList $fields)
-    {
-        // Don't show this field if you're not an admin
-        if (!Permission::check('ADMIN')) {
-            return;
-        }
+	public function updateCMSFields(FieldList $fields)
+	{
+		// Don't show this field if you're not an admin
+		if (!Permission::check('ADMIN')) {
+			return;
+		}
 
-        // Search synonyms
-        $fields->addFieldToTab(
-            'Root.FulltextSearch',
-            TextareaField::create('SearchSynonyms', _t('CwpConfig.SearchSynonyms', 'Search Synonyms'))
-                ->setDescription(_t(
-                    'CwpConfig.SearchSynonyms_Description',
-                    'Enter as many comma separated synonyms as you wish, where '.
-                    'each line represents a group of synonyms.<br /> ' .
-                    'You will need to run <a rel="external" target="_blank" href="dev/tasks/Solr_Configure">'
-                    . 'Solr_Configure</a> if you make any changes'
-                ))
-        );
-    }
+		// Search synonyms
+		$fields->addFieldToTab(
+			'Root.FulltextSearch',
+			TextareaField::create('SearchSynonyms', _t('CwpConfig.SearchSynonyms', 'Search Synonyms'))
+				->setDescription(_t(
+					'CwpConfig.SearchSynonyms_Description',
+					'Enter as many comma separated synonyms as you wish, where '.
+					'each line represents a group of synonyms.<br /> ' .
+					'You will need to run <a rel="external" target="_blank" href="dev/tasks/Solr_Configure">'
+					. 'Solr_Configure</a> if you make any changes'
+				))
+		);
+	}
 
-    /**
-     * @inheritdoc
-     *
-     * @param ValidationResult $validationResult
-     */
-    public function validate(ValidationResult $validationResult)
-    {
-        $validator = new SynonymValidator(array(
-            'SearchSynonyms',
-        ));
+	/**
+	 * @inheritdoc
+	 *
+	 * @param ValidationResult $validationResult
+	 */
+	public function validate(ValidationResult $validationResult)
+	{
+		$validator = new SynonymValidator(array(
+			'SearchSynonyms',
+		));
 
-        $validator->php(array(
-            'SearchSynonyms' => $this->owner->SearchSynonyms
-        ));
+		$validator->php(array(
+			'SearchSynonyms' => $this->owner->SearchSynonyms
+		));
 
-        $errors = $validator->getErrors();
+		$errors = $validator->getErrors();
 
-        if (is_array($errors) || $errors instanceof Traversable) {
-            foreach ($errors as $error) {
-                $validationResult->error($error['message']);
-            }
-        }
-    }
+		if (is_array($errors) || $errors instanceof Traversable) {
+			foreach ($errors as $error) {
+				$validationResult->error($error['message']);
+			}
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
             TextareaField::create('SearchSynonyms', _t('CwpConfig.SearchSynonyms', 'Search Synonyms'))
                 ->setDescription(_t(
                     'CwpConfig.SearchSynonyms_Description',
-                    'Enter as many comma separated synonyms as you wish, where '.
+                    'Enter as many comma separated synonyms as you wish, where ' .
                     'each line represents a group of synonyms.<br /> ' .
                     'You will need to run <a rel="external" target="_blank" href="dev/tasks/Solr_Configure">'
                     . 'Solr_Configure</a> if you make any changes'

src/Extensions/SynonymValidator.php

Indentation +150 added lines, -150 removed lines

@@ -6,154 +6,154 @@
 
 class SynonymValidator extends Validator
 {
-    /**
-     * @var array
-     */
-    protected $fieldNames;
-
-    /**
-     * @inheritdoc
-     *
-     * @param array $fieldNames
-     */
-    public function __construct(array $fieldNames)
-    {
-        $this->fieldNames = $fieldNames;
-
-        parent::__construct();
-    }
-
-    /**
-     * @inheritdoc
-     *
-     * @param array $data
-     *
-     * @return mixed
-     */
-    public function php($data)
-    {
-        foreach ($this->fieldNames as $fieldName) {
-            if (empty($data[$fieldName])) {
-                return;
-            }
-
-            $this->validateField($fieldName, $data[$fieldName]);
-        }
-    }
-
-    /**
-     * Validate field values, raising errors if the values are invalid.
-     *
-     * @param string $fieldName
-     * @param mixed $value
-     */
-    protected function validateField($fieldName, $value)
-    {
-        if (!$this->validateValue($value)) {
-            $this->validationError(
-                $fieldName,
-                _t(
-                    'FullTextSearch.SynonymValidator.InvalidValue',
-                    'Synonyms cannot contain words separated by spaces'
-                )
-            );
-        }
-    }
-
-    /**
-     * Check field values to see that they doesn't contain spaces between words.
-     *
-     * @param mixed $value
-     *
-     * @return bool
-     */
-    protected function validateValue($value)
-    {
-        // strip empty lines
-        $lines = array_filter(
-            explode("\n", $value)
-        );
-
-        // strip comments (lines beginning with "#")
-        $lines = array_filter($lines, function ($line) {
-            $line = trim($line);
-
-            return !empty($line) && $line[0] !== '#';
-        });
-
-        // validate each line
-        foreach ($lines as $line) {
-            if (!$this->validateLine($line)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Check each line to see that it doesn't contain spaces between words.
-     *
-     * @param string $line
-     *
-     * @return bool
-     */
-    protected function validateLine($line)
-    {
-        $line = trim($line);
-
-        $parts = explode(',', $line);
-        $parts = array_filter($parts);
-
-        foreach ($parts as $part) {
-            if (!$this->validatePart($part)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Check each part of the line doesn't contain spaces between words.
-     *
-     * @param string $part
-     *
-     * @return bool
-     */
-    protected function validatePart($part)
-    {
-        if (strpos($part, '=>') !== false) {
-            $subs = explode('=>', $part);
-            $subs = array_filter($subs);
-
-            foreach ($subs as $sub) {
-                if (!$this->validateNoSpaces($sub)) {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        return $this->validateNoSpaces($part);
-    }
-
-    /**
-     * @param string $value
-     *
-     * @return bool
-     */
-    protected function validateNoSpaces($value)
-    {
-        // allow spaces at the beginning and end of the value
-        $value = trim($value);
-
-        // does the value contain 1 or more whitespace characters?
-        if (preg_match('/\s+/', $value)) {
-            return false;
-        }
-
-        return true;
-    }
+	/**
+	 * @var array
+	 */
+	protected $fieldNames;
+
+	/**
+	 * @inheritdoc
+	 *
+	 * @param array $fieldNames
+	 */
+	public function __construct(array $fieldNames)
+	{
+		$this->fieldNames = $fieldNames;
+
+		parent::__construct();
+	}
+
+	/**
+	 * @inheritdoc
+	 *
+	 * @param array $data
+	 *
+	 * @return mixed
+	 */
+	public function php($data)
+	{
+		foreach ($this->fieldNames as $fieldName) {
+			if (empty($data[$fieldName])) {
+				return;
+			}
+
+			$this->validateField($fieldName, $data[$fieldName]);
+		}
+	}
+
+	/**
+	 * Validate field values, raising errors if the values are invalid.
+	 *
+	 * @param string $fieldName
+	 * @param mixed $value
+	 */
+	protected function validateField($fieldName, $value)
+	{
+		if (!$this->validateValue($value)) {
+			$this->validationError(
+				$fieldName,
+				_t(
+					'FullTextSearch.SynonymValidator.InvalidValue',
+					'Synonyms cannot contain words separated by spaces'
+				)
+			);
+		}
+	}
+
+	/**
+	 * Check field values to see that they doesn't contain spaces between words.
+	 *
+	 * @param mixed $value
+	 *
+	 * @return bool
+	 */
+	protected function validateValue($value)
+	{
+		// strip empty lines
+		$lines = array_filter(
+			explode("\n", $value)
+		);
+
+		// strip comments (lines beginning with "#")
+		$lines = array_filter($lines, function ($line) {
+			$line = trim($line);
+
+			return !empty($line) && $line[0] !== '#';
+		});
+
+		// validate each line
+		foreach ($lines as $line) {
+			if (!$this->validateLine($line)) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check each line to see that it doesn't contain spaces between words.
+	 *
+	 * @param string $line
+	 *
+	 * @return bool
+	 */
+	protected function validateLine($line)
+	{
+		$line = trim($line);
+
+		$parts = explode(',', $line);
+		$parts = array_filter($parts);
+
+		foreach ($parts as $part) {
+			if (!$this->validatePart($part)) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check each part of the line doesn't contain spaces between words.
+	 *
+	 * @param string $part
+	 *
+	 * @return bool
+	 */
+	protected function validatePart($part)
+	{
+		if (strpos($part, '=>') !== false) {
+			$subs = explode('=>', $part);
+			$subs = array_filter($subs);
+
+			foreach ($subs as $sub) {
+				if (!$this->validateNoSpaces($sub)) {
+					return false;
+				}
+			}
+
+			return true;
+		}
+
+		return $this->validateNoSpaces($part);
+	}
+
+	/**
+	 * @param string $value
+	 *
+	 * @return bool
+	 */
+	protected function validateNoSpaces($value)
+	{
+		// allow spaces at the beginning and end of the value
+		$value = trim($value);
+
+		// does the value contain 1 or more whitespace characters?
+		if (preg_match('/\s+/', $value)) {
+			return false;
+		}
+
+		return true;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
         );
 
         // strip comments (lines beginning with "#")
-        $lines = array_filter($lines, function ($line) {
+        $lines = array_filter($lines, function($line) {
             $line = trim($line);
 
             return !empty($line) && $line[0] !== '#';

src/Extensions/CwpCommentingExtension.php

Indentation +14 added lines, -14 removed lines

@@ -13,21 +13,21 @@
  */
 class CwpCommentingExtension extends Extension
 {
-    public function alterCommentForm(Form $form)
-    {
-        $fields = $form->Fields();
+	public function alterCommentForm(Form $form)
+	{
+		$fields = $form->Fields();
 
 
-        if ($emailField = $fields->dataFieldByName(Email::class)) {
-            $emailField
-                ->setTitle(_t('CwpCommentingExtension.EMAIL_TITLE', Email::class))
-                ->setDescription(_t('CwpCommentingExtension.WILL_NOT_BE_PUBLISHED', 'Will not be published.'));
-        }
+		if ($emailField = $fields->dataFieldByName(Email::class)) {
+			$emailField
+				->setTitle(_t('CwpCommentingExtension.EMAIL_TITLE', Email::class))
+				->setDescription(_t('CwpCommentingExtension.WILL_NOT_BE_PUBLISHED', 'Will not be published.'));
+		}
 
-        if ($urlField = $fields->dataFieldByName('URL')) {
-            $urlField
-                ->setTitle(_t('CwpCommentingExtension.WEBSITE_TITLE', 'Your website (optional)'))
-                ->setAttribute('placeholder', 'http://');
-        }
-    }
+		if ($urlField = $fields->dataFieldByName('URL')) {
+			$urlField
+				->setTitle(_t('CwpCommentingExtension.WEBSITE_TITLE', 'Your website (optional)'))
+				->setAttribute('placeholder', 'http://');
+		}
+	}
 }