silverstripe / silverstripe-environmentcheck

code/checks/FileAccessibilityAndValidationCheck.php

Doc Comments +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
     /**
      * @inheritdoc
      *
-     * @return array
+     * @return string[]
      */
     public function check()
     {

Indentation +159 added lines, -159 removed lines

@@ -21,163 +21,163 @@
  */
 class FileAccessibilityAndValidationCheck implements EnvironmentCheck
 {
-    /**
-     * @var int
-     */
-    const CHECK_SINGLE = 1;
-
-    /**
-     * @var int
-     */
-    const CHECK_ALL = 2;
-
-    /**
-     * Absolute path to a file or folder, compatible with glob().
-     *
-     * @var string
-     */
-    protected $path;
-
-    /**
-     * Constant, check for a single file to match age criteria, or all of them.
-     *
-     * @var int
-     */
-    protected $fileTypeValidateFunc;
-
-    /**
-     * Constant, check for a single file to match age criteria, or all of them.
-     *
-     * @var int
-     */
-    protected $checkType;
-
-    /**
-     * @param string $path
-     * @param string $fileTypeValidateFunc
-     * @param null|int $checkType
-     */
-    public function __construct($path, $fileTypeValidateFunc = 'noVidation', $checkType = null)
-    {
-        $this->path = $path;
-        $this->fileTypeValidateFunc = ($fileTypeValidateFunc)? $fileTypeValidateFunc:'noVidation';
-        $this->checkType = ($checkType) ? $checkType : self::CHECK_SINGLE;
-    }
-
-    /**
-     * @inheritdoc
-     *
-     * @return array
-     */
-    public function check()
-    {
-        $origStage = Versioned::get_reading_mode();
-        Versioned::set_reading_mode('Live');
-
-        $files = $this->getFiles();
-        if ($files) {
-            $fileTypeValidateFunc = $this->fileTypeValidateFunc;
-            if (method_exists($this, $fileTypeValidateFunc)) {
-                $invalidFiles = array();
-                $validFiles = array();
-
-                foreach ($files as $file) {
-                    if ($this->$fileTypeValidateFunc($file)) {
-                        $validFiles[] = $file;
-                    } else {
-                        $invalidFiles[] = $file;
-                    }
-                }
-
-                // If at least one file was valid, count as passed
-                if ($this->checkType == self::CHECK_SINGLE && count($invalidFiles) < count($files)) {
-                    $validFileList = "\n";
-                    foreach ($validFiles as $vf) {
-                        $validFileList .= $vf."\n";
-                    }
-                    if ($fileTypeValidateFunc == 'noVidation') {
-                        $checkReturn = array(
-                            EnvironmentCheck::OK,
-                            sprintf('At least these file(s) accessible: %s', $validFileList)
-                        );
-                    } else {
-                        $checkReturn = array(
-                            EnvironmentCheck::OK,
-                            sprintf('At least these file(s) passed file type validate function "%s": %s', $fileTypeValidateFunc, $validFileList)
-                        );
-                    }
-                } else {
-                    if (count($invalidFiles) == 0) {
-                        $checkReturn = array(EnvironmentCheck::OK, 'All files valideted');
-                    } else {
-                        $invalidFileList = "\n";
-                        foreach ($invalidFiles as $vf) {
-                            $invalidFileList .= $vf."\n";
-                        }
-
-                        if ($fileTypeValidateFunc == 'noVidation') {
-                            $checkReturn = array(
-                                EnvironmentCheck::ERROR,
-                                sprintf('File(s) not accessible: %s', $invalidFileList)
-                            );
-                        } else {
-                            $checkReturn = array(
-                                EnvironmentCheck::ERROR,
-                                sprintf('File(s) not passing the file type validate function "%s": %s', $fileTypeValidateFunc, $invalidFileList)
-                            );
-                        }
-                    }
-                }
-            } else {
-                $checkReturn =  array(
-                    EnvironmentCheck::ERROR,
-                    sprintf("Invalid file type validation method name passed: %s ", $fileTypeValidateFunc)
-                );
-            }
-        } else {
-            $checkReturn = array(
-                EnvironmentCheck::ERROR,
-                sprintf("No files accessible at path %s", $this->path)
-            );
-        }
-
-        Versioned::set_reading_mode($origStage);
-
-        return $checkReturn;
-    }
-
-    /**
-     * @param string $file
-     *
-     * @return bool
-     */
-    private function jsonValidate($file)
-    {
-        $json = json_decode(file_get_contents($file));
-        if (!$json) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    /**
-     * @param string $file
-     *
-     * @return bool
-     */
-    protected function noVidation($file)
-    {
-        return true;
-    }
-
-    /**
-     * Gets a list of absolute file paths.
-     *
-     * @return array
-     */
-    protected function getFiles()
-    {
-        return glob($this->path);
-    }
+	/**
+	 * @var int
+	 */
+	const CHECK_SINGLE = 1;
+
+	/**
+	 * @var int
+	 */
+	const CHECK_ALL = 2;
+
+	/**
+	 * Absolute path to a file or folder, compatible with glob().
+	 *
+	 * @var string
+	 */
+	protected $path;
+
+	/**
+	 * Constant, check for a single file to match age criteria, or all of them.
+	 *
+	 * @var int
+	 */
+	protected $fileTypeValidateFunc;
+
+	/**
+	 * Constant, check for a single file to match age criteria, or all of them.
+	 *
+	 * @var int
+	 */
+	protected $checkType;
+
+	/**
+	 * @param string $path
+	 * @param string $fileTypeValidateFunc
+	 * @param null|int $checkType
+	 */
+	public function __construct($path, $fileTypeValidateFunc = 'noVidation', $checkType = null)
+	{
+		$this->path = $path;
+		$this->fileTypeValidateFunc = ($fileTypeValidateFunc)? $fileTypeValidateFunc:'noVidation';
+		$this->checkType = ($checkType) ? $checkType : self::CHECK_SINGLE;
+	}
+
+	/**
+	 * @inheritdoc
+	 *
+	 * @return array
+	 */
+	public function check()
+	{
+		$origStage = Versioned::get_reading_mode();
+		Versioned::set_reading_mode('Live');
+
+		$files = $this->getFiles();
+		if ($files) {
+			$fileTypeValidateFunc = $this->fileTypeValidateFunc;
+			if (method_exists($this, $fileTypeValidateFunc)) {
+				$invalidFiles = array();
+				$validFiles = array();
+
+				foreach ($files as $file) {
+					if ($this->$fileTypeValidateFunc($file)) {
+						$validFiles[] = $file;
+					} else {
+						$invalidFiles[] = $file;
+					}
+				}
+
+				// If at least one file was valid, count as passed
+				if ($this->checkType == self::CHECK_SINGLE && count($invalidFiles) < count($files)) {
+					$validFileList = "\n";
+					foreach ($validFiles as $vf) {
+						$validFileList .= $vf."\n";
+					}
+					if ($fileTypeValidateFunc == 'noVidation') {
+						$checkReturn = array(
+							EnvironmentCheck::OK,
+							sprintf('At least these file(s) accessible: %s', $validFileList)
+						);
+					} else {
+						$checkReturn = array(
+							EnvironmentCheck::OK,
+							sprintf('At least these file(s) passed file type validate function "%s": %s', $fileTypeValidateFunc, $validFileList)
+						);
+					}
+				} else {
+					if (count($invalidFiles) == 0) {
+						$checkReturn = array(EnvironmentCheck::OK, 'All files valideted');
+					} else {
+						$invalidFileList = "\n";
+						foreach ($invalidFiles as $vf) {
+							$invalidFileList .= $vf."\n";
+						}
+
+						if ($fileTypeValidateFunc == 'noVidation') {
+							$checkReturn = array(
+								EnvironmentCheck::ERROR,
+								sprintf('File(s) not accessible: %s', $invalidFileList)
+							);
+						} else {
+							$checkReturn = array(
+								EnvironmentCheck::ERROR,
+								sprintf('File(s) not passing the file type validate function "%s": %s', $fileTypeValidateFunc, $invalidFileList)
+							);
+						}
+					}
+				}
+			} else {
+				$checkReturn =  array(
+					EnvironmentCheck::ERROR,
+					sprintf("Invalid file type validation method name passed: %s ", $fileTypeValidateFunc)
+				);
+			}
+		} else {
+			$checkReturn = array(
+				EnvironmentCheck::ERROR,
+				sprintf("No files accessible at path %s", $this->path)
+			);
+		}
+
+		Versioned::set_reading_mode($origStage);
+
+		return $checkReturn;
+	}
+
+	/**
+	 * @param string $file
+	 *
+	 * @return bool
+	 */
+	private function jsonValidate($file)
+	{
+		$json = json_decode(file_get_contents($file));
+		if (!$json) {
+			return false;
+		} else {
+			return true;
+		}
+	}
+
+	/**
+	 * @param string $file
+	 *
+	 * @return bool
+	 */
+	protected function noVidation($file)
+	{
+		return true;
+	}
+
+	/**
+	 * Gets a list of absolute file paths.
+	 *
+	 * @return array
+	 */
+	protected function getFiles()
+	{
+		return glob($this->path);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -60,7 +60,7 @@ 
     public function __construct($path, $fileTypeValidateFunc = 'noVidation', $checkType = null)
     {
         $this->path = $path;
-        $this->fileTypeValidateFunc = ($fileTypeValidateFunc)? $fileTypeValidateFunc:'noVidation';
+        $this->fileTypeValidateFunc = ($fileTypeValidateFunc) ? $fileTypeValidateFunc : 'noVidation';
         $this->checkType = ($checkType) ? $checkType : self::CHECK_SINGLE;
     }
 
@@ -93,7 +93,7 @@ 
                 if ($this->checkType == self::CHECK_SINGLE && count($invalidFiles) < count($files)) {
                     $validFileList = "\n";
                     foreach ($validFiles as $vf) {
-                        $validFileList .= $vf."\n";
+                        $validFileList .= $vf . "\n";
                     }
                     if ($fileTypeValidateFunc == 'noVidation') {
                         $checkReturn = array(
@@ -112,7 +112,7 @@ 
                     } else {
                         $invalidFileList = "\n";
                         foreach ($invalidFiles as $vf) {
-                            $invalidFileList .= $vf."\n";
+                            $invalidFileList .= $vf . "\n";
                         }
 
                         if ($fileTypeValidateFunc == 'noVidation') {
@@ -129,7 +129,7 @@ 
                     }
                 }
             } else {
-                $checkReturn =  array(
+                $checkReturn = array(
                     EnvironmentCheck::ERROR,
                     sprintf("Invalid file type validation method name passed: %s ", $fileTypeValidateFunc)
                 );

code/checks/FileAgeCheck.php

Doc Comments +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
     /**
      * @inheritdoc
      *
-     * @return array
+     * @return string[]
      */
     public function check()
     {

Indentation +109 added lines, -109 removed lines

@@ -21,123 +21,123 @@
  */
 class FileAgeCheck implements EnvironmentCheck
 {
-    /**
-     * @var int
-     */
-    const CHECK_SINGLE = 1;
+	/**
+	 * @var int
+	 */
+	const CHECK_SINGLE = 1;
 
-    /**
-     * @var int
-     */
-    const CHECK_ALL = 2;
+	/**
+	 * @var int
+	 */
+	const CHECK_ALL = 2;
     
-    /**
-     * Absolute path to a file or folder, compatible with glob().
-     *
-     * @var string
-     */
-    protected $path;
+	/**
+	 * Absolute path to a file or folder, compatible with glob().
+	 *
+	 * @var string
+	 */
+	protected $path;
 
-    /**
-     * Relative date specification, compatible with strtotime().
-     *
-     * @var string
-     */
-    protected $relativeAge;
+	/**
+	 * Relative date specification, compatible with strtotime().
+	 *
+	 * @var string
+	 */
+	protected $relativeAge;
 
-    /**
-     * The function to use for checking file age: so filemtime(), filectime(), or fileatime().
-     *
-     * @var string
-     */
-    protected $checkFn;
+	/**
+	 * The function to use for checking file age: so filemtime(), filectime(), or fileatime().
+	 *
+	 * @var string
+	 */
+	protected $checkFn;
 
-    /**
-     * Constant, check for a single file to match age criteria, or all of them.
-     *
-     * @var int
-     */
-    protected $checkType;
+	/**
+	 * Constant, check for a single file to match age criteria, or all of them.
+	 *
+	 * @var int
+	 */
+	protected $checkType;
 
-    /**
-     * Type of comparison (either > or <).
-     *
-     * @var string
-     */
-    protected $compareOperand;
+	/**
+	 * Type of comparison (either > or <).
+	 *
+	 * @var string
+	 */
+	protected $compareOperand;
 
-    /**
-     * @param string $path
-     * @param string $relativeAge
-     * @param string $compareOperand
-     * @param null|int $checkType
-     * @param string $checkFn
-     */
-    public function __construct($path, $relativeAge, $compareOperand = '>', $checkType = null, $checkFn = 'filemtime')
-    {
-        $this->path = $path;
-        $this->relativeAge = $relativeAge;
-        $this->checkFn = $checkFn;
-        $this->checkType = ($checkType) ? $checkType : self::CHECK_SINGLE;
-        $this->compareOperand = $compareOperand;
-    }
+	/**
+	 * @param string $path
+	 * @param string $relativeAge
+	 * @param string $compareOperand
+	 * @param null|int $checkType
+	 * @param string $checkFn
+	 */
+	public function __construct($path, $relativeAge, $compareOperand = '>', $checkType = null, $checkFn = 'filemtime')
+	{
+		$this->path = $path;
+		$this->relativeAge = $relativeAge;
+		$this->checkFn = $checkFn;
+		$this->checkType = ($checkType) ? $checkType : self::CHECK_SINGLE;
+		$this->compareOperand = $compareOperand;
+	}
 
-    /**
-     * @inheritdoc
-     *
-     * @return array
-     */
-    public function check()
-    {
-        $cutoffTime =  strtotime($this->relativeAge, SS_Datetime::now()->Format('U'));
-        $files = $this->getFiles();
-        $invalidFiles = array();
-        $validFiles = array();
-        $checkFn = $this->checkFn;
-        $allValid = true;
-        if ($files) {
-            foreach ($files as $file) {
-                $fileTime = $checkFn($file);
-                $valid = ($this->compareOperand == '>') ? ($fileTime >= $cutoffTime) : ($fileTime <= $cutoffTime);
-                if ($valid) {
-                    $validFiles[] = $file;
-                } else {
-                    $invalidFiles[] = $file;
-                    if ($this->checkType == self::CHECK_ALL) {
-                        return array(
-                        EnvironmentCheck::ERROR,
-                        sprintf(
-                            'File "%s" doesn\'t match age check (compare %s: %s, actual: %s)',
-                            $file, $this->compareOperand, date('c', $cutoffTime), date('c', $fileTime)
-                        )
-                    );
-                    }
-                }
-            }
-        }
+	/**
+	 * @inheritdoc
+	 *
+	 * @return array
+	 */
+	public function check()
+	{
+		$cutoffTime =  strtotime($this->relativeAge, SS_Datetime::now()->Format('U'));
+		$files = $this->getFiles();
+		$invalidFiles = array();
+		$validFiles = array();
+		$checkFn = $this->checkFn;
+		$allValid = true;
+		if ($files) {
+			foreach ($files as $file) {
+				$fileTime = $checkFn($file);
+				$valid = ($this->compareOperand == '>') ? ($fileTime >= $cutoffTime) : ($fileTime <= $cutoffTime);
+				if ($valid) {
+					$validFiles[] = $file;
+				} else {
+					$invalidFiles[] = $file;
+					if ($this->checkType == self::CHECK_ALL) {
+						return array(
+						EnvironmentCheck::ERROR,
+						sprintf(
+							'File "%s" doesn\'t match age check (compare %s: %s, actual: %s)',
+							$file, $this->compareOperand, date('c', $cutoffTime), date('c', $fileTime)
+						)
+					);
+					}
+				}
+			}
+		}
 
-        // If at least one file was valid, count as passed
-        if ($this->checkType == self::CHECK_SINGLE && count($invalidFiles) < count($files)) {
-            return array(EnvironmentCheck::OK, '');
-        } else {
-            if (count($invalidFiles) == 0) {
-                return array(EnvironmentCheck::OK, '');
-            } else {
-                return array(
-                EnvironmentCheck::ERROR,
-                sprintf('No files matched criteria (%s %s)', $this->compareOperand, date('c', $cutoffTime))
-            );
-            }
-        }
-    }
+		// If at least one file was valid, count as passed
+		if ($this->checkType == self::CHECK_SINGLE && count($invalidFiles) < count($files)) {
+			return array(EnvironmentCheck::OK, '');
+		} else {
+			if (count($invalidFiles) == 0) {
+				return array(EnvironmentCheck::OK, '');
+			} else {
+				return array(
+				EnvironmentCheck::ERROR,
+				sprintf('No files matched criteria (%s %s)', $this->compareOperand, date('c', $cutoffTime))
+			);
+			}
+		}
+	}
 
-    /**
-     * Gets a list of absolute file paths.
-     *
-     * @return array
-     */
-    protected function getFiles()
-    {
-        return glob($this->path);
-    }
+	/**
+	 * Gets a list of absolute file paths.
+	 *
+	 * @return array
+	 */
+	protected function getFiles()
+	{
+		return glob($this->path);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
      */
     public function check()
     {
-        $cutoffTime =  strtotime($this->relativeAge, SS_Datetime::now()->Format('U'));
+        $cutoffTime = strtotime($this->relativeAge, SS_Datetime::now()->Format('U'));
         $files = $this->getFiles();
         $invalidFiles = array();
         $validFiles = array();

code/checks/SMTPConnectCheck.php

Doc Comments +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
     /**
      * @inheritdoc
      *
-     * @return array
+     * @return string[]
      */
     public function check()
     {

Indentation +55 added lines, -55 removed lines

@@ -7,67 +7,67 @@
  */
 class SMTPConnectCheck implements EnvironmentCheck
 {
-    /**
-     * @var string
-     */
-    protected $host;
+	/**
+	 * @var string
+	 */
+	protected $host;
 
-    /**
-     * @var int
-     */
-    protected $port;
+	/**
+	 * @var int
+	 */
+	protected $port;
 
-    /**
-     * Timeout (in seconds).
-     *
-     * @var int
-     */
-    protected $timeout;
+	/**
+	 * Timeout (in seconds).
+	 *
+	 * @var int
+	 */
+	protected $timeout;
 
-    /**
-     * @param null|string $host
-     * @param null|int $port
-     * @param int $timeout
-     */
-    public function __construct($host = null, $port = null, $timeout = 15)
-    {
-        $this->host = ($host) ? $host : ini_get('SMTP');
-        if (!$this->host) {
-            $this->host = 'localhost';
-        }
+	/**
+	 * @param null|string $host
+	 * @param null|int $port
+	 * @param int $timeout
+	 */
+	public function __construct($host = null, $port = null, $timeout = 15)
+	{
+		$this->host = ($host) ? $host : ini_get('SMTP');
+		if (!$this->host) {
+			$this->host = 'localhost';
+		}
         
-        $this->port = ($port) ? $port : ini_get('smtp_port');
-        if (!$this->port) {
-            $this->port = 25;
-        }
+		$this->port = ($port) ? $port : ini_get('smtp_port');
+		if (!$this->port) {
+			$this->port = 25;
+		}
 
-        $this->timeout = $timeout;
-    }
+		$this->timeout = $timeout;
+	}
 
-    /**
-     * @inheritdoc
-     *
-     * @return array
-     */
-    public function check()
-    {
-        $f = @fsockopen($this->host, $this->port, $errno, $errstr, $this->timeout);
-        if (!$f) {
-            return array(
-                EnvironmentCheck::ERROR,
-                sprintf("Couldn't connect to SMTP on %s:%s (Error: %s %s)", $this->host, $this->port, $errno, $errstr)
-            );
-        }
+	/**
+	 * @inheritdoc
+	 *
+	 * @return array
+	 */
+	public function check()
+	{
+		$f = @fsockopen($this->host, $this->port, $errno, $errstr, $this->timeout);
+		if (!$f) {
+			return array(
+				EnvironmentCheck::ERROR,
+				sprintf("Couldn't connect to SMTP on %s:%s (Error: %s %s)", $this->host, $this->port, $errno, $errstr)
+			);
+		}
 
-        fwrite($f, "HELO its_me\r\n");
-        $response = fread($f, 26);
-        if (substr($response, 0, 3) != '220') {
-            return array(
-                EnvironmentCheck::ERROR,
-                sprintf("Invalid mail server response: %s", $response)
-            );
-        }
+		fwrite($f, "HELO its_me\r\n");
+		$response = fread($f, 26);
+		if (substr($response, 0, 3) != '220') {
+			return array(
+				EnvironmentCheck::ERROR,
+				sprintf("Invalid mail server response: %s", $response)
+			);
+		}
 
-        return array(EnvironmentCheck::OK, '');
-    }
+		return array(EnvironmentCheck::OK, '');
+	}
 }

code/EnvironmentCheckSuite.php

Doc Comments +3 added lines, -2 removed lines

@@ -89,7 +89,7 @@ 
     /**
      * Run this test suite and return the result code of the worst result.
      *
-     * @return int
+     * @return EnvironmentCheckSuiteResult
      */
     public function run()
     {
@@ -175,7 +175,7 @@ 
     /**
      * Register a check against the named check suite.
      *
-     * @param string|array $names
+     * @param string $names
      * @param EnvironmentCheck $check
      * @param string|array
      */
@@ -287,6 +287,7 @@ 
     /**
      * Return a text version of a status code.
      *
+     * @param integer $status
      * @return string
      */
     protected function statusText($status)

Indentation +243 added lines, -243 removed lines

@@ -21,181 +21,181 @@ 
  */
 class EnvironmentCheckSuite extends Object
 {
-    /**
-     * Name of this suite.
-     *
-     * @var string
-     */
-    protected $name;
+	/**
+	 * Name of this suite.
+	 *
+	 * @var string
+	 */
+	protected $name;
 
-    /**
-     * @var array
-     */
-    protected $checks = array();
+	/**
+	 * @var array
+	 */
+	protected $checks = array();
 
-    /**
-     * Associative array of named checks registered via the config system. Each check should specify:
-     * - definition (e.g. 'MyHealthCheck("my param")')
-     * - title (e.g. 'Is my feature working?')
-     * - state (setting this to 'disabled' will cause suites to skip this check entirely.
-     *
-     * @var array
-     */
-    private static $registered_checks = array();
+	/**
+	 * Associative array of named checks registered via the config system. Each check should specify:
+	 * - definition (e.g. 'MyHealthCheck("my param")')
+	 * - title (e.g. 'Is my feature working?')
+	 * - state (setting this to 'disabled' will cause suites to skip this check entirely.
+	 *
+	 * @var array
+	 */
+	private static $registered_checks = array();
 
-    /**
-     * Associative array of named suites registered via the config system. Each suite should enumerate
-     * named checks that have been configured in 'registered_checks'.
-     *
-     * @var array
-     */
-    private static $registered_suites = array();
+	/**
+	 * Associative array of named suites registered via the config system. Each suite should enumerate
+	 * named checks that have been configured in 'registered_checks'.
+	 *
+	 * @var array
+	 */
+	private static $registered_suites = array();
 
-    /**
-     * Load checks for this suite from the configuration system. This is an alternative to the
-     * EnvironmentCheckSuite::register - both can be used, checks will be appended to the suite.
-     *
-     * @param string $suiteName The name of this suite.
-     */
-    public function __construct($suiteName)
-    {
-        parent::__construct();
+	/**
+	 * Load checks for this suite from the configuration system. This is an alternative to the
+	 * EnvironmentCheckSuite::register - both can be used, checks will be appended to the suite.
+	 *
+	 * @param string $suiteName The name of this suite.
+	 */
+	public function __construct($suiteName)
+	{
+		parent::__construct();
 
-        if (empty($this->config()->registered_suites[$suiteName])) {
-            // Not registered via config system, but it still may be configured later via self::register.
-            return;
-        }
+		if (empty($this->config()->registered_suites[$suiteName])) {
+			// Not registered via config system, but it still may be configured later via self::register.
+			return;
+		}
 
-        foreach ($this->config()->registered_suites[$suiteName] as $checkName) {
-            if (empty($this->config()->registered_checks[$checkName])) {
-                throw new InvalidArgumentException(
-                    "Bad EnvironmentCheck: '$checkName' - the named check has not been registered."
-                );
-            }
+		foreach ($this->config()->registered_suites[$suiteName] as $checkName) {
+			if (empty($this->config()->registered_checks[$checkName])) {
+				throw new InvalidArgumentException(
+					"Bad EnvironmentCheck: '$checkName' - the named check has not been registered."
+				);
+			}
 
-            $check = $this->config()->registered_checks[$checkName];
+			$check = $this->config()->registered_checks[$checkName];
 
-            // Existing named checks can be disabled by setting their 'state' to 'disabled'.
-            // This is handy for disabling checks mandated by modules.
-            if (!empty($check['state']) && $check['state']==='disabled') {
-                continue;
-            }
+			// Existing named checks can be disabled by setting their 'state' to 'disabled'.
+			// This is handy for disabling checks mandated by modules.
+			if (!empty($check['state']) && $check['state']==='disabled') {
+				continue;
+			}
             
-            // Add the check to this suite.
-            $this->push($check['definition'], $check['title']);
-        }
-    }
+			// Add the check to this suite.
+			$this->push($check['definition'], $check['title']);
+		}
+	}
 
-    /**
-     * Run this test suite and return the result code of the worst result.
-     *
-     * @return int
-     */
-    public function run()
-    {
-        $result = new EnvironmentCheckSuiteResult();
+	/**
+	 * Run this test suite and return the result code of the worst result.
+	 *
+	 * @return int
+	 */
+	public function run()
+	{
+		$result = new EnvironmentCheckSuiteResult();
 
-        foreach ($this->checkInstances() as $check) {
-            list($checkClass, $checkTitle) = $check;
-            try {
-                list($status, $message) = $checkClass->check();
-            // If the check fails, register that as an error
-            } catch (Exception $e) {
-                $status = EnvironmentCheck::ERROR;
-                $message = $e->getMessage();
-            }
-            $result->addResult($status, $message, $checkTitle);
-        }
+		foreach ($this->checkInstances() as $check) {
+			list($checkClass, $checkTitle) = $check;
+			try {
+				list($status, $message) = $checkClass->check();
+			// If the check fails, register that as an error
+			} catch (Exception $e) {
+				$status = EnvironmentCheck::ERROR;
+				$message = $e->getMessage();
+			}
+			$result->addResult($status, $message, $checkTitle);
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Get instances of all the environment checks.
-     *
-     * @return array
-     */
-    protected function checkInstances()
-    {
-        $output = array();
-        foreach ($this->checks as $check) {
-            list($checkClass, $checkTitle) = $check;
-            if (is_string($checkClass)) {
-                $checkInst = Object::create_from_string($checkClass);
-                if ($checkInst instanceof EnvironmentCheck) {
-                    $output[] = array($checkInst, $checkTitle);
-                } else {
-                    throw new InvalidArgumentException("Bad EnvironmentCheck: '$checkClass' - the named class doesn't implement EnvironmentCheck");
-                }
-            } elseif ($checkClass instanceof EnvironmentCheck) {
-                $output[] = array($checkClass, $checkTitle);
-            } else {
-                throw new InvalidArgumentException("Bad EnvironmentCheck: " . var_export($check, true));
-            }
-        }
-        return $output;
-    }
+	/**
+	 * Get instances of all the environment checks.
+	 *
+	 * @return array
+	 */
+	protected function checkInstances()
+	{
+		$output = array();
+		foreach ($this->checks as $check) {
+			list($checkClass, $checkTitle) = $check;
+			if (is_string($checkClass)) {
+				$checkInst = Object::create_from_string($checkClass);
+				if ($checkInst instanceof EnvironmentCheck) {
+					$output[] = array($checkInst, $checkTitle);
+				} else {
+					throw new InvalidArgumentException("Bad EnvironmentCheck: '$checkClass' - the named class doesn't implement EnvironmentCheck");
+				}
+			} elseif ($checkClass instanceof EnvironmentCheck) {
+				$output[] = array($checkClass, $checkTitle);
+			} else {
+				throw new InvalidArgumentException("Bad EnvironmentCheck: " . var_export($check, true));
+			}
+		}
+		return $output;
+	}
 
-    /**
-     * Add a check to this suite.
-     *
-     * @param mixed $check
-     * @param string $title
-     */
-    public function push($check, $title = null)
-    {
-        if (!$title) {
-            $title = is_string($check) ? $check : get_class($check);
-        }
-        $this->checks[] = array($check, $title);
-    }
+	/**
+	 * Add a check to this suite.
+	 *
+	 * @param mixed $check
+	 * @param string $title
+	 */
+	public function push($check, $title = null)
+	{
+		if (!$title) {
+			$title = is_string($check) ? $check : get_class($check);
+		}
+		$this->checks[] = array($check, $title);
+	}
 
-    /////////////////////////////////////////////////////////////////////////////////////////////
+	/////////////////////////////////////////////////////////////////////////////////////////////
 
-    /**
-     * @var array
-     */
-    protected static $instances = array();
+	/**
+	 * @var array
+	 */
+	protected static $instances = array();
 
-    /**
-     * Return a named instance of EnvironmentCheckSuite.
-     *
-     * @param string $name
-     *
-     * @return EnvironmentCheckSuite
-     */
-    public static function inst($name)
-    {
-        if (!isset(self::$instances[$name])) {
-            self::$instances[$name] = new EnvironmentCheckSuite($name);
-        }
-        return self::$instances[$name];
-    }
+	/**
+	 * Return a named instance of EnvironmentCheckSuite.
+	 *
+	 * @param string $name
+	 *
+	 * @return EnvironmentCheckSuite
+	 */
+	public static function inst($name)
+	{
+		if (!isset(self::$instances[$name])) {
+			self::$instances[$name] = new EnvironmentCheckSuite($name);
+		}
+		return self::$instances[$name];
+	}
 
-    /**
-     * Register a check against the named check suite.
-     *
-     * @param string|array $names
-     * @param EnvironmentCheck $check
-     * @param string|array
-     */
-    public static function register($names, $check, $title = null)
-    {
-        if (!is_array($names)) {
-            $names = array($names);
-        }
-        foreach ($names as $name) {
-            self::inst($name)->push($check, $title);
-        }
-    }
+	/**
+	 * Register a check against the named check suite.
+	 *
+	 * @param string|array $names
+	 * @param EnvironmentCheck $check
+	 * @param string|array
+	 */
+	public static function register($names, $check, $title = null)
+	{
+		if (!is_array($names)) {
+			$names = array($names);
+		}
+		foreach ($names as $name) {
+			self::inst($name)->push($check, $title);
+		}
+	}
 
-    /**
-     * Unregisters all checks.
-     */
-    public static function reset()
-    {
-        self::$instances = array();
-    }
+	/**
+	 * Unregisters all checks.
+	 */
+	public static function reset()
+	{
+		self::$instances = array();
+	}
 }
 
 /**
@@ -203,100 +203,100 @@ 
  */
 class EnvironmentCheckSuiteResult extends ViewableData
 {
-    /**
-     * @var ArrayList
-     */
-    protected $details;
+	/**
+	 * @var ArrayList
+	 */
+	protected $details;
 
-    /**
-     * @var int
-     */
-    protected $worst = 0;
+	/**
+	 * @var int
+	 */
+	protected $worst = 0;
 
-    public function __construct()
-    {
-        parent::__construct();
-        $this->details = new ArrayList();
-    }
+	public function __construct()
+	{
+		parent::__construct();
+		$this->details = new ArrayList();
+	}
 
-    /**
-     * @param int $status
-     * @param string $message
-     * @param string $checkIdentifier
-     */
-    public function addResult($status, $message, $checkIdentifier)
-    {
-        $this->details->push(new ArrayData(array(
-            'Check' => $checkIdentifier,
-            'Status' => $this->statusText($status),
-            'StatusCode' => $status,
-            'Message' => $message,
-        )));
+	/**
+	 * @param int $status
+	 * @param string $message
+	 * @param string $checkIdentifier
+	 */
+	public function addResult($status, $message, $checkIdentifier)
+	{
+		$this->details->push(new ArrayData(array(
+			'Check' => $checkIdentifier,
+			'Status' => $this->statusText($status),
+			'StatusCode' => $status,
+			'Message' => $message,
+		)));
 
-        $this->worst = max($this->worst, $status);
-    }
+		$this->worst = max($this->worst, $status);
+	}
 
-    /**
-     * Returns true if there are no errors.
-     *
-     * @return bool
-     */
-    public function ShouldPass()
-    {
-        return $this->worst <= EnvironmentCheck::WARNING;
-    }
+	/**
+	 * Returns true if there are no errors.
+	 *
+	 * @return bool
+	 */
+	public function ShouldPass()
+	{
+		return $this->worst <= EnvironmentCheck::WARNING;
+	}
 
-    /**
-     * Returns overall (i.e. worst) status as a string.
-     *
-     * @return string
-     */
-    public function Status()
-    {
-        return $this->statusText($this->worst);
-    }
+	/**
+	 * Returns overall (i.e. worst) status as a string.
+	 *
+	 * @return string
+	 */
+	public function Status()
+	{
+		return $this->statusText($this->worst);
+	}
 
-    /**
-     * Returns detailed status information about each check.
-     *
-     * @return ArrayList
-     */
-    public function Details()
-    {
-        return $this->details;
-    }
+	/**
+	 * Returns detailed status information about each check.
+	 *
+	 * @return ArrayList
+	 */
+	public function Details()
+	{
+		return $this->details;
+	}
 
-    /**
-     * Convert the final result status and details to JSON.
-     *
-     * @return string
-     */
-    public function toJSON()
-    {
-        $result = array(
-            'Status' => $this->Status(),
-            'ShouldPass' => $this->ShouldPass(),
-            'Checks' => array()
-        );
-        foreach ($this->details as $detail) {
-            $result['Checks'][] = $detail->toMap();
-        }
-        return json_encode($result);
-    }
+	/**
+	 * Convert the final result status and details to JSON.
+	 *
+	 * @return string
+	 */
+	public function toJSON()
+	{
+		$result = array(
+			'Status' => $this->Status(),
+			'ShouldPass' => $this->ShouldPass(),
+			'Checks' => array()
+		);
+		foreach ($this->details as $detail) {
+			$result['Checks'][] = $detail->toMap();
+		}
+		return json_encode($result);
+	}
 
-    /**
-     * Return a text version of a status code.
-     *
-     * @return string
-     */
-    protected function statusText($status)
-    {
-        switch ($status) {
-            case EnvironmentCheck::ERROR: return "ERROR";
-            case EnvironmentCheck::WARNING: return "WARNING";
-            case EnvironmentCheck::OK: return "OK";
-            case 0: return "NO CHECKS";
-            default: throw new InvalidArgumentException("Bad environment check status '$status'");
-        }
-    }
+	/**
+	 * Return a text version of a status code.
+	 *
+	 * @return string
+	 */
+	protected function statusText($status)
+	{
+		switch ($status) {
+			case EnvironmentCheck::ERROR: return "ERROR";
+			case EnvironmentCheck::WARNING: return "WARNING";
+			case EnvironmentCheck::OK: return "OK";
+			case 0: return "NO CHECKS";
+			default: throw new InvalidArgumentException("Bad environment check status '$status'");
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 
             // Existing named checks can be disabled by setting their 'state' to 'disabled'.
             // This is handy for disabling checks mandated by modules.
-            if (!empty($check['state']) && $check['state']==='disabled') {
+            if (!empty($check['state']) && $check['state'] === 'disabled') {
                 continue;
             }
             

code/DevCheckController.php

Indentation +29 added lines, -29 removed lines

@@ -2,38 +2,38 @@
 
 class DevCheckController extends Controller
 {
-    /**
-     * @var array
-     */
-    public static $allowed_actions = array(
-        'index'
-    );
+	/**
+	 * @var array
+	 */
+	public static $allowed_actions = array(
+		'index'
+	);
 
-    /**
-     * Permission code to check for access to this controller.
-     *
-     * @var string
-     */
-    private static $permission = 'ADMIN';
+	/**
+	 * Permission code to check for access to this controller.
+	 *
+	 * @var string
+	 */
+	private static $permission = 'ADMIN';
 
-    /**
-     * @param SS_HTTPRequest $request
-     *
-     * @return EnvironmentChecker
-     *
-     * @throws SS_HTTPResponse_Exception
-     */
-    public function index($request)
-    {
-        $suite = 'check';
+	/**
+	 * @param SS_HTTPRequest $request
+	 *
+	 * @return EnvironmentChecker
+	 *
+	 * @throws SS_HTTPResponse_Exception
+	 */
+	public function index($request)
+	{
+		$suite = 'check';
 
-        if ($name = $request->param('Suite')) {
-            $suite = $name;
-        }
+		if ($name = $request->param('Suite')) {
+			$suite = $name;
+		}
 
-        $checker = new EnvironmentChecker($suite, 'Environment status');
-        $checker->init($this->config()->permission);
+		$checker = new EnvironmentChecker($suite, 'Environment status');
+		$checker->init($this->config()->permission);
 
-        return $checker;
-    }
+		return $checker;
+	}
 }

code/DevHealthController.php

Indentation +19 added lines, -19 removed lines

@@ -2,26 +2,26 @@
 
 class DevHealthController extends Controller
 {
-    /**
-     * @var array
-     */
-    public static $allowed_actions = array(
-        'index'
-    );
+	/**
+	 * @var array
+	 */
+	public static $allowed_actions = array(
+		'index'
+	);
 
-    /**
-     * @return EnvironmentChecker
-     *
-     * @throws SS_HTTPResponse_Exception
-     */
-    public function index()
-    {
-        // health check does not require permission to run
+	/**
+	 * @return EnvironmentChecker
+	 *
+	 * @throws SS_HTTPResponse_Exception
+	 */
+	public function index()
+	{
+		// health check does not require permission to run
 
-        $checker = new EnvironmentChecker('health', 'Site health');
-        $checker->init('');
-        $checker->setErrorCode(404);
+		$checker = new EnvironmentChecker('health', 'Site health');
+		$checker->init('');
+		$checker->setErrorCode(404);
 
-        return $checker;
-    }
+		return $checker;
+	}
 }

code/EnvironmentCheck.php

Indentation +18 added lines, -18 removed lines

@@ -16,25 +16,25 @@
  */
 interface EnvironmentCheck
 {
-    /**
-     * @var int
-     */
-    const ERROR = 3;
+	/**
+	 * @var int
+	 */
+	const ERROR = 3;
 
-    /**
-     * @var int
-     */
-    const WARNING = 2;
+	/**
+	 * @var int
+	 */
+	const WARNING = 2;
 
-    /**
-     * @var int
-     */
-    const OK = 1;
+	/**
+	 * @var int
+	 */
+	const OK = 1;
 
-    /**
-     * @return array Result with 'status' and 'message' keys.
-     *
-     * Status is EnvironmentCheck::ERROR, EnvironmentCheck::WARNING, or EnvironmentCheck::OK.
-     */
-    public function check();
+	/**
+	 * @return array Result with 'status' and 'message' keys.
+	 *
+	 * Status is EnvironmentCheck::ERROR, EnvironmentCheck::WARNING, or EnvironmentCheck::OK.
+	 */
+	public function check();
 }

code/EnvironmentChecker.php

Indentation +282 added lines, -282 removed lines

@@ -5,288 +5,288 @@
  */
 class EnvironmentChecker extends RequestHandler
 {
-    /**
-     * @var array
-     */
-    private static $url_handlers = array(
-        '' => 'index',
-    );
-
-    /**
-     * @var string
-     */
-    protected $checkSuiteName;
-
-    /**
-     * @var string
-     */
-    protected $title;
-
-    /**
-     * @var int
-     */
-    protected $errorCode = 500;
-
-    /**
-     * @var null|string
-     */
-    private static $to_email_address = null;
-
-    /**
-     * @var null|string
-     */
-    private static $from_email_address = null;
-
-    /**
-     * @var bool
-     */
-    private static $email_results = false;
-
-    /**
-     * @var bool Log results via {@link SS_Log}
-     */
-    private static $log_results_warning = false;
-
-    /**
-     * @var int Maps to {@link Zend_Log} levels. Defaults to Zend_Log::WARN
-     */
-    private static $log_results_warning_level = 4;
-
-    /**
-     * @var bool Log results via {@link SS_Log}
-     */
-    private static $log_results_error = false;
-
-    /**
-     * @var int Maps to {@link Zend_Log} levels. Defaults to Zend_Log::ALERT
-     */
-    private static $log_results_error_level = 1;
-
-    /**
-     * @param string $checkSuiteName
-     * @param string $title
-     */
-    public function __construct($checkSuiteName, $title)
-    {
-        parent::__construct();
+	/**
+	 * @var array
+	 */
+	private static $url_handlers = array(
+		'' => 'index',
+	);
+
+	/**
+	 * @var string
+	 */
+	protected $checkSuiteName;
+
+	/**
+	 * @var string
+	 */
+	protected $title;
+
+	/**
+	 * @var int
+	 */
+	protected $errorCode = 500;
+
+	/**
+	 * @var null|string
+	 */
+	private static $to_email_address = null;
+
+	/**
+	 * @var null|string
+	 */
+	private static $from_email_address = null;
+
+	/**
+	 * @var bool
+	 */
+	private static $email_results = false;
+
+	/**
+	 * @var bool Log results via {@link SS_Log}
+	 */
+	private static $log_results_warning = false;
+
+	/**
+	 * @var int Maps to {@link Zend_Log} levels. Defaults to Zend_Log::WARN
+	 */
+	private static $log_results_warning_level = 4;
+
+	/**
+	 * @var bool Log results via {@link SS_Log}
+	 */
+	private static $log_results_error = false;
+
+	/**
+	 * @var int Maps to {@link Zend_Log} levels. Defaults to Zend_Log::ALERT
+	 */
+	private static $log_results_error_level = 1;
+
+	/**
+	 * @param string $checkSuiteName
+	 * @param string $title
+	 */
+	public function __construct($checkSuiteName, $title)
+	{
+		parent::__construct();
         
-        $this->checkSuiteName = $checkSuiteName;
-        $this->title = $title;
-    }
-
-    /**
-     * @param string $permission
-     *
-     * @throws SS_HTTPResponse_Exception
-     */
-    public function init($permission = 'ADMIN')
-    {
-        // if the environment supports it, provide a basic auth challenge and see if it matches configured credentials
-        if (defined('ENVCHECK_BASICAUTH_USERNAME') && defined('ENVCHECK_BASICAUTH_PASSWORD')) {
-            if (isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
-                // authenticate the input user/pass with the configured credentials
-                if (
-                    !(
-                        $_SERVER['PHP_AUTH_USER'] == ENVCHECK_BASICAUTH_USERNAME
-                        && $_SERVER['PHP_AUTH_PW'] == ENVCHECK_BASICAUTH_PASSWORD
-                    )
-                ) {
-                    $response = new SS_HTTPResponse(null, 401);
-                    $response->addHeader('WWW-Authenticate', "Basic realm=\"Environment check\"");
-                    // Exception is caught by RequestHandler->handleRequest() and will halt further execution
-                    $e = new SS_HTTPResponse_Exception(null, 401);
-                    $e->setResponse($response);
-                    throw $e;
-                }
-            } else {
-                $response = new SS_HTTPResponse(null, 401);
-                $response->addHeader('WWW-Authenticate', "Basic realm=\"Environment check\"");
-                // Exception is caught by RequestHandler->handleRequest() and will halt further execution
-                $e = new SS_HTTPResponse_Exception(null, 401);
-                $e->setResponse($response);
-                throw $e;
-            }
-        } else {
-            if (!$this->canAccess(null, $permission)) {
-                return $this->httpError(403);
-            }
-        }
-    }
-
-    /**
-     * @param null|int|Member $member
-     * @param string $permission
-     *
-     * @return bool
-     *
-     * @throws SS_HTTPResponse_Exception
-     */
-    public function canAccess($member = null, $permission = "ADMIN")
-    {
-        if (!$member) {
-            $member = Member::currentUser();
-        }
-
-        if (!$member) {
-            $member = BasicAuth::requireLogin('Environment Checker', $permission, false);
-        }
-
-        // We allow access to this controller regardless of live-status or ADMIN permission only
-        // if on CLI.  Access to this controller is always allowed in "dev-mode", or of the user is ADMIN.
-        if (
-            Director::isDev()
-            || Director::is_cli()
-            || empty($permission)
-            || Permission::checkMember($member, $permission)
-        ) {
-            return true;
-        }
-
-        // Extended access checks.
-        // "Veto" style, return NULL to abstain vote.
-        $canExtended = null;
-        $results = $this->extend('canAccess', $member);
-        if ($results && is_array($results)) {
-            if (!min($results)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * @return SS_HTTPResponse
-     */
-    public function index()
-    {
-        $response = new SS_HTTPResponse;
-        $result = EnvironmentCheckSuite::inst($this->checkSuiteName)->run();
-
-        if (!$result->ShouldPass()) {
-            $response->setStatusCode($this->errorCode);
-        }
-
-        $resultText = $result->customise(array(
-            "URL" => Director::absoluteBaseURL(),
-            "Title" => $this->title,
-            "Name" => $this->checkSuiteName,
-            "ErrorCode" => $this->errorCode,
-        ))->renderWith("EnvironmentChecker");
-
-        if ($this->config()->email_results && !$result->ShouldPass()) {
-            $email = new Email($this->config()->from_email_address, $this->config()->to_email_address, $this->title, $resultText);
-            $email->send();
-        }
-
-        // Optionally log errors and warnings individually
-        foreach ($result->Details() as $detail) {
-            if ($this->config()->log_results_warning && $detail->StatusCode == EnvironmentCheck::WARNING) {
-                $this->log(
-                    sprintf('EnvironmentChecker warning at "%s" check. Message: %s', $detail->Check, $detail->Message),
-                    $this->config()->log_results_warning_level
-                );
-            } elseif ($this->config()->log_results_error && $detail->StatusCode == EnvironmentCheck::ERROR) {
-                $this->log(
-                    sprintf('EnvironmentChecker error at "%s" check. Message: %s', $detail->Check, $detail->Message),
-                    $this->config()->log_results_error_level
-                );
-            }
-        }
-
-        // output the result as JSON if requested
-        if (
-            $this->getRequest()->getExtension() == 'json'
-            || strpos($this->getRequest()->getHeader('Accept'), 'application/json') !== false
-        ) {
-            $response->setBody($result->toJSON());
-            $response->addHeader('Content-Type', 'application/json');
-            return $response;
-        }
-
-        $response->setBody($resultText);
+		$this->checkSuiteName = $checkSuiteName;
+		$this->title = $title;
+	}
+
+	/**
+	 * @param string $permission
+	 *
+	 * @throws SS_HTTPResponse_Exception
+	 */
+	public function init($permission = 'ADMIN')
+	{
+		// if the environment supports it, provide a basic auth challenge and see if it matches configured credentials
+		if (defined('ENVCHECK_BASICAUTH_USERNAME') && defined('ENVCHECK_BASICAUTH_PASSWORD')) {
+			if (isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
+				// authenticate the input user/pass with the configured credentials
+				if (
+					!(
+						$_SERVER['PHP_AUTH_USER'] == ENVCHECK_BASICAUTH_USERNAME
+						&& $_SERVER['PHP_AUTH_PW'] == ENVCHECK_BASICAUTH_PASSWORD
+					)
+				) {
+					$response = new SS_HTTPResponse(null, 401);
+					$response->addHeader('WWW-Authenticate', "Basic realm=\"Environment check\"");
+					// Exception is caught by RequestHandler->handleRequest() and will halt further execution
+					$e = new SS_HTTPResponse_Exception(null, 401);
+					$e->setResponse($response);
+					throw $e;
+				}
+			} else {
+				$response = new SS_HTTPResponse(null, 401);
+				$response->addHeader('WWW-Authenticate', "Basic realm=\"Environment check\"");
+				// Exception is caught by RequestHandler->handleRequest() and will halt further execution
+				$e = new SS_HTTPResponse_Exception(null, 401);
+				$e->setResponse($response);
+				throw $e;
+			}
+		} else {
+			if (!$this->canAccess(null, $permission)) {
+				return $this->httpError(403);
+			}
+		}
+	}
+
+	/**
+	 * @param null|int|Member $member
+	 * @param string $permission
+	 *
+	 * @return bool
+	 *
+	 * @throws SS_HTTPResponse_Exception
+	 */
+	public function canAccess($member = null, $permission = "ADMIN")
+	{
+		if (!$member) {
+			$member = Member::currentUser();
+		}
+
+		if (!$member) {
+			$member = BasicAuth::requireLogin('Environment Checker', $permission, false);
+		}
+
+		// We allow access to this controller regardless of live-status or ADMIN permission only
+		// if on CLI.  Access to this controller is always allowed in "dev-mode", or of the user is ADMIN.
+		if (
+			Director::isDev()
+			|| Director::is_cli()
+			|| empty($permission)
+			|| Permission::checkMember($member, $permission)
+		) {
+			return true;
+		}
+
+		// Extended access checks.
+		// "Veto" style, return NULL to abstain vote.
+		$canExtended = null;
+		$results = $this->extend('canAccess', $member);
+		if ($results && is_array($results)) {
+			if (!min($results)) {
+				return false;
+			} else {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * @return SS_HTTPResponse
+	 */
+	public function index()
+	{
+		$response = new SS_HTTPResponse;
+		$result = EnvironmentCheckSuite::inst($this->checkSuiteName)->run();
+
+		if (!$result->ShouldPass()) {
+			$response->setStatusCode($this->errorCode);
+		}
+
+		$resultText = $result->customise(array(
+			"URL" => Director::absoluteBaseURL(),
+			"Title" => $this->title,
+			"Name" => $this->checkSuiteName,
+			"ErrorCode" => $this->errorCode,
+		))->renderWith("EnvironmentChecker");
+
+		if ($this->config()->email_results && !$result->ShouldPass()) {
+			$email = new Email($this->config()->from_email_address, $this->config()->to_email_address, $this->title, $resultText);
+			$email->send();
+		}
+
+		// Optionally log errors and warnings individually
+		foreach ($result->Details() as $detail) {
+			if ($this->config()->log_results_warning && $detail->StatusCode == EnvironmentCheck::WARNING) {
+				$this->log(
+					sprintf('EnvironmentChecker warning at "%s" check. Message: %s', $detail->Check, $detail->Message),
+					$this->config()->log_results_warning_level
+				);
+			} elseif ($this->config()->log_results_error && $detail->StatusCode == EnvironmentCheck::ERROR) {
+				$this->log(
+					sprintf('EnvironmentChecker error at "%s" check. Message: %s', $detail->Check, $detail->Message),
+					$this->config()->log_results_error_level
+				);
+			}
+		}
+
+		// output the result as JSON if requested
+		if (
+			$this->getRequest()->getExtension() == 'json'
+			|| strpos($this->getRequest()->getHeader('Accept'), 'application/json') !== false
+		) {
+			$response->setBody($result->toJSON());
+			$response->addHeader('Content-Type', 'application/json');
+			return $response;
+		}
+
+		$response->setBody($resultText);
         
-        return $response;
-    }
-
-    /**
-     * @param string $message
-     * @param int $level
-     */
-    public function log($message, $level)
-    {
-        SS_Log::log($message, $level);
-    }
-
-    /**
-     * Set the HTTP status code that should be returned when there's an error.
-     *
-     * @param int $errorCode
-     */
-    public function setErrorCode($errorCode)
-    {
-        $this->errorCode = $errorCode;
-    }
-
-    /**
-     * @deprecated
-     * @param string $from
-     */
-    public static function set_from_email_address($from)
-    {
-        Deprecation::notice('2.0', 'Use config API instead');
-        Config::inst()->update('EnvironmentChecker', 'from_email_address', $from);
-    }
-
-    /**
-     * @deprecated
-     * @return null|string
-     */
-    public static function get_from_email_address()
-    {
-        Deprecation::notice('2.0', 'Use config API instead');
-        return Config::inst()->get('EnvironmentChecker', 'from_email_address');
-    }
-
-    /**
-     * @deprecated
-     * @param string $to
-     */
-    public static function set_to_email_address($to)
-    {
-        Deprecation::notice('2.0', 'Use config API instead');
-        Config::inst()->update('EnvironmentChecker', 'to_email_address',  $to);
-    }
-
-    /**
-     * @deprecated
-     * @return null|string
-     */
-    public static function get_to_email_address()
-    {
-        Deprecation::notice('2.0', 'Use config API instead');
-        return Config::inst()->get('EnvironmentChecker', 'to_email_address');
-    }
-
-    /**
-     * @deprecated
-     * @param bool $results
-     */
-    public static function set_email_results($results)
-    {
-        Deprecation::notice('2.0', 'Use config API instead');
-        Config::inst()->update('EnvironmentChecker', 'email_results', $results);
-    }
-
-    /**
-     * @deprecated
-     * @return bool
-     */
-    public static function get_email_results()
-    {
-        Deprecation::notice('2.0', 'Use config API instead');
-        return Config::inst()->get('EnvironmentChecker', 'email_results');
-    }
+		return $response;
+	}
+
+	/**
+	 * @param string $message
+	 * @param int $level
+	 */
+	public function log($message, $level)
+	{
+		SS_Log::log($message, $level);
+	}
+
+	/**
+	 * Set the HTTP status code that should be returned when there's an error.
+	 *
+	 * @param int $errorCode
+	 */
+	public function setErrorCode($errorCode)
+	{
+		$this->errorCode = $errorCode;
+	}
+
+	/**
+	 * @deprecated
+	 * @param string $from
+	 */
+	public static function set_from_email_address($from)
+	{
+		Deprecation::notice('2.0', 'Use config API instead');
+		Config::inst()->update('EnvironmentChecker', 'from_email_address', $from);
+	}
+
+	/**
+	 * @deprecated
+	 * @return null|string
+	 */
+	public static function get_from_email_address()
+	{
+		Deprecation::notice('2.0', 'Use config API instead');
+		return Config::inst()->get('EnvironmentChecker', 'from_email_address');
+	}
+
+	/**
+	 * @deprecated
+	 * @param string $to
+	 */
+	public static function set_to_email_address($to)
+	{
+		Deprecation::notice('2.0', 'Use config API instead');
+		Config::inst()->update('EnvironmentChecker', 'to_email_address',  $to);
+	}
+
+	/**
+	 * @deprecated
+	 * @return null|string
+	 */
+	public static function get_to_email_address()
+	{
+		Deprecation::notice('2.0', 'Use config API instead');
+		return Config::inst()->get('EnvironmentChecker', 'to_email_address');
+	}
+
+	/**
+	 * @deprecated
+	 * @param bool $results
+	 */
+	public static function set_email_results($results)
+	{
+		Deprecation::notice('2.0', 'Use config API instead');
+		Config::inst()->update('EnvironmentChecker', 'email_results', $results);
+	}
+
+	/**
+	 * @deprecated
+	 * @return bool
+	 */
+	public static function get_email_results()
+	{
+		Deprecation::notice('2.0', 'Use config API instead');
+		return Config::inst()->get('EnvironmentChecker', 'email_results');
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -257,7 +257,7 @@
     public static function set_to_email_address($to)
     {
         Deprecation::notice('2.0', 'Use config API instead');
-        Config::inst()->update('EnvironmentChecker', 'to_email_address',  $to);
+        Config::inst()->update('EnvironmentChecker', 'to_email_address', $to);
     }
 
     /**

code/checks/DatabaseCheck.php

Indentation +27 added lines, -27 removed lines

@@ -6,35 +6,35 @@
  */
 class DatabaseCheck implements EnvironmentCheck
 {
-    protected $checkTable;
+	protected $checkTable;
 
-    /**
-     * By default, Member will be checked.
-     *
-     * @param string $checkTable
-     */
-    public function __construct($checkTable = "Member")
-    {
-        $this->checkTable = $checkTable;
-    }
+	/**
+	 * By default, Member will be checked.
+	 *
+	 * @param string $checkTable
+	 */
+	public function __construct($checkTable = "Member")
+	{
+		$this->checkTable = $checkTable;
+	}
 
-    /**
-     * @inheritdoc
-     *
-     * @return array
-     */
-    public function check()
-    {
-        if (!DB::getConn()->hasTable($this->checkTable)) {
-            return array(EnvironmentCheck::ERROR, "$this->checkTable not present in the database");
-        }
+	/**
+	 * @inheritdoc
+	 *
+	 * @return array
+	 */
+	public function check()
+	{
+		if (!DB::getConn()->hasTable($this->checkTable)) {
+			return array(EnvironmentCheck::ERROR, "$this->checkTable not present in the database");
+		}
 
-        $count = DB::query("SELECT COUNT(*) FROM \"$this->checkTable\"")->value();
+		$count = DB::query("SELECT COUNT(*) FROM \"$this->checkTable\"")->value();
         
-        if ($count > 0) {
-            return array(EnvironmentCheck::OK, "");
-        } else {
-            return array(EnvironmentCheck::WARNING, "$this->checkTable queried ok but has no records");
-        }
-    }
+		if ($count > 0) {
+			return array(EnvironmentCheck::OK, "");
+		} else {
+			return array(EnvironmentCheck::WARNING, "$this->checkTable queried ok but has no records");
+		}
+	}
 }