silverstripe / cwp

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'],
+		];
+	}
 }

src/PageTypes/NewsHolderController.php

Indentation +24 added lines, -24 removed lines

@@ -7,30 +7,30 @@
 
 class NewsHolderController extends DatedUpdateHolderController
 {
-    private static $allowed_actions = [
-        'rss',
-        'atom',
-    ];
+	private static $allowed_actions = [
+		'rss',
+		'atom',
+	];
 
-    public function rss()
-    {
-        $rss = RSSFeed::create(
-            $this->Updates()->sort('Created DESC')->limit(20),
-            $this->Link('rss'),
-            $this->getSubscriptionTitle()
-        );
-        $rss->setTemplate('CWP\\CWP\\PageTypes\\NewsHolder_rss');
-        return $rss->outputToBrowser();
-    }
+	public function rss()
+	{
+		$rss = RSSFeed::create(
+			$this->Updates()->sort('Created DESC')->limit(20),
+			$this->Link('rss'),
+			$this->getSubscriptionTitle()
+		);
+		$rss->setTemplate('CWP\\CWP\\PageTypes\\NewsHolder_rss');
+		return $rss->outputToBrowser();
+	}
 
-    public function atom()
-    {
-        $atom = CwpAtomFeed::create(
-            $this->Updates()->sort('Created DESC')->limit(20),
-            $this->Link('atom'),
-            $this->getSubscriptionTitle()
-        );
-        $atom->setTemplate('CWP\\CWP\\PageTypes\\NewsHolder_atom');
-        return $atom->outputToBrowser();
-    }
+	public function atom()
+	{
+		$atom = CwpAtomFeed::create(
+			$this->Updates()->sort('Created DESC')->limit(20),
+			$this->Link('atom'),
+			$this->getSubscriptionTitle()
+		);
+		$atom->setTemplate('CWP\\CWP\\PageTypes\\NewsHolder_atom');
+		return $atom->outputToBrowser();
+	}
 }

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(__CLASS__ . '.NameLabel', 'Name');
-        $labels['ExternalLink'] = _t(__CLASS__ . '.ExternalLinkLabel', 'External Link');
-        $labels['SortOrder'] = _t(__CLASS__ . '.SortOrderLabel', 'Sort Order');
-        $labels['ParentID'] = _t(__CLASS__ . '.ParentRelationLabel', 'Parent');
-        $labels['InternalLinkID'] = _t(__CLASS__ . '.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(
-            'Name',
-            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>'
-                )
-            )
-        );
-
-        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(__CLASS__ . '.NameLabel', 'Name');
+		$labels['ExternalLink'] = _t(__CLASS__ . '.ExternalLinkLabel', 'External Link');
+		$labels['SortOrder'] = _t(__CLASS__ . '.SortOrderLabel', 'Sort Order');
+		$labels['ParentID'] = _t(__CLASS__ . '.ParentRelationLabel', 'Parent');
+		$labels['InternalLinkID'] = _t(__CLASS__ . '.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(
+			'Name',
+			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>'
+				)
+			)
+		);
+
+		return $fields;
+	}
 }

src/Extensions/CustomSiteConfig.php

Indentation +46 added lines, -46 removed lines

@@ -11,55 +11,55 @@
  */
 class CustomSiteConfig extends DataExtension
 {
-    private static $db = array(
-        'GACode' => 'Varchar(16)',
-        'FacebookURL' => 'Varchar(256)', // multitude of ways to link to Facebook accounts, best to leave it open.
-        'TwitterUsername' => 'Varchar(16)', // max length of Twitter username 15
-    );
+	private static $db = array(
+		'GACode' => 'Varchar(16)',
+		'FacebookURL' => 'Varchar(256)', // multitude of ways to link to Facebook accounts, best to leave it open.
+		'TwitterUsername' => 'Varchar(16)', // max length of Twitter username 15
+	);
 
-    public function updateCMSFields(FieldList $fields)
-    {
-        $fields->addFieldToTab(
-            'Root.Main',
-            $gaCode = TextField::create(
-                'GACode',
-                _t(__CLASS__ . '.GaField', 'Google Analytics account')
-            )
-        );
+	public function updateCMSFields(FieldList $fields)
+	{
+		$fields->addFieldToTab(
+			'Root.Main',
+			$gaCode = TextField::create(
+				'GACode',
+				_t(__CLASS__ . '.GaField', 'Google Analytics account')
+			)
+		);
 
-        $gaCode->setRightTitle(
-            _t(
-                __CLASS__ . '.GaFieldDesc',
-                'Account number to be used all across the site (in the format <strong>UA-XXXXX-X</strong>)'
-            )
-        );
+		$gaCode->setRightTitle(
+			_t(
+				__CLASS__ . '.GaFieldDesc',
+				'Account number to be used all across the site (in the format <strong>UA-XXXXX-X</strong>)'
+			)
+		);
 
-        $fields->findOrMakeTab('Root.SocialMedia', _t(__CLASS__ . '.SocialMediaTab', 'Social Media'));
+		$fields->findOrMakeTab('Root.SocialMedia', _t(__CLASS__ . '.SocialMediaTab', 'Social Media'));
 
-        $fields->addFieldToTab(
-            'Root.SocialMedia',
-            $facebookURL = TextField::create(
-                'FacebookURL',
-                _t(__CLASS__ . '.FbField', 'Facebook UID or username')
-            )
-        );
-        $facebookURL->setRightTitle(
-            _t(
-                __CLASS__ . '.FbFieldDesc',
-                'Facebook link (everything after the "http://facebook.com/", eg http://facebook.com/'
-                . '<strong>username</strong> or http://facebook.com/<strong>pages/108510539573</strong>)'
-            )
-        );
+		$fields->addFieldToTab(
+			'Root.SocialMedia',
+			$facebookURL = TextField::create(
+				'FacebookURL',
+				_t(__CLASS__ . '.FbField', 'Facebook UID or username')
+			)
+		);
+		$facebookURL->setRightTitle(
+			_t(
+				__CLASS__ . '.FbFieldDesc',
+				'Facebook link (everything after the "http://facebook.com/", eg http://facebook.com/'
+				. '<strong>username</strong> or http://facebook.com/<strong>pages/108510539573</strong>)'
+			)
+		);
 
-        $fields->addFieldToTab(
-            'Root.SocialMedia',
-            $twitterUsername = TextField::create(
-                'TwitterUsername',
-                _t(__CLASS__ . '.TwitterField', 'Twitter username')
-            )
-        );
-        $twitterUsername->setRightTitle(
-            _t(__CLASS__ . '.TwitterFieldDesc', 'Twitter username (eg, http://twitter.com/<strong>username</strong>)')
-        );
-    }
+		$fields->addFieldToTab(
+			'Root.SocialMedia',
+			$twitterUsername = TextField::create(
+				'TwitterUsername',
+				_t(__CLASS__ . '.TwitterField', 'Twitter username')
+			)
+		);
+		$twitterUsername->setRightTitle(
+			_t(__CLASS__ . '.TwitterFieldDesc', 'Twitter username (eg, http://twitter.com/<strong>username</strong>)')
+		);
+	}
 }

