silverstripe / cwp

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/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/SynonymValidator.php

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] !== '#';

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(
-                    __CLASS__ . '.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(
+					__CLASS__ . '.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;
+	}
 }

src/Extensions/CwpWorkflowDefinitionExtension.php

Indentation +29 added lines, -29 removed lines

@@ -12,37 +12,37 @@
  */
 class CwpWorkflowDefinitionExtension extends DataExtension
 {
-    /**
-     * Create the default 'Two-step Workflow' when this extension is loaded
-     *
-     * @config
-     * @var boolean
-     */
-    private static $create_default_workflow = true;
+	/**
+	 * Create the default 'Two-step Workflow' when this extension is loaded
+	 *
+	 * @config
+	 * @var boolean
+	 */
+	private static $create_default_workflow = true;
 
-    public function requireDefaultRecords()
-    {
-        if (Config::inst()->get(CwpWorkflowDefinitionExtension::class, 'create_default_workflow')) {
-            // Only proceed if a definition using this template has not been created yet
-            $definition = WorkflowDefinition::get()->filter("Template", "Review and Approve")->First();
-            if ($definition && $definition->exists()) {
-                return;
-            }
+	public function requireDefaultRecords()
+	{
+		if (Config::inst()->get(CwpWorkflowDefinitionExtension::class, 'create_default_workflow')) {
+			// Only proceed if a definition using this template has not been created yet
+			$definition = WorkflowDefinition::get()->filter("Template", "Review and Approve")->First();
+			if ($definition && $definition->exists()) {
+				return;
+			}
 
-            //generate from the template, which happens after we write the definition
-            $definition = WorkflowDefinition::create();
-            $definition->Template = "Review and Approve";
-            $definition->write();
+			//generate from the template, which happens after we write the definition
+			$definition = WorkflowDefinition::create();
+			$definition->Template = "Review and Approve";
+			$definition->write();
 
-            //change the title, description, and reminder days
-            $definition->update(array(
-                'Title' => "Two-step Workflow",
-                'Description' => "Content Authors can write content and Content Publishers can approve/reject.",
-                'RemindDays' => 3,
-            ));
-            $definition->write();
+			//change the title, description, and reminder days
+			$definition->update(array(
+				'Title' => "Two-step Workflow",
+				'Description' => "Content Authors can write content and Content Publishers can approve/reject.",
+				'RemindDays' => 3,
+			));
+			$definition->write();
 
-            DB::alteration_message("Added default workflow definition to WorkflowDefinition table", "created");
-        }
-    }
+			DB::alteration_message("Added default workflow definition to WorkflowDefinition table", "created");
+		}
+	}
 }

tests/PageTypes/BasePageTest.php

Indentation +38 added lines, -38 removed lines

@@ -8,42 +8,42 @@
 
 class BasePageTest extends SapphireTest
 {
-    protected static $fixture_file = 'BasePageTest.yml';
-
-    protected function setUp()
-    {
-        parent::setUp();
-
-        Config::modify()->set(BasePage::class, 'pdf_export', true);
-        Config::modify()->set(BasePage::class, 'generated_pdf_path', 'assets/_generated_pdfs');
-    }
-
-    public function testPdfFilename()
-    {
-        $page = $this->objFromFixture(BasePage::class, 'test-page-one');
-        $this->assertContains(
-            'assets/_generated_pdfs/test-page-one-1.pdf',
-            $page->getPdfFilename(),
-            'Generated filename for PDF'
-        );
-    }
-
-    public function testPdfLink()
-    {
-        $page = $this->objFromFixture(BasePage::class, 'test-page-one');
-        $this->assertContains('test-page-one/downloadpdf', $page->PdfLink(), 'Link to download PDF');
-    }
-
-    public function testHomePagePdfLink()
-    {
-        $page = $this->objFromFixture(BasePage::class, 'home-page');
-        $this->assertContains('home/downloadpdf', $page->PdfLink(), 'Link to download PDF');
-    }
-
-    public function testPdfLinkDisabled()
-    {
-        Config::modify()->set(BasePage::class, 'pdf_export', false);
-        $page = $this->objFromFixture(BasePage::class, 'test-page-one');
-        $this->assertFalse($page->PdfLink(), 'No PDF link as the functionality is disabled');
-    }
+	protected static $fixture_file = 'BasePageTest.yml';
+
+	protected function setUp()
+	{
+		parent::setUp();
+
+		Config::modify()->set(BasePage::class, 'pdf_export', true);
+		Config::modify()->set(BasePage::class, 'generated_pdf_path', 'assets/_generated_pdfs');
+	}
+
+	public function testPdfFilename()
+	{
+		$page = $this->objFromFixture(BasePage::class, 'test-page-one');
+		$this->assertContains(
+			'assets/_generated_pdfs/test-page-one-1.pdf',
+			$page->getPdfFilename(),
+			'Generated filename for PDF'
+		);
+	}
+
+	public function testPdfLink()
+	{
+		$page = $this->objFromFixture(BasePage::class, 'test-page-one');
+		$this->assertContains('test-page-one/downloadpdf', $page->PdfLink(), 'Link to download PDF');
+	}
+
+	public function testHomePagePdfLink()
+	{
+		$page = $this->objFromFixture(BasePage::class, 'home-page');
+		$this->assertContains('home/downloadpdf', $page->PdfLink(), 'Link to download PDF');
+	}
+
+	public function testPdfLinkDisabled()
+	{
+		Config::modify()->set(BasePage::class, 'pdf_export', false);
+		$page = $this->objFromFixture(BasePage::class, 'test-page-one');
+		$this->assertFalse($page->PdfLink(), 'No PDF link as the functionality is disabled');
+	}
 }

