silverstripe / cwp-core

tests/AtomFeedTest.php

Indentation +54 added lines, -54 removed lines

@@ -14,67 +14,67 @@
 
 class AtomFeedTest extends SapphireTest
 {
-    protected static $original_host;
+	protected static $original_host;
 
-    public function testAtomFeed()
-    {
-        $list = new ArrayList();
-        $list->push(new ItemA());
-        $list->push(new ItemB());
-        $list->push(new ItemC());
+	public function testAtomFeed()
+	{
+		$list = new ArrayList();
+		$list->push(new ItemA());
+		$list->push(new ItemB());
+		$list->push(new ItemC());
 
-        $atomFeed = new CwpAtomFeed(
-            $list,
-            "http://www.example.com",
-            "Test Atom Feed",
-            "Test Atom Feed Description"
-        );
-        $content = $atomFeed->outputToBrowser();
+		$atomFeed = new CwpAtomFeed(
+			$list,
+			"http://www.example.com",
+			"Test Atom Feed",
+			"Test Atom Feed Description"
+		);
+		$content = $atomFeed->outputToBrowser();
 
-        //Debug::message($content);
-        $this->assertContains('<link href="http://www.example.org/item-a/" />', $content);
-        $this->assertContains('<link href="http://www.example.com/item-b.html" />', $content);
-        $this->assertContains('<link href="http://www.example.com/item-c.html" />', $content);
+		//Debug::message($content);
+		$this->assertContains('<link href="http://www.example.org/item-a/" />', $content);
+		$this->assertContains('<link href="http://www.example.com/item-b.html" />', $content);
+		$this->assertContains('<link href="http://www.example.com/item-c.html" />', $content);
 
-        $this->assertContains('<title type="html">ItemA</title>', $content);
-        $this->assertContains('<title type="html">ItemB</title>', $content);
-        $this->assertContains('<title type="html">ItemC</title>', $content);
+		$this->assertContains('<title type="html">ItemA</title>', $content);
+		$this->assertContains('<title type="html">ItemB</title>', $content);
+		$this->assertContains('<title type="html">ItemC</title>', $content);
 
-        $this->assertContains("\tItemA Content\n", $content);
-        $this->assertContains("\tItemB Content\n", $content);
-        $this->assertContains("\tItemC Content\n", $content);
-    }
+		$this->assertContains("\tItemA Content\n", $content);
+		$this->assertContains("\tItemB Content\n", $content);
+		$this->assertContains("\tItemC Content\n", $content);
+	}
 
-    public function testRenderWithTemplate()
-    {
-        $atomFeed = new CwpAtomFeed(new ArrayList(), "", "", "");
-        $content = $atomFeed->outputToBrowser();
-        // test we have switched from a RSS feed test template tot he AtomFeed template
-        $this->assertNotContains('<title>Test Custom Template</title>', $content);
-    }
+	public function testRenderWithTemplate()
+	{
+		$atomFeed = new CwpAtomFeed(new ArrayList(), "", "", "");
+		$content = $atomFeed->outputToBrowser();
+		// test we have switched from a RSS feed test template tot he AtomFeed template
+		$this->assertNotContains('<title>Test Custom Template</title>', $content);
+	}
 
-    public function testLinkToFeed()
-    {
-        $link = AtomTagsStub::linkToFeed('atomLinkUrl', 'Atom feed of this blog');
-        $this->assertContains('atomLinkUrl', $link);
-        $this->assertContains('Atom feed of this blog', $link);
-        $this->assertContains('application/atom+xml', $link);
-    }
+	public function testLinkToFeed()
+	{
+		$link = AtomTagsStub::linkToFeed('atomLinkUrl', 'Atom feed of this blog');
+		$this->assertContains('atomLinkUrl', $link);
+		$this->assertContains('Atom feed of this blog', $link);
+		$this->assertContains('application/atom+xml', $link);
+	}
 
-    protected function setUp()
-    {
-        parent::setUp();
-        Config::modify()->set(Director::class, 'alternate_base_url', '/');
-        if (!self::$original_host) {
-            self::$original_host = $_SERVER['HTTP_HOST'];
-        }
-        $_SERVER['HTTP_HOST'] = 'www.example.org';
-    }
+	protected function setUp()
+	{
+		parent::setUp();
+		Config::modify()->set(Director::class, 'alternate_base_url', '/');
+		if (!self::$original_host) {
+			self::$original_host = $_SERVER['HTTP_HOST'];
+		}
+		$_SERVER['HTTP_HOST'] = 'www.example.org';
+	}
 
-    protected function tearDown()
-    {
-        parent::tearDown();
-        Config::modify()->set(Director::class, 'alternate_base_url', null);
-        $_SERVER['HTTP_HOST'] = self::$original_host;
-    }
+	protected function tearDown()
+	{
+		parent::tearDown();
+		Config::modify()->set(Director::class, 'alternate_base_url', null);
+		$_SERVER['HTTP_HOST'] = self::$original_host;
+	}
 }

