silverstripe / silverstripe-environmentcheck

code/checks/FileWriteableCheck.php

Indentation +60 added lines, -60 removed lines

@@ -5,73 +5,73 @@
  */
 class FileWriteableCheck implements EnvironmentCheck
 {
-    /**
-     * @var string
-     */
-    protected $path;
+	/**
+	 * @var string
+	 */
+	protected $path;
 
-    /**
-     * @param string $path The full path. If a relative path, it will relative to the BASE_PATH.
-     */
-    public function __construct($path)
-    {
-        $this->path = $path;
-    }
+	/**
+	 * @param string $path The full path. If a relative path, it will relative to the BASE_PATH.
+	 */
+	public function __construct($path)
+	{
+		$this->path = $path;
+	}
 
-    /**
-     * @inheritdoc
-     *
-     * @return array
-     */
-    public function check()
-    {
-        if ($this->path[0] == '/') {
-            $filename = $this->path;
-        } else {
-            $filename = BASE_PATH . DIRECTORY_SEPARATOR . str_replace('/', DIRECTORY_SEPARATOR, $this->path);
-        }
+	/**
+	 * @inheritdoc
+	 *
+	 * @return array
+	 */
+	public function check()
+	{
+		if ($this->path[0] == '/') {
+			$filename = $this->path;
+		} else {
+			$filename = BASE_PATH . DIRECTORY_SEPARATOR . str_replace('/', DIRECTORY_SEPARATOR, $this->path);
+		}
         
-        if (file_exists($filename)) {
-            $isWriteable = is_writeable($filename);
-        } else {
-            $isWriteable = is_writeable(dirname($filename));
-        }
+		if (file_exists($filename)) {
+			$isWriteable = is_writeable($filename);
+		} else {
+			$isWriteable = is_writeable(dirname($filename));
+		}
         
-        if (!$isWriteable) {
-            if (function_exists('posix_getgroups')) {
-                $userID = posix_geteuid();
-                $user = posix_getpwuid($userID);
+		if (!$isWriteable) {
+			if (function_exists('posix_getgroups')) {
+				$userID = posix_geteuid();
+				$user = posix_getpwuid($userID);
 
-                $currentOwnerID = fileowner(file_exists($filename) ? $filename : dirname($filename));
-                $currentOwner = posix_getpwuid($currentOwnerID);
+				$currentOwnerID = fileowner(file_exists($filename) ? $filename : dirname($filename));
+				$currentOwner = posix_getpwuid($currentOwnerID);
 
-                $message = "User '$user[name]' needs to be able to write to this file:\n$filename\n\nThe file is currently owned by '$currentOwner[name]'.  ";
+				$message = "User '$user[name]' needs to be able to write to this file:\n$filename\n\nThe file is currently owned by '$currentOwner[name]'.  ";
 
-                if ($user['name'] == $currentOwner['name']) {
-                    $message .= "We recommend that you make the file writeable.";
-                } else {
-                    $groups = posix_getgroups();
-                    $groupList = array();
-                    foreach ($groups as $group) {
-                        $groupInfo = posix_getgrgid($group);
-                        if (in_array($currentOwner['name'], $groupInfo['members'])) {
-                            $groupList[] = $groupInfo['name'];
-                        }
-                    }
-                    if ($groupList) {
-                        $message .= "	We recommend that you make the file group-writeable and change the group to one of these groups:\n - ". implode("\n - ", $groupList)
-                            . "\n\nFor example:\nchmod g+w $filename\nchgrp " . $groupList[0] . " $filename";
-                    } else {
-                        $message .= "  There is no user-group that contains both the web-server user and the owner of this file.  Change the ownership of the file, create a new group, or temporarily make the file writeable by everyone during the install process.";
-                    }
-                }
-            } else {
-                $message = "The webserver user needs to be able to write to this file:\n$filename";
-            }
+				if ($user['name'] == $currentOwner['name']) {
+					$message .= "We recommend that you make the file writeable.";
+				} else {
+					$groups = posix_getgroups();
+					$groupList = array();
+					foreach ($groups as $group) {
+						$groupInfo = posix_getgrgid($group);
+						if (in_array($currentOwner['name'], $groupInfo['members'])) {
+							$groupList[] = $groupInfo['name'];
+						}
+					}
+					if ($groupList) {
+						$message .= "	We recommend that you make the file group-writeable and change the group to one of these groups:\n - ". implode("\n - ", $groupList)
+							. "\n\nFor example:\nchmod g+w $filename\nchgrp " . $groupList[0] . " $filename";
+					} else {
+						$message .= "  There is no user-group that contains both the web-server user and the owner of this file.  Change the ownership of the file, create a new group, or temporarily make the file writeable by everyone during the install process.";
+					}
+				}
+			} else {
+				$message = "The webserver user needs to be able to write to this file:\n$filename";
+			}
             
-            return array(EnvironmentCheck::ERROR, $message);
-        }
+			return array(EnvironmentCheck::ERROR, $message);
+		}
 
-        return array(EnvironmentCheck::OK,'');
-    }
+		return array(EnvironmentCheck::OK,'');
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -59,7 +59,7 @@ 
                         }
                     }
                     if ($groupList) {
-                        $message .= "	We recommend that you make the file group-writeable and change the group to one of these groups:\n - ". implode("\n - ", $groupList)
+                        $message .= "	We recommend that you make the file group-writeable and change the group to one of these groups:\n - " . implode("\n - ", $groupList)
                             . "\n\nFor example:\nchmod g+w $filename\nchgrp " . $groupList[0] . " $filename";
                     } else {
                         $message .= "  There is no user-group that contains both the web-server user and the owner of this file.  Change the ownership of the file, create a new group, or temporarily make the file writeable by everyone during the install process.";
@@ -72,6 +72,6 @@ 
             return array(EnvironmentCheck::ERROR, $message);
         }
 
