silverstripe / silverstripe-environmentcheck

src/Checks/EnvTypeCheck.php

Indentation +24 added lines, -24 removed lines

@@ -13,28 +13,28 @@
  */
 class EnvTypeCheck implements EnvironmentCheck
 {
-    /**
-     * Check the environment setting.
-     *
-     * @return array
-     */
-    public function check()
-    {
-        $envSetting = Director::get_environment_type();
-        switch ($envSetting) {
-            case 'live':
-                return [
-                    EnvironmentCheck::OK,
-                    "Env setting is 'live'",
-                ];
-            // Fallthrough
-            default:
-            case 'dev':
-            case 'test':
-                return [
-                    EnvironmentCheck::ERROR,
-                    "Env setting is '{$envSetting}' and may disclose information",
-                ];
-        }
-    }
+	/**
+	 * Check the environment setting.
+	 *
+	 * @return array
+	 */
+	public function check()
+	{
+		$envSetting = Director::get_environment_type();
+		switch ($envSetting) {
+			case 'live':
+				return [
+					EnvironmentCheck::OK,
+					"Env setting is 'live'",
+				];
+			// Fallthrough
+			default:
+			case 'dev':
+			case 'test':
+				return [
+					EnvironmentCheck::ERROR,
+					"Env setting is '{$envSetting}' and may disclose information",
+				];
+		}
+	}
 }

tests/Checks/EnvTypeCheckTest.php

Indentation +45 added lines, -45 removed lines

@@ -14,60 +14,60 @@
  */
 class EnvTypeCheckTest extends SapphireTest
 {
-    /**
-     * Check is OK when in live mode
-     *
-     * @return void
-     */
-    public function testEnvSettingLive()
-    {
-        /** @var Kernel $kernel */
-        $kernel = Injector::inst()->get(Kernel::class);
-        $kernel->setEnvironment('live');
+	/**
+	 * Check is OK when in live mode
+	 *
+	 * @return void
+	 */
+	public function testEnvSettingLive()
+	{
+		/** @var Kernel $kernel */
+		$kernel = Injector::inst()->get(Kernel::class);
+		$kernel->setEnvironment('live');
 
-        $this->assertTrue(Director::isLive());
+		$this->assertTrue(Director::isLive());
 
-        $checker = Injector::inst()->get(EnvTypeCheck::class);
-        $result = $checker->check();
+		$checker = Injector::inst()->get(EnvTypeCheck::class);
+		$result = $checker->check();
 
-        $this->assertSame($result[0], EnvironmentCheck::OK);
-    }
+		$this->assertSame($result[0], EnvironmentCheck::OK);
+	}
 
-    /**
-     * Check is ERROR when in test mode
-     *
-     * @return void
-     */
-    public function testEnvSettingTest()
-    {
-        /** @var Kernel $kernel */
-        $kernel = Injector::inst()->get(Kernel::class);
-        $kernel->setEnvironment('test');
+	/**
+	 * Check is ERROR when in test mode
+	 *
+	 * @return void
+	 */
+	public function testEnvSettingTest()
+	{
+		/** @var Kernel $kernel */
+		$kernel = Injector::inst()->get(Kernel::class);
+		$kernel->setEnvironment('test');
 
-        $this->assertTrue(Director::isTest());
+		$this->assertTrue(Director::isTest());
 
-        $checker = Injector::inst()->get(EnvTypeCheck::class);
-        $result = $checker->check();
+		$checker = Injector::inst()->get(EnvTypeCheck::class);
+		$result = $checker->check();
 
-        $this->assertSame($result[0], EnvironmentCheck::ERROR);
-    }
+		$this->assertSame($result[0], EnvironmentCheck::ERROR);
+	}
 
-    /**
-     * Check is ERROR when in dev mode
-     *
-     * @return void
-     */
-    public function testEnvSettingDev()
-    {
-        /** @var Kernel $kernel */
-        $kernel = Injector::inst()->get(Kernel::class);
-        $kernel->setEnvironment('dev');
+	/**
+	 * Check is ERROR when in dev mode
+	 *
+	 * @return void
+	 */
+	public function testEnvSettingDev()
+	{
+		/** @var Kernel $kernel */
+		$kernel = Injector::inst()->get(Kernel::class);
+		$kernel->setEnvironment('dev');
 
-        $this->assertTrue(Director::isDev());
+		$this->assertTrue(Director::isDev());
 
-        $checker = Injector::inst()->get(EnvTypeCheck::class);
-        $result = $checker->check();
+		$checker = Injector::inst()->get(EnvTypeCheck::class);
+		$result = $checker->check();
 
-        $this->assertSame($result[0], EnvironmentCheck::ERROR);
-    }
+		$this->assertSame($result[0], EnvironmentCheck::ERROR);
+	}
 }

