Clean up code style to K&R/OTB style. Fix a couple bugs with empty() return value.

Author: Alexia

classes/options.php

@@ -78,13 +78,14 @@ class options {
 				'syntax'
 			]
 		],
-    'x' => [
-      'option'  => self::OPTION_OPTIONAL,
-      'value'   => self::VALUE_REQUIRED,
-      'comment' => 'File extensions to include when scanning directory',
-      'description' => 'A comma separated list of file extensions to consider as PHP files. Defaults to "php"',
-      'example' => '-x="php,inc"'
-    ]
+		'x' => [
+			'option'			=> self::OPTION_OPTIONAL,
+			'value'				=> self::VALUE_REQUIRED,
+			'comment'			=> 'File extensions to include when scanning a directory.',
+			'description'		=> 'A comma separated list of file extensions to consider as PHP files.  Defaults to "php"',
+			'example'			=> '-x="php,inc"',
+			'comma_delimited'	=> true
+		]
 	];
 
 	/**
@@ -191,9 +192,11 @@ private function parseOption($rawOption) {
 				if ($validOptions[$option]['value'] === self::VALUE_REQUIRED && !isset($value)) {
 					die("The option `{$option}` requires a value, but none was given.\n");
 				}
-				if (isset($validOptions[$option]['allowed'])) {
+				if (isset($validOptions[$option]['allowed']) || (isset($validOptions[$option]['comma_delimited']) && $validOptions[$option]['comma_delimited'] == true)) {
 					$value = explode(',', $value);
 					$value = array_map('trim', $value);
+				}
+				if (isset($validOptions[$option]['allowed'])) {
 					foreach ($value as $_value) {
 						if (!in_array($_value, $validOptions[$option]['allowed'])) {
 							die("The value `{$_value}` for `{$option}` is not valid.\n");

classes/scanner.php

@@ -25,29 +25,30 @@ class scanner {
 	 */
 	private $files = [];
 
-  /**
-   * List of file extension to process.
-   *
-   * @var   array
-   */
-  private $extensions = ['php'];
+	/**
+	 * List of file extension(s) to process.
+	 *
+	 * @var   array
+	 */
+	private $extensions = ['php'];
 
 	/**
 	 * Main Constructor
 	 *
 	 * @access	public
 	 * @param	string	Project file or folder
+	 * @param	array	[Optional] Array of allowed file extensions.
 	 * @return	void
 	 */
-	public function __construct($projectPath, Array $extensions = null) {
+	public function __construct($projectPath, $extensions = null) {
 		if (empty($projectPath)) {
 			throw new \Exception(__METHOD__.": Project path given was empty.");
 		}
 		$this->projectPath = $projectPath;
 
-    if (!is_null($extensions)) {
-      $this->extensions = $extensions;
-    }
+		if (!is_null($extensions)) {
+			$this->setFileExtensions($extensions);
+		}
 
 		$this->recursiveScan($this->projectPath);
 		reset($this->files);
@@ -75,8 +76,8 @@ private function recursiveScan($startFolder) {
 			if (is_dir($path)) {
 				$this->recursiveScan($path);
 			} else {
-        $fileExtension = pathinfo($content, PATHINFO_EXTENSION);
-				if (strlen($fileExtension) == 0 || !in_array($fileExtension, $this->extensions)) {
+				$fileExtension = pathinfo($content, PATHINFO_EXTENSION);
+				if (strlen($fileExtension) == 0 || !in_array($fileExtension, $this->getFileExtensions())) {
 					continue;
 				}
 				$this->files[] = $path;
@@ -114,27 +115,28 @@ public function getCurrentFilePath() {
 		return current($this->files);
 	}
 
-  /**
-   * Sets the file extensions to be considered as PHP file. Ex:
-   *
-   *  array('php', 'inc')
-   *
-   * Do NOT include the dot before the extension
-   *
-   * @access public
-   * @param array $extensions
-   */
-  public function setFileExtensions(Array $extensions) {
-    $this->extensions = $extensions;
-  }
+	/**
+	 * Sets the file extensions to be considered as PHP file. Ex:
+	 *
+	 *  array('php', 'inc')
+	 *
+	 * Do NOT include the dot before the extension
+	 *
+	 * @access	public
+	 * @param 	array	Allowed file extensions
+	 */
+	public function setFileExtensions(array $extensions) {
+		$this->extensions = $extensions;
+	}
 
-  /**
-   * Gets the list of extensions to be considered PHP files when scanning
-   *
-   * @return array File extensions to be considered as PHP files
-   */
-  public function getFileExtensions() {
-    return $this->extensions;
-  }
+	/**
+	 * Gets the list of extensions to be considered PHP files when scanning
+	 *
+	 * @access	public
+	 * @return	array	File extensions to be considered as PHP files.
+	 */
+	public function getFileExtensions() {
+		return (array) $this->extensions;
+	}
 }
 ?>

mar.php

@@ -72,14 +72,14 @@ public function __construct() {
 
 		$this->tests = new tests($this->options->getOption('t'));
 
-		if (!empty($this->options->getOption('php'))) {
+		$phpBinary = $this->options->getOption('php');
+		if (!empty($phpBinary)) {
 			$this->tests->setPHPBinaryPath($this->options->getOption('php'));
 		}
 
 		$start = microtime(true);
 
-    $extensions = !empty($this->options->getOption('x')) ? explode(',', $this->options->getOption('x')) : null;
-		$this->scanner = new scanner($this->projectPath, $extensions);
+		$this->scanner = new scanner($this->projectPath, (is_array($this->options->getOption('x')) ? $this->options->getOption('x') : null));
 
 
 		$this->run();