CamelCase

Author: JBlond

src/classes/jblond/cli.class.php src/classes/jblond/cli/Cli.phpsrc/classes/jblond/cli.class.php renamed to src/classes/jblond/cli/Cli.php

@@ -1,30 +1,30 @@
 <?php
-namespace jblond;
+namespace jblond\cli;
 
 
 /**
  * Class cli
- * @package jblond
+ * @package jblond\helper
  */
-class cli {
+class Cli {
 
 	/**
 	 * @param string $prompt
-	 * @param array|string $valid_inputs
+	 * @param array|string $validInputs
 	 * @param string $default
 	 * @return string
 	 */
-	public function input($prompt, $valid_inputs, $default = ''){
+	public function input($prompt, $validInputs, $default = ''){
 		echo $prompt;
 		$input = trim(fgets(fopen('php://stdin', 'r')));
 		while(
 			!isset($input) ||
 			(
-				is_array($valid_inputs) &&
-				!in_array($input, $valid_inputs)
+				is_array($validInputs) &&
+				!in_array($input, $validInputs)
 			) ||
 			(
-				$valid_inputs == 'is_file' &&
+				$validInputs == 'is_file' &&
 				!is_file($input)
 			)
 		){

src/classes/jblond/cli_colors.class.php src/classes/jblond/cli/CliColors.phpsrc/classes/jblond/cli_colors.class.php renamed to src/classes/jblond/cli/CliColors.php

@@ -1,19 +1,18 @@
 <?php
-namespace jblond;
+namespace jblond\cli;
 
 /**
- * Class cli_colors
+ * Class CliColors
  *
- * works on bash
- *
- * @package jblond
+ * Works on bash
+ * @package jblond\helper
  */
-class cli_colors {
+class CliColors {
 
 	/**
 	 * @var array
 	 */
-	private $foreground_colors = array(
+	private $foregroundColors = array(
 		'black' => '0;30',
 		'dark_gray' => '1;30',
 		'blue' => '0,34',
@@ -35,7 +34,7 @@ class cli_colors {
 	/**
 	 * @var array
 	 */
-	private $background_colors = array(
+	private $backgroundColors = array(
 		'black' => '40',
 		'red' => '41',
 		'green' => '42',
@@ -46,25 +45,24 @@ class cli_colors {
 		'light_gray' => '47'
 	);
 
-
 	/**
 	 * @param string $string
 	 * @param null|string $foreground_color
 	 * @param null|string $background_color
 	 * @return string
 	 */
-	public function get_colored_string($string, $foreground_color = null, $background_color = null){
+	public function getColoredString($string, $foreground_color = null, $background_color = null){
 		$colored_string = '';
 
-		if(isset($this->foreground_colors["$foreground_color"])){
-			$colored_string .= "\033[" . $this->foreground_colors[$foreground_color] . "m";
+		if(isset($this->foregroundColors["$foreground_color"])){
+			$colored_string .= "\033[" . $this->foregroundColors[$foreground_color] . "m";
 		}
 
-		if(isset($this->background_colors["$background_color"])){
-			$colored_string .= "\033[" . $this->background_colors[$background_color] . "m";
+		if(isset($this->backgroundColors["$background_color"])){
+			$colored_string .= "\033[" . $this->backgroundColors[$background_color] . "m";
 		}
 
-		$colored_string .=  $string . "\033[0m";
+		$colored_string .= $string . "\033[0m";
 		return $colored_string;
 	}
 
@@ -73,17 +71,16 @@ public function get_colored_string($string, $foreground_color = null, $backgroun
 	 *
 	 * @return array
 	 */
-	public function get_foreground_colors() {
-		return array_keys($this->foreground_colors);
+	public function getForegroundColors() {
+		return array_keys($this->foregroundColors);
 	}
 
-
 	/**
 	 * Returns all background color names
 	 *
 	 * @return array
 	 */
-	public function get_background_colors() {
-		return array_keys($this->background_colors);
+	public function getBackgroundColors() {
+		return array_keys($this->backgroundColors);
 	}
 }

src/cli.php

@@ -1,10 +1,12 @@
 <?php
-require 'classes/jblond/cli.class.php';
-require 'classes/jblond/cli_colors.class.php';
-$cli = new \jblond\cli();
-$colors = new \jblond\cli_colors();
-$string = $colors->get_colored_string('This is a test','red','black');
+require 'classes/jblond/cli/Cli.php';
+require 'classes/jblond/cli/CliColors.php';
+$cli = new \jblond\cli\Cli();
+$colors = new \jblond\cli\CliColors();
+$string = $colors->getColoredString('This is a test','red','black');
 $cli->output($string);
 $cli->error($string);
 echo $cli->input('Hello world: ',array('Hello','world'));
 echo $cli->input('Test2: ', 'test');
+print_r($colors->getForegroundColors());
+print_r($colors->getBackgroundColors());