tests/Checks/CacheHeadersCheckTest.php

Indentation +72 added lines, -72 removed lines

@@ -15,87 +15,87 @@
  */
 class CacheHeadersCheckTest extends SapphireTest
 {
-    /**
-     * Test that directives that must be included, are.
-     *
-     * @return void
-     */
-    public function testMustInclude()
-    {
-        // Create a mock and queue responses
-        $mock = new MockHandler([
-            new Response(200, ['Cache-Control' => 'must-revalidate', 'ETag' => '123']),
-            new Response(200, ['Cache-Control' =>'no-cache', 'ETag' => '123']),
-            new Response(200, ['ETag' => '123']),
-            new Response(200, ['Cache-Control' => 'must-revalidate, private', 'ETag' => '123']),
-        ]);
+	/**
+	 * Test that directives that must be included, are.
+	 *
+	 * @return void
+	 */
+	public function testMustInclude()
+	{
+		// Create a mock and queue responses
+		$mock = new MockHandler([
+			new Response(200, ['Cache-Control' => 'must-revalidate', 'ETag' => '123']),
+			new Response(200, ['Cache-Control' =>'no-cache', 'ETag' => '123']),
+			new Response(200, ['ETag' => '123']),
+			new Response(200, ['Cache-Control' => 'must-revalidate, private', 'ETag' => '123']),
+		]);
 
-        $handler = HandlerStack::create($mock);
-        $client = new Client(['handler' => $handler]);
+		$handler = HandlerStack::create($mock);
+		$client = new Client(['handler' => $handler]);
 
-        $cacheHeadersCheck = new CacheHeadersCheck('/', ['must-revalidate']);
-        $cacheHeadersCheck->client = $client;
+		$cacheHeadersCheck = new CacheHeadersCheck('/', ['must-revalidate']);
+		$cacheHeadersCheck->client = $client;
 
-        // Run checks for each response above
-        $this->assertContains(EnvironmentCheck::OK, $cacheHeadersCheck->check());
-        $this->assertContains(EnvironmentCheck::ERROR, $cacheHeadersCheck->check());
-        $this->assertContains(EnvironmentCheck::ERROR, $cacheHeadersCheck->check());
-        $this->assertContains(EnvironmentCheck::OK, $cacheHeadersCheck->check());
-    }
+		// Run checks for each response above
+		$this->assertContains(EnvironmentCheck::OK, $cacheHeadersCheck->check());
+		$this->assertContains(EnvironmentCheck::ERROR, $cacheHeadersCheck->check());
+		$this->assertContains(EnvironmentCheck::ERROR, $cacheHeadersCheck->check());
+		$this->assertContains(EnvironmentCheck::OK, $cacheHeadersCheck->check());
+	}
 
-    /**
-     * Test that directives that must be excluded, are.
-     *
-     * @return void
-     */
-    public function testMustExclude()
-    {
-        // Create a mock and queue responses
-        $mock = new MockHandler([
-            new Response(200, ['Cache-Control' => 'must-revalidate', 'ETag' => '123']),
-            new Response(200, ['Cache-Control' =>'no-cache', 'ETag' => '123']),
-            new Response(200, ['ETag' => '123']),
-            new Response(200, ['Cache-Control' =>'private, no-store', ' ETag' => '123']),
-        ]);
+	/**
+	 * Test that directives that must be excluded, are.
+	 *
+	 * @return void
+	 */
+	public function testMustExclude()
+	{
+		// Create a mock and queue responses
+		$mock = new MockHandler([
+			new Response(200, ['Cache-Control' => 'must-revalidate', 'ETag' => '123']),
+			new Response(200, ['Cache-Control' =>'no-cache', 'ETag' => '123']),
+			new Response(200, ['ETag' => '123']),
+			new Response(200, ['Cache-Control' =>'private, no-store', ' ETag' => '123']),
+		]);
 
-        $handler = HandlerStack::create($mock);
-        $client = new Client(['handler' => $handler]);
+		$handler = HandlerStack::create($mock);
+		$client = new Client(['handler' => $handler]);
 
-        $cacheHeadersCheck = new CacheHeadersCheck('/', [], ["no-store", "no-cache", "private"]);
-        $cacheHeadersCheck->client = $client;
+		$cacheHeadersCheck = new CacheHeadersCheck('/', [], ["no-store", "no-cache", "private"]);
+		$cacheHeadersCheck->client = $client;
 
-        // Run checks for each response above
-        $this->assertContains(EnvironmentCheck::OK, $cacheHeadersCheck->check());
-        $this->assertContains(EnvironmentCheck::ERROR, $cacheHeadersCheck->check());
-        $this->assertContains(EnvironmentCheck::OK, $cacheHeadersCheck->check());
-        $this->assertContains(EnvironmentCheck::ERROR, $cacheHeadersCheck->check());
-    }
+		// Run checks for each response above
+		$this->assertContains(EnvironmentCheck::OK, $cacheHeadersCheck->check());
+		$this->assertContains(EnvironmentCheck::ERROR, $cacheHeadersCheck->check());
+		$this->assertContains(EnvironmentCheck::OK, $cacheHeadersCheck->check());
+		$this->assertContains(EnvironmentCheck::ERROR, $cacheHeadersCheck->check());
+	}
 
-    /**
-     * Test that Etag header must exist in response.
-     *
-     * @return void
-     */
-    public function testEtag()
-    {
-        // Create a mock and queue responses
-        $mock = new MockHandler([
-            new Response(200, ['Cache-Control' => 'must-revalidate', 'ETag' => '123']),
-            new Response(200, ['Cache-Control' =>'no-cache']),
-            new Response(200, ['ETag' => '123']),
-            new Response(200, []),
-        ]);
+	/**
+	 * Test that Etag header must exist in response.
+	 *
+	 * @return void
+	 */
+	public function testEtag()
+	{
+		// Create a mock and queue responses
+		$mock = new MockHandler([
+			new Response(200, ['Cache-Control' => 'must-revalidate', 'ETag' => '123']),
+			new Response(200, ['Cache-Control' =>'no-cache']),
+			new Response(200, ['ETag' => '123']),
+			new Response(200, []),
+		]);
 
-        $handler = HandlerStack::create($mock);
-        $client = new Client(['handler' => $handler]);
+		$handler = HandlerStack::create($mock);
+		$client = new Client(['handler' => $handler]);
 
-        $cacheHeadersCheck = new CacheHeadersCheck('/');
-        $cacheHeadersCheck->client = $client;
+		$cacheHeadersCheck = new CacheHeadersCheck('/');
+		$cacheHeadersCheck->client = $client;
 
-        // Run checks for each response above
-        $this->assertContains(EnvironmentCheck::OK, $cacheHeadersCheck->check());
-        $this->assertContains(EnvironmentCheck::ERROR, $cacheHeadersCheck->check());
-        $this->assertContains(EnvironmentCheck::OK, $cacheHeadersCheck->check());
-        $this->assertContains(EnvironmentCheck::ERROR, $cacheHeadersCheck->check());
-    }
+		// Run checks for each response above
+		$this->assertContains(EnvironmentCheck::OK, $cacheHeadersCheck->check());
+		$this->assertContains(EnvironmentCheck::ERROR, $cacheHeadersCheck->check());
+		$this->assertContains(EnvironmentCheck::OK, $cacheHeadersCheck->check());
+		$this->assertContains(EnvironmentCheck::ERROR, $cacheHeadersCheck->check());
+	}
 }