tests/PageTypes/EventHolderTest.php

Indentation +68 added lines, -68 removed lines

@@ -8,94 +8,94 @@
 
 class EventHolderTest extends SapphireTest
 {
-    protected static $fixture_file = 'EventHolderTest.yml';
+	protected static $fixture_file = 'EventHolderTest.yml';
 
-    public function testEventTags()
-    {
-        $holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
+	public function testEventTags()
+	{
+		$holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
 
-        $tags = $holder->UpdateTags();
-        $this->assertNotNull($tags->find('Name', 'Future'), 'Finds present terms.');
-        $this->assertNull($tags->find('Name', 'Event types', 'Does not find top level taxonomy.'));
-        $this->assertNull($tags->find('Name', 'Carrot'), 'Does not find terms that are not applied.');
-    }
+		$tags = $holder->UpdateTags();
+		$this->assertNotNull($tags->find('Name', 'Future'), 'Finds present terms.');
+		$this->assertNull($tags->find('Name', 'Event types', 'Does not find top level taxonomy.'));
+		$this->assertNull($tags->find('Name', 'Carrot'), 'Does not find terms that are not applied.');
+	}
 
-    public function testEventWithParentFilter()
-    {
-        $holder = $this->objFromFixture(EventHolder::class, 'EventHolder2');
+	public function testEventWithParentFilter()
+	{
+		$holder = $this->objFromFixture(EventHolder::class, 'EventHolder2');
 
-        $items = $holder->Updates();
+		$items = $holder->Updates();
 
-        $this->assertNotNull($items->find('URLSegment', 'other-holder'), 'Event from the holder is shown.');
-        $this->assertNull($items->find('URLSegment', 'future-event-1'), 'Events from other holders are not shown.');
-    }
+		$this->assertNotNull($items->find('URLSegment', 'other-holder'), 'Event from the holder is shown.');
+		$this->assertNull($items->find('URLSegment', 'future-event-1'), 'Events from other holders are not shown.');
+	}
 
-    public function testEventsWithTagFilter()
-    {
-        $holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
+	public function testEventsWithTagFilter()
+	{
+		$holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
 
-        //Get the "Future" tag.
-        $tag = $this->objFromFixture(TaxonomyTerm::class, 'TaxonomyTerm1');
+		//Get the "Future" tag.
+		$tag = $this->objFromFixture(TaxonomyTerm::class, 'TaxonomyTerm1');
 
-        $items = $holder->Updates($tag->ID);
+		$items = $holder->Updates($tag->ID);
 
-        $this->assertNotNull($items->find('URLSegment', 'future-event-1'), 'Finds the tagged page.');
-        $this->assertNull($items->find('URLSegment', 'past-event-1'), 'Does not find pages that are not tagged.');
-    }
+		$this->assertNotNull($items->find('URLSegment', 'future-event-1'), 'Finds the tagged page.');
+		$this->assertNull($items->find('URLSegment', 'past-event-1'), 'Does not find pages that are not tagged.');
+	}
 
-    public function testEventsWithMonthFilter()
-    {
-        $holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
+	public function testEventsWithMonthFilter()
+	{
+		$holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
 
-        $items = $holder->Updates(null, null, null, 2013, 7);
+		$items = $holder->Updates(null, null, null, 2013, 7);
 
-        $this->assertNotNull($items->find('URLSegment', 'future-event-1'), 'Finds the event in 2013-07.');
-        $this->assertNull($items->find('URLSegment', 'past-event-1'), 'Does not find events at other dates.');
-    }
+		$this->assertNotNull($items->find('URLSegment', 'future-event-1'), 'Finds the event in 2013-07.');
+		$this->assertNull($items->find('URLSegment', 'past-event-1'), 'Does not find events at other dates.');
+	}
 
-    public function testEventsWithDateRangeFilter()
-    {
-        $holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
+	public function testEventsWithDateRangeFilter()
+	{
+		$holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
 
-        $items = $holder->Updates(null, '2013-01-19', null);
-        $this->assertNotNull($items->find('URLSegment', 'past-event-2'), 'Finds the event at the date');
-        $this->assertNull($items->find('URLSegment', 'future-event-1'), 'Does not find the event at another date');
+		$items = $holder->Updates(null, '2013-01-19', null);
+		$this->assertNotNull($items->find('URLSegment', 'past-event-2'), 'Finds the event at the date');
+		$this->assertNull($items->find('URLSegment', 'future-event-1'), 'Does not find the event at another date');
 
-        $items = $holder->Updates(null, '2013-01-01', '2013-01-19');
-        $this->assertNotNull($items->find('URLSegment', 'past-event-2'), 'Finds events in the date range');
-        $this->assertNull($items->find('URLSegment', 'future-event-1'), 'Does not find event out of range');
-    }
+		$items = $holder->Updates(null, '2013-01-01', '2013-01-19');
+		$this->assertNotNull($items->find('URLSegment', 'past-event-2'), 'Finds events in the date range');
+		$this->assertNull($items->find('URLSegment', 'future-event-1'), 'Does not find event out of range');
+	}
 
-    public function testExtractMonths()
-    {
-        $holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
+	public function testExtractMonths()
+	{
+		$holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
 
-        $months = EventHolder::ExtractMonths(
-            $holder->Updates(),
-            'http://mybase.org/?tag=12&start=10&from=2010-10-10&to=2010-10-11', // Used for link generation
-            2013, // Currently selected
-            1 // Currently selected
-        );
+		$months = EventHolder::ExtractMonths(
+			$holder->Updates(),
+			'http://mybase.org/?tag=12&start=10&from=2010-10-10&to=2010-10-11', // Used for link generation
+			2013, // Currently selected
+			1 // Currently selected
+		);
 
-        // Check which years are generated.
-        $this->assertNotNull($months->find('YearName', 2013), 'Generates existing year');
-        $this->assertNull($months->find('YearName', 1990), 'Does not generate non-present year');
+		// Check which years are generated.
+		$this->assertNotNull($months->find('YearName', 2013), 'Generates existing year');
+		$this->assertNull($months->find('YearName', 1990), 'Does not generate non-present year');
 
-        $year = $months->find('YearName', 2013);
+		$year = $months->find('YearName', 2013);
 
-        // Check which months come up in 2013
-        $this->assertNotNull($year['Months']->find('MonthNumber', 7), 'Generates existing month');
-        $this->assertNull($year['Months']->find('MonthNumber', 12), 'Does not generate non-present month');
+		// Check which months come up in 2013
+		$this->assertNotNull($year['Months']->find('MonthNumber', 7), 'Generates existing month');
+		$this->assertNull($year['Months']->find('MonthNumber', 12), 'Does not generate non-present month');
 
-        $month = $year['Months']->find('MonthNumber', 7);
-        $this->assertEquals(
-            $month['MonthLink'],
-            'http://mybase.org/?tag=12&from=2010-10-10&to=2010-10-11&month=7&year=2013',
-            'Selection link is built properly - start is removed, and tag, from and to retained.'
-        );
+		$month = $year['Months']->find('MonthNumber', 7);
+		$this->assertEquals(
+			$month['MonthLink'],
+			'http://mybase.org/?tag=12&from=2010-10-10&to=2010-10-11&month=7&year=2013',
+			'Selection link is built properly - start is removed, and tag, from and to retained.'
+		);
 
-        // Check if these months are marked properly.
-        $month = $year['Months']->find('MonthNumber', 1);
-        $this->assertEquals($month['Active'], true, 'Correctly marks active link');
-    }
+		// Check if these months are marked properly.
+		$month = $year['Months']->find('MonthNumber', 1);
+		$this->assertEquals($month['Active'], true, 'Correctly marks active link');
+	}
 }

