silverstripe / cwp

tests/PageTypes/DatedUpdateHolderControllerTest.php

Indentation +23 added lines, -23 removed lines

@@ -9,36 +9,36 @@
 
 class DatedUpdateHolderControllerTest extends FunctionalTest
 {
-    protected static $fixture_file = 'EventHolderTest.yml';
+	protected static $fixture_file = 'EventHolderTest.yml';
 
-    protected static $use_draft_site = true;
+	protected static $use_draft_site = true;
 
-    protected function setUp()
-    {
-        parent::setUp();
+	protected function setUp()
+	{
+		parent::setUp();
 
-        // Note: this test requires the starter theme to be installed
-        Config::modify()->set(SSViewer::class, 'themes', ['starter', '$default']);
-        Config::modify()->set(SSViewer::class, 'theme', 'starter');
-    }
+		// Note: this test requires the starter theme to be installed
+		Config::modify()->set(SSViewer::class, 'themes', ['starter', '$default']);
+		Config::modify()->set(SSViewer::class, 'theme', 'starter');
+	}
 
-    public function testSettingDateFiltersInReverseOrderShowsMessage()
-    {
-        /** @var EventHolder $holder */
-        $holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
+	public function testSettingDateFiltersInReverseOrderShowsMessage()
+	{
+		/** @var EventHolder $holder */
+		$holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
 
-        $result = $this->get($holder->Link() . '?from=2018-01-10&to=2018-01-01');
+		$result = $this->get($holder->Link() . '?from=2018-01-10&to=2018-01-01');
 
-        $this->assertContains('Filter has been applied with the dates reversed', $result->getBody());
-    }
+		$this->assertContains('Filter has been applied with the dates reversed', $result->getBody());
+	}
 
-    public function testSettingFromButNotToDateShowsMessage()
-    {
-        /** @var EventHolder $holder */
-        $holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
+	public function testSettingFromButNotToDateShowsMessage()
+	{
+		/** @var EventHolder $holder */
+		$holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
 
-        $result = $this->get($holder->Link() . '?from=2018-01-10');
+		$result = $this->get($holder->Link() . '?from=2018-01-10');
 
-        $this->assertContains('Filtered by a single date', $result->getBody());
-    }
+		$this->assertContains('Filtered by a single date', $result->getBody());
+	}
 }

tests/PageTypes/SitemapPageTest.php

Indentation +19 added lines, -19 removed lines

@@ -9,27 +9,27 @@
 
 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::modify()->set(SSViewer::class, 'themes', ['starter', '$default']);
-        Config::modify()->set(SSViewer::class, 'theme', 'starter');
-    }
+		Config::modify()->set(SSViewer::class, 'themes', ['starter', '$default']);
+		Config::modify()->set(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]);
+	}
 }

src/PageTypes/BasePageController.php

Indentation +10 added lines, -10 removed lines

@@ -7,15 +7,15 @@
 
 class BasePageController extends ContentController
 {
-    /**
-     * Provide current year.
-     */
-    public function CurrentDatetime()
-    {
-        return DBDatetime::now();
-    }
+	/**
+	 * Provide current year.
+	 */
+	public function CurrentDatetime()
+	{
+		return DBDatetime::now();
+	}
 
-    public function getRSSLink()
-    {
-    }
+	public function getRSSLink()
+	{
+	}
 }

src/Report/CwpStatsReport.php

Indentation +104 added lines, -104 removed lines