tests/RichLinksExtensionTest.php

Indentation +28 added lines, -28 removed lines

@@ -7,35 +7,35 @@
 
 class RichLinksExtensionTest extends SapphireTest
 {
-    public function testContentLinkInjections()
-    {
-        $field = new DBText();
+	public function testContentLinkInjections()
+	{
+		$field = new DBText();
 
-        // External links injection.
-        $field->setValue('<a href="http://newzealand.govt.nz">New Zealand Government</a>');
-        $this->assertEquals(
-            $field->RichLinks(),
-            '<a class="external" rel="external" title="Open external link" '
-            . 'href="http://newzealand.govt.nz">New Zealand Government'
-            .'<span class="nonvisual-indicator">(external link)</span></a>',
-            'Injects attributes to external link without target.'
-        );
+		// External links injection.
+		$field->setValue('<a href="http://newzealand.govt.nz">New Zealand Government</a>');
+		$this->assertEquals(
+			$field->RichLinks(),
+			'<a class="external" rel="external" title="Open external link" '
+			. 'href="http://newzealand.govt.nz">New Zealand Government'
+			.'<span class="nonvisual-indicator">(external link)</span></a>',
+			'Injects attributes to external link without target.'
+		);
 
-        $field->setValue('<a href="http://newzealand.govt.nz" target="_blank">New Zealand Government</a>');
-        $this->assertEquals(
-            $field->RichLinks(),
-            '<a class="external" rel="external" title="Open external link" '
-            . 'href="http://newzealand.govt.nz" target="_blank">New Zealand Government'
-            .'<span class="nonvisual-indicator">(external link)</span></a>',
-            'Injects attributes to external link with target, while keeping the existing attributes.'
-        );
+		$field->setValue('<a href="http://newzealand.govt.nz" target="_blank">New Zealand Government</a>');
+		$this->assertEquals(
+			$field->RichLinks(),
+			'<a class="external" rel="external" title="Open external link" '
+			. 'href="http://newzealand.govt.nz" target="_blank">New Zealand Government'
+			.'<span class="nonvisual-indicator">(external link)</span></a>',
+			'Injects attributes to external link with target, while keeping the existing attributes.'
+		);
 
-        // Check the normal links are not affected.
-        $field->setValue('<a href="[sitetree_link,id=1]">Internal</a>');
-        $this->assertEquals(
-            $field->RichLinks(),
-            '<a href="[sitetree_link,id=1]">Internal</a>',
-            'Regular link is not modified.'
-        );
-    }
+		// Check the normal links are not affected.
+		$field->setValue('<a href="[sitetree_link,id=1]">Internal</a>');
+		$this->assertEquals(
+			$field->RichLinks(),
+			'<a href="[sitetree_link,id=1]">Internal</a>',
+			'Regular link is not modified.'
+		);
+	}
 }

tests/AtomFeedTest/AtomTagsStub.php

Indentation +7 added lines, -7 removed lines

@@ -11,11 +11,11 @@
  */
 class AtomTagsStub implements TestOnly
 {
-    public static function linkToFeed($url, $title = null)
-    {
-        $link = '<link rel="alternate" type="application/atom+xml" title="' . $title .
-            '" href="' . $url . '" />';
-        CwpAtomFeed::linkToFeed($url, $title);
-        return $link;
-    }
+	public static function linkToFeed($url, $title = null)
+	{
+		$link = '<link rel="alternate" type="application/atom+xml" title="' . $title .
+			'" href="' . $url . '" />';
+		CwpAtomFeed::linkToFeed($url, $title);
+		return $link;
+	}
 }