tests/Checks/SessionCheckTest.php

Indentation +50 added lines, -50 removed lines

@@ -15,62 +15,62 @@
  */
 class SessionCheckTest extends SapphireTest
 {
-    /**
-     * @var SilverStripe\EnvironmentCheck\Checks\SessionCheck
-     */
-    public $sessionCheck = null;
+	/**
+	 * @var SilverStripe\EnvironmentCheck\Checks\SessionCheck
+	 */
+	public $sessionCheck = null;
 
-    /**
-     * Create a session check for use by tests.
-     *
-     * @return void
-     */
-    protected function setUp()
-    {
-        parent::setUp();
-        $this->sessionCheck = new SessionCheck('/');
-    }
+	/**
+	 * Create a session check for use by tests.
+	 *
+	 * @return void
+	 */
+	protected function setUp()
+	{
+		parent::setUp();
+		$this->sessionCheck = new SessionCheck('/');
+	}
 
-    /**
-     * Env check reports error when session cookies are being set.
-     *
-     * @return void
-     */
-    public function testSessionSet()
-    {
-        // Create a mock and queue two responses.
-        $mock = new MockHandler([
-            new Response(200, ['Set-Cookie' => 'PHPSESSID:foo']),
-            new Response(200, ['Set-Cookie' => 'SECSESSID:bar'])
-        ]);
+	/**
+	 * Env check reports error when session cookies are being set.
+	 *
+	 * @return void
+	 */
+	public function testSessionSet()
+	{
+		// Create a mock and queue two responses.
+		$mock = new MockHandler([
+			new Response(200, ['Set-Cookie' => 'PHPSESSID:foo']),
+			new Response(200, ['Set-Cookie' => 'SECSESSID:bar'])
+		]);
 
-        $handler = HandlerStack::create($mock);
-        $client = new Client(['handler' => $handler]);
-        $this->sessionCheck->client = $client;
+		$handler = HandlerStack::create($mock);
+		$client = new Client(['handler' => $handler]);
+		$this->sessionCheck->client = $client;
 
-        // Check for PHPSESSID
-        $this->assertContains(EnvironmentCheck::ERROR, $this->sessionCheck->check());
+		// Check for PHPSESSID
+		$this->assertContains(EnvironmentCheck::ERROR, $this->sessionCheck->check());
 
-        // Check for SECSESSID
-        $this->assertContains(EnvironmentCheck::ERROR, $this->sessionCheck->check());
-    }
+		// Check for SECSESSID
+		$this->assertContains(EnvironmentCheck::ERROR, $this->sessionCheck->check());
+	}
 
-    /**
-     * Env check responds OK when no session cookies are set in response.
-     *
-     * @return void
-     */
-    public function testSessionNotSet()
-    {
-        // Create a mock and queue two responses.
-        $mock = new MockHandler([
-            new Response(200)
-        ]);
+	/**
+	 * Env check responds OK when no session cookies are set in response.
+	 *
+	 * @return void
+	 */
+	public function testSessionNotSet()
+	{
+		// Create a mock and queue two responses.
+		$mock = new MockHandler([
+			new Response(200)
+		]);
 
-        $handler = HandlerStack::create($mock);
-        $client = new Client(['handler' => $handler]);
-        $this->sessionCheck->client = $client;
+		$handler = HandlerStack::create($mock);
+		$client = new Client(['handler' => $handler]);
+		$this->sessionCheck->client = $client;
 
-        $this->assertContains(EnvironmentCheck::OK, $this->sessionCheck->check());
-    }
+		$this->assertContains(EnvironmentCheck::OK, $this->sessionCheck->check());
+	}
 }

