phpMv / phpMv-UI

Ajax/Jquery.php

Doc Comments +8 added lines, -1 removed lines

@@ -55,6 +55,9 @@ 
 		return $this->_semantic;
 	}
 
+	/**
+	 * @param JsUtils $jsUtils
+	 */
 	public function __construct($params,$jsUtils) {
 		$this->params=array();
 		foreach ( $params as $key => $val ) {
@@ -175,7 +178,7 @@ 
 	 *
 	 * @param string $element
 	 * @param array $options
-	 * @return void
+	 * @return string
 	 */
 	public function sortable($element, $options=array()) {
 		if (count($options)>0) {
@@ -307,6 +310,7 @@ 
 
 	/**
 	 * A wrapper for writing document.ready()
+	 * @param string $js
 	 * @return string
 	 */
 	public function _document_ready($js) {
@@ -354,6 +358,9 @@ 
 		return $value;
 	}
 
+	/**
+	 * @param string $input
+	 */
 	private function minify($input) {
 	if(trim($input) === "") return $input;
 	return preg_replace(

Spacing +25 added lines, -25 removed lines

@@ -17,21 +17,21 @@ 
  * jQuery Class
  */
 class Jquery {
-	use JqueryEventsTrait,JqueryAjaxTrait,JqueryActionsTrait;
+	use JqueryEventsTrait, JqueryAjaxTrait, JqueryActionsTrait;
 	protected $_ui;
 	protected $_bootstrap;
 	protected $_semantic;
 	protected $libraryFile;
 	protected $_javascript_folder='js';
-	protected $jquery_code_for_load=array ();
-	protected $jquery_code_for_compile=array ();
+	protected $jquery_code_for_load=array();
+	protected $jquery_code_for_compile=array();
 	protected $jquery_corner_active=FALSE;
 	protected $jquery_table_sorter_active=FALSE;
 	protected $jquery_table_sorter_pager_active=FALSE;
 	protected $jsUtils;
 
-	protected $jquery_events=array (
-			"bind","blur","change","click","dblclick","delegate","die","error","focus","focusin","focusout","hover","keydown","keypress","keyup","live","load","mousedown","mousseenter","mouseleave","mousemove","mouseout","mouseover","mouseup","off","on","one","ready","resize","scroll","select","submit","toggle","trigger","triggerHandler","undind","undelegate","unload"
+	protected $jquery_events=array(
+			"bind", "blur", "change", "click", "dblclick", "delegate", "die", "error", "focus", "focusin", "focusout", "hover", "keydown", "keypress", "keyup", "live", "load", "mousedown", "mousseenter", "mouseleave", "mousemove", "mouseout", "mouseover", "mouseup", "off", "on", "one", "ready", "resize", "scroll", "select", "submit", "toggle", "trigger", "triggerHandler", "undind", "undelegate", "unload"
 	);
 
 	public function ui($ui=NULL) {
@@ -55,9 +55,9 @@ 
 		return $this->_semantic;
 	}
 
-	public function __construct($params,$jsUtils) {
+	public function __construct($params, $jsUtils) {
 		$this->params=array();
-		foreach ( $params as $key => $val ) {
+		foreach ($params as $key => $val) {
 				$this->params[$key]=$params[$key];
 		}
 		$this->jsUtils=$jsUtils;
@@ -125,12 +125,12 @@ 
 	 */
 	public function _output($array_js='') {
 		if (!is_array($array_js)) {
-			$array_js=array (
+			$array_js=array(
 					$array_js
 			);
 		}
 
-		foreach ( $array_js as $js ) {
+		foreach ($array_js as $js) {
 			$this->jquery_code_for_compile[]="\t$js\n";
 		}
 	}
@@ -142,7 +142,7 @@ 
 	 * @param string $param
 	 * @param boolean $immediatly delayed if false
 	 */
-	public function _genericCallValue($jQueryCall,$element='this', $param="", $immediatly=false) {
+	public function _genericCallValue($jQueryCall, $element='this', $param="", $immediatly=false) {
 		$element=$this->_prep_element($element);
 		if (isset($param)) {
 			$param=$this->_prep_value($param);
@@ -161,7 +161,7 @@ 
 	 * @param boolean $immediatly delayed if false
 	 * @return string
 	 */
-	public function _genericCallElement($jQueryCall,$to='this', $element, $immediatly=false) {
+	public function _genericCallElement($jQueryCall, $to='this', $element, $immediatly=false) {
 		$to=$this->_prep_element($to);
 		$element=$this->_prep_element($element);
 		$str="$({$to}).{$jQueryCall}({$element});";
@@ -179,8 +179,8 @@ 
 	 */
 	public function sortable($element, $options=array()) {
 		if (count($options)>0) {
-			$sort_options=array ();
-			foreach ( $options as $k => $v ) {
+			$sort_options=array();
+			foreach ($options as $k => $v) {
 				$sort_options[]="\n\t\t".$k.': '.$v."";
 			}
 			$sort_options=implode(",", $sort_options);
@@ -212,7 +212,7 @@ 
 	 * @param boolean $stopPropagation Prevents the event from bubbling up the DOM tree, preventing any parent handlers from being notified of the event.
 	 * @return string
 	 */
-	public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true) {
+	public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true) {
 		if (is_array($js)) {
 			$js=implode("\n\t\t", $js);
 		}
@@ -226,7 +226,7 @@ 
 			$event="\n\t$(".$this->_prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";
 		else
 			$event="\n\t$(".$this->_prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n";
-		if($immediatly)
+		if ($immediatly)
 			$this->jquery_code_for_compile[]=$event;
 		return $event;
 	}
@@ -266,7 +266,7 @@ 
 
 		// External references
 		$external_scripts=implode('', $this->jquery_code_for_load);
-		extract(array (
+		extract(array(
 				'library_src' => $external_scripts
 		));
 
@@ -281,13 +281,13 @@ 
 		$script.='});';
 
 		$this->jquery_code_for_compile=array();
-		if($this->params["debug"]==false){
+		if ($this->params["debug"]==false) {
 			$script=$this->minify($script);
 		}
 		$output=($script_tags===FALSE) ? $script : $this->inline($script);
 
-		if ($view!==NULL){
-			$this->jsUtils->createScriptVariable($view,$view_var, $output);
+		if ($view!==NULL) {
+			$this->jsUtils->createScriptVariable($view, $view_var, $output);
 		}
 		return $output;
 	}
@@ -302,7 +302,7 @@ 
 	 * @return void
 	 */
 	public function _clear_compile() {
-		$this->jquery_code_for_compile=array ();
+		$this->jquery_code_for_compile=array();
 	}
 
 	/**
@@ -311,12 +311,12 @@ 
 	 */
 	public function _document_ready($js) {
 		if (!is_array($js)) {
-			$js=array (
+			$js=array(
 					$js
 			);
 		}
 
-		foreach ( $js as $script ) {
+		foreach ($js as $script) {
 			$this->jquery_code_for_compile[]=$script;
 		}
 	}
@@ -330,7 +330,7 @@ 
 	 * @return string
 	 */
 	public function _prep_element($element) {
-		if (strrpos($element, 'this')===false&&strrpos($element, 'event')===false&&strrpos($element, 'self')===false) {
+		if (strrpos($element, 'this')===false && strrpos($element, 'event')===false && strrpos($element, 'self')===false) {
 			$element='"'.addslashes($element).'"';
 		}
 		return $element;
@@ -348,14 +348,14 @@ 
 		if (is_array($value)) {
 			$value=implode(",", $value);
 		}
-		if (strrpos($value, 'this')===false&&strrpos($value, 'event')===false&&strrpos($value, 'self')===false) {
+		if (strrpos($value, 'this')===false && strrpos($value, 'event')===false && strrpos($value, 'self')===false) {
 			$value='"'.$value.'"';
 		}
 		return $value;
 	}
 
 	private function minify($input) {
-	if(trim($input) === "") return $input;
+	if (trim($input)==="") return $input;
 	return preg_replace(
 			array(
 					// Remove comment(s)

Braces +20 added lines, -13 removed lines

@@ -147,10 +147,12 @@ 
 		if (isset($param)) {
 			$param=$this->_prep_value($param);
 			$str="$({$element}).{$jQueryCall}({$param});";
-		} else
-			$str="$({$element}).{$jQueryCall}();";
-			if ($immediatly)
-				$this->jquery_code_for_compile[]=$str;
+		} else {
+					$str="$({$element}).{$jQueryCall}();";
+		}
+			if ($immediatly) {
+							$this->jquery_code_for_compile[]=$str;
+			}
 			return $str;
 	}
 	/**
@@ -165,8 +167,9 @@ 
 		$to=$this->_prep_element($to);
 		$element=$this->_prep_element($element);
 		$str="$({$to}).{$jQueryCall}({$element});";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 			return $str;
 	}
 
@@ -222,12 +225,14 @@ 
 		if ($stopPropagation===true) {
 			$js="event.stopPropagation();\n".$js;
 		}
-		if (array_search($event, $this->jquery_events)===false)
-			$event="\n\t$(".$this->_prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";
-		else
-			$event="\n\t$(".$this->_prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n";
-		if($immediatly)
-			$this->jquery_code_for_compile[]=$event;
+		if (array_search($event, $this->jquery_events)===false) {
+					$event="\n\t$(".$this->_prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";
+		} else {
+					$event="\n\t$(".$this->_prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n";
+		}
+		if($immediatly) {
+					$this->jquery_code_for_compile[]=$event;
+		}
 		return $event;
 	}
 
@@ -355,7 +360,9 @@ 
 	}
 
 	private function minify($input) {
-	if(trim($input) === "") return $input;
+	if(trim($input) === "") {
+		return $input;
+	}
 	return preg_replace(
 			array(
 					// Remove comment(s)

Ajax/php/yii/URI.php

Doc Comments +1 added lines, -1 removed lines

@@ -429,7 +429,7 @@
 	 *
 	 * @access public
 	 * @param array an associative array of key/values
-	 * @return array
+	 * @return string
 	 *
 	 */
 	function assoc_to_uri($array) {

Spacing +41 added lines, -41 removed lines

@@ -10,7 +10,7 @@ 
 	 * @access public
 	 *
 	 */
-	var $keyval=array ();
+	var $keyval=array();
 	/**
 	 * Current uri string
 	 *
@@ -26,7 +26,7 @@ 
 	 * @access public
 	 *
 	 */
-	var $segments=array ();
+	var $segments=array();
 	/**
 	 * Re-indexed list of uri segments
 	 * Starts at 1 instead of 0
@@ -35,7 +35,7 @@ 
 	 * @access public
 	 *
 	 */
-	var $rsegments=array ();
+	var $rsegments=array();
 	var $permitted_uri_chars="a-z 0-9~%.:_\-";
 	var $enable_query_strings=false;
 
@@ -75,9 +75,9 @@ 
 	 */
 	function _fetch_uri_string() {
 		$uri="";
-		if ($this->uri_protocol == 'AUTO') {
+		if ($this->uri_protocol=='AUTO') {
 			// Is the request coming from the command line?
-			if (php_sapi_name() == 'cli' or defined('STDIN')) {
+			if (php_sapi_name()=='cli' or defined('STDIN')) {
 				$this->_set_uri_string($this->_parse_cli_args());
 				return;
 			}
@@ -91,20 +91,20 @@ 
 			// Is there a PATH_INFO variable?
 			// Note: some servers seem to have trouble with getenv() so we'll test it two ways
 			$path=(isset($_SERVER['PATH_INFO'])) ? $_SERVER['PATH_INFO'] : @getenv('PATH_INFO');
-			if (trim($path, '/') != '' && $path != "/" . SELF) {
+			if (trim($path, '/')!='' && $path!="/".SELF) {
 				$this->_set_uri_string($path);
 				return;
 			}
 
 			// No PATH_INFO?... What about QUERY_STRING?
 			$path=(isset($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : @getenv('QUERY_STRING');
-			if (trim($path, '/') != '') {
+			if (trim($path, '/')!='') {
 				$this->_set_uri_string($path);
 				return;
 			}
 
 			// As a last ditch effort lets try using the $_GET array
-			if (is_array($_GET) && count($_GET) == 1 && trim(key($_GET), '/') != '') {
+			if (is_array($_GET) && count($_GET)==1 && trim(key($_GET), '/')!='') {
 				$this->_set_uri_string(key($_GET));
 				return;
 			}
@@ -114,7 +114,7 @@ 
 			return;
 		}
 
-		if ($uri == 'REQUEST_URI') {
+		if ($uri=='REQUEST_URI') {
 			$this->_set_uri_string($this->_detect_uri());
 			return;
 		}
@@ -138,7 +138,7 @@ 
 		// $str = remove_invisible_characters($str, FALSE);
 
 		// If the URI contains only a slash we'll kill it
-		$this->uri_string=($str == '/') ? '' : $str;
+		$this->uri_string=($str=='/') ? '' : $str;
 	}
 
 	// --------------------------------------------------------------------
@@ -159,15 +159,15 @@ 
 		}
 
 		$uri=$_SERVER['REQUEST_URI'];
-		if (strpos($uri, $_SERVER['SCRIPT_NAME']) === 0) {
+		if (strpos($uri, $_SERVER['SCRIPT_NAME'])===0) {
 			$uri=substr($uri, strlen($_SERVER['SCRIPT_NAME']));
-		} elseif (strpos($uri, dirname($_SERVER['SCRIPT_NAME'])) === 0) {
+		} elseif (strpos($uri, dirname($_SERVER['SCRIPT_NAME']))===0) {
 			$uri=substr($uri, strlen(dirname($_SERVER['SCRIPT_NAME'])));
 		}
 
 		// This section ensures that even on servers that require the URI to be in the query string (Nginx) a correct
 		// URI is found, and also fixes the QUERY_STRING server var and $_GET array.
-		if (strncmp($uri, '?/', 2) === 0) {
+		if (strncmp($uri, '?/', 2)===0) {
 			$uri=substr($uri, 2);
 		}
 		$parts=preg_split('#\?#i', $uri, 2);
@@ -177,17 +177,17 @@ 
 			parse_str($_SERVER['QUERY_STRING'], $_GET);
 		} else {
 			$_SERVER['QUERY_STRING']='';
-			$_GET=array ();
+			$_GET=array();
 		}
 
-		if ($uri == '/' || empty($uri)) {
+		if ($uri=='/' || empty($uri)) {
 			return '/';
 		}
 
 		$uri=parse_url($uri, PHP_URL_PATH);
 
 		// Do some final cleaning of the URI and return it
-		return str_replace(array ('//','../' ), '/', trim($uri, '/'));
+		return str_replace(array('//', '../'), '/', trim($uri, '/'));
 	}
 
 	// --------------------------------------------------------------------
@@ -204,7 +204,7 @@ 
 	private function _parse_cli_args() {
 		$args=array_slice($_SERVER['argv'], 1);
 
-		return $args ? '/' . implode('/', $args) : '';
+		return $args ? '/'.implode('/', $args) : '';
 	}
 
 	// --------------------------------------------------------------------
@@ -218,17 +218,17 @@ 
 	 *
 	 */
 	function _filter_uri($str) {
-		if ($str != '' && $this->permitted_uri_chars != '' && $this->enable_query_strings == FALSE) {
+		if ($str!='' && $this->permitted_uri_chars!='' && $this->enable_query_strings==FALSE) {
 			// preg_quote() in PHP 5.3 escapes -, so the str_replace() and addition of - to preg_quote() is to maintain backwards
 			// compatibility as many are unaware of how characters in the permitted_uri_chars will be parsed as a regex pattern
-			if (!preg_match("|^[" . str_replace(array ('\\-','\-' ), '-', preg_quote($this->permitted_uri_chars, '-')) . "]+$|i", $str)) {
+			if (!preg_match("|^[".str_replace(array('\\-', '\-'), '-', preg_quote($this->permitted_uri_chars, '-'))."]+$|i", $str)) {
 				show_error('The URI you submitted has disallowed characters.', 400);
 			}
 		}
 
 		// Convert programatic characters to entities
-		$bad=array ('$','(',')','%28','%29' );
-		$good=array ('$','(',')','(',')' );
+		$bad=array('$', '(', ')', '%28', '%29');
+		$good=array('$', '(', ')', '(', ')');
 
 		return str_replace($bad, $good, $str);
 	}
@@ -243,11 +243,11 @@ 
 	 *
 	 */
 	function _explode_segments() {
-		foreach ( explode("/", preg_replace("|/*(.+?)/*$|", "\\1", $this->uri_string)) as $val ) {
+		foreach (explode("/", preg_replace("|/*(.+?)/*$|", "\\1", $this->uri_string)) as $val) {
 			// Filter segments for security
 			$val=trim($this->_filter_uri($val));
 
-			if ($val != '') {
+			if ($val!='') {
 				$this->segments[]=$val;
 			}
 		}
@@ -364,7 +364,7 @@ 
 	 *
 	 */
 	function _uri_to_assoc($n=3, $default=array(), $which='segment') {
-		if ($which == 'segment') {
+		if ($which=='segment') {
 			$total_segments='total_segments';
 			$segment_array='segment_array';
 		} else {
@@ -380,25 +380,25 @@ 
 			return $this->keyval[$n];
 		}
 
-		if ($this->$total_segments() < $n) {
-			if (count($default) == 0) {
-				return array ();
+		if ($this->$total_segments()<$n) {
+			if (count($default)==0) {
+				return array();
 			}
 
-			$retval=array ();
-			foreach ( $default as $val ) {
+			$retval=array();
+			foreach ($default as $val) {
 				$retval[$val]=FALSE;
 			}
 			return $retval;
 		}
 
-		$segments=array_slice($this->$segment_array(), ($n - 1));
+		$segments=array_slice($this->$segment_array(), ($n-1));
 
 		$i=0;
 		$lastval='';
-		$retval=array ();
-		foreach ( $segments as $seg ) {
-			if ($i % 2) {
+		$retval=array();
+		foreach ($segments as $seg) {
+			if ($i%2) {
 				$retval[$lastval]=$seg;
 			} else {
 				$retval[$seg]=FALSE;
@@ -408,8 +408,8 @@ 
 			$i++;
 		}
 
-		if (count($default) > 0) {
-			foreach ( $default as $val ) {
+		if (count($default)>0) {
+			foreach ($default as $val) {
 				if (!array_key_exists($val, $retval)) {
 					$retval[$val]=FALSE;
 				}
@@ -433,8 +433,8 @@ 
 	 *
 	 */
 	function assoc_to_uri($array) {
-		$temp=array ();
-		foreach ( ( array ) $array as $key => $val ) {
+		$temp=array();
+		foreach ((array)$array as $key => $val) {
 			$temp[]=$key;
 			$temp[]=$val;
 		}
@@ -488,13 +488,13 @@ 
 		$leading='/';
 		$trailing='/';
 
-		if ($where == 'trailing') {
+		if ($where=='trailing') {
 			$leading='';
-		} elseif ($where == 'leading') {
+		} elseif ($where=='leading') {
 			$trailing='';
 		}
 
-		return $leading . $this->$which($n) . $trailing;
+		return $leading.$this->$which($n).$trailing;
 	}
 
 	// --------------------------------------------------------------------
@@ -572,7 +572,7 @@ 
 	 *
 	 */
 	function ruri_string() {
-		return '/' . implode('/', $this->rsegment_array());
+		return '/'.implode('/', $this->rsegment_array());
 	}
 }
 // END URI Class
\ No newline at end of file

Ajax/semantic/html/base/HtmlSemNavElement.php

Doc Comments +10 added lines, -2 removed lines

@@ -22,6 +22,11 @@ 
 	protected $_contentSeparator="";
 
 
+	/**
+	 * @param string $identifier
+	 * @param string $tagName
+	 * @param string $baseClass
+	 */
 	public function __construct($identifier,$tagName,$baseClass){
 		parent::__construct($identifier,$tagName,$baseClass);
 		$this->root="";
@@ -31,7 +36,7 @@ 
 	/**
 	 * Associate an ajax get to the elements, displayed in $targetSelector
 	 * @param string $targetSelector the target of the get
-	 * @return HtmlNavElement
+	 * @return HtmlSemNavElement
 	 */
 	public function autoGetOnClick($targetSelector){
 		return $this->getOnClick($this->root, $targetSelector,array("attr"=>$this->attr));
@@ -63,7 +68,7 @@ 
 	/**
 	 * Define the html attribute for each element url in ajax
 	 * @param string $attr html attribute
-	 * @return HtmlNavElement
+	 * @return HtmlSemNavElement
 	 */
 	public function setAttr($attr) {
 		$this->attr = $attr;
@@ -103,6 +108,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param integer $index
+	 */
 	protected function getContentDivider($index){
 		if(\is_array($this->_contentSeparator)===true){
 			return @$this->_contentSeparator[$index];

Spacing +20 added lines, -20 removed lines

@@ -22,8 +22,8 @@ 
 	protected $_contentSeparator="";
 
 
-	public function __construct($identifier,$tagName,$baseClass){
-		parent::__construct($identifier,$tagName,$baseClass);
+	public function __construct($identifier, $tagName, $baseClass) {
+		parent::__construct($identifier, $tagName, $baseClass);
 		$this->root="";
 		$this->attr="data-ajax";
 	}
@@ -33,11 +33,11 @@ 
 	 * @param string $targetSelector the target of the get
 	 * @return HtmlNavElement
 	 */
-	public function autoGetOnClick($targetSelector){
-		return $this->getOnClick($this->root, $targetSelector,array("attr"=>$this->attr));
+	public function autoGetOnClick($targetSelector) {
+		return $this->getOnClick($this->root, $targetSelector, array("attr"=>$this->attr));
 	}
 
-	public function contentAsString(){
+	public function contentAsString() {
 		return JArray::implode($this->_contentSeparator, $this->content);
 	}
 
@@ -45,15 +45,15 @@ 
 	 * Generate the jquery script to set the elements to the HtmlNavElement
 	 * @param JsUtils $jsUtils
 	 */
-	public function jsSetContent(JsUtils $jsUtils){
-		$jsUtils->html("#".$this->identifier,str_replace("\"","'", $this->contentAsString()),true);
+	public function jsSetContent(JsUtils $jsUtils) {
+		$jsUtils->html("#".$this->identifier, str_replace("\"", "'", $this->contentAsString()), true);
 	}
 
 	public function getRoot() {
 		return $this->root;
 	}
 	public function setRoot($root) {
-		$this->root = $root;
+		$this->root=$root;
 		return $this;
 	}
 	public function getAttr() {
@@ -66,12 +66,12 @@ 
 	 * @return HtmlNavElement
 	 */
 	public function setAttr($attr) {
-		$this->attr = $attr;
+		$this->attr=$attr;
 		return $this;
 	}
 
 	public function __call($method, $args) {
-		if(isset($this->$method) && is_callable($this->$method)) {
+		if (isset($this->$method) && is_callable($this->$method)) {
 			return call_user_func_array(
 					$this->$method,
 					$args
@@ -79,32 +79,32 @@ 
 		}
 	}
 
-	public abstract function fromDispatcher(JsUtils $js,$dispatcher, $startIndex=0);
+	public abstract function fromDispatcher(JsUtils $js, $dispatcher, $startIndex=0);
 
 
-	public function setContentDivider($divider,$index=NULL) {
+	public function setContentDivider($divider, $index=NULL) {
 		$divider="<div class='divider'> {$divider} </div>";
 		return $this->setDivider($divider, $index);
 	}
 
-	public function setIconContentDivider($iconContentDivider,$index=NULL) {
+	public function setIconContentDivider($iconContentDivider, $index=NULL) {
 		$contentDivider="<i class='".$iconContentDivider." icon divider'></i>";
 		return $this->setDivider($contentDivider, $index);
 	}
 
-	protected function setDivider($divider,$index){
-		if(isset($index)){
-			if(\is_array($this->_contentSeparator)===false)
-				$this->_contentSeparator=array_fill (0, $this->count()-1,$this->_contentSeparator);
+	protected function setDivider($divider, $index) {
+		if (isset($index)) {
+			if (\is_array($this->_contentSeparator)===false)
+				$this->_contentSeparator=array_fill(0, $this->count()-1, $this->_contentSeparator);
 			$this->_contentSeparator[$index]=$divider;
-		}else{
+		} else {
 			$this->_contentSeparator=$divider;
 		}
 		return $this;
 	}
 
-	protected function getContentDivider($index){
-		if(\is_array($this->_contentSeparator)===true){
+	protected function getContentDivider($index) {
+		if (\is_array($this->_contentSeparator)===true) {
 			return @$this->_contentSeparator[$index];
 		}
 		return $this->_contentSeparator;

Braces +4 added lines, -3 removed lines

@@ -94,10 +94,11 @@
 
 	protected function setDivider($divider,$index){
 		if(isset($index)){
-			if(\is_array($this->_contentSeparator)===false)
-				$this->_contentSeparator=array_fill (0, $this->count()-1,$this->_contentSeparator);
+			if(\is_array($this->_contentSeparator)===false) {
+							$this->_contentSeparator=array_fill (0, $this->count()-1,$this->_contentSeparator);
+			}
 			$this->_contentSeparator[$index]=$divider;
-		}else{
+		} else{
 			$this->_contentSeparator=$divider;
 		}
 		return $this;

Ajax/semantic/html/base/traits/AttachedTrait.php

Doc Comments -1 removed lines

@@ -9,7 +9,6 @@
 
 	/**
 	 *
-	 * @param string $side
 	 * @return \Ajax\semantic\html\base\HtmlSemDoubleElement
 	 */
 	public function setAttachment(HtmlSemDoubleElement $toElement, $value=Side::BOTH) {

Spacing +2 added lines, -2 removed lines

@@ -14,8 +14,8 @@
 	 */
 	public function setAttachment(HtmlSemDoubleElement $toElement, $value=Side::BOTH) {
 		if (isset($toElement)) {
-			$toElement->addToPropertyCtrl("class", "attached", array ("attached" ));
+			$toElement->addToPropertyCtrl("class", "attached", array("attached"));
 		}
-		return $this->addToPropertyCtrl("class", $value . " attached", Side::getConstantValues("attached"));
+		return $this->addToPropertyCtrl("class", $value." attached", Side::getConstantValues("attached"));
 	}
 }
\ No newline at end of file

Ajax/semantic/html/base/traits/BaseTrait.php

Doc Comments +12 added lines

@@ -12,12 +12,24 @@
 	protected $_states=[ ];
 	protected $_baseClass;
 
+	/**
+	 * @param string $name
+	 */
 	protected abstract function setPropertyCtrl($name, $value, $typeCtrl);
 
+	/**
+	 * @param string $name
+	 */
 	protected abstract function addToPropertyCtrl($name, $value, $typeCtrl);
 
+	/**
+	 * @param string $name
+	 */
 	protected abstract function addToPropertyCtrlCheck($name, $value, $typeCtrl);
 
+	/**
+	 * @param string $name
+	 */
 	public abstract function addToProperty($name, $value, $separator=" ");
 
 	public function addVariation($variation) {

Spacing +8 added lines, -8 removed lines

@@ -8,8 +8,8 @@ 
 use Ajax\semantic\html\elements\HtmlIcon;
 
 trait BaseTrait {
-	protected $_variations=[ ];
-	protected $_states=[ ];
+	protected $_variations=[];
+	protected $_states=[];
 	protected $_baseClass;
 
 	protected abstract function setPropertyCtrl($name, $value, $typeCtrl);
@@ -37,7 +37,7 @@ 
 		$this->setProperty("class", $this->_baseClass);
 		if (\is_string($variations))
 			$variations=\explode(" ", $variations);
-		foreach ( $variations as $variation ) {
+		foreach ($variations as $variation) {
 			$this->addVariation($variation);
 		}
 		return $this;
@@ -51,7 +51,7 @@ 
 	public function addVariations($variations=array()) {
 		if (\is_string($variations))
 			$variations=\explode(" ", $variations);
-		foreach ( $variations as $variation ) {
+		foreach ($variations as $variation) {
 			$this->addVariation($variation);
 		}
 		return $this;
@@ -60,7 +60,7 @@ 
 	public function addStates($states=array()) {
 		if (\is_string($states))
 			$states=\explode(" ", $states);
-		foreach ( $states as $state ) {
+		foreach ($states as $state) {
 			$this->addState($state);
 		}
 		return $this;
@@ -70,14 +70,14 @@ 
 		$this->setProperty("class", $this->_baseClass);
 		if (\is_string($states))
 			$states=\explode(" ", $states);
-		foreach ( $states as $state ) {
+		foreach ($states as $state) {
 			$this->addState($state);
 		}
 		return $this;
 	}
 
 	public function addIcon($icon, $before=true) {
-		return $this->addContent(new HtmlIcon("icon-" . $this->identifier, $icon), $before);
+		return $this->addContent(new HtmlIcon("icon-".$this->identifier, $icon), $before);
 	}
 
 	/**
@@ -127,7 +127,7 @@ 
 	}
 
 	public function setFloated($direction="right") {
-		return $this->addToPropertyCtrl("class", $direction . " floated", Direction::getConstantValues("floated"));
+		return $this->addToPropertyCtrl("class", $direction." floated", Direction::getConstantValues("floated"));
 	}
 
 	public function floatRight() {

Braces +12 added lines, -8 removed lines

@@ -35,8 +35,9 @@ 
 
 	public function setVariations($variations) {
 		$this->setProperty("class", $this->_baseClass);
-		if (\is_string($variations))
-			$variations=\explode(" ", $variations);
+		if (\is_string($variations)) {
+					$variations=\explode(" ", $variations);
+		}
 		foreach ( $variations as $variation ) {
 			$this->addVariation($variation);
 		}
@@ -49,8 +50,9 @@ 
 	}
 
 	public function addVariations($variations=array()) {
-		if (\is_string($variations))
-			$variations=\explode(" ", $variations);
+		if (\is_string($variations)) {
+					$variations=\explode(" ", $variations);
+		}
 		foreach ( $variations as $variation ) {
 			$this->addVariation($variation);
 		}
@@ -58,8 +60,9 @@ 
 	}
 
 	public function addStates($states=array()) {
-		if (\is_string($states))
-			$states=\explode(" ", $states);
+		if (\is_string($states)) {
+					$states=\explode(" ", $states);
+		}
 		foreach ( $states as $state ) {
 			$this->addState($state);
 		}
@@ -68,8 +71,9 @@ 
 
 	public function setStates($states) {
 		$this->setProperty("class", $this->_baseClass);
-		if (\is_string($states))
-			$states=\explode(" ", $states);
+		if (\is_string($states)) {
+					$states=\explode(" ", $states);
+		}
 		foreach ( $states as $state ) {
 			$this->addState($state);
 		}

Ajax/semantic/html/base/traits/IconTrait.php

Doc Comments +4 added lines

@@ -7,6 +7,10 @@
 trait IconTrait {
 	private $_hasIcon=false;
 
+	/**
+	 * @param string $name
+	 * @param string $value
+	 */
 	protected abstract function addToPropertyCtrl($name, $value, $typeCtrl);
 	public abstract function addContent($content,$before=false);
 

Spacing +10 added lines, -10 removed lines

@@ -8,18 +8,18 @@ 
 	private $_hasIcon=false;
 
 	protected abstract function addToPropertyCtrl($name, $value, $typeCtrl);
-	public abstract function addContent($content,$before=false);
+	public abstract function addContent($content, $before=false);
 
-	public function addIcon($icon,$direction=Direction::LEFT){
-		if($this->_hasIcon===false){
+	public function addIcon($icon, $direction=Direction::LEFT) {
+		if ($this->_hasIcon===false) {
 			$iconO=$icon;
-			if(\is_string($icon)){
+			if (\is_string($icon)) {
 				$iconO=new HtmlIcon("icon-".$this->identifier, $icon);
 			}
 			$this->addToPropertyCtrl("class", $direction." icon", Direction::getConstantValues("icon"));
-			$this->addContent($iconO,false);
+			$this->addContent($iconO, false);
 			$this->_hasIcon=true;
-		}else{
+		} else {
 			$iconO=$this->getIcon();
 			$iconO->setIcon($icon);
 			$this->addToPropertyCtrl("class", $direction." icon", Direction::getConstantValues("icon"));
@@ -27,10 +27,10 @@ 
 		return $iconO;
 	}
 
-	public function getIcon(){
-		if(\is_array($this->content)){
-			foreach ($this->content as $item){
-				if($item instanceof HtmlIcon)
+	public function getIcon() {
+		if (\is_array($this->content)) {
+			foreach ($this->content as $item) {
+				if ($item instanceof HtmlIcon)
 					return $item;
 			}
 		}

Braces +4 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
 			$this->addToPropertyCtrl("class", $direction." icon", Direction::getConstantValues("icon"));
 			$this->addContent($iconO,false);
 			$this->_hasIcon=true;
-		}else{
+		} else{
 			$iconO=$this->getIcon();
 			$iconO->setIcon($icon);
 			$this->addToPropertyCtrl("class", $direction." icon", Direction::getConstantValues("icon"));
@@ -30,8 +30,9 @@ 
 	public function getIcon(){
 		if(\is_array($this->content)){
 			foreach ($this->content as $item){
-				if($item instanceof HtmlIcon)
-					return $item;
+				if($item instanceof HtmlIcon) {
+									return $item;
+				}
 			}
 		}
 	}

Ajax/semantic/html/collections/form/HtmlFormFields.php

Doc Comments +3 added lines

@@ -15,6 +15,9 @@
 	protected $_equalWidth;
 	protected $_name;
 
+	/**
+	 * @param string $identifier
+	 */
 	public function __construct($identifier, $fields=array(), $equalWidth=true) {
 		parent::__construct($identifier, "div");
 		$this->_equalWidth=$equalWidth;

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 use Ajax\semantic\html\base\HtmlSemCollection;
 use Ajax\semantic\html\base\constants\Wide;
 use Ajax\JsUtils;
-
 use Ajax\semantic\html\base\HtmlSemDoubleElement;
 use Ajax\semantic\html\collections\form\traits\FieldsTrait;
 

Spacing +5 added lines, -5 removed lines

@@ -35,7 +35,7 @@ 
 		}
 		if (isset($label))
 			$this->setLabel($label);
-		foreach ( $fields as $field ) {
+		foreach ($fields as $field) {
 			$this->addItem($field);
 		}
 		return $this;
@@ -96,9 +96,9 @@ 
 	}
 
 	public static function radios($name, $items=array(), $label=NULL, $value=null, $type=NULL) {
-		$fields=array ();
+		$fields=array();
 		$i=0;
-		foreach ( $items as $val => $caption ) {
+		foreach ($items as $val => $caption) {
 			$itemO=new HtmlFormRadio($name."-".$i++, $name, $caption, $val, $type);
 			if ($val===$value) {
 				$itemO->getField()->getField()->setProperty("checked", "");
@@ -112,9 +112,9 @@ 
 	}
 
 	public static function checkeds($name, $items=array(), $label=NULL, $values=array(), $type=NULL) {
-		$fields=array ();
+		$fields=array();
 		$i=0;
-		foreach ( $items as $val => $caption ) {
+		foreach ($items as $val => $caption) {
 			$itemO=new HtmlFormCheckbox($name."-".$i++, $name, $caption, $val, $type);
 			if (\array_search($val, $values)!==false) {
 				$itemO->getField()->getField()->setProperty("checked", "");

Braces +15 added lines, -10 removed lines

@@ -29,12 +29,14 @@ 
 				if (\is_string($end)) {
 					$label=$end;
 					\array_pop($fields);
-				} else
-					$label=NULL;
+				} else {
+									$label=NULL;
+				}
 			}
 		}
-		if (isset($label))
-			$this->setLabel($label);
+		if (isset($label)) {
+					$this->setLabel($label);
+		}
 		foreach ( $fields as $field ) {
 			$this->addItem($field);
 		}
@@ -65,8 +67,9 @@ 
 		if ($this->_equalWidth) {
 			$count=$this->count();
 			$this->addToProperty("class", Wide::getConstants()["W".$count]." fields");
-		} else
-			$this->addToProperty("class", "fields");
+		} else {
+					$this->addToProperty("class", "fields");
+		}
 		return parent::compile($js, $view);
 	}
 
@@ -106,8 +109,9 @@ 
 			$fields[]=$itemO;
 		}
 		$radios=new HtmlFormFields("fields-".$name, $fields);
-		if (isset($label))
-			$radios->setLabel($label)->setProperty("for", $name);
+		if (isset($label)) {
+					$radios->setLabel($label)->setProperty("for", $name);
+		}
 		return $radios;
 	}
 
@@ -122,8 +126,9 @@ 
 			$fields[]=$itemO;
 		}
 		$radios=new HtmlFormFields("fields-".$name, $fields);
-		if (isset($label))
-			$radios->setLabel($label)->setProperty("for", $name);
+		if (isset($label)) {
+					$radios->setLabel($label)->setProperty("for", $name);
+		}
 		return $radios;
 	}
 

Ajax/semantic/html/collections/form/traits/CheckboxTrait.php

Doc Comments +3 added lines

@@ -6,6 +6,9 @@
 
 trait CheckboxTrait {
 
+	/**
+	 * @param string $name
+	 */
 	public abstract function addToPropertyCtrl($name, $value, $typeCtrl);
 
 	public function setType($checkboxType) {

Ajax/semantic/html/collections/HtmlBreadcrumb.php

Doc Comments +3 added lines, -4 removed lines

@@ -64,8 +64,7 @@ 
 	 * Associate an ajax get to the breadcrumb elements, displayed in $targetSelector
 	 * $attr member is used to build each element url
 	 * @param string $targetSelector the target of the get
-	 * @param string $attr the html attribute used to build the elements url
-	 * @return HtmlBreadcrumbs
+	 * @return HtmlBreadcrumb
 	 */
 	public function autoGetOnClick($targetSelector) {
 		return $this->getOnClick($this->root, $targetSelector, array ("attr" => $this->attr ));
@@ -91,7 +90,7 @@ 
 	 * Add new elements in breadcrumbs corresponding to request dispatcher : controllerName, actionName, parameters
 	 * @param JsUtils $js
 	 * @param Dispatcher $dispatcher the request dispatcher
-	 * @return \Ajax\bootstrap\html\HtmlBreadcrumbs
+	 * @return HtmlBreadcrumb
 	 */
 	public function fromDispatcher(JsUtils $js,$dispatcher, $startIndex=0) {
 		return $this->addItems($js->fromDispatcher($dispatcher));
@@ -120,7 +119,7 @@ 
 	 * sets the function who generates the href elements.
 	 * default : function($element){return $element->getContent()}
 	 * @param function $_hrefFunction
-	 * @return \Ajax\bootstrap\html\HtmlBreadcrumbs
+	 * @return HtmlBreadcrumb
 	 */
 	public function setHrefFunction($_hrefFunction) {
 		$this->_hrefFunction=$_hrefFunction;

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use Ajax\semantic\html\base\HtmlSemNavElement;
 use Ajax\semantic\html\base\HtmlSemDoubleElement;
-
 use Ajax\semantic\html\elements\HtmlIcon;
 use Ajax\JsUtils;
 

Spacing +15 added lines, -15 removed lines

@@ -51,7 +51,7 @@ 
 		$this->startIndex=$startIndex;
 		$this->autoActive=$autoActive;
 		$this->_contentSeparator="<div class='divider'> / </div>";
-		$this->_hrefFunction=function ($e) {
+		$this->_hrefFunction=function($e) {
 			return $e->getContent();
 		};
 		if (isset($hrefFunction)) {
@@ -68,7 +68,7 @@ 
 	 * @return HtmlBreadcrumbs
 	 */
 	public function autoGetOnClick($targetSelector) {
-		return $this->getOnClick($this->root, $targetSelector, array ("attr" => $this->attr ));
+		return $this->getOnClick($this->root, $targetSelector, array("attr" => $this->attr));
 	}
 
 	public function contentAsString() {
@@ -80,7 +80,7 @@ 
 
 	public function setActive($index=null) {
 		if (!isset($index)) {
-			$index=sizeof($this->content) - 1;
+			$index=sizeof($this->content)-1;
 		}
 		$activeItem=$this->content[$index];
 		$activeItem->addToProperty("class", "active");
@@ -93,7 +93,7 @@ 
 	 * @param Dispatcher $dispatcher the request dispatcher
 	 * @return \Ajax\bootstrap\html\HtmlBreadcrumbs
 	 */
-	public function fromDispatcher(JsUtils $js,$dispatcher, $startIndex=0) {
+	public function fromDispatcher(JsUtils $js, $dispatcher, $startIndex=0) {
 		return $this->addItems($js->fromDispatcher($dispatcher));
 	}
 
@@ -107,12 +107,12 @@ 
 		if (!isset($index)) {
 			$index=sizeof($this->content);
 		}
-		if ($this->absolutePaths === true) {
+		if ($this->absolutePaths===true) {
 			return $this->_hrefFunction($this->content[$index]);
 		} else {
-			return $this->root . implode($separator, array_slice(array_map(function ($e) {
+			return $this->root.implode($separator, array_slice(array_map(function($e) {
 				return $this->_hrefFunction($e);
-			}, $this->content), $this->startIndex, $index + 1));
+			}, $this->content), $this->startIndex, $index+1));
 		}
 	}
 
@@ -146,8 +146,8 @@ 
 			$this->setActive();
 		}
 		$count=$this->count();
-		for($i=1; $i < $count; $i++) {
-			$this->content[$i]->wrap($this->getContentDivider($i - 1));
+		for ($i=1; $i<$count; $i++) {
+			$this->content[$i]->wrap($this->getContentDivider($i-1));
 		}
 		return parent::compile($js, $view);
 	}
@@ -157,15 +157,15 @@ 
 	 * @see \Ajax\bootstrap\html\base\BaseHtml::on()
 	 */
 	public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
-		foreach ( $this->content as $element ) {
+		foreach ($this->content as $element) {
 			$element->on($event, $jsCode, $stopPropagation, $preventDefault);
 		}
 		return $this;
 	}
 
 	public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) {
-		foreach ( $this->content as $element ) {
-			if ($element->getProperty($this->attr) != NULL){
+		foreach ($this->content as $element) {
+			if ($element->getProperty($this->attr)!=NULL) {
 				$element->_ajaxOn($operation, $event, $url, $responseElement, $parameters);
 			}
 		}
@@ -180,7 +180,7 @@ 
 	 */
 	protected function createItem($value) {
 		$count=$this->count();
-		$itemO=new HtmlSemDoubleElement("item-" . $this->identifier . "-" . $count, "a", "section");
+		$itemO=new HtmlSemDoubleElement("item-".$this->identifier."-".$count, "a", "section");
 		if (\is_array($value))
 			$itemO->fromArray($value);
 		else {
@@ -192,7 +192,7 @@ 
 	public function addIconAt($icon, $index) {
 		$item=$this->getItem($index);
 		if (isset($item)) {
-			$icon=new HtmlIcon("icon-" . $this->identifier, $icon);
+			$icon=new HtmlIcon("icon-".$this->identifier, $icon);
 			$item->wrapContent($icon);
 		}
 	}
@@ -200,7 +200,7 @@ 
 	public function addItem($item) {
 		$count=$this->count();
 		$itemO=parent::addItem($item);
-		$this->addToPropertyCtrl("class", "section", array ("section" ));
+		$this->addToPropertyCtrl("class", "section", array("section"));
 		$itemO->setProperty($this->attr, $this->getHref($count));
 		return $itemO;
 	}

Braces +3 added lines, -3 removed lines

@@ -181,9 +181,9 @@
 	protected function createItem($value) {
 		$count=$this->count();
 		$itemO=new HtmlSemDoubleElement("item-" . $this->identifier . "-" . $count, "a", "section");
-		if (\is_array($value))
-			$itemO->fromArray($value);
-		else {
+		if (\is_array($value)) {
+					$itemO->fromArray($value);
+		} else {
 			$itemO->setContent($value);
 		}
 		return $itemO;