tests/PageTypes/SitemapPageTest.php

Indentation +18 added lines, -18 removed lines

@@ -9,26 +9,26 @@
 
 class SitemapPageTest extends FunctionalTest
 {
-    protected static $fixture_file = 'SitemapPageTest.yml';
+	protected static $fixture_file = 'SitemapPageTest.yml';
 
-    protected static $use_draft_site = true;
+	protected static $use_draft_site = true;
 
-    protected function setUp()
-    {
-        parent::setUp();
+	protected function setUp()
+	{
+		parent::setUp();
 
-        Config::inst()->update(SSViewer::class, 'theme', 'starter');
-    }
+		Config::inst()->update(SSViewer::class, 'theme', 'starter');
+	}
 
-    /**
-     * Note: this test depends on the "starter" theme being installed and configured as default
-     */
-    public function testSitemapShowsNavigationTitleNotNormalTitle()
-    {
-        $response = $this->get('sitemap');
-        $parser = new CSSContentParser($response->getBody());
-        $elements = $parser->getBySelector('.sitemap li.first .sitemap-link');
-        $this->assertNotEmpty($elements);
-        $this->assertEquals('Top page nav 1', (string) $elements[0]);
-    }
+	/**
+	 * Note: this test depends on the "starter" theme being installed and configured as default
+	 */
+	public function testSitemapShowsNavigationTitleNotNormalTitle()
+	{
+		$response = $this->get('sitemap');
+		$parser = new CSSContentParser($response->getBody());
+		$elements = $parser->getBySelector('.sitemap li.first .sitemap-link');
+		$this->assertNotEmpty($elements);
+		$this->assertEquals('Top page nav 1', (string) $elements[0]);
+	}
 }

