silverstripe / silverstripe-environmentcheck

src/Checks/FileAccessibilityAndValidationCheck.php

Indentation +166 added lines, -166 removed lines

@@ -28,170 +28,170 @@
  */
 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(Versioned::LIVE);
-
-        $files = $this->getFiles();
-        if ($files) {
-            $fileTypeValidateFunc = $this->fileTypeValidateFunc;
-            if (method_exists($this, $fileTypeValidateFunc)) {
-                $invalidFiles = [];
-                $validFiles = [];
-
-                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 = PHP_EOL;
-                    foreach ($validFiles as $vf) {
-                        $validFileList .= $vf . PHP_EOL;
-                    }
-                    if ($fileTypeValidateFunc == 'noVidation') {
-                        $checkReturn = [
-                            EnvironmentCheck::OK,
-                            sprintf('At least these file(s) accessible: %s', $validFileList)
-                        ];
-                    } else {
-                        $checkReturn = [
-                            EnvironmentCheck::OK,
-                            sprintf(
-                                'At least these file(s) passed file type validate function "%s": %s',
-                                $fileTypeValidateFunc,
-                                $validFileList
-                            )
-                        ];
-                    }
-                } else {
-                    if (count($invalidFiles) == 0) {
-                        $checkReturn = [EnvironmentCheck::OK, 'All files valideted'];
-                    } else {
-                        $invalidFileList = PHP_EOL;
-                        foreach ($invalidFiles as $vf) {
-                            $invalidFileList .= $vf . PHP_EOL;
-                        }
-
-                        if ($fileTypeValidateFunc == 'noVidation') {
-                            $checkReturn = [
-                                EnvironmentCheck::ERROR,
-                                sprintf('File(s) not accessible: %s', $invalidFileList)
-                            ];
-                        } else {
-                            $checkReturn = [
-                                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;
-        }
-        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(Versioned::LIVE);
+
+		$files = $this->getFiles();
+		if ($files) {
+			$fileTypeValidateFunc = $this->fileTypeValidateFunc;
+			if (method_exists($this, $fileTypeValidateFunc)) {
+				$invalidFiles = [];
+				$validFiles = [];
+
+				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 = PHP_EOL;
+					foreach ($validFiles as $vf) {
+						$validFileList .= $vf . PHP_EOL;
+					}
+					if ($fileTypeValidateFunc == 'noVidation') {
+						$checkReturn = [
+							EnvironmentCheck::OK,
+							sprintf('At least these file(s) accessible: %s', $validFileList)
+						];
+					} else {
+						$checkReturn = [
+							EnvironmentCheck::OK,
+							sprintf(
+								'At least these file(s) passed file type validate function "%s": %s',
+								$fileTypeValidateFunc,
+								$validFileList
+							)
+						];
+					}
+				} else {
+					if (count($invalidFiles) == 0) {
+						$checkReturn = [EnvironmentCheck::OK, 'All files valideted'];
+					} else {
+						$invalidFileList = PHP_EOL;
+						foreach ($invalidFiles as $vf) {
+							$invalidFileList .= $vf . PHP_EOL;
+						}
+
+						if ($fileTypeValidateFunc == 'noVidation') {
+							$checkReturn = [
+								EnvironmentCheck::ERROR,
+								sprintf('File(s) not accessible: %s', $invalidFileList)
+							];
+						} else {
+							$checkReturn = [
+								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;
+		}
+		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);
+	}
 }

src/Checks/URLCheck.php

Indentation +42 added lines, -42 removed lines

@@ -14,50 +14,50 @@
  */
 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;
-    }
+	/**
+	 * @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;
+	}
 
-    /**
-     * {@inheritDoc}
-     *
-     * @return array
-     * @throws HTTPResponse_Exception
-     */
-    public function check()
-    {
-        $response = Director::test($this->url);
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @return array
+	 * @throws HTTPResponse_Exception
+	 */
+	public function check()
+	{
+		$response = Director::test($this->url);
 
-        if ($response->getStatusCode() != 200) {
-            return [
-                EnvironmentCheck::ERROR,
-                sprintf('Error retrieving "%s" (Code: %d)', $this->url, $response->getStatusCode())
-            ];
-        } elseif ($this->testString && (strpos($response->getBody(), $this->testString) === false)) {
-            return [
-                EnvironmentCheck::WARNING,
-                sprintf('Success retrieving "%s", but string "%s" not found', $this->url, $this->testString)
-            ];
-        }
-        return [
-            EnvironmentCheck::OK,
-            sprintf('Success retrieving "%s"', $this->url)
-        ];
-    }
+		if ($response->getStatusCode() != 200) {
+			return [
+				EnvironmentCheck::ERROR,
+				sprintf('Error retrieving "%s" (Code: %d)', $this->url, $response->getStatusCode())
+			];
+		} elseif ($this->testString && (strpos($response->getBody(), $this->testString) === false)) {
+			return [
+				EnvironmentCheck::WARNING,
+				sprintf('Success retrieving "%s", but string "%s" not found', $this->url, $this->testString)
+			];
+		}
+		return [
+			EnvironmentCheck::OK,
+			sprintf('Success retrieving "%s"', $this->url)
+		];
+	}
 }

src/Checks/ExternalURLCheck.php

Indentation +102 added lines, -102 removed lines

@@ -16,118 +16,118 @@
  */
 class ExternalURLCheck implements EnvironmentCheck
 {
-    /**
-     * @var array
-     */
-    protected $urls = [];
+	/**
+	 * @var array
+	 */
+	protected $urls = [];
 
-    /**
-     * @var Int Timeout in seconds.
-     */
-    protected $timeout;
+	/**
+	 * @var Int Timeout in seconds.
+	 */
+	protected $timeout;
 
-    /**
-     * @param string $urls Space-separated list of absolute URLs.
-     * @param int $timeout
-     */
-    public function __construct($urls, $timeout = 15)
-    {
-        if ($urls) {
-            $this->urls = explode(' ', $urls);
-        }
-        $this->timeout = $timeout;
-    }
+	/**
+	 * @param string $urls Space-separated list of absolute URLs.
+	 * @param int $timeout
+	 */
+	public function __construct($urls, $timeout = 15)
+	{
+		if ($urls) {
+			$this->urls = explode(' ', $urls);
+		}
+		$this->timeout = $timeout;
+	}
 
-    /**
-     * {@inheritDoc}
-     *
-     * @return array
-     */
-    public function check()
-    {
-        $urls = $this->getURLs();
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @return array
+	 */
+	public function check()
+	{
+		$urls = $this->getURLs();
 
-        $chs = [];
-        foreach ($urls as $url) {
-            $ch = curl_init();
-            $chs[] = $ch;
-            curl_setopt_array($ch, $this->getCurlOpts($url));
-        }
-        // Parallel execution for faster performance
-        $mh = curl_multi_init();
-        foreach ($chs as $ch) {
-            curl_multi_add_handle($mh, $ch);
-        }
+		$chs = [];
+		foreach ($urls as $url) {
+			$ch = curl_init();
+			$chs[] = $ch;
+			curl_setopt_array($ch, $this->getCurlOpts($url));
+		}
+		// Parallel execution for faster performance
+		$mh = curl_multi_init();
+		foreach ($chs as $ch) {
+			curl_multi_add_handle($mh, $ch);
+		}
 
-        $active = null;
-        // Execute the handles
-        do {
-            $mrc = curl_multi_exec($mh, $active);
-            curl_multi_select($mh);
-        } while ($active > 0);
+		$active = null;
+		// Execute the handles
+		do {
+			$mrc = curl_multi_exec($mh, $active);
+			curl_multi_select($mh);
+		} while ($active > 0);
 
-        while ($active && $mrc == CURLM_OK) {
-            if (curl_multi_select($mh) != -1) {
-                do {
-                    $mrc = curl_multi_exec($mh, $active);
-                } while ($mrc == CURLM_CALL_MULTI_PERFORM);
-            }
-        }
+		while ($active && $mrc == CURLM_OK) {
+			if (curl_multi_select($mh) != -1) {
+				do {
+					$mrc = curl_multi_exec($mh, $active);
+				} while ($mrc == CURLM_CALL_MULTI_PERFORM);
+			}
+		}
 
-        $hasError = false;
-        $msgs = [];
-        foreach ($chs as $ch) {
-            $url = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL);
-            $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-            if (curl_errno($ch) || $code >= 400) {
-                $hasError = true;
-                $msgs[] = sprintf(
-                    'Error retrieving "%s": %s (Code: %s)',
-                    $url,
-                    curl_error($ch),
-                    $code
-                );
-            } else {
-                $msgs[] = sprintf(
-                    'Success retrieving "%s" (Code: %s)',
-                    $url,
-                    $code
-                );
-            }
-        }
+		$hasError = false;
+		$msgs = [];
+		foreach ($chs as $ch) {
+			$url = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL);
+			$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+			if (curl_errno($ch) || $code >= 400) {
+				$hasError = true;
+				$msgs[] = sprintf(
+					'Error retrieving "%s": %s (Code: %s)',
+					$url,
+					curl_error($ch),
+					$code
+				);
+			} else {
+				$msgs[] = sprintf(
+					'Success retrieving "%s" (Code: %s)',
+					$url,
+					$code
+				);
+			}
+		}
 
-        // Close the handles
-        foreach ($chs as $ch) {
-            curl_multi_remove_handle($mh, $ch);
-        }
-        curl_multi_close($mh);
+		// Close the handles
+		foreach ($chs as $ch) {
+			curl_multi_remove_handle($mh, $ch);
+		}
+		curl_multi_close($mh);
 
-        if ($hasError) {
-            return [EnvironmentCheck::ERROR, implode(', ', $msgs)];
-        }
+		if ($hasError) {
+			return [EnvironmentCheck::ERROR, implode(', ', $msgs)];
+		}
 
-        return [EnvironmentCheck::OK, implode(', ', $msgs)];
-    }
+		return [EnvironmentCheck::OK, implode(', ', $msgs)];
+	}
 
-    /**
-     * @return array
-     */
-    protected function getCurlOpts($url)
-    {
-        return [
-            CURLOPT_URL => $url,
-            CURLOPT_HEADER => 0,
-            CURLOPT_RETURNTRANSFER => 1,
-            CURLOPT_FAILONERROR => 1,
-            CURLOPT_TIMEOUT => $this->timeout,
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	protected function getCurlOpts($url)
+	{
+		return [
+			CURLOPT_URL => $url,
+			CURLOPT_HEADER => 0,
+			CURLOPT_RETURNTRANSFER => 1,
+			CURLOPT_FAILONERROR => 1,
+			CURLOPT_TIMEOUT => $this->timeout,
+		];
+	}
 
-    /**
-     * @return array
-     */
-    protected function getURLs()
-    {
-        return $this->urls;
-    }
+	/**
+	 * @return array
+	 */
+	protected function getURLs()
+	{
+		return $this->urls;
+	}
 }

src/Checks/FileAgeCheck.php

Indentation +110 added lines, -110 removed lines

@@ -28,124 +28,124 @@
  */
 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, DBDatetime::now()->Format('U'));
-        $files = $this->getFiles();
-        $invalidFiles = [];
-        $validFiles = [];
-        $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 [
-                            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, DBDatetime::now()->Format('U'));
+		$files = $this->getFiles();
+		$invalidFiles = [];
+		$validFiles = [];
+		$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 [
+							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 [EnvironmentCheck::OK, ''];
-        }
-        if (count($invalidFiles) == 0) {
-            return [EnvironmentCheck::OK, ''];
-        }
-        return [
-            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 [EnvironmentCheck::OK, ''];
+		}
+		if (count($invalidFiles) == 0) {
+			return [EnvironmentCheck::OK, ''];
+		}
+		return [
+			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);
+	}
 }

