jcheron / phalcon-jquery

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

Spacing +2 added lines, -2 removed lines

@@ -3,11 +3,11 @@
 namespace Ajax\semantic\html\collections\form;
 
 trait TextFieldsTrait {
-	public function setPlaceholder($value){
+	public function setPlaceholder($value) {
 		return $this->getField()->setPlaceholder($value);
 	}
 
-	public function setValue($value){
+	public function setValue($value) {
 		return $this->getField()->setValue($value);
 	}
 }
\ No newline at end of file

Ajax/semantic/traits/SemanticHtmlElementsTrait.php

Braces +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 			foreach ($icons as $icon=>$size){
 				$group->addIcon($icon,$size);
 			}
-		}else{
+		} else{
 			foreach ($icons as $icon){
 				$group->addIcon($icon);
 			}

Spacing +29 added lines, -29 removed lines

@@ -42,8 +42,8 @@ 
 	 * @param boolean $asIcons
 	 * @return HtmlButtonGroups
 	 */
-	public function htmlButtonGroups($identifier,$elements=array(),$asIcons=false){
-		return $this->addHtmlComponent(new HtmlButtonGroups($identifier, $elements,$asIcons));
+	public function htmlButtonGroups($identifier, $elements=array(), $asIcons=false) {
+		return $this->addHtmlComponent(new HtmlButtonGroups($identifier, $elements, $asIcons));
 	}
 
 	/**
@@ -52,7 +52,7 @@ 
 	 * @param string $content
 	 * @return HtmlContainer
 	 */
-	public function htmlContainer($identifier,$content=""){
+	public function htmlContainer($identifier, $content="") {
 		return $this->addHtmlComponent(new HtmlContainer($identifier, $content));
 	}
 
@@ -61,8 +61,8 @@ 
 	 * @param string $content
 	 * @return HtmlDivider
 	 */
-	public function htmlDivider($identifier,$content="",$tagName="div"){
-		return $this->addHtmlComponent(new HtmlDivider($identifier, $content,$tagName));
+	public function htmlDivider($identifier, $content="", $tagName="div") {
+		return $this->addHtmlComponent(new HtmlDivider($identifier, $content, $tagName));
 	}
 
 	/**
@@ -72,8 +72,8 @@ 
 	 * @param string $type
 	 * @return HtmlHeader
 	 */
-	public function htmlHeader($identifier,$niveau=1,$content=NULL,$type="page"){
-		return $this->addHtmlComponent(new HtmlHeader($identifier,$niveau,$content,$type));
+	public function htmlHeader($identifier, $niveau=1, $content=NULL, $type="page") {
+		return $this->addHtmlComponent(new HtmlHeader($identifier, $niveau, $content, $type));
 	}
 
 	/**
@@ -81,7 +81,7 @@ 
 	 * @param string $icon
 	 * @return HtmlIcon
 	 */
-	public function htmlIcon($identifier,$icon){
+	public function htmlIcon($identifier, $icon) {
 		return $this->addHtmlComponent(new HtmlIcon($identifier, $icon));
 	}
 
@@ -91,14 +91,14 @@ 
 	 * @param array $icons
 	 * @return HtmlIconGroups
 	 */
-	public function htmlIconGroups($identifier,$size="",$icons=array()){
-		$group=new HtmlIconGroups($identifier,$size);
-		if(JArray::isAssociative($icons)){
-			foreach ($icons as $icon=>$size){
-				$group->add($icon,$size);
+	public function htmlIconGroups($identifier, $size="", $icons=array()) {
+		$group=new HtmlIconGroups($identifier, $size);
+		if (JArray::isAssociative($icons)) {
+			foreach ($icons as $icon=>$size) {
+				$group->add($icon, $size);
 			}
-		}else{
-			foreach ($icons as $icon){
+		}else {
+			foreach ($icons as $icon) {
 				$group->add($icon);
 			}
 		}
@@ -113,8 +113,8 @@ 
 	 * @param string $placeholder
 	 * @return HtmlInput
 	 */
-	public function htmlInput($identifier,$type="text",$value="",$placeholder=""){
-		return $this->addHtmlComponent(new HtmlInput($identifier,$type,$value,$placeholder));
+	public function htmlInput($identifier, $type="text", $value="", $placeholder="") {
+		return $this->addHtmlComponent(new HtmlInput($identifier, $type, $value, $placeholder));
 	}
 
 	/**
@@ -123,8 +123,8 @@ 
 	 * @param string $tagName
 	 * @return HtmlLabel
 	 */
-	public function htmlLabel($identifier,$content="",$tagName="div"){
-		return $this->addHtmlComponent(new HtmlLabel($identifier, $content,$tagName));
+	public function htmlLabel($identifier, $content="", $tagName="div") {
+		return $this->addHtmlComponent(new HtmlLabel($identifier, $content, $tagName));
 	}
 
 	/**
@@ -133,8 +133,8 @@ 
 	 * @param array $items
 	 * @return HtmlList
 	 */
-	public function htmlList($identifier,$items=array()){
-		return $this->addHtmlComponent(new HtmlList($identifier,$items));
+	public function htmlList($identifier, $items=array()) {
+		return $this->addHtmlComponent(new HtmlList($identifier, $items));
 	}
 
 	/**
@@ -143,8 +143,8 @@ 
 	 * @param string $content
 	 * @return HtmlSegment
 	 */
-	public function htmlSegment($identifier, $content=""){
-		return $this->addHtmlComponent(new HtmlSegment($identifier,$content));
+	public function htmlSegment($identifier, $content="") {
+		return $this->addHtmlComponent(new HtmlSegment($identifier, $content));
 	}
 
 	/**
@@ -153,8 +153,8 @@ 
 	 * @param array $items the segments
 	 * @return HtmlSegmentGroups
 	 */
-	public function htmlSegmentGroups($identifier, $items=array()){
-		return $this->addHtmlComponent(new HtmlSegmentGroups($identifier,$items));
+	public function htmlSegmentGroups($identifier, $items=array()) {
+		return $this->addHtmlComponent(new HtmlSegmentGroups($identifier, $items));
 	}
 
 	/**
@@ -164,11 +164,11 @@ 
 	 * @param RevealType|string $type
 	 * @param Direction|string $attributeType
 	 */
-	public function htmlReveal($identifier, $visibleContent,$hiddenContent,$type=RevealType::FADE,$attributeType=NULL){
-		return $this->addHtmlComponent(new HtmlReveal($identifier,$visibleContent,$hiddenContent,$type,$attributeType));
+	public function htmlReveal($identifier, $visibleContent, $hiddenContent, $type=RevealType::FADE, $attributeType=NULL) {
+		return $this->addHtmlComponent(new HtmlReveal($identifier, $visibleContent, $hiddenContent, $type, $attributeType));
 	}
 
-	public function htmlStep($identifier, $steps=array()){
-		return $this->addHtmlComponent(new HtmlStep($identifier,$steps));
+	public function htmlStep($identifier, $steps=array()) {
+		return $this->addHtmlComponent(new HtmlStep($identifier, $steps));
 	}
 }
\ No newline at end of file

Ajax/common/traits/JqueryEventsTrait.php

Doc Comments +9 added lines

@@ -3,7 +3,16 @@
 namespace Ajax\common\traits;
 
 trait JqueryEventsTrait {
+
+	/**
+	 * @param string $element
+	 */
 	public abstract function _prep_element($element);
+
+	/**
+	 * @param string $element
+	 * @param string $event
+	 */
 	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
 
 	/**

Spacing +2 added lines, -2 removed lines

@@ -4,7 +4,7 @@ 
 
 trait JqueryEventsTrait {
 	public abstract function _prep_element($element);
-	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
+	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
 
 	/**
 	 * Blur
@@ -46,7 +46,7 @@ 
 	 */
 	public function _click($element='this', $js=array(), $ret_false=TRUE) {
 		if (!is_array($js)) {
-			$js=array (
+			$js=array(
 					$js
 			);
 		}

Ajax/semantic/html/modules/HtmlDropdown.php

Doc Comments +7 added lines, -1 removed lines

@@ -21,6 +21,9 @@ 
 	protected $params=array("action"=>"nothing","on"=>"hover");
 	protected $input;
 
+	/**
+	 * @param string $identifier
+	 */
 	public function __construct($identifier, $value="", $items=array()) {
 		parent::__construct($identifier, "div");
 		$this->_template=include dirname(__FILE__).'/../templates/tplDropdown.php';
@@ -47,7 +50,7 @@ 
 	/**
 	 * Insert an item at a position
 	 * @param mixed $item
-	 * @param number $position
+	 * @param integer $position
 	 * @return \Ajax\semantic\html\content\HtmlDropdownItem|unknown
 	 */
 	public function insertItem($item,$position=0){
@@ -196,6 +199,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $action
+	 */
 	public function setAction($action){
 		$this->params["action"]=$action;
 	}

Spacing +58 added lines, -58 removed lines

@@ -17,31 +17,31 @@ 
 	}
 	protected $mClass="menu";
 	protected $mTagName="div";
-	protected $items=array ();
-	protected $_params=array("action"=>"nothing","on"=>"hover");
+	protected $items=array();
+	protected $_params=array("action"=>"nothing", "on"=>"hover");
 	protected $input;
 
 	public function __construct($identifier, $value="", $items=array()) {
 		parent::__construct($identifier, "div");
 		$this->_template=include dirname(__FILE__).'/../templates/tplDropdown.php';
 		$this->setProperty("class", "ui dropdown");
-		$content=new HtmlSemDoubleElement("text-".$this->identifier,"div");
+		$content=new HtmlSemDoubleElement("text-".$this->identifier, "div");
 		$content->setClass("text");
 		$content->setContent($value);
-		$content->wrap("",new HtmlIcon("", "dropdown"));
+		$content->wrap("", new HtmlIcon("", "dropdown"));
 		$this->content=array($content);
 		$this->tagName="div";
 		$this->addItems($items);
 	}
 
-	public function addItem($item,$value=NULL,$image=NULL){
-		$itemO=$this->beforeAddItem($item,$value,$image);
+	public function addItem($item, $value=NULL, $image=NULL) {
+		$itemO=$this->beforeAddItem($item, $value, $image);
 		$this->items[]=$itemO;
 		return $itemO;
 	}
 
-	public function addIcon($icon,$before=true,$labeled=false){
-		$this->addIconP($icon,$before,$labeled);
+	public function addIcon($icon, $before=true, $labeled=false) {
+		$this->addIconP($icon, $before, $labeled);
 		return $this->getElementById("text-".$this->identifier, $this->content)->setWrapAfter("");
 	}
 	/**
@@ -50,20 +50,20 @@ 
 	 * @param number $position
 	 * @return \Ajax\semantic\html\content\HtmlDropdownItem|unknown
 	 */
-	public function insertItem($item,$position=0){
+	public function insertItem($item, $position=0) {
 		$itemO=$this->beforeAddItem($item);
-		 $start = array_slice($this->items, 0, $position);
-		 $end = array_slice($this->items, $position);
-		 $start[] = $item;
+		 $start=array_slice($this->items, 0, $position);
+		 $end=array_slice($this->items, $position);
+		 $start[]=$item;
 		 $this->items=array_merge($start, $end);
 		 return $itemO;
 	}
 
-	protected function beforeAddItem($item,$value=NULL,$image=NULL){
+	protected function beforeAddItem($item, $value=NULL, $image=NULL) {
 		$itemO=$item;
-		if(!$item instanceof HtmlDropdownItem){
-			$itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items),$item,$value,$image);
-		}elseif($itemO instanceof HtmlDropdownItem){
+		if (!$item instanceof HtmlDropdownItem) {
+			$itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items), $item, $value, $image);
+		}elseif ($itemO instanceof HtmlDropdownItem) {
 			$this->addToProperty("class", "vertical");
 		}
 		return $itemO;
@@ -76,76 +76,76 @@ 
 		$this->addItem($function($object));
 	}
 
-	public function addInput($name){
-		if(!isset($name))
+	public function addInput($name) {
+		if (!isset($name))
 			$name="input-".$this->identifier;
 		$this->setAction("activate");
-		$this->input=new HtmlInput($name,"hidden");
+		$this->input=new HtmlInput($name, "hidden");
 	}
 
-	public function addItems($items){
-		if(JArray::isAssociative($items)){
-			foreach ($items as $k=>$v){
+	public function addItems($items) {
+		if (JArray::isAssociative($items)) {
+			foreach ($items as $k=>$v) {
 				$this->addItem($v)->setData($k);
 			}
-		}else{
-			foreach ($items as $item){
+		}else {
+			foreach ($items as $item) {
 				$this->addItem($item);
 			}
 		}
 	}
 
-	public function count(){
+	public function count() {
 		return \sizeof($this->items);
 	}
 	/**
 	 * @param boolean $dropdown
 	 */
-	public function asDropdown($dropdown){
-		if($dropdown===false){
+	public function asDropdown($dropdown) {
+		if ($dropdown===false) {
 			$this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php';
 			$dropdown="menu";
-		}else{
+		}else {
 			$dropdown="dropdown";
 			$this->mClass="menu";
 		}
-		return $this->addToPropertyCtrl("class", $dropdown,array("menu","dropdown"));
+		return $this->addToPropertyCtrl("class", $dropdown, array("menu", "dropdown"));
 	}
 
-	public function setVertical(){
-		return $this->addToPropertyCtrl("class", "vertical",array("vertical"));
+	public function setVertical() {
+		return $this->addToPropertyCtrl("class", "vertical", array("vertical"));
 	}
 
-	public function setSimple(){
-		return $this->addToPropertyCtrl("class", "simple",array("simple"));
+	public function setSimple() {
+		return $this->addToPropertyCtrl("class", "simple", array("simple"));
 	}
 
-	public function asButton($floating=false){
-		if($floating)
+	public function asButton($floating=false) {
+		if ($floating)
 			$this->addToProperty("class", "floating");
 		return $this->addToProperty("class", "button");
 	}
 
-	public function asSelect($name=NULL,$multiple=false,$selection=true){
-		if(isset($name))
+	public function asSelect($name=NULL, $multiple=false, $selection=true) {
+		if (isset($name))
 			$this->addInput($name);
-		if($multiple)
+		if ($multiple)
 			$this->addToProperty("class", "multiple");
 		if ($selection)
-			$this->addToPropertyCtrl("class", "selection",array("selection"));
+			$this->addToPropertyCtrl("class", "selection", array("selection"));
 		return $this;
 	}
 
-	public function asSearch($name=NULL,$multiple=false,$selection=false){
-		$this->asSelect($name,$multiple,$selection);
+	public function asSearch($name=NULL, $multiple=false, $selection=false) {
+		$this->asSelect($name, $multiple, $selection);
 		return $this->addToProperty("class", "search");
 	}
 
-	public function setSelect($name=NULL,$multiple=false){
-		if(!isset($name))
+	public function setSelect($name=NULL, $multiple=false) {
+		if (!isset($name))
 			$name="select-".$this->identifier;
 		$this->input=null;
-		if($multiple){
+		if ($multiple) {
 			$this->setProperty("multiple", true);
 			$this->addToProperty("class", "multiple");
 		}
@@ -153,32 +153,32 @@ 
 		$this->tagName="select";
 		$this->setProperty("name", $name);
 		$this->content=null;
-		foreach ($this->items as $item){
+		foreach ($this->items as $item) {
 			$item->asOption();
 		}
 		return $this;
 	}
 
-	public function asSubmenu($pointing=NULL){
+	public function asSubmenu($pointing=NULL) {
 		$this->setClass("ui dropdown link item");
-		if(isset($pointing)){
+		if (isset($pointing)) {
 			$this->setPointing($pointing);
 		}
 		return $this;
 	}
 
-	public function setPointing($value=Direction::NONE){
-		return $this->addToPropertyCtrl("class", $value." pointing",Direction::getConstantValues("pointing"));
+	public function setPointing($value=Direction::NONE) {
+		return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing"));
 	}
 
-	public function setValue($value){
-		if(isset($this->input)){
+	public function setValue($value) {
+		if (isset($this->input)) {
 			$this->input->setProperty("value", $value);
-		}else{
+		}else {
 			$this->setProperty("value", $value);
 		}
 		$textElement=$this->getElementById("text-".$this->identifier, $this->content);
-		if(isset($textElement))
+		if (isset($textElement))
 			$textElement->setContent($value);
 		return $this;
 	}
@@ -188,19 +188,19 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if($this->propertyContains("class", "simple")===false){
-			if(isset($this->_bsComponent)===false)
-				$this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier,$this->_params);
+		if ($this->propertyContains("class", "simple")===false) {
+			if (isset($this->_bsComponent)===false)
+				$this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier, $this->_params);
 			$this->addEventsOnRun($js);
 			return $this->_bsComponent;
 		}
 	}
 
-	public function setAction($action){
+	public function setAction($action) {
 		$this->_params["action"]=$action;
 	}
 
-	public function setFullTextSearch($value){
+	public function setFullTextSearch($value) {
 		$this->_params["fullTextSearch"]=$value;
 	}
 }
\ No newline at end of file

Braces +28 added lines, -20 removed lines

@@ -63,7 +63,7 @@ 
 		$itemO=$item;
 		if(!$item instanceof HtmlDropdownItem){
 			$itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items),$item,$value,$image);
-		}elseif($itemO instanceof HtmlDropdownItem){
+		} elseif($itemO instanceof HtmlDropdownItem){
 			$this->addToProperty("class", "vertical");
 		}
 		return $itemO;
@@ -77,8 +77,9 @@ 
 	}
 
 	public function addInput($name){
-		if(!isset($name))
-			$name="input-".$this->identifier;
+		if(!isset($name)) {
+					$name="input-".$this->identifier;
+		}
 		$this->setAction("activate");
 		$this->input=new HtmlInput($name,"hidden");
 	}
@@ -88,7 +89,7 @@ 
 			foreach ($items as $k=>$v){
 				$this->addItem($v)->setData($k);
 			}
-		}else{
+		} else{
 			foreach ($items as $item){
 				$this->addItem($item);
 			}
@@ -105,7 +106,7 @@ 
 		if($dropdown===false){
 			$this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php';
 			$dropdown="menu";
-		}else{
+		} else{
 			$dropdown="dropdown";
 			$this->mClass="menu";
 		}
@@ -121,18 +122,22 @@ 
 	}
 
 	public function asButton($floating=false){
-		if($floating)
-			$this->addToProperty("class", "floating");
+		if($floating) {
+					$this->addToProperty("class", "floating");
+		}
 		return $this->addToProperty("class", "button");
 	}
 
 	public function asSelect($name=NULL,$multiple=false,$selection=true){
-		if(isset($name))
-			$this->addInput($name);
-		if($multiple)
-			$this->addToProperty("class", "multiple");
-		if ($selection)
-			$this->addToPropertyCtrl("class", "selection",array("selection"));
+		if(isset($name)) {
+					$this->addInput($name);
+		}
+		if($multiple) {
+					$this->addToProperty("class", "multiple");
+		}
+		if ($selection) {
+					$this->addToPropertyCtrl("class", "selection",array("selection"));
+		}
 		return $this;
 	}
 
@@ -142,8 +147,9 @@ 
 	}
 
 	public function setSelect($name=NULL,$multiple=false){
-		if(!isset($name))
-			$name="select-".$this->identifier;
+		if(!isset($name)) {
+					$name="select-".$this->identifier;
+		}
 		$this->input=null;
 		if($multiple){
 			$this->setProperty("multiple", true);
@@ -174,12 +180,13 @@ 
 	public function setValue($value){
 		if(isset($this->input)){
 			$this->input->setProperty("value", $value);
-		}else{
+		} else{
 			$this->setProperty("value", $value);
 		}
 		$textElement=$this->getElementById("text-".$this->identifier, $this->content);
-		if(isset($textElement))
-			$textElement->setContent($value);
+		if(isset($textElement)) {
+					$textElement->setContent($value);
+		}
 		return $this;
 	}
 
@@ -189,8 +196,9 @@ 
 	 */
 	public function run(JsUtils $js) {
 		if($this->propertyContains("class", "simple")===false){
-			if(isset($this->_bsComponent)===false)
-				$this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier,$this->_params);
+			if(isset($this->_bsComponent)===false) {
+							$this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier,$this->_params);
+			}
 			$this->addEventsOnRun($js);
 			return $this->_bsComponent;
 		}

Ajax/bootstrap/traits/BootstrapComponentsTrait.php

Doc Comments +3 added lines

@@ -16,6 +16,9 @@
 
 trait BootstrapComponentsTrait {
 
+	/**
+	 * @param string|null $attachTo
+	 */
 	public abstract function addComponent(SimpleComponent $component, $attachTo, $params);
 	/**
 	 *

Unused Use Statements -1 removed lines

@@ -11,7 +11,6 @@
 use Ajax\bootstrap\components\Tab;
 use Ajax\bootstrap\components\Carousel;
 use Ajax\bootstrap\components\Collapse;
-use Ajax\Bootstrap;
 use Ajax\common\components\SimpleComponent;
 
 trait BootstrapComponentsTrait {

Ajax/semantic/components/Popup.php

Spacing +4 added lines, -4 removed lines

@@ -30,7 +30,7 @@ 
 		return $this->setParam("onShow", "%function(){".$jsCode."}%");
 	}
 
-	public function setExclusive($value){
+	public function setExclusive($value) {
 		return $this->setParam("exclusive", $value);
 	}
 
@@ -39,15 +39,15 @@ 
 	 * @param string $popup the css selector of the popup
 	 * @return \Ajax\semantic\components\Popup
 	 */
-	public function setPopup($popup){
+	public function setPopup($popup) {
 		return $this->setParam("popup", $popup);
 	}
 
-	public function setInline($value){
+	public function setInline($value) {
 		return $this->setParam("inline", $value);
 	}
 
-	public function setPosition($value){
+	public function setPosition($value) {
 		return $this->setParam("position", $value);
 	}
 	//TODO other events implementation

Ajax/semantic/html/modules/HtmlSticky.php

Spacing +5 added lines, -5 removed lines

@@ -8,13 +8,13 @@ 
 class HtmlSticky extends HtmlSemDoubleElement {
 	private $_params=array();
 
-	public function __construct($identifier,$context=NULL,$content=NULL) {
+	public function __construct($identifier, $context=NULL, $content=NULL) {
 		parent::__construct($identifier, "div", "ui sticky", $content);
-		if(isset($content))
+		if (isset($content))
 			$this->setContext($context);
 	}
 
-	public function setContext($context){
+	public function setContext($context) {
 		$this->_params["context"]=$context;
 		return $this;
 	}
@@ -23,8 +23,8 @@ 
 	 * {@inheritDoc}
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run()
 	 */
-	public function run(JsUtils $js){
+	public function run(JsUtils $js) {
 		parent::run($js);
-		return $js->semantic()->sticky("#".$this->identifier,$this->_params);
+		return $js->semantic()->sticky("#".$this->identifier, $this->_params);
 	}
 }
\ No newline at end of file

Braces +3 added lines, -2 removed lines

@@ -10,8 +10,9 @@
 
 	public function __construct($identifier,$context=NULL,$content=NULL) {
 		parent::__construct($identifier, "div", "ui sticky", $content);
-		if(isset($content))
-			$this->setContext($context);
+		if(isset($content)) {
+					$this->setContext($context);
+		}
 	}
 
 	public function setContext($context){

Ajax/semantic/html/collections/HtmlGrid.php

Braces +26 added lines, -18 removed lines

@@ -49,8 +49,9 @@ 
 	public function addCol($width=NULL){
 		$colCount=$this->colCount()+1;
 		$this->setColsCount($colCount,true,$width);
-		if($this->hasOnlyCols($this->count()))
-			return $this->content[$colCount-1];
+		if($this->hasOnlyCols($this->count())) {
+					return $this->content[$colCount-1];
+		}
 		return $this;
 	}
 
@@ -73,7 +74,7 @@ 
 			for($i=$count;$i<$colsCount;$i++){
 				$this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i));
 			}
-		}else{
+		} else{
 			if($this->hasOnlyCols($count)){
 				$tmpContent=$this->content;
 				$item=$this->addItem($colsCount);
@@ -93,15 +94,16 @@ 
 	}
 
 	public function setColsCount($numCols,$toCreate=true,$width=NULL){
-		if(isset($width)===false)
-			$this->setWide($numCols);
+		if(isset($width)===false) {
+					$this->setWide($numCols);
+		}
 		if($toCreate==true){
 			$count=$this->count();
 			if($count==0 || $this->hasOnlyCols($count)){
 				for($i=$count;$i<$numCols;$i++){
 					$this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i,$width));
 				}
-			}else{
+			} else{
 				for($i=0;$i<$count;$i++){
 					$this->getItem($i)->setColsCount($numCols);
 				}
@@ -121,17 +123,20 @@ 
 
 	public function rowCount(){
 		$count=$this->count();
-		if($this->hasOnlyCols($count))
-			return 0;
+		if($this->hasOnlyCols($count)) {
+					return 0;
+		}
 		return $count;
 	}
 
 	public function colCount(){
 		$count=$this->count();
-		if($this->hasOnlyCols($count))
-			return $count;
-		if($count>0)
-			return $this->getItem(0)->count();
+		if($this->hasOnlyCols($count)) {
+					return $count;
+		}
+		if($count>0) {
+					return $this->getItem(0)->count();
+		}
 		return 0;
 	}
 
@@ -141,8 +146,9 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGridCol
 	 */
 	public function getCell($row,$col){
-		if($row<2 && $this->hasOnlyCols($this->count()))
-			return $this->getItem($col);
+		if($row<2 && $this->hasOnlyCols($this->count())) {
+					return $this->getItem($col);
+		}
 		$row=$this->getItem($row);
 		if(isset($row)){
 			$col=$row->getItem($col);
@@ -191,8 +197,9 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
 	public function setPadded($value=NULL){
-		if(isset($value))
-			$this->addToPropertyCtrl("class", $value,array("vertically","horizontally"));
+		if(isset($value)) {
+					$this->addToPropertyCtrl("class", $value,array("vertically","horizontally"));
+		}
 		return $this->addToProperty("class", "padded");
 	}
 
@@ -214,8 +221,9 @@ 
 	 * @see \Ajax\common\html\HtmlCollection::createItem()
 	 */
 	protected function createItem($value){
-		if($this->_createCols===false)
-			$value=null;
+		if($this->_createCols===false) {
+					$value=null;
+		}
 		$item=new HtmlGridRow($this->identifier."-row-".($this->count()+1),$value,$this->_colSizing,$this->_implicitRows);
 		return $item;
 	}

Doc Comments +6 added lines, -2 removed lines

@@ -22,6 +22,10 @@ 
 	private $_colSizing=true;
 	private $_implicitRows=false;
 
+	/**
+	 * @param string $identifier
+	 * @param integer $numCols
+	 */
 	public function __construct( $identifier,$numRows=1,$numCols=NULL,$createCols=true,$implicitRows=false){
 		parent::__construct( $identifier, "div","ui grid");
 		$this->_implicitRows=$implicitRows;
@@ -148,7 +152,7 @@ 
 	/**
 	 * return the row at $index
 	 * @param int $index
-	 * @return \Ajax\semantic\html\collections\HtmlGridRow
+	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
 	public function getRow($index){
 		return $this->getItem($index);
@@ -284,7 +288,7 @@ 
 
 	/**
 	 * stretch the row contents to take up the entire column height
-	 * @return \Ajax\semantic\html\content\HtmlGridRow
+	 * @return HtmlGrid
 	 */
 	public function setStretched(){
 		return $this->addToProperty("class", "stretched");

Spacing +68 added lines, -68 removed lines

@@ -16,26 +16,26 @@ 
  * @author jc
  * @version 1.001
  */
-class HtmlGrid extends HtmlSemCollection{
+class HtmlGrid extends HtmlSemCollection {
 	use TextAlignmentTrait;
 	private $_createCols;
 	private $_colSizing=true;
 	private $_implicitRows=false;
 
-	public function __construct( $identifier,$numRows=1,$numCols=NULL,$createCols=true,$implicitRows=false){
-		parent::__construct( $identifier, "div","ui grid");
+	public function __construct($identifier, $numRows=1, $numCols=NULL, $createCols=true, $implicitRows=false) {
+		parent::__construct($identifier, "div", "ui grid");
 		$this->_implicitRows=$implicitRows;
 		$this->_createCols=$createCols;
-		if(isset($numCols)){
+		if (isset($numCols)) {
 			//if($this->_createCols){
 				$this->_colSizing=false;
 			//}
 			$this->setWide($numCols);
 		}
-		$this->setRowsCount($numRows,$numCols);
+		$this->setRowsCount($numRows, $numCols);
 	}
 
-	public function asSegment(){
+	public function asSegment() {
 		return $this->addToPropertyCtrl("class", "segment", array("segment"));
 	}
 
@@ -43,10 +43,10 @@ 
 	 * Defines the grid width (alias for setWidth)
 	 * @param int $wide
 	 */
-	public function setWide($wide){
+	public function setWide($wide) {
 		$wide=Wide::getConstants()["W".$wide];
 		$this->addToPropertyCtrl("class", $wide, Wide::getConstants());
-		return $this->addToPropertyCtrl("class","column",array("column"));
+		return $this->addToPropertyCtrl("class", "column", array("column"));
 	}
 
 	/**
@@ -54,7 +54,7 @@ 
 	 * @param int $width
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
-	public function setWidth($width){
+	public function setWidth($width) {
 	return $this->setWide($width);
 	}
 
@@ -63,9 +63,9 @@ 
 	 * @param int $colsCount number of columns to create
 	 * @return mixed
 	 */
-	public function addRow($colsCount=NULL){
+	public function addRow($colsCount=NULL) {
 		$rowCount=$this->rowCount()+1;
-		$this->setRowsCount($rowCount,$colsCount,true);
+		$this->setRowsCount($rowCount, $colsCount, true);
 		return $this->content[$rowCount-1];
 	}
 
@@ -74,10 +74,10 @@ 
 	 * @param int $width with of the column to add
 	 * @return mixed|\Ajax\semantic\html\collections\HtmlGrid
 	 */
-	public function addCol($width=NULL){
+	public function addCol($width=NULL) {
 		$colCount=$this->colCount()+1;
-		$this->setColsCount($colCount,true,$width);
-		if($this->hasOnlyCols($this->count()))
+		$this->setColsCount($colCount, true, $width);
+		if ($this->hasOnlyCols($this->count()))
 			return $this->content[$colCount-1];
 		return $this;
 	}
@@ -86,8 +86,8 @@ 
 	 * @param array $sizes array of width of the columns to create
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
-	public function addCols($sizes=array()){
-		foreach ($sizes as $size){
+	public function addCols($sizes=array()) {
+		foreach ($sizes as $size) {
 			$this->addCol($size);
 		}
 		return $this;
@@ -99,28 +99,28 @@ 
 	 * @param int $colsCount
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
-	public function setRowsCount($rowsCount,$colsCount=NULL,$force=false){
+	public function setRowsCount($rowsCount, $colsCount=NULL, $force=false) {
 		$count=$this->count();
-		if($rowsCount<2 && $force===false){
-			for($i=$count;$i<$colsCount;$i++){
+		if ($rowsCount<2 && $force===false) {
+			for ($i=$count; $i<$colsCount; $i++) {
 				$this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i));
 			}
-		}else{
-			if($this->hasOnlyCols($count)){
+		}else {
+			if ($this->hasOnlyCols($count)) {
 				$tmpContent=$this->content;
 				$item=$this->addItem($colsCount);
 				$item->setContent($tmpContent);
 				$this->content=array();
 				$count=1;
 			}
-			for($i=$count;$i<$rowsCount;$i++){
+			for ($i=$count; $i<$rowsCount; $i++) {
 				$this->addItem($colsCount);
 			}
 		}
 		return $this;
 	}
 
-	protected function hasOnlyCols($count){
+	protected function hasOnlyCols($count) {
 		return $count>0 && $this->content[0] instanceof HtmlGridCol;
 	}
 
@@ -131,17 +131,17 @@ 
 	 * @param int $width
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
-	public function setColsCount($numCols,$toCreate=true,$width=NULL){
-		if(isset($width)===false)
+	public function setColsCount($numCols, $toCreate=true, $width=NULL) {
+		if (isset($width)===false)
 			$this->setWide($numCols);
-		if($toCreate==true){
+		if ($toCreate==true) {
 			$count=$this->count();
-			if($count==0 || $this->hasOnlyCols($count)){
-				for($i=$count;$i<$numCols;$i++){
-					$this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i,$width));
+			if ($count==0 || $this->hasOnlyCols($count)) {
+				for ($i=$count; $i<$numCols; $i++) {
+					$this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i, $width));
 				}
-			}else{
-				for($i=0;$i<$count;$i++){
+			}else {
+				for ($i=0; $i<$count; $i++) {
 					$this->getItem($i)->setColsCount($numCols);
 				}
 			}
@@ -154,7 +154,7 @@ 
 	 * @param int $index
 	 * @return \Ajax\semantic\html\collections\HtmlGridRow
 	 */
-	public function getRow($index){
+	public function getRow($index) {
 		return $this->getItem($index);
 	}
 
@@ -162,9 +162,9 @@ 
 	 * Returns the row count
 	 * @return int
 	 */
-	public function rowCount(){
+	public function rowCount() {
 		$count=$this->count();
-		if($this->hasOnlyCols($count))
+		if ($this->hasOnlyCols($count))
 			return 0;
 		return $count;
 	}
@@ -173,11 +173,11 @@ 
 	 * Returns the column count
 	 * @return int
 	 */
-	public function colCount(){
+	public function colCount() {
 		$count=$this->count();
-		if($this->hasOnlyCols($count))
+		if ($this->hasOnlyCols($count))
 			return $count;
-		if($count>0)
+		if ($count>0)
 			return $this->getItem(0)->count();
 		return 0;
 	}
@@ -188,11 +188,11 @@ 
 	 * @param int $col
 	 * @return \Ajax\semantic\html\collections\HtmlGridCol
 	 */
-	public function getCell($row,$col){
-		if($row<2 && $this->hasOnlyCols($this->count()))
+	public function getCell($row, $col) {
+		if ($row<2 && $this->hasOnlyCols($this->count()))
 			return $this->getItem($col);
 		$row=$this->getItem($row);
-		if(isset($row)){
+		if (isset($row)) {
 			$col=$row->getItem($col);
 		}
 		return $col;
@@ -203,9 +203,9 @@ 
 	 * @param boolean $vertically
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
-	public function setDivided($vertically=false){
-		$value=($vertically===true)?"vertically divided":"divided";
-		return $this->addToPropertyCtrl("class", $value,array("divided"));
+	public function setDivided($vertically=false) {
+		$value=($vertically===true) ? "vertically divided" : "divided";
+		return $this->addToPropertyCtrl("class", $value, array("divided"));
 	}
 
 	/**
@@ -213,23 +213,23 @@ 
 	 * @param boolean $internally true for internal cells
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
-	public function setCelled($internally=false){
-		$value=($internally===true)?"internally celled":"celled";
-		return $this->addToPropertyCtrl("class", $value,array("celled","internally celled"));
+	public function setCelled($internally=false) {
+		$value=($internally===true) ? "internally celled" : "celled";
+		return $this->addToPropertyCtrl("class", $value, array("celled", "internally celled"));
 	}
 
 	/**
 	 * A grid can have its columns centered
 	 */
-	public function setCentered(){
-		return $this->addToPropertyCtrl("class", "centered",array("centered"));
+	public function setCentered() {
+		return $this->addToPropertyCtrl("class", "centered", array("centered"));
 	}
 
 	/**
 	 * automatically resize all elements to split the available width evenly
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
-	public function setEqualWidth(){
+	public function setEqualWidth() {
 		return $this->addToProperty("class", "equal width");
 	}
 
@@ -238,9 +238,9 @@ 
 	 * @param string $value
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
-	public function setPadded($value=NULL){
-		if(isset($value))
-			$this->addToPropertyCtrl("class", $value,array("vertically","horizontally"));
+	public function setPadded($value=NULL) {
+		if (isset($value))
+			$this->addToPropertyCtrl("class", $value, array("vertically", "horizontally"));
 		return $this->addToProperty("class", "padded");
 	}
 
@@ -248,23 +248,23 @@ 
 	 * @param boolean $very
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
-	public function setRelaxed($very=false){
-		$value=($very===true)?"very relaxed":"relaxed";
-		return $this->addToPropertyCtrl("class", $value,array("relaxed","very relaxed"));
+	public function setRelaxed($very=false) {
+		$value=($very===true) ? "very relaxed" : "relaxed";
+		return $this->addToPropertyCtrl("class", $value, array("relaxed", "very relaxed"));
 	}
 
-	public function setVerticalAlignment($value=VerticalAlignment::MIDDLE){
-		return $this->addToPropertyCtrl("class", $value." aligned",VerticalAlignment::getConstantValues("aligned"));
+	public function setVerticalAlignment($value=VerticalAlignment::MIDDLE) {
+		return $this->addToPropertyCtrl("class", $value." aligned", VerticalAlignment::getConstantValues("aligned"));
 	}
 
 	/**
 	 * {@inheritDoc}
 	 * @see \Ajax\common\html\HtmlCollection::createItem()
 	 */
-	protected function createItem($value){
-		if($this->_createCols===false)
+	protected function createItem($value) {
+		if ($this->_createCols===false)
 			$value=null;
-		$item=new HtmlGridRow($this->identifier."-row-".($this->count()+1),$value,$this->_colSizing,$this->_implicitRows);
+		$item=new HtmlGridRow($this->identifier."-row-".($this->count()+1), $value, $this->_colSizing, $this->_implicitRows);
 		return $item;
 	}
 
@@ -272,17 +272,17 @@ 
 	 * Sets $values to the grid
 	 * @param array $values
 	 */
-	public function setValues($values,$force=true){
+	public function setValues($values, $force=true) {
 		$count=$this->count();
-		if($this->_createCols===false || $force===true){
-			for($i=$count;$i<\sizeof($values);$i++){
+		if ($this->_createCols===false || $force===true) {
+			for ($i=$count; $i<\sizeof($values); $i++) {
 				$colSize=\sizeof($values[$i]);
-				$this->addItem(new HtmlGridRow($this->identifier."-row-".($this->count()+1),$colSize,$this->_colSizing,$this->_implicitRows));
+				$this->addItem(new HtmlGridRow($this->identifier."-row-".($this->count()+1), $colSize, $this->_colSizing, $this->_implicitRows));
 			}
 		}
-		$count=\min(array($this->count(),\sizeof($values)));
-		for($i=0;$i<$count;$i++){
-			$this->content[$i]->setValues($values[$i],$this->_createCols===false);
+		$count=\min(array($this->count(), \sizeof($values)));
+		for ($i=0; $i<$count; $i++) {
+			$this->content[$i]->setValues($values[$i], $this->_createCols===false);
 		}
 	}
 
@@ -290,7 +290,7 @@ 
 	 * stretch the row contents to take up the entire column height
 	 * @return \Ajax\semantic\html\content\HtmlGridRow
 	 */
-	public function setStretched(){
+	public function setStretched() {
 		return $this->addToProperty("class", "stretched");
 	}
 

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

Spacing +4 added lines, -4 removed lines

@@ -8,13 +8,13 @@
 class HtmlFormInput extends HtmlFormField {
 	use TextFieldsTrait;
 
-	public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL) {
-		if(!isset($placeholder) && $type==="text")
+	public function __construct($identifier, $label=NULL, $type="text", $value=NULL, $placeholder=NULL) {
+		if (!isset($placeholder) && $type==="text")
 			$placeholder=$label;
-		parent::__construct("field-".$identifier, new HtmlInput($identifier,$type,$value,$placeholder), $label);
+		parent::__construct("field-".$identifier, new HtmlInput($identifier, $type, $value, $placeholder), $label);
 	}
 
-	public function setReadonly(){
+	public function setReadonly() {
 		$this->getField()->setProperty("readonly", "");
 	}
 }
\ No newline at end of file

Braces +3 added lines, -2 removed lines

@@ -9,8 +9,9 @@
 	use TextFieldsTrait;
 
 	public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL) {
-		if(!isset($placeholder) && $type==="text")
-			$placeholder=$label;
+		if(!isset($placeholder) && $type==="text") {
+					$placeholder=$label;
+		}
 		parent::__construct("field-".$identifier, new HtmlInput($identifier,$type,$value,$placeholder), $label);
 	}