src/Services/ClientFactory.php

Indentation +29 added lines, -29 removed lines

@@ -14,36 +14,36 @@
  */
 class ClientFactory implements Factory
 {
-    use Configurable;
+	use Configurable;
 
-    /**
-     * Default config for Guzzle client.
-     *
-     * @var array
-     */
-    private static $default_config = [];
+	/**
+	 * Default config for Guzzle client.
+	 *
+	 * @var array
+	 */
+	private static $default_config = [];
 
-    /**
-     * Wrapper to create a Guzzle client.
-     *
-     * {@inheritdoc}
-     */
-    public function create($service, array $params = [])
-    {
-        return new GuzzleClient($this->getConfig($params));
-    }
+	/**
+	 * Wrapper to create a Guzzle client.
+	 *
+	 * {@inheritdoc}
+	 */
+	public function create($service, array $params = [])
+	{
+		return new GuzzleClient($this->getConfig($params));
+	}
 
-    /**
-     * Merge config provided from yaml with default config
-     *
-     * @param array $overrides
-     * @return array
-     */
-    public function getConfig(array $overrides)
-    {
-        return array_merge(
-            $this->config()->get('default_config'),
-            $overrides
-        );
-    }
+	/**
+	 * Merge config provided from yaml with default config
+	 *
+	 * @param array $overrides
+	 * @return array
+	 */
+	public function getConfig(array $overrides)
+	{
+		return array_merge(
+			$this->config()->get('default_config'),
+			$overrides
+		);
+	}
 }

src/Traits/Fetcher.php

Indentation +34 added lines, -34 removed lines

@@ -11,41 +11,41 @@
  */
 trait Fetcher
 {
-    /**
-     * Client for making requests, set vi Injector.
-     *
-     * @see SilverStripe\EnvironmentCheck\Services
-     *
-     * @var GuzzleHttp\Client
-     */
-    public $client = null;
+	/**
+	 * Client for making requests, set vi Injector.
+	 *
+	 * @see SilverStripe\EnvironmentCheck\Services
+	 *
+	 * @var GuzzleHttp\Client
+	 */
+	public $client = null;
 
-    /**
-     * Absolute URL for requests.
-     *
-     * @var string
-     */
-    protected $url;
+	/**
+	 * Absolute URL for requests.
+	 *
+	 * @var string
+	 */
+	protected $url;
 
-    /**
-     * Set URL for requests.
-     *
-     * @param string $url Relative URL
-     * @return self
-     */
-    public function setURL($url)
-    {
-        $this->url = Director::absoluteURL($url);
-        return $this;
-    }
+	/**
+	 * Set URL for requests.
+	 *
+	 * @param string $url Relative URL
+	 * @return self
+	 */
+	public function setURL($url)
+	{
+		$this->url = Director::absoluteURL($url);
+		return $this;
+	}
 
-    /**
-     * Getter for URL
-     *
-     * @return string
-     */
-    public function getURL()
-    {
-        return $this->url;
-    }
+	/**
+	 * Getter for URL
+	 *
+	 * @return string
+	 */
+	public function getURL()
+	{
+		return $this->url;
+	}
 }