src/Extensions/CwpCommentingExtension.php

Indentation +14 added lines, -14 removed lines

@@ -13,20 +13,20 @@
  */
 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(__CLASS__ . '.EMAIL_TITLE', Email::class))
-                ->setDescription(_t(__CLASS__ . '.WILL_NOT_BE_PUBLISHED', 'Will not be published.'));
-        }
+		if ($emailField = $fields->dataFieldByName(Email::class)) {
+			$emailField
+				->setTitle(_t(__CLASS__ . '.EMAIL_TITLE', Email::class))
+				->setDescription(_t(__CLASS__ . '.WILL_NOT_BE_PUBLISHED', 'Will not be published.'));
+		}
 
-        if ($urlField = $fields->dataFieldByName('URL')) {
-            $urlField
-                ->setTitle(_t(__CLASS__ . '.WEBSITE_TITLE', 'Your website (optional)'))
-                ->setAttribute('placeholder', 'http://');
-        }
-    }
+		if ($urlField = $fields->dataFieldByName('URL')) {
+			$urlField
+				->setTitle(_t(__CLASS__ . '.WEBSITE_TITLE', 'Your website (optional)'))
+				->setAttribute('placeholder', 'http://');
+		}
+	}
 }

src/Extensions/CwpSearchBoostExtension.php

Indentation +41 added lines, -41 removed lines

@@ -12,45 +12,45 @@
 class CwpSearchBoostExtension extends DataExtension
 {
 
-    /**
-     * Quality to boost the 'SearchBoost' field by.
-     * Default boost is 2x
-     *
-     * @config
-     * @var string
-     */
-    private static $search_boost = '2';
-
-    private static $db = array(
-        'SearchBoost' => 'Text'
-    );
-
-    /**
-     * Adds boost fields to this page
-     *
-     * @param FieldList $fields
-     */
-    public function updateCMSFields(FieldList $fields)
-    {
-        parent::updateCMSFields($fields);
-
-        // Rename metafield
-        $meta = $fields->fieldByName('Root.Main.Metadata');
-        $meta->setTitle(_t(__CLASS__ . '.PAGEINFO', 'Page info and SEO'));
-
-        $boostTitle = _t(__CLASS__ . '.SearchBoost', 'Boost Keywords');
-        $boostNote = _t(
-            __CLASS__ . '.SearchBoostNote',
-            '(Only applies to the search results on this site e.g. not on Google search)'
-        );
-        $boostDescription = _t(
-            __CLASS__ . '.SearchBoostDescription',
-            'Enter keywords separated by comma ( , ) for which to boost the ranking of this page '
-            . 'within the search results on this site.'
-        );
-        $boostField = TextareaField::create('SearchBoost', $boostTitle)
-            ->setRightTitle($boostNote)
-            ->setDescription($boostDescription);
-        $fields->insertBefore('MetaDescription', $boostField);
-    }
+	/**
+	 * Quality to boost the 'SearchBoost' field by.
+	 * Default boost is 2x
+	 *
+	 * @config
+	 * @var string
+	 */
+	private static $search_boost = '2';
+
+	private static $db = array(
+		'SearchBoost' => 'Text'
+	);
+
+	/**
+	 * Adds boost fields to this page
+	 *
+	 * @param FieldList $fields
+	 */
+	public function updateCMSFields(FieldList $fields)
+	{
+		parent::updateCMSFields($fields);
+
+		// Rename metafield
+		$meta = $fields->fieldByName('Root.Main.Metadata');
+		$meta->setTitle(_t(__CLASS__ . '.PAGEINFO', 'Page info and SEO'));
+
+		$boostTitle = _t(__CLASS__ . '.SearchBoost', 'Boost Keywords');
+		$boostNote = _t(
+			__CLASS__ . '.SearchBoostNote',
+			'(Only applies to the search results on this site e.g. not on Google search)'
+		);
+		$boostDescription = _t(
+			__CLASS__ . '.SearchBoostDescription',
+			'Enter keywords separated by comma ( , ) for which to boost the ranking of this page '
+			. 'within the search results on this site.'
+		);
+		$boostField = TextareaField::create('SearchBoost', $boostTitle)
+			->setRightTitle($boostNote)
+			->setDescription($boostDescription);
+		$fields->insertBefore('MetaDescription', $boostField);
+	}
 }

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(
-                    __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;
+	}
 }