@@ -20,108 +20,108 @@
  */
 class CwpStatsReport extends Report
 {
-    public function title()
-    {
-        return _t(__CLASS__ . '.Title', 'Summary statistics');
-    }
-
-    public function description()
-    {
-        return _t(
-            __CLASS__ . '.Description',
-            'This report provides various statistics for this site. The "total live page count" is the number that ' .
-                'can be compared against the instance size specifications.'
-        );
-    }
-
-    public function columns()
-    {
-        return [
-            'Name' => _t(__CLASS__ . '.Name', 'Name'),
-            'Count' => _t(__CLASS__ . '.Count', 'Count'),
-        ];
-    }
-
-    /**
-     * Manually create source records for the report. Agreggates cannot be provided as a column of a DataQuery result.
-     *
-     * {@inheritDoc}
-     */
-    public function sourceRecords($params = [], $sort = null, $limit = null)
-    {
-        $records = [];
-
-        // Get the query to apply across all variants: looks at all subsites, translations, live stage only.
-        $crossVariant = (function ($dataQuery) {
-            $params = [
-                'Subsite.filter' => false,
-                'Versioned.mode' => 'stage',
-                'Versioned.stage' => Versioned::LIVE,
-            ];
-
-            return $dataQuery->setDataQueryParam($params);
-        });
-
-        // Total.
-        $records[] = [
-            'Name' => _t(
-                __CLASS__ . '.TotalPageCount',
-                'Total live page count, across all translations and subsites'
-            ),
-            'Count' => $crossVariant(SiteTree::get())->count(),
-        ];
-
-        if (class_exists(Subsite::class)) {
-            // Main site.
-            $records[] = [
-                'Name' => _t(__CLASS__ . '.PagesForMainSite', '- in the main site'),
-                'Count' => $crossVariant(SiteTree::get())
-                    ->filter(['SubsiteID' => 0])
-                    ->count(),
-            ];
-
-            // Per subsite.
-            $subsites = Subsite::get();
-            foreach ($subsites as $subsite) {
-                $records[] = [
-                    'Name' => _t(
-                        __CLASS__ . '.PagesForSubsite',
-                        "- in the subsite '{SubsiteTitle}'",
-                        ['SubsiteTitle' => $subsite->Title]
-                    ),
-                    'Count' => $crossVariant(SiteTree::get())
-                        ->filter(['SubsiteID' => $subsite->ID])
-                        ->count(),
-                ];
-            }
-        }
-
-        // Files.
-        $records[] = [
-            'Name' => _t(__CLASS__ . '.FileCount', 'File count'),
-            'Count' => File::get()
-                ->setDataQueryParam('Subsite.filter', false)
-                ->filter(['ClassName:not' => Folder::class])
-                ->count(),
-        ];
-
-        return ArrayList::create($records);
-    }
-
-    /**
-     * @return GridField
-     */
-    public function getReportField()
-    {
-        /** @var GridField $gridField */
-        $gridField = parent::getReportField();
-
-        /** @var GridFieldConfig $gridConfig */
-        $gridConfig = $gridField->getConfig();
-        $gridConfig->removeComponentsByType(GridFieldPrintButton::class);
-        $gridConfig->removeComponentsByType(GridFieldExportButton::class);
-        $gridConfig->removeComponentsByType(GridFieldSortableHeader::class);
-
-        return $gridField;
-    }
+	public function title()
+	{
+		return _t(__CLASS__ . '.Title', 'Summary statistics');
+	}
+
+	public function description()
+	{
+		return _t(
+			__CLASS__ . '.Description',
+			'This report provides various statistics for this site. The "total live page count" is the number that ' .
+				'can be compared against the instance size specifications.'
+		);
+	}
+
+	public function columns()
+	{
+		return [
+			'Name' => _t(__CLASS__ . '.Name', 'Name'),
+			'Count' => _t(__CLASS__ . '.Count', 'Count'),
+		];
+	}
+
+	/**
+	 * Manually create source records for the report. Agreggates cannot be provided as a column of a DataQuery result.
+	 *
+	 * {@inheritDoc}
+	 */
+	public function sourceRecords($params = [], $sort = null, $limit = null)
+	{
+		$records = [];
+
+		// Get the query to apply across all variants: looks at all subsites, translations, live stage only.
+		$crossVariant = (function ($dataQuery) {
+			$params = [
+				'Subsite.filter' => false,
+				'Versioned.mode' => 'stage',
+				'Versioned.stage' => Versioned::LIVE,
+			];
+
+			return $dataQuery->setDataQueryParam($params);
+		});
+
+		// Total.
+		$records[] = [
+			'Name' => _t(
+				__CLASS__ . '.TotalPageCount',
+				'Total live page count, across all translations and subsites'
+			),
+			'Count' => $crossVariant(SiteTree::get())->count(),
+		];
+
+		if (class_exists(Subsite::class)) {
+			// Main site.
+			$records[] = [
+				'Name' => _t(__CLASS__ . '.PagesForMainSite', '- in the main site'),
+				'Count' => $crossVariant(SiteTree::get())
+					->filter(['SubsiteID' => 0])
+					->count(),
+			];
+
+			// Per subsite.
+			$subsites = Subsite::get();
+			foreach ($subsites as $subsite) {
+				$records[] = [
+					'Name' => _t(
+						__CLASS__ . '.PagesForSubsite',
+						"- in the subsite '{SubsiteTitle}'",
+						['SubsiteTitle' => $subsite->Title]
+					),
+					'Count' => $crossVariant(SiteTree::get())
+						->filter(['SubsiteID' => $subsite->ID])
+						->count(),
+				];
+			}
+		}
+
+		// Files.
+		$records[] = [
+			'Name' => _t(__CLASS__ . '.FileCount', 'File count'),
+			'Count' => File::get()
+				->setDataQueryParam('Subsite.filter', false)
+				->filter(['ClassName:not' => Folder::class])
+				->count(),
+		];
+
+		return ArrayList::create($records);
+	}
+
+	/**
+	 * @return GridField
+	 */
+	public function getReportField()
+	{
+		/** @var GridField $gridField */
+		$gridField = parent::getReportField();
+
+		/** @var GridFieldConfig $gridConfig */
+		$gridConfig = $gridField->getConfig();
+		$gridConfig->removeComponentsByType(GridFieldPrintButton::class);
+		$gridConfig->removeComponentsByType(GridFieldExportButton::class);
+		$gridConfig->removeComponentsByType(GridFieldSortableHeader::class);
+
+		return $gridField;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
         $records = [];
 
         // Get the query to apply across all variants: looks at all subsites, translations, live stage only.
-        $crossVariant = (function ($dataQuery) {
+        $crossVariant = (function($dataQuery) {
             $params = [
                 'Subsite.filter' => false,
                 'Versioned.mode' => 'stage',

src/Extensions/CustomSiteConfig.php

Indentation +49 added lines, -49 removed lines

@@ -12,58 +12,58 @@
  */
 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(
-            DBField::create_field('HTMLFragment', _t(
-                __CLASS__ . '.GaFieldDesc',
-                'Account number to be used all across the site (in the format <strong>UA-XXXXX-X</strong>)'
-            ))
-        );
+		$gaCode->setRightTitle(
+			DBField::create_field('HTMLFragment', _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(
-            DBField::create_field('HTMLFragment', _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(
+			DBField::create_field('HTMLFragment', _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(
-            DBField::create_field('HTMLFragment', _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(
+			DBField::create_field('HTMLFragment', _t(
+				__CLASS__ . '.TwitterFieldDesc',
+				'Twitter username (eg, http://twitter.com/<strong>username</strong>)'
+			))
+		);
+	}
 }

tests/Extensions/WorkflowDefinitionExtensionTest.php

Indentation +34 added lines, -34 removed lines

@@ -15,38 +15,38 @@
 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;
-
-    /**
-     * Tests the config option that controls the creation of a default workflow definition
-     *
-     * @return void
-     */
-    public function testCreateDefaultWorkflowTest()
-    {
-        if (!class_exists(WorkflowDefinition::class)) {
-            $this->markTestSkipped('This test requires the advancedworkflow module to be installed');
-        }
-
-        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 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);
-    }
+	/**
+	 * @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()
+	{
+		if (!class_exists(WorkflowDefinition::class)) {
+			$this->markTestSkipped('This test requires the advancedworkflow module to be installed');
+		}
+
+		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 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/Tasks/PopulateThemeSampleDataTaskTest.php

Indentation +46 added lines, -46 removed lines

@@ -10,50 +10,50 @@
 
 class PopulateThemeSampleDataTaskTest extends SapphireTest
 {
-    protected $usesDatabase = true;
-
-    /**
-     * Ensure that the "contact" user form is only created once
-     */
-    public function testOnlyCreateContactFormOnce()
-    {
-        if (!class_exists(UserDefinedForm::class)) {
-            $this->markTestSkipped('This test requires the userforms module to be installed');
-        }
-
-        $createdMessage = 'Created "contact" UserDefinedForm';
-
-        $task = new PopulateThemeSampleDataTask;
-
-        // Run the task
-        $this->assertContains($createdMessage, $this->bufferedTask($task));
-
-        // Run a second time
-        $this->assertNotContains($createdMessage, $this->bufferedTask($task));
-
-        // Change the page name
-        $form = UserDefinedForm::get()->filter('URLSegment', 'contact')->first();
-        $form->URLSegment = 'testing';
-        $form->write();
-
-        // Ensure the old version is still detected in draft, so not recreated
-        $this->assertNotContains($createdMessage, $this->bufferedTask($task));
-
-        // Delete the page, then ensure it's recreated again (DataObject::delete will remove staged versions)
-        $form->delete();
-        $this->assertContains($createdMessage, $this->bufferedTask($task));
-    }
-
-    /**
-     * Run a BuildTask while buffering its output, and return the result
-     *
-     * @param  BuildTask $task
-     * @return string
-     */
-    protected function bufferedTask(BuildTask $task)
-    {
-        ob_start();
-        $task->run(new HTTPRequest('GET', '/'));
-        return ob_get_clean();
-    }
+	protected $usesDatabase = true;
+
+	/**
+	 * Ensure that the "contact" user form is only created once
+	 */
+	public function testOnlyCreateContactFormOnce()
+	{
+		if (!class_exists(UserDefinedForm::class)) {
+			$this->markTestSkipped('This test requires the userforms module to be installed');
+		}
+
+		$createdMessage = 'Created "contact" UserDefinedForm';
+
+		$task = new PopulateThemeSampleDataTask;
+
+		// Run the task
+		$this->assertContains($createdMessage, $this->bufferedTask($task));
+
+		// Run a second time
+		$this->assertNotContains($createdMessage, $this->bufferedTask($task));
+
+		// Change the page name
+		$form = UserDefinedForm::get()->filter('URLSegment', 'contact')->first();
+		$form->URLSegment = 'testing';
+		$form->write();
+
+		// Ensure the old version is still detected in draft, so not recreated
+		$this->assertNotContains($createdMessage, $this->bufferedTask($task));
+
+		// Delete the page, then ensure it's recreated again (DataObject::delete will remove staged versions)
+		$form->delete();
+		$this->assertContains($createdMessage, $this->bufferedTask($task));
+	}
+
+	/**
+	 * Run a BuildTask while buffering its output, and return the result
+	 *
+	 * @param  BuildTask $task
+	 * @return string
+	 */
+	protected function bufferedTask(BuildTask $task)
+	{
+		ob_start();
+		$task->run(new HTTPRequest('GET', '/'));
+		return ob_get_clean();
+	}
 }

src/Tasks/PopulateThemeSampleDataTask.php

Indentation +132 added lines, -132 removed lines

@@ -17,136 +17,136 @@
  */
 class PopulateThemeSampleDataTask extends BuildTask
 {
-    protected $title = 'Populate sample data for theme demo';
-
-    protected $description = 'Populates some sample data for showcasing the functionality of the '
-        . 'starter and Wātea themes';
-
-    /**
-     * A series of method calls to create sample data
-     *
-     * @param HTTPRequest $request
-     */
-    public function run($request)
-    {
-        if (!class_exists(UserDefinedForm::class)) {
-            return;
-        }
-        $this->handleContactForm();
-    }
-
-    /**
-     * Decide whether to create a contact user defined form, and call it to be be created if so
-     *
-     * @return $this
-     */
-    protected function handleContactForm()
-    {
-        if (!$this->getContactFormExists()) {
-            $this->createContactForm();
-        }
-        return $this;
-    }
-
-    /**
-     * Determine whether a "contact us" userform exists yet
-     *
-     * @return bool
-     */
-    protected function getContactFormExists()
-    {
-        $exists = false;
-        foreach (UserDefinedForm::get()->column('ID') as $formId) {
-            $count = Versioned::get_all_versions(UserDefinedForm::class, $formId)
-                ->filter('URLSegment', 'contact')
-                ->count();
-
-            if ($count >= 1) {
-                $exists = true;
-                break;
-            }
-        }
-        return $exists;
-    }
-
-    /**
-     * Create a "contact us" userform. Please note that this form does not have any recipients by default, so
-     * no emails will be sent. To add recipients - edit the page in the CMS and add a recipient via the "Recipients"
-     * tab.
-     *
-     * @return $this
-     */
-    protected function createContactForm()
-    {
-        $form = UserDefinedForm::create(array(
-            'Title' => 'Contact',
-            'URLSegment' => 'contact',
-            'Content' => '<p>$UserDefinedForm</p>',
-            'SubmitButtonText' => 'Submit',
-            'ClearButtonText' => 'Clear',
-            'OnCompleteMessage' => "<p>Thanks, we've received your submission and will be in touch shortly.</p>",
-            'EnableLiveValidation' => true
-        ));
-
-        $form->write();
-
-        // Add form fields
-        $fields = array(
-            EditableFormStep::create([
-                'Title' => _t(
-                    'SilverStripe\\UserForms\\Model\\EditableFormField\\EditableFormStep.TITLE_FIRST',
-                    'First Page'
-                )
-            ]),
-            EditableTextField::create([
-                'Title' => 'Name',
-                'Required' => true,
-                'RightTitle' => 'Please enter your first and last name'
-            ]),
-            EditableEmailField::create([
-                'Title' => Email::class,
-                'Required' => true,
-                'Placeholder' => 'example@example.com'
-            ]),
-            EditableTextField::create([
-                'Title' => 'Subject'
-            ]),
-            EditableTextField::create([
-                'Title' => 'Message',
-                'Required' => true,
-                'Rows' => 5
-            ])
-        );
-
-        foreach ($fields as $field) {
-            $field->write();
-            $form->Fields()->add($field);
-            $field->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
-        }
-
-        $form->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
-        $form->flushCache();
-
-        $this->output(' + Created "contact" UserDefinedForm page');
-
-        return $this;
-    }
-
-    /**
-     * Output a message either to the console or browser
-     *
-     * @param  string $message
-     * @return $this
-     */
-    protected function output($message)
-    {
-        if (Director::is_cli()) {
-            $message .= PHP_EOL;
-        } else {
-            $message = sprintf('<p>%s</p>', $message);
-        }
-        echo $message;
-
-        return $this;
-    }
+	protected $title = 'Populate sample data for theme demo';
+
+	protected $description = 'Populates some sample data for showcasing the functionality of the '
+		. 'starter and Wātea themes';
+
+	/**
+	 * A series of method calls to create sample data
+	 *
+	 * @param HTTPRequest $request
+	 */
+	public function run($request)
+	{
+		if (!class_exists(UserDefinedForm::class)) {
+			return;
+		}
+		$this->handleContactForm();
+	}
+
+	/**
+	 * Decide whether to create a contact user defined form, and call it to be be created if so
+	 *
+	 * @return $this
+	 */
+	protected function handleContactForm()
+	{
+		if (!$this->getContactFormExists()) {
+			$this->createContactForm();
+		}
+		return $this;
+	}
+
+	/**
+	 * Determine whether a "contact us" userform exists yet
+	 *
+	 * @return bool
+	 */
+	protected function getContactFormExists()
+	{
+		$exists = false;
+		foreach (UserDefinedForm::get()->column('ID') as $formId) {
+			$count = Versioned::get_all_versions(UserDefinedForm::class, $formId)
+				->filter('URLSegment', 'contact')
+				->count();
+
+			if ($count >= 1) {
+				$exists = true;
+				break;
+			}
+		}
+		return $exists;
+	}
+
+	/**
+	 * Create a "contact us" userform. Please note that this form does not have any recipients by default, so
+	 * no emails will be sent. To add recipients - edit the page in the CMS and add a recipient via the "Recipients"
+	 * tab.
+	 *
+	 * @return $this
+	 */
+	protected function createContactForm()
+	{
+		$form = UserDefinedForm::create(array(
+			'Title' => 'Contact',
+			'URLSegment' => 'contact',
+			'Content' => '<p>$UserDefinedForm</p>',
+			'SubmitButtonText' => 'Submit',
+			'ClearButtonText' => 'Clear',
+			'OnCompleteMessage' => "<p>Thanks, we've received your submission and will be in touch shortly.</p>",
+			'EnableLiveValidation' => true
+		));
+
+		$form->write();
+
+		// Add form fields
+		$fields = array(
+			EditableFormStep::create([
+				'Title' => _t(
+					'SilverStripe\\UserForms\\Model\\EditableFormField\\EditableFormStep.TITLE_FIRST',
+					'First Page'
+				)
+			]),
+			EditableTextField::create([
+				'Title' => 'Name',
+				'Required' => true,
+				'RightTitle' => 'Please enter your first and last name'
+			]),
+			EditableEmailField::create([
+				'Title' => Email::class,
+				'Required' => true,
+				'Placeholder' => 'example@example.com'
+			]),
+			EditableTextField::create([
+				'Title' => 'Subject'
+			]),
+			EditableTextField::create([
+				'Title' => 'Message',
+				'Required' => true,
+				'Rows' => 5
+			])
+		);
+
+		foreach ($fields as $field) {
+			$field->write();
+			$form->Fields()->add($field);
+			$field->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
+		}
+
+		$form->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
+		$form->flushCache();
+
+		$this->output(' + Created "contact" UserDefinedForm page');
+
+		return $this;
+	}
+
+	/**
+	 * Output a message either to the console or browser
+	 *
+	 * @param  string $message
+	 * @return $this
+	 */
+	protected function output($message)
+	{
+		if (Director::is_cli()) {
+			$message .= PHP_EOL;
+		} else {
+			$message = sprintf('<p>%s</p>', $message);
+		}
+		echo $message;
+
+		return $this;
+	}
 }

src/PageTypes/SitemapPageController.php

Indentation +41 added lines, -41 removed lines

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