jcheron / phalcon-jquery

Ajax/bootstrap/html/base/BaseHtml.php

Doc Comments +39 added lines

@@ -48,6 +48,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param string $name
+	 */
 	public function getProperty($name) {
 		if (array_key_exists($name, $this->properties))
 			return $this->properties [$name];
@@ -113,6 +116,10 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param string $name
+	 * @param string[] $typeCtrl
+	 */
 	protected function setMemberCtrl(&$name, $value, $typeCtrl) {
 		if ($this->ctrl($name, $value, $typeCtrl)===true) {
 			return $name=$value;
@@ -128,6 +135,10 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param string $name
+	 * @param string[] $typeCtrl
+	 */
 	protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") {
 		if ($this->ctrl($name, $value, $typeCtrl)===true) {
 			if (is_array($typeCtrl)) {
@@ -138,6 +149,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param string $name
+	 */
 	protected function addToMember(&$name, $value, $separator=" ") {
 		$name=str_ireplace($value, "", $name).$separator.$value;
 		return $this;
@@ -152,6 +166,10 @@ 
 		return $this->addToProperty($name, $value);
 	}
 
+	/**
+	 * @param string $name
+	 * @param string[] $typeCtrl
+	 */
 	public function addToPropertyCtrl($name, $value, $typeCtrl) {
 		// if($this->ctrl($name, $value, $typeCtrl)===true){
 		return $this->addToPropertyUnique($name, $value, $typeCtrl);
@@ -219,6 +237,9 @@ 
 
 	}
 
+	/**
+	 * @param string $before
+	 */
 	public function wrap($before, $after="") {
 		$this->wrapBefore.=$before;
 		$this->wrapAfter=$after.$this->wrapAfter;
@@ -285,6 +306,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $operation
+	 */
 	public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) {
 		$params=array (
 				"url" => $url,
@@ -295,14 +319,23 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param string $event
+	 */
 	public function getOn($event, $url, $responseElement="", $parameters=array()) {
 		return $this->_ajaxOn("get", $event, $url, $responseElement, $parameters);
 	}
 
+	/**
+	 * @param string $url
+	 */
 	public function getOnClick($url, $responseElement="", $parameters=array()) {
 		return $this->getOn("click", $url, $responseElement, $parameters);
 	}
 
+	/**
+	 * @param string $event
+	 */
 	public function postOn($event, $url, $params="{}", $responseElement="", $parameters=array()) {
 		$parameters ["params"]=$params;
 		return $this->_ajaxOn("post", $event, $url, $responseElement, $parameters);
@@ -312,6 +345,9 @@ 
 		return $this->postOn("click", $url, $params, $responseElement, $parameters);
 	}
 
+	/**
+	 * @param string $event
+	 */
 	public function postFormOn($event, $url, $form, $responseElement="", $parameters=array()) {
 		$parameters ["form"]=$form;
 		return $this->_ajaxOn("postForm", $event, $url, $responseElement, $parameters);
@@ -361,6 +397,9 @@ 
 		return $value;
 	}
 
+	/**
+	 * @param string $jqueryCall
+	 */
 	public function jsDoJquery($jqueryCall, $param=""){
 		return "$('#".$this->identifier."').".$jqueryCall."(".$this->_prep_value($param).");";
 	}

Braces +23 added lines, -16 removed lines

@@ -49,16 +49,18 @@ 
 	}
 
 	public function getProperty($name) {
-		if (array_key_exists($name, $this->properties))
-			return $this->properties [$name];
+		if (array_key_exists($name, $this->properties)) {
+					return $this->properties [$name];
+		}
 	}
 
 	public function addToProperty($name, $value, $separator=" ") {
 		$v=$this->properties [$name];
-		if (isset($v)&&$v!=="")
-			$v=$v.$separator.$value;
-		else
-			$v=$value;
+		if (isset($v)&&$v!=="") {
+					$v=$v.$separator.$value;
+		} else {
+					$v=$value;
+		}
 
 		return $this->setProperty($name, $v);
 	}
@@ -108,8 +110,9 @@ 
 	}
 
 	protected function setPropertyCtrl($name, $value, $typeCtrl) {
-		if ($this->ctrl($name, $value, $typeCtrl)===true)
-			return $this->setProperty($name, $value);
+		if ($this->ctrl($name, $value, $typeCtrl)===true) {
+					return $this->setProperty($name, $value);
+		}
 		return $this;
 	}
 
@@ -144,8 +147,9 @@ 
 	}
 
 	protected function addToPropertyUnique($name, $value, $typeCtrl) {
-		if (@class_exists($typeCtrl, true))
-			$typeCtrl=$typeCtrl::getConstants();
+		if (@class_exists($typeCtrl, true)) {
+					$typeCtrl=$typeCtrl::getConstants();
+		}
 		if (is_array($typeCtrl)) {
 			$this->removeOldValues($this->properties [$name], $typeCtrl);
 		}
@@ -326,15 +330,18 @@ 
 			$flag=false;
 			$index=0;
 			while ( !$flag&&$index<sizeof($elements) ) {
-				if ($elements [$index] instanceof BaseHtml)
-					$flag=($elements [$index]->getIdentifier()===$identifier);
+				if ($elements [$index] instanceof BaseHtml) {
+									$flag=($elements [$index]->getIdentifier()===$identifier);
+				}
 				$index++;
 			}
-			if ($flag===true)
-				return $elements [$index-1];
+			if ($flag===true) {
+							return $elements [$index-1];
+			}
 		} elseif ($elements instanceof BaseHtml) {
-			if ($elements->getIdentifier()===$identifier)
-				return $elements;
+			if ($elements->getIdentifier()===$identifier) {
+							return $elements;
+			}
 		}
 		return null;
 	}

Spacing +34 added lines, -34 removed lines

@@ -15,8 +15,8 @@ 
 abstract class BaseHtml extends BaseWidget {
 	protected $_template;
 	protected $tagName;
-	protected $properties=array ();
-	protected $events=array ();
+	protected $properties=array();
+	protected $events=array();
 	protected $wrapBefore="";
 	protected $wrapAfter="";
 	protected $_bsComponent;
@@ -55,7 +55,7 @@ 
 
 	public function addToProperty($name, $value, $separator=" ") {
 		$v=$this->properties [$name];
-		if (isset($v)&&$v!=="")
+		if (isset($v) && $v!=="")
 			$v=$v.$separator.$value;
 		else
 			$v=$value;
@@ -70,11 +70,11 @@ 
 
 	public function compile(JsUtils $js=NULL, View $view=NULL) {
 		$result=$this->getTemplate();
-		foreach ( $this as $key => $value ) {
-			if (PhalconUtils::startsWith($key, "_")===false&&$key!=="events") {
+		foreach ($this as $key => $value) {
+			if (PhalconUtils::startsWith($key, "_")===false && $key!=="events") {
 				if (is_array($value)) {
 					$v=PropertyWrapper::wrap($value, $js);
-				} else {
+				}else {
 					$v=$value;
 				}
 				$result=str_ireplace("%".$key."%", $v, $result);
@@ -86,7 +86,7 @@ 
 		if (isset($view)===true) {
 			$controls=$view->getVar("q");
 			if (isset($controls)===false) {
-				$controls=array ();
+				$controls=array();
 			}
 			$controls [$this->identifier]=$result;
 			$view->setVar("q", $controls);
@@ -99,7 +99,7 @@ 
 			if (array_search($value, $typeCtrl)===false) {
 				throw new \Exception("La valeur passée a propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
 			}
-		} else {
+		}else {
 			if (!$typeCtrl($value)) {
 				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name);
 			}
@@ -176,28 +176,28 @@ 
 	}
 
 	public function fromArray($array) {
-		foreach ( $this as $key => $value ) {
+		foreach ($this as $key => $value) {
 			if (array_key_exists($key, $array) && !PhalconUtils::startsWith($key, "_")) {
 					$setter="set".ucfirst($key);
 					$this->$setter($array [$key]);
 				unset($array [$key]);
 			}
 		}
-		foreach ( $array as $key => $value ) {
+		foreach ($array as $key => $value) {
 			if (method_exists($this, $key)) {
 				try {
 					$this->$key($value);
 					unset($array [$key]);
-				} catch ( \Exception $e ) {
+				} catch (\Exception $e) {
 					// Nothing to do
 				}
-			} else {
+			}else {
 				$setter="set".ucfirst($key);
 				if (method_exists($this, $setter)) {
 					try {
 						$this->$setter($value);
 						unset($array [$key]);
-					} catch ( \Exception $e ) {
+					} catch (\Exception $e) {
 						// Nothing to do
 					}
 				}
@@ -206,21 +206,21 @@ 
 		return $array;
 	}
 
-	public function fromDatabaseObjects($objects,$function) {
-		if(isset($objects)){
-			foreach ($objects as $object){
-				$this->fromDatabaseObject($object,$function);
+	public function fromDatabaseObjects($objects, $function) {
+		if (isset($objects)) {
+			foreach ($objects as $object) {
+				$this->fromDatabaseObject($object, $function);
 			}
 		}
 		return $this;
 	}
 
-	public function fromDatabaseObject($object,$function){
+	public function fromDatabaseObject($object, $function) {
 
 	}
 
 	public function wrap($before, $after="") {
-		if(isset($before)){
+		if (isset($before)) {
 			$this->wrapBefore.=$before;
 		}
 		$this->wrapAfter=$after.$this->wrapAfter;
@@ -242,13 +242,13 @@ 
 		if (array_key_exists($event, $this->events)) {
 			if (is_array($this->events [$event])) {
 				$this->events [$event] []=$jsCode;
-			} else {
-				$this->events [$event]=array (
+			}else {
+				$this->events [$event]=array(
 						$this->events [$event],
 						$jsCode
 				);
 			}
-		} else {
+		}else {
 			$this->events [$event]=$jsCode;
 		}
 	}
@@ -267,14 +267,14 @@ 
 
 	public function addEventsOnRun(JsUtils $js) {
 		if (isset($this->_bsComponent)) {
-			foreach ( $this->events as $event => $jsCode ) {
+			foreach ($this->events as $event => $jsCode) {
 				$code=$jsCode;
 				if (is_array($jsCode)) {
 					$code="";
-					foreach ( $jsCode as $jsC ) {
+					foreach ($jsCode as $jsC) {
 						if ($jsC instanceof AjaxCall) {
 							$code.="\n".$jsC->compile($js);
-						} else {
+						}else {
 							$code.="\n".$jsC;
 						}
 					}
@@ -288,7 +288,7 @@ 
 	}
 
 	public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) {
-		$params=array (
+		$params=array(
 				"url" => $url,
 				"responseElement" => $responseElement
 		);
@@ -327,7 +327,7 @@ 
 		if (is_array($elements)) {
 			$flag=false;
 			$index=0;
-			while ( !$flag&&$index<sizeof($elements) ) {
+			while (!$flag && $index<sizeof($elements)) {
 				if ($elements [$index] instanceof BaseHtml)
 					$flag=($elements [$index]->getIdentifier()===$identifier);
 				$index++;
@@ -341,7 +341,7 @@ 
 		return null;
 	}
 
-	public function __toString(){
+	public function __toString() {
 		return $this->compile();
 	}
 
@@ -357,25 +357,25 @@ 
 		if (is_array($value)) {
 			$value=implode(",", $value);
 		}
-		if (strrpos($value, 'this')===false&&strrpos($value, 'event')===false) {
+		if (strrpos($value, 'this')===false && strrpos($value, 'event')===false) {
 			$value='"'.$value.'"';
 		}
 		return $value;
 	}
 
-	public function jsDoJquery($jqueryCall, $param=""){
+	public function jsDoJquery($jqueryCall, $param="") {
 		return "$('#".$this->identifier."').".$jqueryCall."(".$this->_prep_value($param).");";
 	}
 
-	public function jsHtml($content=""){
-		return $this->jsDoJquery("html",$content);
+	public function jsHtml($content="") {
+		return $this->jsDoJquery("html", $content);
 	}
 
-	public function jsShow(){
+	public function jsShow() {
 		return $this->jsDoJquery("show");
 	}
 
-	public function jsHide(){
+	public function jsHide() {
 		return $this->jsDoJquery("hide");
 	}
 }
\ No newline at end of file

Ajax/bootstrap/html/base/PropertyWrapper.php

Doc Comments +3 added lines

@@ -7,6 +7,9 @@
 
 class PropertyWrapper {
 
+	/**
+	 * @param \Ajax\JsUtils $js
+	 */
 	public static function wrap($input, $js=NULL, $separator=' ', $valueQuote='"') {
 		$output="";
 		if (is_string($input)) {

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace Ajax\bootstrap\html\base;
 
 use Ajax\service\JArray;
-use Ajax\service\AjaxCall;
 
 class PropertyWrapper {
 

Spacing +4 added lines, -4 removed lines

@@ -17,7 +17,7 @@ 
 				$value1=reset($input);
 				if (is_object($value1)) {
 					$output=PropertyWrapper::wrapObjects($input, $js, $separator=' ');
-				} else
+				}else
 					$output=PropertyWrapper::wrapStrings($input, $separator=' ', $valueQuote='"');
 			}
 		}
@@ -26,17 +26,17 @@ 
 
 	public static function wrapStrings($input, $separator=' ', $valueQuote='"') {
 		if (JArray::isAssociative($input)===true) {
-			$result=implode($separator, array_map(function ($v, $k) use($valueQuote) {
+			$result=implode($separator, array_map(function($v, $k) use($valueQuote) {
 				return $k.'='.$valueQuote.$v.$valueQuote;
 			}, $input, array_keys($input)));
-		} else {
+		}else {
 			$result=implode($separator, array_values($input));
 		}
 		return $result;
 	}
 
 	public static function wrapObjects($input, $js=NULL, $separator=' ') {
-		return implode($separator, array_map(function ($v) use($js) {
+		return implode($separator, array_map(function($v) use($js) {
 			return $v->compile($js);
 		}, $input));
 	}

Braces +3 added lines, -2 removed lines

@@ -17,8 +17,9 @@
 				$value1=reset($input);
 				if (is_object($value1)) {
 					$output=PropertyWrapper::wrapObjects($input, $js, $separator=' ');
-				} else
-					$output=PropertyWrapper::wrapStrings($input, $separator=' ', $valueQuote='"');
+				} else {
+									$output=PropertyWrapper::wrapStrings($input, $separator=' ', $valueQuote='"');
+				}
 			}
 		}
 		return $output;

Ajax/bootstrap/html/content/HtmlListgroupItem.php

Doc Comments +4 added lines, -1 removed lines

@@ -18,6 +18,9 @@ 
  */
 class HtmlListgroupItem extends HtmlElementAsContent {
 
+	/**
+	 * @param HtmlDoubleElement $element
+	 */
 	public function __construct($element) {
 		parent::__construct($element);
 		$this->element->setProperty("class", "list-group-item");
@@ -37,7 +40,7 @@ 
 	 * define the Panel style
 	 * avaible values : "list-group-item-default","list-group-item-primary","list-group-item-success","list-group-item-info","list-group-item-warning","list-group-item-danger"
 	 * @param string|int $cssStyle
-	 * @return \Ajax\bootstrap\html\HtmlListgroupItem default : "list-group-item-default"
+	 * @return \Ajax\bootstrap\html\base\HtmlSingleElement default : "list-group-item-default"
 	 */
 	public function setStyle($cssStyle) {
 		if (!PhalconUtils::startsWith($cssStyle, "list-group-item"))

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 		$element=new HtmlDoubleElement("", "p");
 		$element->setContent($content);
 		$element->setClass("list-group-item-text");
-		$this->element->setContent(array (
+		$this->element->setContent(array(
 				$elementHeader,
 				$element
 		));

Braces +3 added lines, -2 removed lines

@@ -40,8 +40,9 @@
 	 * @return \Ajax\bootstrap\html\HtmlListgroupItem default : "list-group-item-default"
 	 */
 	public function setStyle($cssStyle) {
-		if (!PhalconUtils::startsWith($cssStyle, "list-group-item"))
-			$cssStyle="list-group-item".$cssStyle;
+		if (!PhalconUtils::startsWith($cssStyle, "list-group-item")) {
+					$cssStyle="list-group-item".$cssStyle;
+		}
 		$this->element->addToPropertyCtrl("class", $cssStyle, CssRef::Styles("list-group-item"));
 		return $this->element;
 	}

Ajax/bootstrap/html/HtmlBreadcrumbs.php

Doc Comments +3 added lines, -1 removed lines

@@ -175,7 +175,6 @@ 
 	 * Associate an ajax get to the breadcrumbs 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
 	 */
 	public function autoGetOnClick($targetSelector){
@@ -197,6 +196,9 @@ 
 		$jsUtils->html("#".$this->identifier,str_replace("\"","'", $this->contentAsString()),true);
 	}
 	
+	/**
+	 * @param integer $index
+	 */
 	public function getElement($index){
 		return $this->content[$index];
 	}

Braces +3 added lines, -3 removed lines

@@ -67,9 +67,9 @@ 
 		if(is_array($element)){
 			$elm=new HtmlLink("lnk-".$this->identifier."-".$size);
 			$elm->fromArray($element);
-		}else if($element instanceof HtmlLink){
+		} else if($element instanceof HtmlLink){
 			$elm=$element;
-		}else{
+		} else{
 			$elm=new HtmlLink("lnk-".$this->identifier."-".$size,$href,$element);
 			if(isset($glyph)){
 				$elm->wrapContentWithGlyph($glyph);
@@ -116,7 +116,7 @@ 
 		}
 		if($this->absolutePaths===true){
 			return $this->_hrefFunction($this->content[$index]);
-		}else{
+		} else{
 			return $this->root.implode($separator, array_slice(array_map(function($e){return $this->_hrefFunction($e);}, $this->content),0,$index+1));
 		}
 	}

Spacing +37 added lines, -37 removed lines

@@ -35,14 +35,14 @@ 
 	 * @param boolean $autoActive sets the last element's class to <b>active</b> if true
 	 * @param function $hrefFunction the function who generates the href elements. default : function($e){return $e->getContent()}
 	 */
-	public function __construct($identifier,$elements=array(),$autoActive=true,$hrefFunction=NULL){
-		parent::__construct($identifier,"ol");
+	public function __construct($identifier, $elements=array(), $autoActive=true, $hrefFunction=NULL) {
+		parent::__construct($identifier, "ol");
 		$this->setProperty("class", "breadcrumb");
 		$this->content=array();
 		$this->autoActive=$autoActive;
 		$this->absolutePaths;
-		$this->_hrefFunction=function ($e){return $e->getContent();};
-		if(isset($hrefFunction)){
+		$this->_hrefFunction=function($e) {return $e->getContent(); };
+		if (isset($hrefFunction)) {
 			$this->_hrefFunction=$hrefFunction;
 		}
 		$this->addElements($elements);
@@ -53,43 +53,43 @@ 
 	 * @param string $href
 	 * @return \Ajax\bootstrap\html\HtmlLink
 	 */
-	public function addElement($element,$href="",$glyph=NULL){
+	public function addElement($element, $href="", $glyph=NULL) {
 		$size=sizeof($this->content);
-		if(is_array($element)){
+		if (is_array($element)) {
 			$elm=new HtmlLink("lnk-".$this->identifier."-".$size);
 			$elm->fromArray($element);
-		}else if($element instanceof HtmlLink){
+		}else if ($element instanceof HtmlLink) {
 			$elm=$element;
-		}else{
-			$elm=new HtmlLink("lnk-".$this->identifier."-".$size,$href,$element);
-			if(isset($glyph)){
+		}else {
+			$elm=new HtmlLink("lnk-".$this->identifier."-".$size, $href, $element);
+			if (isset($glyph)) {
 				$elm->wrapContentWithGlyph($glyph);
 			}
 		}
-		$elm->wrap("<li>","</li>");
+		$elm->wrap("<li>", "</li>");
 		$this->content[]=$elm;
 		$elm->setProperty($this->attr, $this->getHref($size));
 		return $elm;
 	}
 	
-	public function setActive($index=null){
-		if(!isset($index)){
+	public function setActive($index=null) {
+		if (!isset($index)) {
 			$index=sizeof($this->content)-1;
 		}
-		$li=new HtmlDoubleElement("","li");
+		$li=new HtmlDoubleElement("", "li");
 		$li->setClass("active");
 		$li->setContent($this->content[$index]->getContent());
 		$this->content[$index]=$li;
 	}
 	
-	public function addElements($elements){
-		foreach ( $elements as $element ) {
+	public function addElements($elements) {
+		foreach ($elements as $element) {
 			$this->addElement($element);
 		}
 		return $this;
 	}
 	
-	public function fromArray($array){
+	public function fromArray($array) {
 		$array=parent::fromArray($array);
 		$this->addElements($array);
 		return $array;
@@ -101,14 +101,14 @@ 
 	 * @param string $separator
 	 * @return string
 	 */
-	public function getHref($index=null,$separator="/"){
-		if(!isset($index)){
+	public function getHref($index=null, $separator="/") {
+		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->_hrefFunction($e);}, $this->content),0,$index+1));
+		}else {
+			return $this->root.implode($separator, array_slice(array_map(function($e) {return $this->_hrefFunction($e); }, $this->content), 0, $index+1));
 		}
 	}
 	
@@ -117,7 +117,7 @@ 
 	 * @see \Ajax\bootstrap\html\BaseHtml::compile()
 	 */
 	public function compile(JsUtils $js=NULL, View $view=NULL) {
-		if($this->autoActive){
+		if ($this->autoActive) {
 			$this->setActive();
 		}
 		return parent::compile($js, $view);
@@ -135,19 +135,19 @@ 
 	 * @see \Ajax\bootstrap\html\base\BaseHtml::on()
 	 */
 	public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
-		foreach ($this->content as $element){
-			$element->on($event,$jsCode,$stopPropagation,$preventDefault);
+		foreach ($this->content as $element) {
+			$element->on($event, $jsCode, $stopPropagation, $preventDefault);
 		}
 		return $this;
 	}
 	
 	public function setAutoActive($autoActive) {
-		$this->autoActive = $autoActive;
+		$this->autoActive=$autoActive;
 		return $this;
 	}
 	
 	public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) {
-		foreach ($this->content as $element){
+		foreach ($this->content as $element) {
 			$element->_ajaxOn($operation, $event, $url, $responseElement, $parameters);
 		}
 		return $this;
@@ -160,18 +160,18 @@ 
 	 * @param string $attr the html attribute used to build the elements url 
 	 * @return HtmlBreadcrumbs
 	 */
-	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(){
-		if($this->autoActive){
+	public function contentAsString() {
+		if ($this->autoActive) {
 			$this->setActive();
 		}	
 		return parent::contentAsString();
 	}
 	
-	public function getElement($index){
+	public function getElement($index) {
 		return $this->content[$index];
 	}
 	
@@ -180,7 +180,7 @@ 
 	 * @param mixed $glyph
 	 * @param int $index
 	 */
-	public function addGlyph($glyph,$index){
+	public function addGlyph($glyph, $index) {
 		$elm=$this->getElement($index);
 		return $elm->wrapContentWithGlyph($glyph);
 	}
@@ -190,9 +190,9 @@ 
 	 * @param Dispatcher $dispatcher the request dispatcher
 	 * @return \Ajax\bootstrap\html\HtmlBreadcrumbs
 	 */
-	public function fromDispatcher($dispatcher){
-		$items=array($dispatcher->getControllerName(),$dispatcher->getActionName());
-		$items=array_merge($items,$dispatcher->getParams());
+	public function fromDispatcher($dispatcher) {
+		$items=array($dispatcher->getControllerName(), $dispatcher->getActionName());
+		$items=array_merge($items, $dispatcher->getParams());
 		return $this->addElements($items);
 	}
 	
@@ -203,7 +203,7 @@ 
 	 * @return \Ajax\bootstrap\html\HtmlBreadcrumbs
 	 */
 	public function setHrefFunction($_hrefFunction) {
-		$this->_hrefFunction = $_hrefFunction;
+		$this->_hrefFunction=$_hrefFunction;
 		return $this;
 	}	
 	

Ajax/bootstrap/html/HtmlButtongroups.php

Doc Comments +3 added lines

@@ -48,6 +48,9 @@
 			$element->setStyle($value);
 	}
 
+	/**
+	 * @param HtmlDropdown $bt
+	 */
 	private function dropdownAsButton($bt) {
 		$this->addExistingDropDown($bt);
 		$bt->setTagName("button");

Spacing +8 added lines, -8 removed lines

@@ -34,7 +34,7 @@ 
 	 * @return HtmlButtongroups default : ""
 	 */
 	public function setSize($size) {
-		foreach ( $this->elements as $element ) {
+		foreach ($this->elements as $element) {
 			$element->setSize($size);
 		}
 		if (is_int($size)) {
@@ -44,7 +44,7 @@ 
 	}
 
 	public function setStyle($value) {
-		foreach ( $this->elements as $element )
+		foreach ($this->elements as $element)
 			$element->setStyle($value);
 	}
 
@@ -64,7 +64,7 @@ 
 	public function addElement($element) {
 		$result=$element;
 		$iid=sizeof($this->elements)+1;
-		if (($element instanceof HtmlDropdown)||($element instanceof HtmlSplitbutton)) {
+		if (($element instanceof HtmlDropdown) || ($element instanceof HtmlSplitbutton)) {
 			$this->addExistingDropDown($element);
 			$this->elements[]=$element;
 		} elseif ($element instanceof HtmlButton) {
@@ -78,7 +78,7 @@ 
 				else
 					$bt=new HtmlDropdown($this->identifier."-dropdown-".$iid);
 				$this->dropdownAsButton($bt);
-			} else
+			}else
 				$bt=new HtmlButton($this->identifier."-button-".$iid);
 			$bt->fromArray($element);
 			$this->elements[]=$bt;
@@ -93,7 +93,7 @@ 
 	}
 
 	public function addElements($elements) {
-		foreach ( $elements as $element ) {
+		foreach ($elements as $element) {
 			$this->addElement($element);
 		}
 		return $this;
@@ -110,10 +110,10 @@ 
 	public function setAlignment($value) {
 		if (is_int($value)) {
 			$value=CssRef::alignment("btn-group")[$value];
-		} else
+		}else
 			$value="btn-group-".$value;
 		if (strstr($value, "justified")) {
-			foreach ( $this->elements as $element ) {
+			foreach ($this->elements as $element) {
 				$element->wrap('<div class="btn-group" role="group">', '</div>');
 			}
 		}
@@ -144,7 +144,7 @@ 
 	 * @see \Ajax\bootstrap\html\base\BaseHtml::on()
 	 */
 	public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
-		foreach ( $this->elements as $element ) {
+		foreach ($this->elements as $element) {
 			$element->on($event, $jsCode, $stopPropagation, $preventDefault);
 		}
 		return $this;

Braces +20 added lines, -16 removed lines

@@ -44,8 +44,9 @@ 
 	}
 
 	public function setStyle($value) {
-		foreach ( $this->elements as $element )
-			$element->setStyle($value);
+		foreach ( $this->elements as $element ) {
+					$element->setStyle($value);
+		}
 	}
 
 	private function dropdownAsButton($bt) {
@@ -70,16 +71,18 @@ 
 		} elseif ($element instanceof HtmlButton) {
 			$this->elements[]=$element;
 		} elseif (is_array($element)) {
-			if (array_key_exists("glyph", $element))
-				$bt=new HtmlGlyphButton($this->identifier."-button-".$iid);
-			elseif (array_key_exists("btnCaption", $element)) {
-				if (array_key_exists("split", $element))
-					$bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid);
-				else
-					$bt=new HtmlDropdown($this->identifier."-dropdown-".$iid);
+			if (array_key_exists("glyph", $element)) {
+							$bt=new HtmlGlyphButton($this->identifier."-button-".$iid);
+			} elseif (array_key_exists("btnCaption", $element)) {
+				if (array_key_exists("split", $element)) {
+									$bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid);
+				} else {
+									$bt=new HtmlDropdown($this->identifier."-dropdown-".$iid);
+				}
 				$this->dropdownAsButton($bt);
-			} else
-				$bt=new HtmlButton($this->identifier."-button-".$iid);
+			} else {
+							$bt=new HtmlButton($this->identifier."-button-".$iid);
+			}
 			$bt->fromArray($element);
 			$this->elements[]=$bt;
 			$result=$bt;
@@ -110,8 +113,9 @@ 
 	public function setAlignment($value) {
 		if (is_int($value)) {
 			$value=CssRef::alignment("btn-group")[$value];
-		} else
-			$value="btn-group-".$value;
+		} else {
+					$value="btn-group-".$value;
+		}
 		if (strstr($value, "justified")) {
 			foreach ( $this->elements as $element ) {
 				$element->wrap('<div class="btn-group" role="group">', '</div>');
@@ -126,9 +130,9 @@ 
 	 * @return HtmlButton
 	 */
 	public function getElement($index) {
-		if (is_int($index))
-			return $this->elements[$index];
-		else {
+		if (is_int($index)) {
+					return $this->elements[$index];
+		} else {
 			$elm=$this->getElementById($index, $this->elements);
 			return $elm;
 		}

Ajax/bootstrap/html/HtmlButtontoolbar.php

Doc Comments +6 added lines, -1 removed lines

@@ -11,6 +11,11 @@ 
 
 class HtmlButtontoolbar extends HtmlButtongroups {
 
+	/**
+	 * @param string $identifier
+	 * @param string $cssStyle
+	 * @param string $size
+	 */
 	public function __construct($identifier, $elements=array(), $cssStyle=NULL, $size=NULL, $tagName="div") {
 		parent::__construct($identifier, $elements, $cssStyle, $size, $tagName);
 		$this->setClass("btn-toolbar");
@@ -56,7 +61,7 @@ 
 
 	/**
 	 * return the Buttongroups at position $index
-	 * @return \Ajax\bootstrap\html\HtmlButtongroups
+	 * @return HtmlButton
 	 */
 	public function getGroup($index) {
 		return parent::getElement($index);

Spacing +5 added lines, -5 removed lines

@@ -23,7 +23,7 @@ 
 	public function addElement($element) {
 		if ($element instanceof HtmlButtongroups) {
 			$this->elements []=$element;
-		} else {
+		}else {
 			$this->getLastButtonGroup()->addElement($element);
 		}
 	}
@@ -78,15 +78,15 @@ 
 		$element=null;
 		$i=0;
 		if (is_int($index)) {
-			$elements=array ();
-			foreach ( $this->elements as $group ) {
+			$elements=array();
+			foreach ($this->elements as $group) {
 				$elements=array_merge($elements, $group->getElements());
 			}
 			if ($index<sizeof($elements)) {
 				$element=$elements [$index];
 			}
-		} else {
-			while ( $element==null&&$i<sizeof($this->elements) ) {
+		}else {
+			while ($element==null && $i<sizeof($this->elements)) {
 				$element=$this->elements [$i]->getElement($index);
 				$i++;
 			}

Braces +6 added lines, -5 removed lines

@@ -45,9 +45,9 @@ 
 	 */
 	private function getLastButtonGroup() {
 		$nb=sizeof($this->elements);
-		if ($nb>0)
-			$bg=$this->elements [$nb-1];
-		else {
+		if ($nb>0) {
+					$bg=$this->elements [$nb-1];
+		} else {
 			$bg=new HtmlButtongroups($this->identifier."-buttongroups-".$nb);
 			$this->elements []=$bg;
 		}
@@ -65,8 +65,9 @@ 
 	public function getLastGroup() {
 		$bg=null;
 		$nb=sizeof($this->elements);
-		if ($nb>0)
-			$bg=$this->elements [$nb-1];
+		if ($nb>0) {
+					$bg=$this->elements [$nb-1];
+		}
 		return $bg;
 	}
 

Ajax/bootstrap/html/HtmlCarousel.php

Doc Comments +4 added lines, -1 removed lines

@@ -23,6 +23,9 @@ 
 	protected $_base="";
 	protected $_glyphs=array ();
 
+	/**
+	 * @param string $identifier
+	 */
 	public function __construct($identifier, $images=NULL) {
 		parent::__construct($identifier);
 		$this->_template=include 'templates/tplCarousel.php';
@@ -61,7 +64,7 @@ 
 	 *
 	 * @param string $caption
 	 * @param string $sens
-	 * @return HtmlCarouselControl|string
+	 * @return HtmlCarouselControl
 	 */
 	private function createControl($caption="next", $sens="left") {
 		$control=new HtmlCarouselControl($sens."-ctrl-".$this->identifier);

Spacing +9 added lines, -9 removed lines

@@ -16,12 +16,12 @@ 
  * @version 1.001
  */
 class HtmlCarousel extends BaseHtml {
-	protected $indicators=array ();
-	protected $slides=array ();
+	protected $indicators=array();
+	protected $slides=array();
 	protected $leftControl="";
 	protected $rightControl="";
 	protected $_base="";
-	protected $_glyphs=array ();
+	protected $_glyphs=array();
 
 	public function __construct($identifier, $images=NULL) {
 		parent::__construct($identifier);
@@ -38,7 +38,7 @@ 
 	}
 
 	public function setBase($_base) {
-		foreach ($this->slides as $slide){
+		foreach ($this->slides as $slide) {
 			$imgSrc=$slide->getImageSrc();
 			$slide->setImageSrc(str_replace($this->_base.$imgSrc, $_base.$imgSrc, $imgSrc));
 		}
@@ -93,9 +93,9 @@ 
 	}
 
 	public function addImage($imageSrc, $imageAlt="", $caption=NULL, $description=NULL) {
-		if(is_array($imageSrc)){
-			$this->addImage($imageSrc[0],@$imageSrc[1],@$imageSrc[2],@$imageSrc[3]);
-		}else{
+		if (is_array($imageSrc)) {
+			$this->addImage($imageSrc[0], @$imageSrc[1], @$imageSrc[2], @$imageSrc[3]);
+		}else {
 			$image=new HtmlCarouselItem("item-".$this->identifier);
 			$image->setImageSrc($this->_base.$imageSrc);
 			$image->setImageAlt($imageAlt);
@@ -118,10 +118,10 @@ 
 	 */
 	public function fromArray($array) {
 		if (is_array($array) && sizeof($array)>0) {
-			foreach ( $array as $value ) {
+			foreach ($array as $value) {
 				if (is_array($value)) {
 					$this->addImage($value ["src"], @$value ["alt"], @$value ["caption"], @$value ["description"]);
-				} else {
+				}else {
 					$this->addImage($value);
 				}
 			}

Braces +10 added lines, -7 removed lines

@@ -75,27 +75,30 @@
 	}
 
 	private function getGlyph($sens="left") {
-		if (array_key_exists($sens, $this->_glyphs))
-			return $this->_glyphs [$sens];
+		if (array_key_exists($sens, $this->_glyphs)) {
+					return $this->_glyphs [$sens];
+		}
 		return "glyphicon-chevron-".$sens;
 	}
 
 	public function setRightGlyph($glyphicon) {
 		$glyphs=CssRef::glyphIcons();
-		if (array_search($glyphicon, $glyphs)!==false)
-			$this->_glyphs ["right"]=$glyphicon;
+		if (array_search($glyphicon, $glyphs)!==false) {
+					$this->_glyphs ["right"]=$glyphicon;
+		}
 	}
 
 	public function setLeftGlyph($glyphicon) {
 		$glyphs=CssRef::glyphIcons();
-		if (array_search($glyphicon, $glyphs)!==false)
-			$this->_glyphs ["left"]=$glyphicon;
+		if (array_search($glyphicon, $glyphs)!==false) {
+					$this->_glyphs ["left"]=$glyphicon;
+		}
 	}
 
 	public function addImage($imageSrc, $imageAlt="", $caption=NULL, $description=NULL) {
 		if(is_array($imageSrc)){
 			$this->addImage($imageSrc[0],@$imageSrc[1],@$imageSrc[2],@$imageSrc[3]);
-		}else{
+		} else{
 			$image=new HtmlCarouselItem("item-".$this->identifier);
 			$image->setImageSrc($this->_base.$imageSrc);
 			$image->setImageAlt($imageAlt);

Ajax/bootstrap/html/HtmlForm.php

Doc Comments +3 added lines

@@ -87,6 +87,9 @@
 		return $result;
 	}
 
+	/**
+	 * @return string
+	 */
 	private function getPrefix($element) {
 		$result="input_text";
 		foreach ( $this->formElementsPrefix as $k => $v ) {

Spacing +10 added lines, -10 removed lines

@@ -15,8 +15,8 @@ 
 	public function __construct($identifier) {
 		parent::__construct($identifier, "form");
 		$this->_template='<form id="%identifier%" name="%identifier%" %properties%>%content%</form>';
-		$this->futureElements=array ();
-		$this->formGroups=array ();
+		$this->futureElements=array();
+		$this->formGroups=array();
 	}
 
 	/*
@@ -26,10 +26,10 @@ 
 	public function compile(JsUtils $js=NULL, View $view=NULL) {
 		if (isset($js)) {
 			$this->formElementsPrefix=$js->config()->getVar("formElementsPrefix");
-			foreach ( $this->futureElements as $futureElement ) {
+			foreach ($this->futureElements as $futureElement) {
 				$futureElementValue=$this->getPrefix($futureElement);
 				$futureElementValues=explode("_", $futureElementValue);
-				switch($futureElementValues [0]) {
+				switch ($futureElementValues [0]) {
 					case "input":
 						$control=new HtmlInput($futureElement);
 						$control->setClass("form-control");
@@ -61,7 +61,7 @@ 
 				$this->addElement($control);
 			}
 		}
-		foreach ( $this->formGroups as $group ) {
+		foreach ($this->formGroups as $group) {
 			$this->addContent($group);
 		}
 		return parent::compile($js, $view);
@@ -71,7 +71,7 @@ 
 		$result=preg_split('/(?=[A-Z])/', $str);
 		if (sizeof($result)>$part) {
 			$result=$result [$part];
-		} else {
+		}else {
 			$result=$str;
 		}
 		return $result;
@@ -81,7 +81,7 @@ 
 		$result=preg_split('/(?=[A-Z])/', $str);
 		if (sizeof($result)>2) {
 			$result=$result [2];
-		} else {
+		}else {
 			$result=$str;
 		}
 		return $result;
@@ -89,7 +89,7 @@ 
 
 	private function getPrefix($element) {
 		$result="input_text";
-		foreach ( $this->formElementsPrefix as $k => $v ) {
+		foreach ($this->formElementsPrefix as $k => $v) {
 			if (Text::startsWith($element, $k)) {
 				$result=$v;
 				break;
@@ -119,7 +119,7 @@ 
 
 	public function getElement($name) {
 		$element=null;
-		foreach ( $this->formGroups as $group ) {
+		foreach ($this->formGroups as $group) {
 		}
 		return $element;
 	}
@@ -129,7 +129,7 @@ 
 	 * @see \Ajax\bootstrap\html\base\HtmlSingleElement::fromArray()
 	 */
 	public function fromArray($array) {
-		foreach ( $array as $value ) {
+		foreach ($array as $value) {
 			if (is_string($value)) {
 				$this->futureElements []=$value;
 			}

Braces +3 added lines, -2 removed lines

@@ -99,8 +99,9 @@
 	}
 
 	public function addGroup($identifier="") {
-		if ($identifier==="")
-			$identifier="form-".$this->identifier;
+		if ($identifier==="") {
+					$identifier="form-".$this->identifier;
+		}
 		$group=new HtmlDoubleElement($identifier);
 		$group->setTagName("div");
 		$group->setClass("form-group");

Ajax/bootstrap/html/HtmlModal.php

Doc Comments +1 added lines, -1 removed lines

@@ -208,7 +208,7 @@
 	 * Includes a modal-backdrop element.
 	 * Alternatively, specify static for a backdrop which doesn't close the modal on click.
 	 * @param Boolean $value default : true
-	 * @return HtmlModal
+	 * @return boolean
 	 */
 	public function setBackdrop($value) {
 		return $this->backdrop=$value;

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 use Phalcon\Mvc\View;
 use Ajax\JsUtils;
 use Ajax\bootstrap\html\base\BaseHtml;
-use Phalcon\Mvc\Dispatcher;
 use Phalcon\Mvc\Controller;
 
 /**

Spacing +11 added lines, -11 removed lines

@@ -16,7 +16,7 @@ 
 class HtmlModal extends BaseHtml {
 	protected $title="Titre de ma boîte";
 	protected $content="";
-	protected $buttons=array ();
+	protected $buttons=array();
 	protected $showOnStartup=false;
 	protected $draggable=false;
 	protected $validCondition=NULL;
@@ -29,10 +29,10 @@ 
 	public function __construct($identifier, $title="", $content="", $buttonCaptions=array()) {
 		parent::__construct($identifier);
 		$this->_template=include 'templates/tplModal.php';
-		$this->buttons=array ();
+		$this->buttons=array();
 		$this->title=$title;
 		$this->content=$content;
-		foreach ( $buttonCaptions as $button ) {
+		foreach ($buttonCaptions as $button) {
 			$this->addButton($button);
 		}
 	}
@@ -67,7 +67,7 @@ 
 	 * @param string $value
 	 * @return HtmlButton
 	 */
-	public function addOkayButton($value="Okay",$jsCode="") {
+	public function addOkayButton($value="Okay", $jsCode="") {
 		$btn=$this->addButton($value, "btn-primary");
 		$btn->onClick("if(".$this->getValidCondition()."){ ".$jsCode."$('#".$this->identifier."').modal('hide');}");
 		return $btn;
@@ -84,7 +84,7 @@ 
 	public function getValidCondition() {
 		if ($this->validCondition==NULL) {
 			return $this->getDefaultValidCondition();
-		} else {
+		}else {
 			return $this->validCondition;
 		}
 	}
@@ -117,7 +117,7 @@ 
 	 * @param $params The parameters to pass to the view
 	 */
 	public function renderContent($view, $controller, $action, $params=NULL) {
-		$template=$view->getRender($controller, $action, $params, function ($view) {
+		$template=$view->getRender($controller, $action, $params, function($view) {
 			$view->setRenderLevel(View::LEVEL_ACTION_VIEW);
 		});
 		$this->content=$template;
@@ -129,12 +129,12 @@ 
 	 * @param string $controller a Phalcon controller
 	 * @param string $action a Phalcon action
 	 */
-	public function forward($initialController,$controller,$action){
-		$dispatcher = $initialController->dispatcher;
+	public function forward($initialController, $controller, $action) {
+		$dispatcher=$initialController->dispatcher;
 		$dispatcher->setControllerName($controller);
 		$dispatcher->setActionName($action);
 		$dispatcher->dispatch();
-		$template=$initialController->view->getRender($dispatcher->getControllerName(), $dispatcher->getActionName(),$dispatcher->getParams(), function ($view) {
+		$template=$initialController->view->getRender($dispatcher->getControllerName(), $dispatcher->getActionName(), $dispatcher->getParams(), function($view) {
 			$view->setRenderLevel(View::LEVEL_ACTION_VIEW);
 		});
 		$this->content=$template;
@@ -145,10 +145,10 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if($this->content instanceof BaseHtml){
+		if ($this->content instanceof BaseHtml) {
 			$this->content->run($js);
 		}
-		$this->_bsComponent=$js->bootstrap()->modal("#".$this->identifier, array (
+		$this->_bsComponent=$js->bootstrap()->modal("#".$this->identifier, array(
 				"show" => $this->showOnStartup
 		));
 		if ($this->draggable)

Braces +11 added lines, -8 removed lines

@@ -151,18 +151,20 @@ 
 		$this->_bsComponent=$js->bootstrap()->modal("#".$this->identifier, array (
 				"show" => $this->showOnStartup
 		));
-		if ($this->draggable)
-			$this->_bsComponent->setDraggable(true);
+		if ($this->draggable) {
+					$this->_bsComponent->setDraggable(true);
+		}
 		$this->_bsComponent->setBackdrop($this->backdrop);
 		$this->addEventsOnRun($js);
 		return $this->_bsComponent;
 	}
 
 	public function getButton($index) {
-		if (is_int($index))
-			return $this->buttons [$index];
-		else
-			return $this->getElementById($index, $this->buttons);
+		if (is_int($index)) {
+					return $this->buttons [$index];
+		} else {
+					return $this->getElementById($index, $this->buttons);
+		}
 	}
 
 	public function showOnCreate() {
@@ -188,8 +190,9 @@ 
 
 	public function jsHideButton($index) {
 		$btn=$this->getButton($index);
-		if ($btn)
-			return "$('#".$btn->getIdentifier()."').hide();";
+		if ($btn) {
+					return "$('#".$btn->getIdentifier()."').hide();";
+		}
 	}
 
 	/**