silverstripe / silverstripe-environmentcheck

code/checks/URLCheck.php

Doc Comments +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 	/**
 	 * @inheritdoc
 	 *
-	 * @return array
+	 * @return string[]
 	 *
 	 * @throws SS_HTTPResponse_Exception
 	 */

Spacing +2 added lines, -2 removed lines

@@ -35,13 +35,13 @@
 	function check() {
 		$response = Director::test($this->url);
 
-		if($response->getStatusCode() != 200) {
+		if ($response->getStatusCode() != 200) {
 			return array(
 				EnvironmentCheck::ERROR, 
 				sprintf('Error retrieving "%s" (Code: %d)', $this->url, $response->getStatusCode())
 			);
 
-		} else if($this->testString && (strpos($response->getBody(), $this->testString) === false)) {
+		} else if ($this->testString && (strpos($response->getBody(), $this->testString) === false)) {
 			return array(
 				EnvironmentCheck::WARNING, 
 				sprintf('Success retrieving "%s", but string "%s" not found', $this->url, $this->testString)

code/EnvironmentCheckSuite.php

Doc Comments +3 added lines, -2 removed lines

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

Spacing +13 added lines, -13 removed lines

@@ -75,7 +75,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') continue;
+			if (!empty($check['state']) && $check['state'] === 'disabled') continue;
 			
 			// Add the check to this suite.
 			$this->push($check['definition'], $check['title']);
@@ -90,12 +90,12 @@ 
 	public function run() {
 		$result = new EnvironmentCheckSuiteResult();
 
-		foreach($this->checkInstances() as $check) {
+		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) {
+			} catch (Exception $e) {
 				$status = EnvironmentCheck::ERROR;
 				$message = $e->getMessage();
 			}
@@ -112,16 +112,16 @@ 
 	 */
 	protected function checkInstances() {
 		$output = array();
-		foreach($this->checks as $check) {
+		foreach ($this->checks as $check) {
 			list($checkClass, $checkTitle) = $check;
-			if(is_string($checkClass)) {
+			if (is_string($checkClass)) {
 				$checkInst = Object::create_from_string($checkClass);
-				if($checkInst instanceof EnvironmentCheck) {
+				if ($checkInst instanceof EnvironmentCheck) {
 					$output[] = array($checkInst, $checkTitle);
 				} else {
 					throw new InvalidArgumentException("Bad EnvironmentCheck: '$checkClass' - the named class doesn't implement EnvironmentCheck");
 				}
-			} else if($checkClass instanceof EnvironmentCheck) {
+			} else if ($checkClass instanceof EnvironmentCheck) {
 				$output[] = array($checkClass, $checkTitle);
 			} else {
 				throw new InvalidArgumentException("Bad EnvironmentCheck: " . var_export($check, true));
@@ -137,7 +137,7 @@ 
 	 * @param string $title
 	 */
 	public function push($check, $title = null) {
-		if(!$title) {
+		if (!$title) {
 			$title = is_string($check) ? $check : get_class($check);
 		}
 		$this->checks[] = array($check, $title);
@@ -158,7 +158,7 @@ 
 	 * @return EnvironmentCheckSuite
 	 */
 	static function inst($name) {
-		if(!isset(self::$instances[$name])) self::$instances[$name] = new EnvironmentCheckSuite($name);
+		if (!isset(self::$instances[$name])) self::$instances[$name] = new EnvironmentCheckSuite($name);
 		return self::$instances[$name];
 	}
 
@@ -170,8 +170,8 @@ 
 	 * @param string|array
 	 */
 	static function register($names, $check, $title = null) {
-		if(!is_array($names)) $names = array($names);
-		foreach($names as $name) self::inst($name)->push($check, $title);
+		if (!is_array($names)) $names = array($names);
+		foreach ($names as $name) self::inst($name)->push($check, $title);
 	}
 
 	/**
@@ -255,7 +255,7 @@ 
 			'ShouldPass' => $this->ShouldPass(),
 			'Checks' => array()
 		);
-		foreach($this->details as $detail) {
+		foreach ($this->details as $detail) {
 			$result['Checks'][] = $detail->toMap();
 		}
 		return json_encode($result);
@@ -267,7 +267,7 @@ 
 	 * @return string
 	 */
 	protected function statusText($status) {
-		switch($status) {
+		switch ($status) {
 			case EnvironmentCheck::ERROR: return "ERROR";
 			case EnvironmentCheck::WARNING: return "WARNING";
 			case EnvironmentCheck::OK: return "OK";

Braces +12 added lines, -4 removed lines

@@ -75,7 +75,9 @@ 
 
 			// 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;
+			if (!empty($check['state']) && $check['state']==='disabled') {
+				continue;
+			}
 			
 			// Add the check to this suite.
 			$this->push($check['definition'], $check['title']);
@@ -158,7 +160,9 @@ 
 	 * @return EnvironmentCheckSuite
 	 */
 	static function inst($name) {
-		if(!isset(self::$instances[$name])) self::$instances[$name] = new EnvironmentCheckSuite($name);
+		if(!isset(self::$instances[$name])) {
+			self::$instances[$name] = new EnvironmentCheckSuite($name);
+		}
 		return self::$instances[$name];
 	}
 
@@ -170,8 +174,12 @@ 
 	 * @param string|array
 	 */
 	static function register($names, $check, $title = null) {
-		if(!is_array($names)) $names = array($names);
-		foreach($names as $name) self::inst($name)->push($check, $title);
+		if(!is_array($names)) {
+			$names = array($names);
+		}
+		foreach($names as $name) {
+			self::inst($name)->push($check, $title);
+		}
 	}
 
 	/**

code/EnvironmentChecker.php

Spacing +15 added lines, -15 removed lines

@@ -79,10 +79,10 @@ 
 	 */
 	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'])) {
+		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(
+				if (
 					!(
 						$_SERVER['PHP_AUTH_USER'] == ENVCHECK_BASICAUTH_USERNAME
 						&& $_SERVER['PHP_AUTH_PW'] == ENVCHECK_BASICAUTH_PASSWORD
@@ -104,7 +104,7 @@ 
 				throw $e;
 			}
 		} else {
-			if(!$this->canAccess(null, $permission)) return $this->httpError(403);
+			if (!$this->canAccess(null, $permission)) return $this->httpError(403);
 		}
 	}
 
@@ -117,17 +117,17 @@ 
 	 * @throws SS_HTTPResponse_Exception
 	 */
 	function canAccess($member = null, $permission = "ADMIN") {
-		if(!$member) {
+		if (!$member) {
 			$member = Member::currentUser();
 		}
 
-		if(!$member) {
+		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(
+		if (
 			Director::isDev() 
 			|| Director::is_cli()
 			|| empty($permission)
@@ -140,8 +140,8 @@ 
 		// "Veto" style, return NULL to abstain vote.
 		$canExtended = null;
 		$results = $this->extend('canAccess', $member);
-		if($results && is_array($results)) {
-			if(!min($results)) return false;
+		if ($results && is_array($results)) {
+			if (!min($results)) return false;
 			else return true;
 		}
 
@@ -155,7 +155,7 @@ 
 		$response = new SS_HTTPResponse;
 		$result = EnvironmentCheckSuite::inst($this->checkSuiteName)->run();
 
-		if(!$result->ShouldPass()) {
+		if (!$result->ShouldPass()) {
 			$response->setStatusCode($this->errorCode);
 		}
 
@@ -172,13 +172,13 @@ 
 		}
 
 		// Optionally log errors and warnings individually
-		foreach($result->Details() as $detail) {
-			if($this->config()->log_results_warning && $detail->StatusCode == EnvironmentCheck::WARNING) {
+		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) {
+			} 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
@@ -187,7 +187,7 @@ 
 		}
 
 		// output the result as JSON if requested
-		if(
+		if (
 			$this->getRequest()->getExtension() == 'json'
 			|| strpos($this->getRequest()->getHeader('Accept'), 'application/json') !== false
 		) {
@@ -242,7 +242,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);
 	}
 
 	/**

Braces +8 added lines, -3 removed lines

@@ -104,7 +104,9 @@ 
 				throw $e;
 			}
 		} else {
-			if(!$this->canAccess(null, $permission)) return $this->httpError(403);
+			if(!$this->canAccess(null, $permission)) {
+				return $this->httpError(403);
+			}
 		}
 	}
 
@@ -141,8 +143,11 @@ 
 		$canExtended = null;
 		$results = $this->extend('canAccess', $member);
 		if($results && is_array($results)) {
-			if(!min($results)) return false;
-			else return true;
+			if(!min($results)) {
+				return false;
+			} else {
+				return true;
+			}
 		}
 
 		return false;

code/checks/DatabaseCheck.php

Spacing +2 added lines, -2 removed lines

@@ -22,13 +22,13 @@
 	 * @return array
 	 */
 	function check() {
-		if(!DB::getConn()->hasTable($this->checkTable)) {
+		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();
 		
-		if($count > 0) {
+		if ($count > 0) {
 			return array(EnvironmentCheck::OK, "");
 		} else {
 			return array(EnvironmentCheck::WARNING, "$this->checkTable queried ok but has no records");

code/checks/ExternalURLCheck.php

Spacing +7 added lines, -7 removed lines

@@ -24,7 +24,7 @@ 
 	 * @param int $timeout
 	 */
 	function __construct($urls, $timeout = 15) {
-		if($urls) $this->urls = explode(' ', $urls);
+		if ($urls) $this->urls = explode(' ', $urls);
 		$this->timeout = $timeout;
 	}
 
@@ -37,14 +37,14 @@ 
 		$urls = $this->getURLs();
 
 		$chs = array();
-		foreach($urls as $url)	{
+		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);
+		foreach ($chs as $ch) curl_multi_add_handle($mh, $ch);
 		
 		$active = null;
 		// Execute the handles
@@ -63,10 +63,10 @@ 
 
 		$hasError = false;
 		$msgs = array();
-		foreach($chs as $ch) {
+		foreach ($chs as $ch) {
 			$url = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL);
 			$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-			if(curl_errno($ch) || $code >= 400) {
+			if (curl_errno($ch) || $code >= 400) {
 				$hasError = true;
 				$msgs[] = sprintf(
 					'Error retrieving "%s": %s (Code: %s)',
@@ -84,10 +84,10 @@ 
 		}
 
 		// Close the handles
-		foreach($chs as $ch) curl_multi_remove_handle($mh, $ch);
+		foreach ($chs as $ch) curl_multi_remove_handle($mh, $ch);
 		curl_multi_close($mh);
 		
-		if($hasError) {
+		if ($hasError) {
 			return array(EnvironmentCheck::ERROR, implode(', ', $msgs));
 		} else {
 			return array(EnvironmentCheck::OK, implode(', ', $msgs));

Braces +9 added lines, -3 removed lines

@@ -24,7 +24,9 @@ 
 	 * @param int $timeout
 	 */
 	function __construct($urls, $timeout = 15) {
-		if($urls) $this->urls = explode(' ', $urls);
+		if($urls) {
+			$this->urls = explode(' ', $urls);
+		}
 		$this->timeout = $timeout;
 	}
 
@@ -44,7 +46,9 @@ 
 		}	
 		// Parallel execution for faster performance
 		$mh = curl_multi_init();
-		foreach($chs as $ch) curl_multi_add_handle($mh,$ch);
+		foreach($chs as $ch) {
+			curl_multi_add_handle($mh,$ch);
+		}
 		
 		$active = null;
 		// Execute the handles
@@ -84,7 +88,9 @@ 
 		}
 
 		// Close the handles
-		foreach($chs as $ch) curl_multi_remove_handle($mh, $ch);
+		foreach($chs as $ch) {
+			curl_multi_remove_handle($mh, $ch);
+		}
 		curl_multi_close($mh);
 		
 		if($hasError) {

Doc Comments +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 	/**
 	 * @inheritdoc
 	 *
-	 * @return array
+	 * @return string[]
 	 *
 	 * @throws SS_HTTPResponse_Exception
 	 */

code/checks/FileAccessibilityAndValidationCheck.php

Spacing +21 added lines, -21 removed lines

@@ -58,7 +58,7 @@ 
 	 */
 	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;
 	}
 
@@ -72,32 +72,32 @@ 
 		Versioned::set_reading_mode('Live');
 
 		$files = $this->getFiles();
-		if($files){
+		if ($files) {
 			$fileTypeValidateFunc = $this->fileTypeValidateFunc;
-			if(method_exists ($this, $fileTypeValidateFunc)){
+			if (method_exists($this, $fileTypeValidateFunc)) {
 				$invalidFiles = array();
 				$validFiles = array();
 
-				foreach($files as $file){
-					if($this->$fileTypeValidateFunc($file)){
+				foreach ($files as $file) {
+					if ($this->$fileTypeValidateFunc($file)) {
 						$validFiles[] = $file;
-					}else{
+					} else {
 						$invalidFiles[] = $file;
 					}
 				}
 
 				// If at least one file was valid, count as passed
-				if($this->checkType == self::CHECK_SINGLE && count($invalidFiles) < count($files)) {
+				if ($this->checkType == self::CHECK_SINGLE && count($invalidFiles) < count($files)) {
 					$validFileList = "\n";
-					foreach($validFiles as $vf){
-						$validFileList .= $vf."\n";
+					foreach ($validFiles as $vf) {
+						$validFileList .= $vf . "\n";
 					}
-					if($fileTypeValidateFunc == 'noVidation') {
+					if ($fileTypeValidateFunc == 'noVidation') {
 						$checkReturn = array(
 							EnvironmentCheck::OK,
 							sprintf('At least these file(s) accessible: %s', $validFileList)
 						);
-					}else{
+					} else {
 						$checkReturn = array(
 							EnvironmentCheck::OK,
 							sprintf('At least these file(s) passed file type validate function "%s": %s', $fileTypeValidateFunc, $validFileList)
@@ -107,16 +107,16 @@ 
 					if (count($invalidFiles) == 0) $checkReturn = array(EnvironmentCheck::OK, 'All files valideted');
 					else {
 						$invalidFileList = "\n";
-						foreach($invalidFiles as $vf){
-							$invalidFileList .= $vf."\n";
+						foreach ($invalidFiles as $vf) {
+							$invalidFileList .= $vf . "\n";
 						}
 
-						if($fileTypeValidateFunc == 'noVidation'){
+						if ($fileTypeValidateFunc == 'noVidation') {
 							$checkReturn = array(
 								EnvironmentCheck::ERROR,
 								sprintf('File(s) not accessible: %s', $invalidFileList)
 							);
-						}else{
+						} else {
 							$checkReturn = array(
 								EnvironmentCheck::ERROR,
 								sprintf('File(s) not passing the file type validate function "%s": %s', $fileTypeValidateFunc, $invalidFileList)
@@ -125,14 +125,14 @@ 
 	
 					}
 				}
-			}else{
-				$checkReturn =  array(
+			} else {
+				$checkReturn = array(
 					EnvironmentCheck::ERROR,
 					sprintf("Invalid file type validation method name passed: %s ", $fileTypeValidateFunc)
 				);
 			}
 
-		}else{
+		} else {
 			$checkReturn = array(
 				EnvironmentCheck::ERROR,
 				sprintf("No files accessible at path %s", $this->path)
@@ -149,11 +149,11 @@ 
 	 *
 	 * @return bool
 	 */
-	private function jsonValidate($file){
+	private function jsonValidate($file) {
 		$json = json_decode(file_get_contents($file));
-		if(!$json) {
+		if (!$json) {
 			return false;
-		}else{
+		} else {
 			return true;
 		}
 	}

Braces +9 added lines, -8 removed lines

@@ -81,7 +81,7 @@ 
 				foreach($files as $file){
 					if($this->$fileTypeValidateFunc($file)){
 						$validFiles[] = $file;
-					}else{
+					} else{
 						$invalidFiles[] = $file;
 					}
 				}
@@ -97,15 +97,16 @@ 
 							EnvironmentCheck::OK,
 							sprintf('At least these file(s) accessible: %s', $validFileList)
 						);
-					}else{
+					} 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 {
+					if (count($invalidFiles) == 0) {
+						$checkReturn = array(EnvironmentCheck::OK, 'All files valideted');
+					} else {
 						$invalidFileList = "\n";
 						foreach($invalidFiles as $vf){
 							$invalidFileList .= $vf."\n";
@@ -116,7 +117,7 @@ 
 								EnvironmentCheck::ERROR,
 								sprintf('File(s) not accessible: %s', $invalidFileList)
 							);
-						}else{
+						} else{
 							$checkReturn = array(
 								EnvironmentCheck::ERROR,
 								sprintf('File(s) not passing the file type validate function "%s": %s', $fileTypeValidateFunc, $invalidFileList)
@@ -125,14 +126,14 @@ 
 	
 					}
 				}
-			}else{
+			} else{
 				$checkReturn =  array(
 					EnvironmentCheck::ERROR,
 					sprintf("Invalid file type validation method name passed: %s ", $fileTypeValidateFunc)
 				);
 			}
 
-		}else{
+		} else{
 			$checkReturn = array(
 				EnvironmentCheck::ERROR,
 				sprintf("No files accessible at path %s", $this->path)
@@ -153,7 +154,7 @@ 
 		$json = json_decode(file_get_contents($file));
 		if(!$json) {
 			return false;
-		}else{
+		} else{
 			return true;
 		}
 	}

Doc Comments +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 	/**
 	 * @inheritdoc
 	 *
-	 * @return array
+	 * @return string[]
 	 *
 	 * @throws SS_HTTPResponse_Exception
 	 */

code/checks/FileAgeCheck.php

Indentation +2 added lines, -2 removed lines

@@ -115,8 +115,8 @@
 		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(
+		   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))
 			);

Spacing +5 added lines, -5 removed lines

@@ -86,20 +86,20 @@ 
 	 * @return array
 	 */
 	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();
 		$checkFn = $this->checkFn;
 		$allValid = true;
-		if($files) foreach($files as $file) {
+		if ($files) foreach ($files as $file) {
 			$fileTime = $checkFn($file);
 			$valid = ($this->compareOperand == '>') ? ($fileTime >= $cutoffTime) : ($fileTime <= $cutoffTime);
-			if($valid) {
+			if ($valid) {
 				$validFiles[] = $file;
 			} else {
 				$invalidFiles[] = $file;
-				if($this->checkType == self::CHECK_ALL) {
+				if ($this->checkType == self::CHECK_ALL) {
 					return array(
 						EnvironmentCheck::ERROR,
 						sprintf(
@@ -112,7 +112,7 @@ 
 		}
 
 		// If at least one file was valid, count as passed
-		if($this->checkType == self::CHECK_SINGLE && count($invalidFiles) < count($files)) {
+		if ($this->checkType == self::CHECK_SINGLE && count($invalidFiles) < count($files)) {
 			return array(EnvironmentCheck::OK, '');
 		} else {
 	       if (count($invalidFiles) == 0) return array(EnvironmentCheck::OK, '');

Braces +8 added lines, -3 removed lines

@@ -92,8 +92,10 @@ 
 		$validFiles = array();
 		$checkFn = $this->checkFn;
 		$allValid = true;
-		if($files) foreach($files as $file) {
+		if($files) {
+			foreach($files as $file) {
 			$fileTime = $checkFn($file);
+		}
 			$valid = ($this->compareOperand == '>') ? ($fileTime >= $cutoffTime) : ($fileTime <= $cutoffTime);
 			if($valid) {
 				$validFiles[] = $file;
@@ -115,11 +117,14 @@ 
 		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(
+	       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))
 			);
+	       }
 		}
 			
 	}

Doc Comments +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 	/**
 	 * @inheritdoc
 	 *
-	 * @return array
+	 * @return string[]
 	 *
 	 * @throws SS_HTTPResponse_Exception
 	 */

code/checks/FileWriteableCheck.php

Spacing +11 added lines, -11 removed lines

@@ -22,34 +22,34 @@ 
 	 * @return array
 	 */
 	function check() {
-		if($this->path[0] == '/') $filename = $this->path;
+		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);
+		if (file_exists($filename)) $isWriteable = is_writeable($filename);
 		else $isWriteable = is_writeable(dirname($filename));
 		
-		if(!$isWriteable) {
-			if(function_exists('posix_getgroups')) {
+		if (!$isWriteable) {
+			if (function_exists('posix_getgroups')) {
 				$userID = posix_geteuid();
 				$user = posix_getpwuid($userID);
 
-				$currentOwnerID = fileowner(file_exists($filename) ? $filename : dirname($filename) );
+				$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]'.  ";
 
-				if($user['name'] == $currentOwner['name']) {
+				if ($user['name'] == $currentOwner['name']) {
 					$message .= "We recommend that you make the file writeable.";
 				} else {
 					
 					$groups = posix_getgroups();
 					$groupList = array();
-					foreach($groups as $group) {
+					foreach ($groups as $group) {
 						$groupInfo = posix_getgrgid($group);
-						if(in_array($currentOwner['name'], $groupInfo['members'])) $groupList[] = $groupInfo['name'];
+						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)
+					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.";
@@ -63,6 +63,6 @@ 
 			return array(EnvironmentCheck::ERROR, $message);
 		}
 
-		return array(EnvironmentCheck::OK,'');
+		return array(EnvironmentCheck::OK, '');
 	}
 }

Braces +13 added lines, -5 removed lines

@@ -22,11 +22,17 @@ 
 	 * @return array
 	 */
 	function check() {
-		if($this->path[0] == '/') $filename = $this->path;
-		else $filename = BASE_PATH . DIRECTORY_SEPARATOR . str_replace('/', DIRECTORY_SEPARATOR, $this->path);
+		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')) {
@@ -46,7 +52,9 @@ 
 					$groupList = array();
 					foreach($groups as $group) {
 						$groupInfo = posix_getgrgid($group);
-						if(in_array($currentOwner['name'], $groupInfo['members'])) $groupList[] = $groupInfo['name'];
+						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)

code/checks/HasClassCheck.php

Spacing +2 added lines, -2 removed lines

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

Braces +5 added lines, -2 removed lines

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

Doc Comments +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 	/**
 	 * @inheritdoc
 	 *
-	 * @return array
+	 * @return string[]
 	 *
 	 * @throws SS_HTTPResponse_Exception
 	 */