tests/AtomFeedTest/ItemC.php

Indentation +29 added lines, -29 removed lines

@@ -7,33 +7,33 @@
 
 class ItemC extends ViewableData implements TestOnly
 {
-    // ItemC tests fields - Title has casting, Content doesn't.
-    private static $casting = [
-        'Title' => 'Varchar',
-        'AltContent' => 'Text',
-    ];
-
-    public $Title = 'ItemC';
-
-    public function Title()
-    {
-        return "ItemC";
-    }
-
-    public function Content()
-    {
-        return "ItemC Content";
-    }
-
-    public $AltContent = "ItemC AltContent";
-
-    public function Link()
-    {
-        return "item-c.html";
-    }
-
-    public function AbsoluteLink()
-    {
-        return "http://www.example.com/item-c.html";
-    }
+	// ItemC tests fields - Title has casting, Content doesn't.
+	private static $casting = [
+		'Title' => 'Varchar',
+		'AltContent' => 'Text',
+	];
+
+	public $Title = 'ItemC';
+
+	public function Title()
+	{
+		return "ItemC";
+	}
+
+	public function Content()
+	{
+		return "ItemC Content";
+	}
+
+	public $AltContent = "ItemC AltContent";
+
+	public function Link()
+	{
+		return "item-c.html";
+	}
+
+	public function AbsoluteLink()
+	{
+		return "http://www.example.com/item-c.html";
+	}
 }

tests/AtomFeedTest/ItemB.php

Indentation +18 added lines, -18 removed lines

@@ -7,26 +7,26 @@
 
 class ItemB extends ViewableData implements TestOnly
 {
-    // ItemB tests without $casting
-    public $Title = 'ItemB';
+	// ItemB tests without $casting
+	public $Title = 'ItemB';
 
-    public function Title()
-    {
-        return "ItemB";
-    }
+	public function Title()
+	{
+		return "ItemB";
+	}
 
-    public function AbsoluteLink()
-    {
-        return "http://www.example.com/item-b.html";
-    }
+	public function AbsoluteLink()
+	{
+		return "http://www.example.com/item-b.html";
+	}
 
-    public function Content()
-    {
-        return "ItemB Content";
-    }
+	public function Content()
+	{
+		return "ItemB Content";
+	}
 
-    public function AltContent()
-    {
-        return "ItemB AltContent";
-    }
+	public function AltContent()
+	{
+		return "ItemB AltContent";
+	}
 }

tests/AtomFeedTest/ItemA.php

Indentation +28 added lines, -28 removed lines

@@ -8,32 +8,32 @@
 
 class ItemA extends ViewableData implements TestOnly
 {
-    // Atom-feed items must have $casting/$db information.
-    private static $casting = [
-        'Title' => 'Varchar',
-        'Content' => 'Text',
-        'AltContent' => 'Text',
-    ];
-
-    public $Title = 'ItemA';
-
-    public function Title()
-    {
-        return "ItemA";
-    }
-
-    public function Content()
-    {
-        return "ItemA Content";
-    }
-
-    public function AltContent()
-    {
-        return "ItemA AltContent";
-    }
-
-    public function Link($action = null)
-    {
-        return Controller::join_links("item-a/", $action);
-    }
+	// Atom-feed items must have $casting/$db information.
+	private static $casting = [
+		'Title' => 'Varchar',
+		'Content' => 'Text',
+		'AltContent' => 'Text',
+	];
+
+	public $Title = 'ItemA';
+
+	public function Title()
+	{
+		return "ItemA";
+	}
+
+	public function Content()
+	{
+		return "ItemA Content";
+	}
+
+	public function AltContent()
+	{
+		return "ItemA AltContent";
+	}
+
+	public function Link($action = null)
+	{
+		return Controller::join_links("item-a/", $action);
+	}
 }

tests/Control/InitialisationMiddlewareTest.php