tests/Extensions/WorkflowDefinitionExtensionTest.php

Indentation +27 added lines, -27 removed lines

@@ -15,34 +15,34 @@
 class WorkflowDefinitionExtensionTest extends FunctionalTest
 {
 
-    /**
-     * @var Boolean If set to TRUE, this will force a test database to be generated
-     * in {@link setUp()}. Note that this flag is overruled by the presence of a
-     * {@link $fixture_file}, which always forces a database build.
-     */
-    protected $usesDatabase = true;
+	/**
+	 * @var Boolean If set to TRUE, this will force a test database to be generated
+	 * in {@link setUp()}. Note that this flag is overruled by the presence of a
+	 * {@link $fixture_file}, which always forces a database build.
+	 */
+	protected $usesDatabase = true;
 
-    /**
-     * Tests the config option that controls the creation of a default workflow definition
-     *
-     * @return void
-     */
-    public function testCreateDefaultWorkflowTest()
-    {
-        DB::quiet();
+	/**
+	 * Tests the config option that controls the creation of a default workflow definition
+	 *
+	 * @return void
+	 */
+	public function testCreateDefaultWorkflowTest()
+	{
+		DB::quiet();
 
-        // test disabling the default workflow definition
-        Config::modify()->set(CwpWorkflowDefinitionExtension::class, 'create_default_workflow', false);
-        $workflowExtn = Injector::inst()->create(CwpWorkflowDefinitionExtension::class);
-        $workflowExtn->requireDefaultRecords();
-        $definition = WorkflowDefinition::get()->first();
-        $this->assertNull($definition);
+		// test disabling the default workflow definition
+		Config::modify()->set(CwpWorkflowDefinitionExtension::class, 'create_default_workflow', false);
+		$workflowExtn = Injector::inst()->create(CwpWorkflowDefinitionExtension::class);
+		$workflowExtn->requireDefaultRecords();
+		$definition = WorkflowDefinition::get()->first();
+		$this->assertNull($definition);
 
-        // test enabling the default workflow definition
-        Config::modify()->set(CwpWorkflowDefinitionExtension::class, 'create_default_workflow', true);
-        $workflowExtn = Injector::inst()->create(CwpWorkflowDefinitionExtension::class);
-        $workflowExtn->requireDefaultRecords();
-        $definition = WorkflowDefinition::get()->first();
-        $this->assertNotNull($definition);
-    }
+		// test enabling the default workflow definition
+		Config::modify()->set(CwpWorkflowDefinitionExtension::class, 'create_default_workflow', true);
+		$workflowExtn = Injector::inst()->create(CwpWorkflowDefinitionExtension::class);
+		$workflowExtn->requireDefaultRecords();
+		$definition = WorkflowDefinition::get()->first();
+		$this->assertNotNull($definition);
+	}
 }