src/Checks/HasClassCheck.php

Indentation +23 added lines, -23 removed lines

@@ -11,29 +11,29 @@
  */
 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 [EnvironmentCheck::OK, 'Class ' . $this->className.' exists'];
-        }
-        return [EnvironmentCheck::ERROR, 'Class ' . $this->className.' doesn\'t exist'];
-    }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @return array
+	 */
+	public function check()
+	{
+		if (class_exists($this->className)) {
+			return [EnvironmentCheck::OK, 'Class ' . $this->className.' exists'];
+		}
+		return [EnvironmentCheck::ERROR, 'Class ' . $this->className.' doesn\'t exist'];
+	}
 }

src/Checks/FileWriteableCheck.php

Indentation +64 added lines, -64 removed lines

@@ -11,77 +11,77 @@
  */
 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 = [];
-                    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 = [];
+					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 [EnvironmentCheck::ERROR, $message];
-        }
+			return [EnvironmentCheck::ERROR, $message];
+		}
 
-        return [EnvironmentCheck::OK, ''];
-    }
+		return [EnvironmentCheck::OK, ''];
+	}
 }

tests/Controllers/DevHealthControllerTest.php

Indentation +17 added lines, -17 removed lines

@@ -16,27 +16,27 @@
  */
 class DevHealthControllerTest extends SapphireTest
 {
-    /**
-     * {@inheritDoc}
-     * @var array
-     */
-    protected $usesDatabase = true;
+	/**
+	 * {@inheritDoc}
+	 * @var array
+	 */
+	protected $usesDatabase = true;
 
-    public function testIndexCreatesChecker()
-    {
-        $controller = new DevHealthController();
+	public function testIndexCreatesChecker()
+	{
+		$controller = new DevHealthController();
 
-        $request = new HTTPRequest('GET', 'example.com');
+		$request = new 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.
 
-        putenv('ENVCHECK_BASICAUTH_USERNAME="foo"');
-        putenv('ENVCHECK_BASICAUTH_PASSWORD="bar"');
+		putenv('ENVCHECK_BASICAUTH_USERNAME="foo"');
+		putenv('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::class, $controller->index($request));
-    }
+		$this->assertInstanceOf(EnvironmentChecker::class, $controller->index($request));
+	}
 }

tests/Controllers/DevCheckControllerTest.php

Indentation +11 added lines, -11 removed lines

@@ -16,18 +16,18 @@
  */
 class DevCheckControllerTest extends SapphireTest
 {
-    /**
-     * {@inheritDoc}
-     * @var array
-     */
-    protected $usesDatabase = true;
+	/**
+	 * {@inheritDoc}
+	 * @var array
+	 */
+	protected $usesDatabase = true;
 
-    public function testIndexCreatesChecker()
-    {
-        $controller = new DevCheckController();
+	public function testIndexCreatesChecker()
+	{
+		$controller = new DevCheckController();
 
-        $request = new HTTPRequest('GET', 'example.com');
+		$request = new HTTPRequest('GET', 'example.com');
 
-        $this->assertInstanceOf(EnvironmentChecker::class, $controller->index($request));
-    }
+		$this->assertInstanceOf(EnvironmentChecker::class, $controller->index($request));
+	}
 }

tests/EnvironmentCheckerTest.php

Indentation +103 added lines, -103 removed lines

@@ -19,119 +19,119 @@
  */
 class EnvironmentCheckerTest extends SapphireTest
 {
-    /**
-     * {@inheritDoc}
-     * @var bool
-     */
-    protected $usesDatabase = true;
-
-    /**
-     * {@inheritDoc}
-     */
-    public static function setUpBeforeClass()
-    {
-        parent::setUpBeforeClass();
-
-        Phockito::include_hamcrest();
-
-        $logger = Injector::inst()->get(LoggerInterface::class);
-        if ($logger instanceof \Monolog\Logger) {
-            // It logs to stderr by default - disable
-            $logger->pushHandler(new \Monolog\Handler\NullHandler);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function setUp()
-    {
-        parent::setUp();
-        Config::nest();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function tearDown()
-    {
-        Config::unnest();
-        parent::tearDown();
-    }
-
-    public function testOnlyLogsWithErrors()
-    {
-        Config::modify()->set(EnvironmentChecker::class, 'log_results_warning', true);
-        Config::modify()->set(EnvironmentChecker::class, 'log_results_error', true);
-        EnvironmentCheckSuite::register('test suite', new EnvironmentCheckerTest_CheckNoErrors());
-        $checker = Phockito::spy(
-            EnvironmentChecker::class,
-            'test suite',
-            'test'
-        );
-
-        $response = $checker->index();
-        Phockito::verify($checker, 0)->log(\anything(), \anything());
-        EnvironmentCheckSuite::reset();
-    }
-
-    public function testLogsWithWarnings()
-    {
-        Config::modify()->set(EnvironmentChecker::class, 'log_results_warning', true);
-        Config::modify()->set(EnvironmentChecker::class, 'log_results_error', false);
-        EnvironmentCheckSuite::register('test suite', new EnvironmentCheckerTest_CheckWarnings());
-        EnvironmentCheckSuite::register('test suite', new EnvironmentCheckerTest_CheckErrors());
-        $checker = Phockito::spy(
-            EnvironmentChecker::class,
-            'test suite',
-            'test'
-        );
-
-        $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::modify()->set(EnvironmentChecker::class, 'log_results_error', false);
-        Config::modify()->set(EnvironmentChecker::class, 'log_results_error', true);
-        EnvironmentCheckSuite::register('test suite', new EnvironmentCheckerTest_CheckWarnings());
-        EnvironmentCheckSuite::register('test suite', new EnvironmentCheckerTest_CheckErrors());
-        $checker = Phockito::spy(
-            EnvironmentChecker::class,
-            'test suite',
-            'test'
-        );
-
-        $response = $checker->index();
-        Phockito::verify($checker, 0)->log(containsString('warning'), \anything());
-        Phockito::verify($checker, 1)->log(containsString('error'), \anything());
-        EnvironmentCheckSuite::reset();
-    }
+	/**
+	 * {@inheritDoc}
+	 * @var bool
+	 */
+	protected $usesDatabase = true;
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public static function setUpBeforeClass()
+	{
+		parent::setUpBeforeClass();
+
+		Phockito::include_hamcrest();
+
+		$logger = Injector::inst()->get(LoggerInterface::class);
+		if ($logger instanceof \Monolog\Logger) {
+			// It logs to stderr by default - disable
+			$logger->pushHandler(new \Monolog\Handler\NullHandler);
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function setUp()
+	{
+		parent::setUp();
+		Config::nest();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function tearDown()
+	{
+		Config::unnest();
+		parent::tearDown();
+	}
+
+	public function testOnlyLogsWithErrors()
+	{
+		Config::modify()->set(EnvironmentChecker::class, 'log_results_warning', true);
+		Config::modify()->set(EnvironmentChecker::class, 'log_results_error', true);
+		EnvironmentCheckSuite::register('test suite', new EnvironmentCheckerTest_CheckNoErrors());
+		$checker = Phockito::spy(
+			EnvironmentChecker::class,
+			'test suite',
+			'test'
+		);
+
+		$response = $checker->index();
+		Phockito::verify($checker, 0)->log(\anything(), \anything());
+		EnvironmentCheckSuite::reset();
+	}
+
+	public function testLogsWithWarnings()
+	{
+		Config::modify()->set(EnvironmentChecker::class, 'log_results_warning', true);
+		Config::modify()->set(EnvironmentChecker::class, 'log_results_error', false);
+		EnvironmentCheckSuite::register('test suite', new EnvironmentCheckerTest_CheckWarnings());
+		EnvironmentCheckSuite::register('test suite', new EnvironmentCheckerTest_CheckErrors());
+		$checker = Phockito::spy(
+			EnvironmentChecker::class,
+			'test suite',
+			'test'
+		);
+
+		$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::modify()->set(EnvironmentChecker::class, 'log_results_error', false);
+		Config::modify()->set(EnvironmentChecker::class, 'log_results_error', true);
+		EnvironmentCheckSuite::register('test suite', new EnvironmentCheckerTest_CheckWarnings());
+		EnvironmentCheckSuite::register('test suite', new EnvironmentCheckerTest_CheckErrors());
+		$checker = Phockito::spy(
+			EnvironmentChecker::class,
+			'test suite',
+			'test'
+		);
+
+		$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 [EnvironmentCheck::OK, ''];
-    }
+	public function check()
+	{
+		return [EnvironmentCheck::OK, ''];
+	}
 }
 
 class EnvironmentCheckerTest_CheckWarnings implements EnvironmentCheck, TestOnly
 {
-    public function check()
-    {
-        return [EnvironmentCheck::WARNING, 'test warning'];
-    }
+	public function check()
+	{
+		return [EnvironmentCheck::WARNING, 'test warning'];
+	}
 }
 
 class EnvironmentCheckerTest_CheckErrors implements EnvironmentCheck, TestOnly
 {
-    public function check()
-    {
-        return [EnvironmentCheck::ERROR, 'test error'];
-    }
+	public function check()
+	{
+		return [EnvironmentCheck::ERROR, 'test error'];
+	}
 }