Spacing +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
      */
     protected function runMiddleware()
     {
-        $this->middleware->process($this->request, function () {
+        $this->middleware->process($this->request, function() {
             // no op
         });
     }

Indentation +102 added lines, -102 removed lines

@@ -14,106 +14,106 @@
 
 class InitialisationMiddlewareTest extends FunctionalTest
 {
-    /**
-     * @var HTTPRequest
-     */
-    protected $request;
-
-    /**
-     * @var InitialisationMiddleware
-     */
-    protected $middleware;
-
-    protected $usesDatabase = true;
-
-    protected function setUp()
-    {
-        parent::setUp();
-
-        $this->request = new HTTPRequest('GET', '/');
-        $this->middleware = new InitialisationMiddleware();
-
-        Environment::setEnv('SS_OUTBOUND_PROXY', '');
-        Environment::setEnv('SS_OUTBOUND_PROXY_PORT', '');
-        putenv('NO_PROXY=');
-    }
-
-    public function testDoNotConfigureProxyIfNoEnvironmentVarsAreSet()
-    {
-        $this->runMiddleware();
-
-        $this->assertEmpty(
-            Environment::getEnv('http_proxy'),
-            'Proxy information is not set if no outbound proxy is configured'
-        );
-    }
-
-    public function testConfigureEgressProxyWhenVarsAreSet()
-    {
-        Environment::setEnv('SS_OUTBOUND_PROXY', 'http://example.com');
-        Environment::setEnv('SS_OUTBOUND_PROXY_PORT', '8024');
-
-        $this->runMiddleware();
-
-        $this->assertEquals(
-            'http://example.com:8024',
-            Environment::getEnv('http_proxy'),
-            'Proxy is configured with proxy and port'
-        );
-    }
-
-    public function testDoNotConfigureProxyDomainExclusionsWhenNoneAreDefined()
-    {
-        Config::modify()->remove(InitialisationMiddleware::class, 'egress_proxy_exclude_domains');
-
-        $this->runMiddleware();
-
-        $this->assertSame(
-            '',
-            Environment::getEnv('NO_PROXY'),
-            'No domain exclusions are set when none are defined'
-        );
-    }
-
-    public function testConfigureEgressProxyDomainExclusions()
-    {
-        Config::modify()->set(
-            InitialisationMiddleware::class,
-            'egress_proxy_exclude_domains',
-            'example.com'
-        );
-
-        putenv('NO_PROXY=foo.com,bar.com');
-        $this->runMiddleware();
-
-        $this->assertSame(
-            'foo.com,bar.com,example.com',
-            Environment::getEnv('NO_PROXY'),
-            'Domain exclusions are combined with existing values and configuration settings'
-        );
-    }
-
-    public function testSecurityHeadersAddedByDefault()
-    {
-        $response = $this->get('Security/login');
-        $this->assertArrayHasKey('x-xss-protection', $response->getHeaders());
-        $this->assertSame('1; mode=block', $response->getHeader('x-xss-protection'));
-    }
-
-    public function testXSSProtectionHeaderNotAdded()
-    {
-        Config::modify()->set(InitialisationMiddleware::class, 'xss_protection_enabled', false);
-        $response = $this->get('Security/login');
-        $this->assertArrayNotHasKey('x-xss-protection', $response->getHeaders());
-    }
-
-    /**
-     * Runs the middleware with a stubbed delegate
-     */
-    protected function runMiddleware()
-    {
-        $this->middleware->process($this->request, function () {
-            // no op
-        });
-    }
+	/**
+	 * @var HTTPRequest
+	 */
+	protected $request;
+
+	/**
+	 * @var InitialisationMiddleware
+	 */
+	protected $middleware;
+
+	protected $usesDatabase = true;
+
+	protected function setUp()
+	{
+		parent::setUp();
+
+		$this->request = new HTTPRequest('GET', '/');
+		$this->middleware = new InitialisationMiddleware();
+
+		Environment::setEnv('SS_OUTBOUND_PROXY', '');
+		Environment::setEnv('SS_OUTBOUND_PROXY_PORT', '');
+		putenv('NO_PROXY=');
+	}
+
+	public function testDoNotConfigureProxyIfNoEnvironmentVarsAreSet()
+	{
+		$this->runMiddleware();
+
+		$this->assertEmpty(
+			Environment::getEnv('http_proxy'),
+			'Proxy information is not set if no outbound proxy is configured'
+		);
+	}
+
+	public function testConfigureEgressProxyWhenVarsAreSet()
+	{
+		Environment::setEnv('SS_OUTBOUND_PROXY', 'http://example.com');
+		Environment::setEnv('SS_OUTBOUND_PROXY_PORT', '8024');
+
+		$this->runMiddleware();
+
+		$this->assertEquals(
+			'http://example.com:8024',
+			Environment::getEnv('http_proxy'),
+			'Proxy is configured with proxy and port'
+		);
+	}
+
+	public function testDoNotConfigureProxyDomainExclusionsWhenNoneAreDefined()
+	{
+		Config::modify()->remove(InitialisationMiddleware::class, 'egress_proxy_exclude_domains');
+
+		$this->runMiddleware();
+
+		$this->assertSame(
+			'',
+			Environment::getEnv('NO_PROXY'),
+			'No domain exclusions are set when none are defined'
+		);
+	}
+
+	public function testConfigureEgressProxyDomainExclusions()
+	{
+		Config::modify()->set(
+			InitialisationMiddleware::class,
+			'egress_proxy_exclude_domains',
+			'example.com'
+		);
+
+		putenv('NO_PROXY=foo.com,bar.com');
+		$this->runMiddleware();
+
+		$this->assertSame(
+			'foo.com,bar.com,example.com',
+			Environment::getEnv('NO_PROXY'),
+			'Domain exclusions are combined with existing values and configuration settings'
+		);
+	}
+
+	public function testSecurityHeadersAddedByDefault()
+	{
+		$response = $this->get('Security/login');
+		$this->assertArrayHasKey('x-xss-protection', $response->getHeaders());
+		$this->assertSame('1; mode=block', $response->getHeader('x-xss-protection'));
+	}
+
+	public function testXSSProtectionHeaderNotAdded()
+	{
+		Config::modify()->set(InitialisationMiddleware::class, 'xss_protection_enabled', false);
+		$response = $this->get('Security/login');
+		$this->assertArrayNotHasKey('x-xss-protection', $response->getHeaders());
+	}
+
+	/**
+	 * Runs the middleware with a stubbed delegate
+	 */
+	protected function runMiddleware()
+	{
+		$this->middleware->process($this->request, function () {
+			// no op
+		});
+	}
 }

src/Extension/CustomHtmlEditorField.php

Indentation +9 added lines, -9 removed lines

@@ -13,13 +13,13 @@
 class CustomHtmlEditorFieldToolbar extends Extension
 {
 
-    /**
-     * @param Form $form
-     * @return void
-     */
-    public function updateMediaForm(Form $form)
-    {
-        Requirements::add_i18n_javascript('cwp/cwp-core:javascript/lang');
-        Requirements::javascript('cwp/cwp-core:javascript/CustomHtmlEditorFieldToolbar.js');
-    }
+	/**
+	 * @param Form $form
+	 * @return void
+	 */
+	public function updateMediaForm(Form $form)
+	{
+		Requirements::add_i18n_javascript('cwp/cwp-core:javascript/lang');
+		Requirements::javascript('cwp/cwp-core:javascript/CustomHtmlEditorFieldToolbar.js');
+	}
 }

src/Extension/CwpHtmlEditorConfig.php

Indentation +14 added lines, -14 removed lines

@@ -7,20 +7,20 @@
 class CwpHtmlEditorConfig extends DataExtension
 {
 
-    /**
-     * @return string
-     *
-     * Override the default HtmlEditorConfig from 'cms' to 'cwp' defined in cwp-core/_config.php
-     * However if the group has a custom editor configuration set, use that instead.
-     */
-    public function getHtmlEditorConfig()
-    {
-        $originalConfig = $this->owner->getField("HtmlEditorConfig");
+	/**
+	 * @return string
+	 *
+	 * Override the default HtmlEditorConfig from 'cms' to 'cwp' defined in cwp-core/_config.php
+	 * However if the group has a custom editor configuration set, use that instead.
+	 */
+	public function getHtmlEditorConfig()
+	{
+		$originalConfig = $this->owner->getField("HtmlEditorConfig");
 
-        if ($originalConfig) {
-            return $originalConfig;
-        }
+		if ($originalConfig) {
+			return $originalConfig;
+		}
 
-        return 'cwp';
-    }
+		return 'cwp';
+	}
 }