-        return array(EnvironmentCheck::OK,'');
+        return array(EnvironmentCheck::OK, '');
     }
 }

code/checks/HasClassCheck.php

Indentation +24 added lines, -24 removed lines

@@ -5,30 +5,30 @@
  */
 class HasClassCheck implements EnvironmentCheck
 {
-    /**
-     * @var string
-     */
-    protected $className;
+	/**
+	 * @var string
+	 */
+	protected $className;
 
-    /**
-     * @param string $className The name of the class to look for.
-     */
-    public function __construct($className)
-    {
-        $this->className = $className;
-    }
+	/**
+	 * @param string $className The name of the class to look for.
+	 */
+	public function __construct($className)
+	{
+		$this->className = $className;
+	}
 
-    /**
-     * @inheritdoc
-     *
-     * @return array
-     */
-    public function check()
-    {
-        if (class_exists($this->className)) {
-            return array(EnvironmentCheck::OK, 'Class ' . $this->className.' exists');
-        } else {
-            return array(EnvironmentCheck::ERROR, 'Class ' . $this->className.' doesn\'t exist');
-        }
-    }
+	/**
+	 * @inheritdoc
+	 *
+	 * @return array
+	 */
+	public function check()
+	{
+		if (class_exists($this->className)) {
+			return array(EnvironmentCheck::OK, 'Class ' . $this->className.' exists');
+		} else {
+			return array(EnvironmentCheck::ERROR, 'Class ' . $this->className.' doesn\'t exist');
+		}
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -26,9 +26,9 @@
     public function check()
     {
         if (class_exists($this->className)) {
-            return array(EnvironmentCheck::OK, 'Class ' . $this->className.' exists');
+            return array(EnvironmentCheck::OK, 'Class ' . $this->className . ' exists');
         } else {
-            return array(EnvironmentCheck::ERROR, 'Class ' . $this->className.' doesn\'t exist');
+            return array(EnvironmentCheck::ERROR, 'Class ' . $this->className . ' doesn\'t exist');
         }
     }
 }

code/checks/HasFunctionCheck.php

Indentation +24 added lines, -24 removed lines

@@ -5,30 +5,30 @@
  */
 class HasFunctionCheck implements EnvironmentCheck
 {
-    /**
-     * @var string
-     */
-    protected $functionName;
+	/**
+	 * @var string
+	 */
+	protected $functionName;
 
-    /**
-     * @param string $functionName The name of the function to look for.
-     */
-    public function __construct($functionName)
-    {
-        $this->functionName = $functionName;
-    }
+	/**
+	 * @param string $functionName The name of the function to look for.
+	 */
+	public function __construct($functionName)
+	{
+		$this->functionName = $functionName;
+	}
 
-    /**
-     * @inheritdoc
-     *
-     * @return array
-     */
-    public function check()
-    {
-        if (function_exists($this->functionName)) {
-            return array(EnvironmentCheck::OK, $this->functionName.'() exists');
-        } else {
-            return array(EnvironmentCheck::ERROR, $this->functionName.'() doesn\'t exist');
-        }
-    }
+	/**
+	 * @inheritdoc
+	 *
+	 * @return array
+	 */
+	public function check()
+	{
+		if (function_exists($this->functionName)) {
+			return array(EnvironmentCheck::OK, $this->functionName.'() exists');
+		} else {
+			return array(EnvironmentCheck::ERROR, $this->functionName.'() doesn\'t exist');
+		}
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -26,9 +26,9 @@
     public function check()
     {
         if (function_exists($this->functionName)) {
-            return array(EnvironmentCheck::OK, $this->functionName.'() exists');
+            return array(EnvironmentCheck::OK, $this->functionName . '() exists');
         } else {
-            return array(EnvironmentCheck::ERROR, $this->functionName.'() doesn\'t exist');
+            return array(EnvironmentCheck::ERROR, $this->functionName . '() doesn\'t exist');
         }
     }
 }

code/checks/SolrIndexCheck.php

Indentation +40 added lines, -40 removed lines

@@ -7,50 +7,50 @@
  */
 class SolrIndexCheck implements EnvironmentCheck
 {
-    /**
-     * @var null|string
-     */
-    protected $indexClass;
+	/**
+	 * @var null|string
+	 */
+	protected $indexClass;
 
-    /**
-     * @param string $indexClass Limit the index checks to the specified class and all its subclasses.
-     */
-    public function __construct($indexClass = null)
-    {
-        $this->indexClass = $indexClass;
-    }
+	/**
+	 * @param string $indexClass Limit the index checks to the specified class and all its subclasses.
+	 */
+	public function __construct($indexClass = null)
+	{
+		$this->indexClass = $indexClass;
+	}
 
-    /**
-     * @inheritdoc
-     *
-     * @return array
-     */
-    public function check()
-    {
-        $brokenCores = array();
+	/**
+	 * @inheritdoc
+	 *
+	 * @return array
+	 */
+	public function check()
+	{
+		$brokenCores = array();
 
-        if (!class_exists('Solr')) {
-            return array(
-                EnvironmentCheck::ERROR,
-                'Class `Solr` not found. Is the fulltextsearch module installed?'
-            );
-        }
+		if (!class_exists('Solr')) {
+			return array(
+				EnvironmentCheck::ERROR,
+				'Class `Solr` not found. Is the fulltextsearch module installed?'
+			);
+		}
 
-        $service = Solr::service();
-        foreach (Solr::get_indexes($this->indexClass) as $index) {
-            $core = $index->getIndexName();
-            if (!$service->coreIsActive($core)) {
-                $brokenCores[] = $core;
-            }
-        }
+		$service = Solr::service();
+		foreach (Solr::get_indexes($this->indexClass) as $index) {
+			$core = $index->getIndexName();
+			if (!$service->coreIsActive($core)) {
+				$brokenCores[] = $core;
+			}
+		}
 
-        if (!empty($brokenCores)) {
-            return array(
-                EnvironmentCheck::ERROR,
-                'The following indexes are unavailable: ' . implode($brokenCores, ', ')
-            );
-        }
+		if (!empty($brokenCores)) {
+			return array(
+				EnvironmentCheck::ERROR,
+				'The following indexes are unavailable: ' . implode($brokenCores, ', ')
+			);
+		}
 
-        return array(EnvironmentCheck::OK, 'Expected indexes are available.');
-    }
+		return array(EnvironmentCheck::OK, 'Expected indexes are available.');
+	}
 }

code/checks/URLCheck.php

Indentation +41 added lines, -41 removed lines

@@ -7,52 +7,52 @@
  */
 class URLCheck implements EnvironmentCheck
 {
-    /**
-     * @var string
-     */
-    protected $url;
+	/**
+	 * @var string
+	 */
+	protected $url;
 
-    /**
-     * @var string
-     */
-    protected $testString;
+	/**
+	 * @var string
+	 */
+	protected $testString;
     
-    /*
+	/*
      * @param string $url The URL to check, relative to the site (homepage is '').
      * @param string $testString An optional piece of text to search for on the homepage.
      */
-    public function __construct($url = '', $testString = '')
-    {
-        $this->url = $url;
-        $this->testString = $testString;
-    }
+	public function __construct($url = '', $testString = '')
+	{
+		$this->url = $url;
+		$this->testString = $testString;
+	}
 
-    /**
-     * @inheritdoc
-     *
-     * @return array
-     *
-     * @throws SS_HTTPResponse_Exception
-     */
-    public function check()
-    {
-        $response = Director::test($this->url);
+	/**
+	 * @inheritdoc
+	 *
+	 * @return array
+	 *
+	 * @throws SS_HTTPResponse_Exception
+	 */
+	public function check()
+	{
+		$response = Director::test($this->url);
 
-        if ($response->getStatusCode() != 200) {
-            return array(
-                EnvironmentCheck::ERROR,
-                sprintf('Error retrieving "%s" (Code: %d)', $this->url, $response->getStatusCode())
-            );
-        } elseif ($this->testString && (strpos($response->getBody(), $this->testString) === false)) {
-            return array(
-                EnvironmentCheck::WARNING,
-                sprintf('Success retrieving "%s", but string "%s" not found', $this->url, $this->testString)
-            );
-        } else {
-            return array(
-                EnvironmentCheck::OK,
-                sprintf('Success retrieving "%s"', $this->url)
-            );
-        }
-    }
+		if ($response->getStatusCode() != 200) {
+			return array(
+				EnvironmentCheck::ERROR,
+				sprintf('Error retrieving "%s" (Code: %d)', $this->url, $response->getStatusCode())
+			);
+		} elseif ($this->testString && (strpos($response->getBody(), $this->testString) === false)) {
+			return array(
+				EnvironmentCheck::WARNING,
+				sprintf('Success retrieving "%s", but string "%s" not found', $this->url, $this->testString)
+			);
+		} else {
+			return array(
+				EnvironmentCheck::OK,
+				sprintf('Success retrieving "%s"', $this->url)
+			);
+		}
+	}
 }

tests/DevCheckControllerTest.php

Indentation +6 added lines, -6 removed lines

@@ -5,12 +5,12 @@
  */
 class DevCheckControllerTest extends SapphireTest
 {
-    public function testIndexCreatesChecker()
-    {
-        $controller = new DevCheckController();
+	public function testIndexCreatesChecker()
+	{
+		$controller = new DevCheckController();
 
-        $request = new SS_HTTPRequest('GET', 'example.com');
+		$request = new SS_HTTPRequest('GET', 'example.com');
 
-        $this->assertInstanceOf('EnvironmentChecker', $controller->index($request));
-    }
+		$this->assertInstanceOf('EnvironmentChecker', $controller->index($request));
+	}
 }

tests/DevHealthControllerTest.php

Indentation +12 added lines, -12 removed lines

@@ -5,21 +5,21 @@
  */
 class DevHealthControllerTest extends SapphireTest
 {
-    public function testIndexCreatesChecker()
-    {
-        $controller = new DevHealthController();
+	public function testIndexCreatesChecker()
+	{
+		$controller = new DevHealthController();
 
-        $request = new SS_HTTPRequest('GET', 'example.com');
+		$request = new SS_HTTPRequest('GET', 'example.com');
 
-        // we need to fake authenticated access as BasicAuth::requireLogin doesn't like empty
-        // permission type strings, which is what health check uses.
+		// we need to fake authenticated access as BasicAuth::requireLogin doesn't like empty
+		// permission type strings, which is what health check uses.
 
-        define('ENVCHECK_BASICAUTH_USERNAME', 'foo');
-        define('ENVCHECK_BASICAUTH_PASSWORD', 'bar');
+		define('ENVCHECK_BASICAUTH_USERNAME', 'foo');
+		define('ENVCHECK_BASICAUTH_PASSWORD', 'bar');
 
-        $_SERVER['PHP_AUTH_USER'] = 'foo';
-        $_SERVER['PHP_AUTH_PW'] = 'bar';
+		$_SERVER['PHP_AUTH_USER'] = 'foo';
+		$_SERVER['PHP_AUTH_PW'] = 'bar';
 
-        $this->assertInstanceOf('EnvironmentChecker', $controller->index($request));
-    }
+		$this->assertInstanceOf('EnvironmentChecker', $controller->index($request));
+	}
 }

tests/EnvironmentCheckerTest.php

Indentation +73 added lines, -73 removed lines

@@ -1,100 +1,100 @@
 <?php
 class EnvironmentCheckerTest extends SapphireTest
 {
-    public function setUpOnce()
-    {
-        parent::setUpOnce();
+	public function setUpOnce()
+	{
+		parent::setUpOnce();
 
-        Phockito::include_hamcrest();
-    }
+		Phockito::include_hamcrest();
+	}
 
-    public function setUp()
-    {
-        parent::setUp();
+	public function setUp()
+	{
+		parent::setUp();
 
-        Config::nest();
-    }
+		Config::nest();
+	}
 
-    public function tearDown()
-    {
-        Config::unnest();
+	public function tearDown()
+	{
+		Config::unnest();
 
-        parent::tearDown();
-    }
+		parent::tearDown();
+	}
 
-    public function testOnlyLogsWithErrors()
-    {
-        Config::inst()->update('EnvironmentChecker', 'log_results_warning', true);
-        Config::inst()->update('EnvironmentChecker', 'log_results_error', true);
-        EnvironmentCheckSuite::register('test suite', new EnvironmentCheckerTest_CheckNoErrors());
-        $checker = Phockito::spy(
-            'EnvironmentChecker',
-            'test suite',
-            'test'
-        );
+	public function testOnlyLogsWithErrors()
+	{
+		Config::inst()->update('EnvironmentChecker', 'log_results_warning', true);
+		Config::inst()->update('EnvironmentChecker', 'log_results_error', true);
+		EnvironmentCheckSuite::register('test suite', new EnvironmentCheckerTest_CheckNoErrors());
+		$checker = Phockito::spy(
+			'EnvironmentChecker',
+			'test suite',
+			'test'
+		);
 
-        $response = $checker->index();
-        Phockito::verify($checker, 0)->log(anything(), anything());
-        EnvironmentCheckSuite::reset();
-    }
+		$response = $checker->index();
+		Phockito::verify($checker, 0)->log(anything(), anything());
+		EnvironmentCheckSuite::reset();
+	}
 
-    public function testLogsWithWarnings()
-    {
-        Config::inst()->update('EnvironmentChecker', 'log_results_warning', true);
-        Config::inst()->update('EnvironmentChecker', 'log_results_error', false);
-        EnvironmentCheckSuite::register('test suite', new EnvironmentCheckerTest_CheckWarnings());
-        EnvironmentCheckSuite::register('test suite', new EnvironmentCheckerTest_CheckErrors());
-        $checker = Phockito::spy(
-            'EnvironmentChecker',
-            'test suite',
-            'test'
-        );
+	public function testLogsWithWarnings()
+	{
+		Config::inst()->update('EnvironmentChecker', 'log_results_warning', true);
+		Config::inst()->update('EnvironmentChecker', 'log_results_error', false);
+		EnvironmentCheckSuite::register('test suite', new EnvironmentCheckerTest_CheckWarnings());
+		EnvironmentCheckSuite::register('test suite', new EnvironmentCheckerTest_CheckErrors());
+		$checker = Phockito::spy(
+			'EnvironmentChecker',
+			'test suite',
+			'test'
+		);
 
-        $response = $checker->index();
-        Phockito::verify($checker, 1)->log(containsString('warning'), anything());
-        Phockito::verify($checker, 0)->log(containsString('error'), anything());
-        EnvironmentCheckSuite::reset();
-    }
+		$response = $checker->index();
+		Phockito::verify($checker, 1)->log(containsString('warning'), anything());
+		Phockito::verify($checker, 0)->log(containsString('error'), anything());
+		EnvironmentCheckSuite::reset();
+	}
 
-    public function testLogsWithErrors()
-    {
-        Config::inst()->update('EnvironmentChecker', 'log_results_error', false);
-        Config::inst()->update('EnvironmentChecker', 'log_results_error', true);
-        EnvironmentCheckSuite::register('test suite', new EnvironmentCheckerTest_CheckWarnings());
-        EnvironmentCheckSuite::register('test suite', new EnvironmentCheckerTest_CheckErrors());
-        $checker = Phockito::spy(
-            'EnvironmentChecker',
-            'test suite',
-            'test'
-        );
+	public function testLogsWithErrors()
+	{
+		Config::inst()->update('EnvironmentChecker', 'log_results_error', false);
+		Config::inst()->update('EnvironmentChecker', 'log_results_error', true);
+		EnvironmentCheckSuite::register('test suite', new EnvironmentCheckerTest_CheckWarnings());
+		EnvironmentCheckSuite::register('test suite', new EnvironmentCheckerTest_CheckErrors());
+		$checker = Phockito::spy(
+			'EnvironmentChecker',
+			'test suite',
+			'test'
+		);
 
-        $response = $checker->index();
-        Phockito::verify($checker, 0)->log(containsString('warning'), anything());
-        Phockito::verify($checker, 1)->log(containsString('error'), anything());
-        EnvironmentCheckSuite::reset();
-    }
+		$response = $checker->index();
+		Phockito::verify($checker, 0)->log(containsString('warning'), anything());
+		Phockito::verify($checker, 1)->log(containsString('error'), anything());
+		EnvironmentCheckSuite::reset();
+	}
 }
 
 class EnvironmentCheckerTest_CheckNoErrors implements EnvironmentCheck, TestOnly
 {
-    public function check()
-    {
-        return array(EnvironmentCheck::OK, '');
-    }
+	public function check()
+	{
+		return array(EnvironmentCheck::OK, '');
+	}
 }
 
 class EnvironmentCheckerTest_CheckWarnings implements EnvironmentCheck, TestOnly
 {
-    public function check()
-    {
-        return array(EnvironmentCheck::WARNING, "test warning");
-    }
+	public function check()
+	{
+		return array(EnvironmentCheck::WARNING, "test warning");
+	}
 }
 
 class EnvironmentCheckerTest_CheckErrors implements EnvironmentCheck, TestOnly
 {
-    public function check()
-    {
-        return array(EnvironmentCheck::ERROR, "test error");
-    }
+	public function check()
+	{
+		return array(EnvironmentCheck::ERROR, "test error");
+	}
 }

tests/checks/DatabaseCheckTest.php

Indentation +9 added lines, -9 removed lines

@@ -5,15 +5,15 @@
  */
 class DatabaseCheckTest extends SapphireTest
 {
-    public function testCheckReportsValidConnection()
-    {
-        $check = new DatabaseCheck();
+	public function testCheckReportsValidConnection()
+	{
+		$check = new DatabaseCheck();
 
-        $expected = array(
-            EnvironmentCheck::OK,
-            '',
-        );
+		$expected = array(
+			EnvironmentCheck::OK,
+			'',
+		);
 
-        $this->assertEquals($expected, $check->check());
-    }
+		$this->assertEquals($expected, $check->check());
+	}
 }