tests/Extensions/SynonymValidatorTest.php

Indentation +61 added lines, -61 removed lines

@@ -7,51 +7,51 @@ 
 
 class SynonymValidatorTest extends SapphireTest
 {
-    /**
-     * @var SynonymValidator
-     */
-    protected $validator;
+	/**
+	 * @var SynonymValidator
+	 */
+	protected $validator;
 
-    protected function setUp()
-    {
-        parent::setUp();
+	protected function setUp()
+	{
+		parent::setUp();
 
-        $this->validator = new SynonymValidator([
-            'Synonyms',
-        ]);
-    }
+		$this->validator = new SynonymValidator([
+			'Synonyms',
+		]);
+	}
 
-    /**
-     * @dataProvider validValuesProvider
-     */
-    public function testItAllowsValidValues($value)
-    {
-        $this->validator->php([
-            'Synonyms' => $value,
-        ]);
+	/**
+	 * @dataProvider validValuesProvider
+	 */
+	public function testItAllowsValidValues($value)
+	{
+		$this->validator->php([
+			'Synonyms' => $value,
+		]);
 
-        $this->assertEmpty($this->validator->getErrors());
-    }
+		$this->assertEmpty($this->validator->getErrors());
+	}
 
-    /**
-     * @return array
-     */
-    public function validValuesProvider()
-    {
-        return [
-            ['foo'],
-            ['foo,bar,baz'],
-            ['foo, bar, baz'],
-            [
-                '
+	/**
+	 * @return array
+	 */
+	public function validValuesProvider()
+	{
+		return [
+			['foo'],
+			['foo,bar,baz'],
+			['foo, bar, baz'],
+			[
+				'
 				foo
 				bar
 				baz
 			'
-            ],
-            ['foo => bar, baz'],
-            [
-                '
+			],
+			['foo => bar, baz'],
+			[
+				'
 				# this is a comment, it should be ignored!
 
 				foo, bar, baz
@@ -59,32 +59,32 @@ 
 
 				# ...as should this.
 			'
-            ],
-        ];
-    }
+			],
+		];
+	}
 
-    /**
-     * @dataProvider invalidValuesProvider
-     *
-     * @param string $value
-     */
-    public function testItDisallowsInvalidValues($value)
-    {
-        $this->validator->php([
-            'Synonyms' => $value,
-        ]);
+	/**
+	 * @dataProvider invalidValuesProvider
+	 *
+	 * @param string $value
+	 */
+	public function testItDisallowsInvalidValues($value)
+	{
+		$this->validator->php([
+			'Synonyms' => $value,
+		]);
 
-        $this->assertNotEmpty($this->validator->getErrors());
-    }
+		$this->assertNotEmpty($this->validator->getErrors());
+	}
 
-    /**
-     * @return array
-     */
-    public function invalidValuesProvider()
-    {
-        return [
-            ['foo, bar baz, qux'],
-            ['foo => bar baz, qux'],
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	public function invalidValuesProvider()
+	{
+		return [
+			['foo, bar baz, qux'],
+			['foo => bar baz, qux'],
+		];
+	}
 }