jcheron / phalcon-jquery

Ajax/semantic/html/elements/HtmlLabel.php

Braces +3 added lines, -2 removed lines

@@ -13,8 +13,9 @@
 	public function __construct($identifier,$caption="",$icon=NULL,$tagName="div") {
 		parent::__construct($identifier,$tagName,"ui label");
 		$this->content=$caption;
-		if(isset($icon))
-			$this->addIcon($icon);
+		if(isset($icon)) {
+					$this->addIcon($icon);
+		}
 	}
 
 	/**

Doc Comments +4 added lines, -1 removed lines

@@ -10,6 +10,10 @@ 
 
 class HtmlLabel extends HtmlSemDoubleElement {
 	use LabeledIconTrait;
+
+	/**
+	 * @param string $icon
+	 */
 	public function __construct($identifier,$caption="",$icon=NULL,$tagName="div") {
 		parent::__construct($identifier,$tagName,"ui label");
 		$this->content=$caption;
@@ -18,7 +22,6 @@ 
 	}
 
 	/**
-	 * @param string $side
 	 * @return \Ajax\semantic\html\elements\HtmlLabel
 	 */
 	public function setPointing($value=Direction::NONE){

Spacing +17 added lines, -17 removed lines

@@ -10,10 +10,10 @@ 
 
 class HtmlLabel extends HtmlSemDoubleElement {
 	use LabeledIconTrait;
-	public function __construct($identifier,$caption="",$icon=NULL,$tagName="div") {
-		parent::__construct($identifier,$tagName,"ui label");
+	public function __construct($identifier, $caption="", $icon=NULL, $tagName="div") {
+		parent::__construct($identifier, $tagName, "ui label");
 		$this->content=$caption;
-		if(isset($icon))
+		if (isset($icon))
 			$this->addIcon($icon);
 	}
 
@@ -21,33 +21,33 @@ 
 	 * @param string $side
 	 * @return \Ajax\semantic\html\elements\HtmlLabel
 	 */
-	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"));
 	}
 
 	/**
 	 * @param string $side
 	 * @return \Ajax\semantic\html\elements\HtmlLabel
 	 */
-	public function toCorner($side="left"){
-		return $this->addToPropertyCtrl("class", $side." corner",array("right corner","left corner"));
+	public function toCorner($side="left") {
+		return $this->addToPropertyCtrl("class", $side." corner", array("right corner", "left corner"));
 	}
 
 	/**
 	 * @return \Ajax\semantic\html\elements\HtmlLabel
 	 */
-	public function asTag(){
+	public function asTag() {
 		return $this->addToProperty("class", "tag");
 	}
 
 	/**
 	 * @return \Ajax\semantic\html\elements\HtmlLabel
 	 */
-	public function asLink(){
+	public function asLink() {
 		return $this->setTagName("a");
 	}
 
-	public function setBasic(){
+	public function setBasic() {
 		return $this->addToProperty("class", "basic");
 	}
 
@@ -58,28 +58,28 @@ 
 	 * @param string $before
 	 * @return \Ajax\semantic\html\elements\HtmlLabel
 	 */
-	public function addImage($src,$alt="",$before=true){
+	public function addImage($src, $alt="", $before=true) {
 		$this->addToProperty("class", "image");
-		return $this->addContent(new HtmlImg("image-".$this->identifier,$src,$alt),$before);
+		return $this->addContent(new HtmlImg("image-".$this->identifier, $src, $alt), $before);
 	}
 
 	/**
 	 * @param string $detail
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addDetail($detail){
-		$div=new HtmlDoubleElement("detail-".$this->identifier,$this->tagName);
+	public function addDetail($detail) {
+		$div=new HtmlDoubleElement("detail-".$this->identifier, $this->tagName);
 		$div->setClass("detail");
 		$div->setContent($detail);
 		$this->addContent($div);
 		return $div;
 	}
 
-	public function asRibbon(){
+	public function asRibbon() {
 		return $this->addToPropertyCtrl("class", "ribbon", array("ribbon"));
 	}
 
-	public static function ribbon($identifier,$caption){
-		return (new HtmlLabel($identifier,$caption))->asRibbon();
+	public static function ribbon($identifier, $caption) {
+		return (new HtmlLabel($identifier, $caption))->asRibbon();
 	}
 }
\ No newline at end of file

Ajax/semantic/html/elements/HtmlImage.php

Spacing +10 added lines, -10 removed lines

@@ -7,24 +7,24 @@
 use Ajax\semantic\html\base\constants\Size;
 
 class HtmlImage extends HtmlSemDoubleElement {
-	public function __construct($identifier, $src="", $alt="",$size=NULL) {
-		$image=new HtmlImg("img-",$src,$alt);
-		parent::__construct($identifier, "div","ui image",$image);
-		if(isset($size))
+	public function __construct($identifier, $src="", $alt="", $size=NULL) {
+		$image=new HtmlImg("img-", $src, $alt);
+		parent::__construct($identifier, "div", "ui image", $image);
+		if (isset($size))
 			$this->setSize($size);
 	}
 
-	public function setCircular(){
+	public function setCircular() {
 		return $this->addToProperty("class", "circular");
 	}
 
-	public function asAvatar($caption=NULL){
-		if(isset($caption))
-			$this->wrap("",$caption);
+	public function asAvatar($caption=NULL) {
+		if (isset($caption))
+			$this->wrap("", $caption);
 		return $this->addToProperty("class", "avatar");
 	}
 
-	public static function small($identifier, $src="", $alt=""){
-		return new HtmlImage($identifier,$src,$alt,Size::SMALL);
+	public static function small($identifier, $src="", $alt="") {
+		return new HtmlImage($identifier, $src, $alt, Size::SMALL);
 	}
 }
\ No newline at end of file

Braces +6 added lines, -4 removed lines

@@ -10,8 +10,9 @@ 
 	public function __construct($identifier, $src="", $alt="",$size=NULL) {
 		$image=new HtmlImg("img-",$src,$alt);
 		parent::__construct($identifier, "div","ui image",$image);
-		if(isset($size))
-			$this->setSize($size);
+		if(isset($size)) {
+					$this->setSize($size);
+		}
 	}
 
 	public function setCircular(){
@@ -19,8 +20,9 @@ 
 	}
 
 	public function asAvatar($caption=NULL){
-		if(isset($caption))
-			$this->wrap("",$caption);
+		if(isset($caption)) {
+					$this->wrap("",$caption);
+		}
 		return $this->addToProperty("class", "avatar");
 	}
 

Ajax/semantic/html/base/constants/StepStatus.php

Spacing +1 added lines, -1 removed lines

@@ -5,5 +5,5 @@
 use Ajax\common\BaseEnum;
 
 abstract class StepStatus extends BaseEnum {
-	const ACTIVE="active",COMPLETED="completed",DISABLED="disabled",NONE="";
+	const ACTIVE="active", COMPLETED="completed", DISABLED="disabled", NONE="";
 }
\ No newline at end of file

Ajax/semantic/html/base/constants/Direction.php

Spacing +1 added lines, -1 removed lines

@@ -2,5 +2,5 @@
 namespace Ajax\semantic\html\base\constants;
 	use Ajax\common\BaseEnum;
 abstract class Direction extends BaseEnum {
-	const RIGHT="right", LEFT="left",DOWN="down",UP="up",NONE="";
+	const RIGHT="right", LEFT="left", DOWN="down", UP="up", NONE="";
 }
\ No newline at end of file

Ajax/semantic/html/base/constants/RevealType.php

Spacing +1 added lines, -1 removed lines

@@ -5,5 +5,5 @@
 use Ajax\common\BaseEnum;
 
 abstract class RevealType extends BaseEnum {
-	const FADE="fade",MOVE="move",ROTATE="rotate";
+	const FADE="fade", MOVE="move", ROTATE="rotate";
 }
\ No newline at end of file

Ajax/semantic/html/content/HtmlStepItem.php

Spacing +25 added lines, -25 removed lines

@@ -12,70 +12,70 @@
 	public function __construct($identifier, $content) {
 		parent::__construct($identifier, "div", "step");
 		$this->content=array();
-		if(\is_array($content)){
-			if(JArray::isAssociative($content)===false){
-				$icon=JArray::getValue($content, "icon",0);
-				$title=JArray::getValue($content, "title",1);
-				$desc=JArray::getValue($content, "description",2);
-				$status=JArray::getValue($content, "status",3);
-			}else{
+		if (\is_array($content)) {
+			if (JArray::isAssociative($content)===false) {
+				$icon=JArray::getValue($content, "icon", 0);
+				$title=JArray::getValue($content, "title", 1);
+				$desc=JArray::getValue($content, "description", 2);
+				$status=JArray::getValue($content, "status", 3);
+			}else {
 				$icon=@$content["icon"];
 				$title=@$content["title"];
 				$desc=@$content["description"];
 				$status=@$content["status"];
 			}
-			if(isset($icon)===true){
+			if (isset($icon)===true) {
 				$this->setIcon($icon);
 			}
-			if(isset($status)===true){
+			if (isset($status)===true) {
 				$this->setStatus($status);
 			}
-			if(isset($title)===true){
-				$this->setTitle($title,$desc);
+			if (isset($title)===true) {
+				$this->setTitle($title, $desc);
 			}
-		}else{
+		}else {
 			$this->setContent($content);
 		}
 	}
 
-	public function setIcon($icon){
+	public function setIcon($icon) {
 		$this->content["icon"]=new HtmlIcon("icon-".$this->identifier, $icon);
 	}
 
-	private function createContent(){
-		$this->content["content"]=new HtmlSemDoubleElement("content-".$this->identifier,"div","content");
+	private function createContent() {
+		$this->content["content"]=new HtmlSemDoubleElement("content-".$this->identifier, "div", "content");
 		return $this->content["content"];
 	}
 
-	public function setTitle($title,$description=NULL){
-		$title=new HtmlSemDoubleElement("","div","title",$title);
-		if(\array_key_exists("content", $this->content)===false){
+	public function setTitle($title, $description=NULL) {
+		$title=new HtmlSemDoubleElement("", "div", "title", $title);
+		if (\array_key_exists("content", $this->content)===false) {
 			$this->createContent();
 		}
 		$this->content["content"]->addContent($title);
-		if(isset($description)){
-			$description=new HtmlSemDoubleElement("","div","description",$description);
+		if (isset($description)) {
+			$description=new HtmlSemDoubleElement("", "div", "description", $description);
 			$this->content["content"]->addContent($description);
 		}
 		return $this;
 	}
 
-	public function setActive(){
+	public function setActive() {
 		return $this->setStatus(StepStatus::ACTIVE);
 	}
 
-	public function setCompleted(){
+	public function setCompleted() {
 		return $this->setStatus(StepStatus::COMPLETED);
 	}
 
-	public function setStatus($status){
+	public function setStatus($status) {
 		return $this->addToPropertyCtrl("class", $status, StepStatus::getConstants());
 	}
 
-	public function asLink(){
+	public function asLink() {
 		return $this->setTagName("a");
 	}
-	public function removeStatus(){
+	public function removeStatus() {
 		$this->removePropertyValues("class", StepStatus::getConstants());
 	}
 }
\ No newline at end of file

Braces +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
 				$title=JArray::getValue($content, "title",1);
 				$desc=JArray::getValue($content, "description",2);
 				$status=JArray::getValue($content, "status",3);
-			}else{
+			} else{
 				$icon=@$content["icon"];
 				$title=@$content["title"];
 				$desc=@$content["description"];
@@ -33,7 +33,7 @@ 
 			if(isset($title)===true){
 				$this->setTitle($title,$desc);
 			}
-		}else{
+		} else{
 			$this->setContent($content);
 		}
 	}

Ajax/semantic/html/collections/menus/HtmlMenu.php

Doc Comments +2 added lines, -1 removed lines

@@ -31,7 +31,7 @@ 
 	/**
 	 * Sets the menu type
 	 * @param string $type one of text,item
-	 * @return \Ajax\semantic\html\collections\HtmlMenu
+	 * @return HtmlMenu
 	 */
 	public function setType($type=""){
 		return $this->addToPropertyCtrl("class", $type, array("","item","text"));
@@ -73,6 +73,7 @@ 
 	/**
 	 * {@inheritDoc}
 	 * @see \Ajax\common\html\HtmlCollection::insertItem()
+	 * @param HtmlIcon $item
 	 */
 	public function insertItem($item,$position=0){
 		$item=parent::insertItem($this->getItemToInsert($item),$position);

Spacing +17 added lines, -17 removed lines

@@ -34,12 +34,12 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlMenu
 	 */
 	public function setType($type="") {
-		return $this->addToPropertyCtrl("class", $type, array ("","item","text" ));
+		return $this->addToPropertyCtrl("class", $type, array("", "item", "text"));
 	}
 
 	public function setActiveItem($index) {
 		$item=$this->getItem($index);
-		if ($item !== null) {
+		if ($item!==null) {
 			$item->addToProperty("class", "active");
 		}
 		return $this;
@@ -47,7 +47,7 @@ 
 
 	private function getItemToInsert($item) {
 		if ($item instanceof HtmlInput || $item instanceof HtmlImg || $item instanceof HtmlIcon) {
-			$itemO=new HtmlSemDoubleElement("item-" . $this->identifier, "div", "");
+			$itemO=new HtmlSemDoubleElement("item-".$this->identifier, "div", "");
 			$itemO->setContent($item);
 			$item=$itemO;
 		}
@@ -56,7 +56,7 @@ 
 
 	private function afterInsert($item) {
 		if (!$item instanceof HtmlMenu)
-			$item->addToPropertyCtrl("class", "item", array ("item" ));
+			$item->addToPropertyCtrl("class", "item", array("item"));
 		else {
 			$this->setSecondary();
 		}
@@ -87,9 +87,9 @@ 
 
 	public function generateMenuAsItem($menu, $header=null) {
 		$count=$this->count();
-		$item=new HtmlSemDoubleElement("item-" . $this->identifier . "-" . $count, "div");
+		$item=new HtmlSemDoubleElement("item-".$this->identifier."-".$count, "div");
 		if (isset($header)) {
-			$headerItem=new HtmlSemDoubleElement("item-header-" . $this->identifier . "-" . $count, "div", "header");
+			$headerItem=new HtmlSemDoubleElement("item-header-".$this->identifier."-".$count, "div", "header");
 			$headerItem->setContent($header);
 			$item->addContent($headerItem);
 		}
@@ -106,7 +106,7 @@ 
 		$value=new HtmlSemDoubleElement($identifier, "a", "browse item", $value);
 		$value->addContent(new HtmlIcon("", "dropdown"));
 		$value=$this->addItem($value);
-		$popup=new HtmlPopup($value, "popup-" . $this->identifier . "-" . $this->count(), $content);
+		$popup=new HtmlPopup($value, "popup-".$this->identifier."-".$this->count(), $content);
 		$popup->setFlowing()->setPosition("bottom left")->setOn("click");
 		$this->wrap("", $popup);
 		return $popup;
@@ -115,7 +115,7 @@ 
 	public function addDropdownAsItem($value, $items=NULL) {
 		$dd=$value;
 		if (\is_string($value)) {
-			$dd=new HtmlDropdown("dropdown-" . $this->identifier . "-" . $this->count(), $value, $items);
+			$dd=new HtmlDropdown("dropdown-".$this->identifier."-".$this->count(), $value, $items);
 		}
 		return $this->addItem($dd);
 	}
@@ -127,7 +127,7 @@ 
 	 * @see \Ajax\common\html\html5\HtmlCollection::createItem()
 	 */
 	protected function createItem($value) {
-		$itemO=new HtmlLink("item-" . \sizeof($this->content), "", $value);
+		$itemO=new HtmlLink("item-".\sizeof($this->content), "", $value);
 		return $itemO->setClass("item");
 	}
 
@@ -140,28 +140,28 @@ 
 	}
 
 	public function setVertical() {
-		return $this->addToPropertyCtrl("class", "vertical", array ("vertical" ));
+		return $this->addToPropertyCtrl("class", "vertical", array("vertical"));
 	}
 
 	public function setPosition($value="right") {
-		return $this->addToPropertyCtrl("class", $value, array ("right","left" ));
+		return $this->addToPropertyCtrl("class", $value, array("right", "left"));
 	}
 
 	public function setPointing($value=Direction::NONE) {
-		return $this->addToPropertyCtrl("class", $value . " pointing", Direction::getConstantValues("pointing"));
+		return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing"));
 	}
 
 	public function asTab($vertical=false) {
-		$this->apply(function (HtmlDoubleElement &$item) {
+		$this->apply(function(HtmlDoubleElement & $item) {
 			$item->setTagName("a");
 		});
-		if ($vertical === true)
+		if ($vertical===true)
 			$this->setVertical();
 		return $this->addToProperty("class", "tabular");
 	}
 
 	public function asPagination() {
-		$this->apply(function (HtmlDoubleElement &$item) {
+		$this->apply(function(HtmlDoubleElement & $item) {
 			$item->setTagName("a");
 		});
 		return $this->addToProperty("class", "pagination");
@@ -198,10 +198,10 @@ 
 	 */
 	public function setWidth($width) {
 		if (\is_int($width)) {
-			$width=Wide::getConstants()["W" . $width];
+			$width=Wide::getConstants()["W".$width];
 		}
 		$this->addToPropertyCtrl("class", $width, Wide::getConstants());
-		return $this->addToPropertyCtrl("class", "item", array ("item" ));
+		return $this->addToPropertyCtrl("class", "item", array("item"));
 	}
 
 	public function addImage($identifier, $src="", $alt="") {

Braces +11 added lines, -9 removed lines

@@ -55,9 +55,9 @@ 
 	}
 
 	private function afterInsert($item) {
-		if (!$item instanceof HtmlMenu)
-			$item->addToPropertyCtrl("class", "item", array ("item" ));
-		else {
+		if (!$item instanceof HtmlMenu) {
+					$item->addToPropertyCtrl("class", "item", array ("item" ));
+		} else {
 			$this->setSecondary();
 		}
 		return $item;
@@ -155,8 +155,9 @@ 
 		$this->apply(function (HtmlDoubleElement &$item) {
 			$item->setTagName("a");
 		});
-		if ($vertical === true)
-			$this->setVertical();
+		if ($vertical === true) {
+					$this->setVertical();
+		}
 		return $this->addToProperty("class", "tabular");
 	}
 
@@ -185,10 +186,11 @@ 
 	 */
 	public function fromDatabaseObject($object, $function) {
 		$return=$function($object);
-		if (\is_array($return))
-			$this->addItems($return);
-		else
-			$this->addItem($return);
+		if (\is_array($return)) {
+					$this->addItems($return);
+		} else {
+					$this->addItem($return);
+		}
 	}
 
 	/**

Ajax/semantic/html/collections/menus/HtmlPaginationMenu.php

Spacing +5 added lines, -5 removed lines

@@ -7,19 +7,19 @@
 use Phalcon\Mvc\View;
 use Ajax\semantic\html\elements\HtmlIcon;
 
-class HtmlPaginationMenu extends HtmlMenu{
+class HtmlPaginationMenu extends HtmlMenu {
 
-	public function __construct( $identifier, $items=array() ){
-		parent::__construct( $identifier,$items);
+	public function __construct($identifier, $items=array()) {
+		parent::__construct($identifier, $items);
 	}
 	/**
 	 * {@inheritDoc}
 	 * @see \Ajax\common\html\BaseHtml::compile()
 	 */
-	public function compile(JsUtils $js=NULL,View $view=NULL){
+	public function compile(JsUtils $js=NULL, View $view=NULL) {
 		$this->insertItem(new HtmlIcon("", "left chevron"));
 		$this->addItem(new HtmlIcon("", "right chevron"));
 		$this->asPagination();
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 }
\ No newline at end of file

Ajax/semantic/html/content/table/HtmlTR.php

Doc Comments +3 added lines

@@ -20,6 +20,9 @@
 	protected $_tabsType="tabs";
 	protected $stacked="";
 
+	/**
+	 * @param string $identifier
+	 */
 	public function __construct($identifier, $tagName="ul") {
 		parent::__construct($identifier, $tagName);
 		$this->_template="<%tagName% %properties%>%tabs%</%tagName%>%content%";

Spacing +16 added lines, -16 removed lines

@@ -20,12 +20,12 @@ 
 
 	public function __construct($identifier) {
 		parent::__construct($identifier, "tr", "");
-		$this->_states=[ State::ACTIVE,State::POSITIVE,State::NEGATIVE,State::WARNING,State::ERROR,State::DISABLED ];
+		$this->_states=[State::ACTIVE, State::POSITIVE, State::NEGATIVE, State::WARNING, State::ERROR, State::DISABLED];
 	}
 
 	public function setColCount($colCount) {
 		$count=$this->count();
-		for($i=$count; $i < $colCount; $i++) {
+		for ($i=$count; $i<$colCount; $i++) {
 			$item=$this->addItem(NULL);
 			$item->setTagName($this->_tdTagName);
 		}
@@ -65,16 +65,16 @@ 
 	 */
 	public function setValues($values=array()) {
 		$count=$this->count();
-		if (\is_array($values) === false) {
+		if (\is_array($values)===false) {
 			$values=\array_fill(0, $count, $values);
-		} else {
-			if (JArray::isAssociative($values) === true) {
+		}else {
+			if (JArray::isAssociative($values)===true) {
 				$values=\array_values($values);
 			}
 		}
 		$count=\min(\sizeof($values), $count);
 		
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$cell=$this->content[$i];
 			$cell->setValue($values[$i]);
 		}
@@ -101,20 +101,20 @@ 
 	public function getColPosition($colIndex) {
 		$pos=0;
 		$rows=$this->_container->getContent();
-		for($i=0; $i < $this->_row; $i++) {
+		for ($i=0; $i<$this->_row; $i++) {
 			$max=\min($colIndex, $rows[$i]->count());
-			for($j=0; $j < $max; $j++) {
+			for ($j=0; $j<$max; $j++) {
 				$rowspan=$rows[$i]->getItem($j)->getRowspan();
-				if ($rowspan + $i > $this->_row)
+				if ($rowspan+$i>$this->_row)
 					$pos++;
 			}
 		}
-		if ($pos > $colIndex)
+		if ($pos>$colIndex)
 			return NULL;
 		$count=$this->count();
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$pos+=$this->content[$i]->getColspan();
-			if ($pos >= $colIndex + 1)
+			if ($pos>=$colIndex+1)
 				return $i;
 		}
 		return null;
@@ -122,7 +122,7 @@ 
 
 	public function conditionalCellFormat($callback, $format) {
 		$cells=$this->content;
-		foreach ( $cells as $cell ) {
+		foreach ($cells as $cell) {
 			$cell->conditionalCellFormat($callback, $format);
 		}
 		return $this;
@@ -137,8 +137,8 @@ 
 
 	public function containsStr($needle) {
 		$cells=$this->content;
-		foreach ( $cells as $cell ) {
-			if (\strpos($cell->getContent(), $needle) !== false)
+		foreach ($cells as $cell) {
+			if (\strpos($cell->getContent(), $needle)!==false)
 				return true;
 		}
 		return false;
@@ -151,7 +151,7 @@ 
 
 	public function applyCells($callback) {
 		$cells=$this->content;
-		foreach ( $cells as $cell ) {
+		foreach ($cells as $cell) {
 			$cell->apply($callback);
 		}
 		return $this;

Braces +12 added lines, -8 removed lines

@@ -105,17 +105,20 @@ 
 			$max=\min($colIndex, $rows[$i]->count());
 			for($j=0; $j < $max; $j++) {
 				$rowspan=$rows[$i]->getItem($j)->getRowspan();
-				if ($rowspan + $i > $this->_row)
-					$pos++;
+				if ($rowspan + $i > $this->_row) {
+									$pos++;
+				}
 			}
 		}
-		if ($pos > $colIndex)
-			return NULL;
+		if ($pos > $colIndex) {
+					return NULL;
+		}
 		$count=$this->count();
 		for($i=0; $i < $count; $i++) {
 			$pos+=$this->content[$i]->getColspan();
-			if ($pos >= $colIndex + 1)
-				return $i;
+			if ($pos >= $colIndex + 1) {
+							return $i;
+			}
 		}
 		return null;
 	}
@@ -138,8 +141,9 @@ 
 	public function containsStr($needle) {
 		$cells=$this->content;
 		foreach ( $cells as $cell ) {
-			if (\strpos($cell->getContent(), $needle) !== false)
-				return true;
+			if (\strpos($cell->getContent(), $needle) !== false) {
+							return true;
+			}
 		}
 		return false;
 	}