phpMv / phpMv-UI

Ajax/semantic/html/elements/HtmlReveal.php

Spacing +22 added lines, -22 removed lines

@@ -10,64 +10,64 @@
 
 class HtmlReveal extends HtmlSemDoubleElement {
 
-	public function __construct($identifier, $visibleContent,$hiddenContent,$type=RevealType::FADE,$attributeType=NULL) {
+	public function __construct($identifier, $visibleContent, $hiddenContent, $type=RevealType::FADE, $attributeType=NULL) {
 		parent::__construct($identifier, "div", "ui reveal");
 		$this->setElement(0, $visibleContent);
 		$this->setElement(1, $hiddenContent);
-		$this->setType($type,$attributeType);
+		$this->setType($type, $attributeType);
 	}
 
-	private function setElement($index,$content){
-		if(!$content instanceof HtmlSingleElement){
-			$content=new HtmlLabel("",$content);
+	private function setElement($index, $content) {
+		if (!$content instanceof HtmlSingleElement) {
+			$content=new HtmlLabel("", $content);
 		}
-		if($content instanceof HtmlSemDoubleElement){
-			$content=new HtmlSemDoubleElement($this->identifier."-".$index,"div","",$content);
-		}elseif ($content instanceof HtmlImg){
+		if ($content instanceof HtmlSemDoubleElement) {
+			$content=new HtmlSemDoubleElement($this->identifier."-".$index, "div", "", $content);
+		}elseif ($content instanceof HtmlImg) {
 			$this->addToPropertyCtrl("class", "image", array("image"));
 		}
-		$content->addToProperty("class",(($index===0)?"visible":"hidden")." content");
+		$content->addToProperty("class", (($index===0) ? "visible" : "hidden")." content");
 		$this->content[$index]=$content;
 		return $this;
 	}
 
-	public function setVisibleContent($visibleContent){
+	public function setVisibleContent($visibleContent) {
 		return $this->setElement(0, $visibleContent);
 	}
 
-	public function setHiddenContent($hiddenContent){
+	public function setHiddenContent($hiddenContent) {
 		return $this->setElement(1, $hiddenContent);
 	}
 
-	public function getVisibleContent(){
+	public function getVisibleContent() {
 		return $this->content[0];
 	}
 
-	public function getHiddenContent(){
+	public function getHiddenContent() {
 		return $this->content[1];
 	}
 
-	public function setType($type,$attribute=NULL){
+	public function setType($type, $attribute=NULL) {
 		$this->addToPropertyCtrl("class", $type, RevealType::getConstants());
-		if(isset($attribute)){
+		if (isset($attribute)) {
 			$this->addToPropertyCtrl("class", $attribute, Direction::getConstants());
 		}
 		return $this;
 	}
 
-	public function setFade($attribute=NULL){
-		return $this->setType(RevealType::FADE,$attribute);
+	public function setFade($attribute=NULL) {
+		return $this->setType(RevealType::FADE, $attribute);
 	}
 
-	public function setMove($attribute=NULL){
-		return $this->setType(RevealType::MOVE,$attribute);
+	public function setMove($attribute=NULL) {
+		return $this->setType(RevealType::MOVE, $attribute);
 	}
 
-	public function setRotate($attribute=NULL){
-		return $this->setType(RevealType::ROTATE,$attribute);
+	public function setRotate($attribute=NULL) {
+		return $this->setType(RevealType::ROTATE, $attribute);
 	}
 
-	public function setCircular(){
+	public function setCircular() {
 		return $this->addToProperty("class", "circular");
 	}
 

Braces +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 		}
 		if($content instanceof HtmlSemDoubleElement){
 			$content=new HtmlSemDoubleElement($this->identifier."-".$index,"div","",$content);
-		}elseif ($content instanceof HtmlImg){
+		} elseif ($content instanceof HtmlImg){
 			$this->addToPropertyCtrl("class", "image", array("image"));
 		}
 		$content->addToProperty("class",(($index===0)?"visible":"hidden")." content");

Ajax/semantic/html/elements/HtmlContainer.php

Spacing +2 added lines, -2 removed lines

@@ -13,11 +13,11 @@
 class HtmlContainer extends HtmlSemDoubleElement {
 	use TextAlignmentTrait;
 	public function __construct($identifier, $content="") {
-		parent::__construct($identifier, "div","ui container");
+		parent::__construct($identifier, "div", "ui container");
 		$this->content=$content;
 	}
 
-	public function asText(){
+	public function asText() {
 		return $this->addToProperty("class", "text");
 	}
 }
\ No newline at end of file

Ajax/semantic/html/elements/HtmlHeader.php

Braces +3 added lines, -2 removed lines

@@ -19,8 +19,9 @@
 		if (isset($type)) {
 			if ($type == "page") {
 				$this->asPageHeader($niveau);
-			} else
-				$this->asContentHeader($niveau);
+			} else {
+							$this->asContentHeader($niveau);
+			}
 		}
 		$this->content=$content;
 	}

Spacing +7 added lines, -7 removed lines

@@ -10,14 +10,14 @@ 
 use Ajax\semantic\html\base\traits\AttachedTrait;
 
 class HtmlHeader extends HtmlSemDoubleElement {
-	use TextAlignmentTrait,AttachedTrait;
+	use TextAlignmentTrait, AttachedTrait;
 	protected $image;
 
 	public function __construct($identifier, $niveau=1, $content=NULL, $type="page") {
 		parent::__construct($identifier, "div", "ui header");
 		$this->_template="<%tagName% %properties%>%image%%wrapContentBefore%%content%%wrapContentAfter%</%tagName%>";
 		if (isset($type)) {
-			if ($type == "page") {
+			if ($type=="page") {
 				$this->asPageHeader($niveau);
 			} else
 				$this->asContentHeader($niveau);
@@ -26,7 +26,7 @@ 
 	}
 
 	public function asPageHeader($niveau) {
-		$this->tagName="h" . $niveau;
+		$this->tagName="h".$niveau;
 	}
 
 	public function asContentHeader($niveau) {
@@ -39,25 +39,25 @@ 
 
 	public function asIcon($icon, $title, $subHeader=NULL) {
 		$this->addToProperty("class", "icon");
-		$this->image=new HtmlIcon("icon-" . $this->identifier, $icon);
+		$this->image=new HtmlIcon("icon-".$this->identifier, $icon);
 		return $this->asTitle($title, $subHeader);
 	}
 
 	public function asImage($src, $title, $subHeader=NULL) {
-		$this->image=new HtmlImg("img-" . $this->identifier, $src, $title);
+		$this->image=new HtmlImg("img-".$this->identifier, $src, $title);
 		return $this->asTitle($title, $subHeader);
 	}
 
 	public function asTitle($title, $subHeader=NULL) {
 		if (!\is_object($title)) {
-			$this->content=new HtmlDoubleElement("content-" . $this->identifier, "div");
+			$this->content=new HtmlDoubleElement("content-".$this->identifier, "div");
 			$this->content->setContent($title);
 		} else {
 			$this->content=$title;
 		}
 		$this->content->setClass("content");
 		if (isset($subHeader)) {
-			$sub=new HtmlDoubleElement("subheader-" . $this->identifier, "div");
+			$sub=new HtmlDoubleElement("subheader-".$this->identifier, "div");
 			$sub->setClass("sub header");
 			$sub->setContent($subHeader);
 			$this->content->addContent($sub);

Ajax/semantic/html/content/HtmlAccordionMenuItem.php

Spacing +3 added lines, -3 removed lines

@@ -4,11 +4,11 @@
 
 
 class HtmlAccordionMenuItem extends HtmlMenuItem {
-	public function __construct($identifier,$title,$content) {
-		parent::__construct($identifier, new HtmlAccordionItem("accordion-".$identifier, $title,$content));
+	public function __construct($identifier, $title, $content) {
+		parent::__construct($identifier, new HtmlAccordionItem("accordion-".$identifier, $title, $content));
 	}
 
-	public function setActive($value=true){
+	public function setActive($value=true) {
 		$this->content->setActive($value);
 		return $this;
 	}

Doc Comments +4 added lines

@@ -4,6 +4,10 @@
 
 
 class HtmlAccordionMenuItem extends HtmlMenuItem {
+
+	/**
+	 * @param string $identifier
+	 */
 	public function __construct($identifier,$title,$content) {
 		parent::__construct($identifier, new HtmlAccordionItem("accordion-".$identifier, $title,$content));
 	}

Ajax/semantic/html/content/HtmlAccordionItem.php

Spacing +10 added lines, -10 removed lines

@@ -20,30 +20,30 @@
 		$this->_title=$title;
 	}
 
-	public function setTitle($title){
+	public function setTitle($title) {
 		$this->_title=$title;
 	}
 
-	public function setIcon($icon){
+	public function setIcon($icon) {
 		$this->_icon=$icon;
 	}
 
-	protected function createTitleElement(){
-		$element=new HtmlSemDoubleElement("title-".$this->identifier,"div","title");
-		$element->setContent(array(new HtmlIcon("", $this->_icon),$this->_title));
-		if($this->_active===true)
+	protected function createTitleElement() {
+		$element=new HtmlSemDoubleElement("title-".$this->identifier, "div", "title");
+		$element->setContent(array(new HtmlIcon("", $this->_icon), $this->_title));
+		if ($this->_active===true)
 			$element->addToProperty("class", "active");
 		return $element;
 	}
 
-	public function compile(JsUtils $js=NULL, &$view=NULL){
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$this->titleElement=$this->createTitleElement();
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
-	public function setActive($value=true){
+	public function setActive($value=true) {
 		$this->_active=$value;
-		if($value===true)
+		if ($value===true)
 			$this->addToPropertyCtrl("class", "active", array("active"));
 		else
 			$this->removePropertyValue("class", "active");

Braces +8 added lines, -6 removed lines

@@ -31,8 +31,9 @@ 
 	protected function createTitleElement(){
 		$element=new HtmlSemDoubleElement("title-".$this->identifier,"div","title");
 		$element->setContent(array(new HtmlIcon("", $this->_icon),$this->_title));
-		if($this->_active===true)
-			$element->addToProperty("class", "active");
+		if($this->_active===true) {
+					$element->addToProperty("class", "active");
+		}
 		return $element;
 	}
 
@@ -43,10 +44,11 @@ 
 
 	public function setActive($value=true){
 		$this->_active=$value;
-		if($value===true)
-			$this->addToPropertyCtrl("class", "active", array("active"));
-		else
-			$this->removePropertyValue("class", "active");
+		if($value===true) {
+					$this->addToPropertyCtrl("class", "active", array("active"));
+		} else {
+					$this->removePropertyValue("class", "active");
+		}
 		return $this;
 	}
 }
\ No newline at end of file

Doc Comments +3 added lines

@@ -14,6 +14,9 @@
 	protected $_title;
 	protected $_active;
 
+	/**
+	 * @param string $identifier
+	 */
 	public function __construct($identifier, $title, $content=NULL) {
 		parent::__construct($identifier, "div", "content", $content);
 		$this->_template="%titleElement%".$this->_template;

Ajax/semantic/html/content/card/HtmlCardContent.php

Spacing +8 added lines, -8 removed lines

@@ -15,16 +15,16 @@ 
 
 	private function addElement($content, $baseClass) {
 		$count=\sizeof($this->content);
-		$result=new HtmlSemDoubleElement("element-" . $count . "-" . $this->identifier, "div", $baseClass, $content);
+		$result=new HtmlSemDoubleElement("element-".$count."-".$this->identifier, "div", $baseClass, $content);
 		$this->addContent($result);
 		return $result;
 	}
 
 	public function addMeta($value, $direction=Direction::LEFT) {
-		if (\array_key_exists("meta", $this->content) === false) {
-			$this->content["meta"]=new HtmlSemDoubleElement("meta-" . $this->identifier, "div", "meta", array ());
+		if (\array_key_exists("meta", $this->content)===false) {
+			$this->content["meta"]=new HtmlSemDoubleElement("meta-".$this->identifier, "div", "meta", array());
 		}
-		if ($direction === Direction::RIGHT) {
+		if ($direction===Direction::RIGHT) {
 			$value=new HtmlSemDoubleElement("", "span", "", $value);
 			$value->setFloated($direction);
 		}
@@ -42,7 +42,7 @@ 
 
 	public function addMetas($metas) {
 		if (\is_array($metas)) {
-			foreach ( $metas as $meta ) {
+			foreach ($metas as $meta) {
 				$this->addMeta($meta);
 			}
 		} else
@@ -51,7 +51,7 @@ 
 	}
 
 	public function addContentIcon($icon, $caption=NULL, $direction=Direction::LEFT) {
-		if ($direction === Direction::RIGHT) {
+		if ($direction===Direction::RIGHT) {
 			if (isset($caption)) {
 				$result=new HtmlSemDoubleElement("", "span", "", $caption);
 				$result->addIcon($icon);
@@ -69,7 +69,7 @@ 
 	}
 
 	public function addContentText($caption, $direction=Direction::LEFT) {
-		if ($direction === Direction::RIGHT) {
+		if ($direction===Direction::RIGHT) {
 			$result=new HtmlSemDoubleElement("", "span", "", $caption);
 			$this->addContent($result);
 			$result->setFloated($direction);
@@ -79,7 +79,7 @@ 
 	}
 
 	public function addContentIcons($icons, $direction=Direction::LEFT) {
-		foreach ( $icons as $icon ) {
+		foreach ($icons as $icon) {
 			$this->addContentIcon($icon, NULL, $direction);
 		}
 		return $this;

Braces +9 added lines, -6 removed lines

@@ -34,8 +34,9 @@ 
 
 	public function addImage($src="", $alt="", $size=NULL) {
 		$image=new HtmlImg("img-", $src, $alt);
-		if (isset($size))
-			$image->setSize($size);
+		if (isset($size)) {
+					$image->setSize($size);
+		}
 		$this->content["image"]=$image;
 		return $image;
 	}
@@ -45,8 +46,9 @@ 
 			foreach ( $metas as $meta ) {
 				$this->addMeta($meta);
 			}
-		} else
-			$this->addMeta($metas);
+		} else {
+					$this->addMeta($metas);
+		}
 		return $this;
 	}
 
@@ -73,8 +75,9 @@ 
 			$result=new HtmlSemDoubleElement("", "span", "", $caption);
 			$this->addContent($result);
 			$result->setFloated($direction);
-		} else
-			$result=$this->addContent($caption);
+		} else {
+					$result=$this->addContent($caption);
+		}
 		return $result;
 	}
 

Ajax/semantic/html/content/card/HtmlCardHeaderContent.php

Spacing +4 added lines, -4 removed lines

@@ -10,7 +10,7 @@ 
 class HtmlCardHeaderContent extends HtmlCardContent {
 
 	public function __construct($identifier, $header=NULL, $metas=array(), $description=NULL) {
-		parent::__construct($identifier, array ());
+		parent::__construct($identifier, array());
 		if (isset($header)) {
 			$this->setHeader($header);
 		}
@@ -21,11 +21,11 @@ 
 	}
 
 	public function setDescription($value) {
-		$this->content["description"]=new HtmlSemDoubleElement("description-" . $this->identifier, "div", "description", $value);
+		$this->content["description"]=new HtmlSemDoubleElement("description-".$this->identifier, "div", "description", $value);
 	}
 
 	public function setHeader($value) {
-		$this->content["header"]=new HtmlSemDoubleElement("header-" . $this->identifier, "a", "header", $value);
+		$this->content["header"]=new HtmlSemDoubleElement("header-".$this->identifier, "a", "header", $value);
 	}
 
 	/**
@@ -35,7 +35,7 @@ 
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile()
 	 */
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		$this->content=JArray::sortAssociative($this->content, [ "image","header","meta","description" ]);
+		$this->content=JArray::sortAssociative($this->content, ["image", "header", "meta", "description"]);
 		return parent::compile($js, $view);
 	}
 }
\ No newline at end of file

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

Braces +12 added lines, -8 removed lines

@@ -22,8 +22,9 @@ 
 	 */
 	public function __construct($identifier, $tagName="tbody", $rowCount=NULL, $colCount=NULL) {
 		parent::__construct($identifier, $tagName, "");
-		if (isset($rowCount) && isset($colCount))
-			$this->setRowCount($rowCount, $colCount);
+		if (isset($rowCount) && isset($colCount)) {
+					$this->setRowCount($rowCount, $colCount);
+		}
 	}
 
 	/**
@@ -129,8 +130,9 @@ 
 			$values=\array_fill(0, $count, $values);
 			$isArray=false;
 		}
-		if (JArray::dimension($values) == 1 && $isArray)
-			$values=[ $values ];
+		if (JArray::dimension($values) == 1 && $isArray) {
+					$values=[ $values ];
+		}
 
 		$count=\min(\sizeof($values), $count);
 
@@ -174,8 +176,9 @@ 
 		$count=$this->count();
 		for($i=0; $i < $count; $i++) {
 			$index=$this->content[$i]->getColPosition($colIndex);
-			if ($index !== NULL)
-				$this->getCell($i, $index)->$function();
+			if ($index !== NULL) {
+							$this->getCell($i, $index)->$function();
+			}
 		}
 		return $this;
 	}
@@ -206,8 +209,9 @@ 
 	 */
 	public function getColCount() {
 		$result=0;
-		if ($this->count() > 0)
-			$result=$this->getItem(0)->getColCount();
+		if ($this->count() > 0) {
+					$result=$this->getItem(0)->getColCount();
+		}
 		return $result;
 	}
 

Spacing +17 added lines, -17 removed lines

@@ -11,7 +11,7 @@ 
  *
  */
 class HtmlTableContent extends HtmlSemCollection {
-	protected $_tdTagNames=[ "thead" => "th","tbody" => "td","tfoot" => "th" ];
+	protected $_tdTagNames=["thead" => "th", "tbody" => "td", "tfoot" => "th"];
 
 	/**
 	 *
@@ -34,7 +34,7 @@ 
 	 */
 	public function setRowCount($rowCount, $colCount) {
 		$count=$this->count();
-		for($i=$count; $i < $rowCount; $i++) {
+		for ($i=$count; $i<$rowCount; $i++) {
 			$this->addItem($colCount);
 		}
 		return $this;
@@ -56,7 +56,7 @@ 
 		$tr=new HtmlTR("", $value);
 		$tr->setContainer($this, $count);
 		$tr->setTdTagName($this->_tdTagNames[$this->tagName]);
-		if (isset($value) === true) {
+		if (isset($value)===true) {
 			$tr->setColCount($value);
 		}
 		return $tr;
@@ -114,7 +114,7 @@ 
 	 */
 	public function setCellValue($row, $col, $value="") {
 		$cell=$this->getCell($row, $col);
-		if (isset($cell) === true) {
+		if (isset($cell)===true) {
 			$cell->setValue($value);
 		}
 		return $this;
@@ -131,12 +131,12 @@ 
 			$values=\array_fill(0, $count, $values);
 			$isArray=false;
 		}
-		if (JArray::dimension($values) == 1 && $isArray)
-			$values=[ $values ];
+		if (JArray::dimension($values)==1 && $isArray)
+			$values=[$values];
 
 		$count=\min(\sizeof($values), $count);
 
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$row=$this->content[$i];
 			$row->setValues($values[$i]);
 		}
@@ -149,7 +149,7 @@ 
 			$values=\array_fill(0, $count, $values);
 		}
 		$count=\min(\sizeof($values), $count);
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$this->getCell($i, $colIndex)->setValue($values[$i]);
 		}
 		return $this;
@@ -157,7 +157,7 @@ 
 
 	public function addColVariations($colIndex, $variations=array()) {
 		$count=$this->count();
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$this->getCell($i, $colIndex)->addVariations($variations);
 		}
 		return $this;
@@ -174,9 +174,9 @@ 
 
 	private function colAlign($colIndex, $function) {
 		$count=$this->count();
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$index=$this->content[$i]->getColPosition($colIndex);
-			if ($index !== NULL)
+			if ($index!==NULL)
 				$this->getCell($i, $index)->$function();
 		}
 		return $this;
@@ -208,7 +208,7 @@ 
 	 */
 	public function getColCount() {
 		$result=0;
-		if ($this->count() > 0)
+		if ($this->count()>0)
 			$result=$this->getItem(0)->getColCount();
 		return $result;
 	}
@@ -222,7 +222,7 @@ 
 	public function delete($rowIndex, $colIndex=NULL) {
 		if (isset($colIndex)) {
 			$row=$this->getItem($rowIndex);
-			if (isset($row) === true) {
+			if (isset($row)===true) {
 				$row->delete($colIndex);
 			}
 		} else {
@@ -254,7 +254,7 @@ 
 	 */
 	public function conditionalCellFormat($callback, $format) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$row->conditionalCellFormat($callback, $format);
 		}
 		return $this;
@@ -267,7 +267,7 @@ 
 	 */
 	public function conditionalRowFormat($callback, $format) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$row->conditionalRowFormat($callback, $format);
 		}
 		return $this;
@@ -279,7 +279,7 @@ 
 	 */
 	public function applyCells($callback) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$row->applyCells($callback);
 		}
 		return $this;
@@ -291,7 +291,7 @@ 
 	 */
 	public function applyRows($callback) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$row->apply($callback);
 		}
 		return $this;

Doc Comments +13 added lines, -1 removed lines

@@ -62,6 +62,9 @@ 
 		return $tr;
 	}
 
+	/**
+	 * @param integer $value
+	 */
 	public function newRow($value) {
 		return $this->createItem($value);
 	}
@@ -99,7 +102,7 @@ 
 	/**
 	 *
 	 * @param int $index
-	 * @return \Ajax\semantic\html\content\HtmlTR
+	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
 	public function getRow($index) {
 		return $this->getItem($index);
@@ -143,6 +146,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param integer $colIndex
+	 */
 	public function setColValues($colIndex, $values=array()) {
 		$count=$this->count();
 		if (!\is_array($values)) {
@@ -163,6 +169,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param integer $rowIndex
+	 */
 	public function setRowValues($rowIndex, $values=array()) {
 		$count=$this->count();
 		if (!\is_array($values)) {
@@ -172,6 +181,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param string $function
+	 */
 	private function colAlign($colIndex, $function) {
 		$count=$this->count();
 		for($i=0; $i < $count; $i++) {

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

Spacing +8 added lines, -8 removed lines

@@ -10,7 +10,7 @@ 
 use Ajax\semantic\html\elements\html5\HtmlLink;
 
 class HtmlTD extends HtmlSemDoubleElement {
-	use TextAlignmentTrait,TableElementTrait;
+	use TextAlignmentTrait, TableElementTrait;
 	private $_container;
 	private $_row;
 	private $_col;
@@ -23,8 +23,8 @@ 
 	 */
 	public function __construct($identifier, $content=NULL, $tagName="td") {
 		parent::__construct($identifier, $tagName, "", $content);
-		$this->_variations=[ Variation::COLLAPSING ];
-		$this->_states=[ State::ACTIVE,State::POSITIVE,State::NEGATIVE,State::WARNING,State::ERROR,State::DISABLED ];
+		$this->_variations=[Variation::COLLAPSING];
+		$this->_states=[State::ACTIVE, State::POSITIVE, State::NEGATIVE, State::WARNING, State::ERROR, State::DISABLED];
 	}
 
 	public function setContainer($container, $row, $col) {
@@ -39,8 +39,8 @@ 
 	}
 
 	public function setRowspan($rowspan) {
-		$to=min($this->_container->count(), $this->_row + $rowspan - 1);
-		for($i=$to; $i > $this->_row; $i--) {
+		$to=min($this->_container->count(), $this->_row+$rowspan-1);
+		for ($i=$to; $i>$this->_row; $i--) {
 			$this->_container->delete($i, $this->_col);
 		}
 		$this->setProperty("rowspan", $rowspan);
@@ -56,9 +56,9 @@ 
 	}
 
 	public function setColspan($colspan) {
-		$to=min($this->_container->getRow($this->_row)->count(), $this->_col + $colspan - 1);
-		for($i=$to; $i > $this->_col; $i--) {
-			$this->_container->delete($this->_row, $this->_col + 1);
+		$to=min($this->_container->getRow($this->_row)->count(), $this->_col+$colspan-1);
+		for ($i=$to; $i>$this->_col; $i--) {
+			$this->_container->delete($this->_row, $this->_col+1);
 		}
 		$this->setProperty("colspan", $colspan);
 		return $this->_container;

Braces +6 added lines, -4 removed lines

@@ -66,15 +66,17 @@
 
 	public function getColspan() {
 		$colspan=1;
-		if (\array_key_exists("colspan", $this->properties))
-			$colspan=$this->getProperty("colspan");
+		if (\array_key_exists("colspan", $this->properties)) {
+					$colspan=$this->getProperty("colspan");
+		}
 		return $colspan;
 	}
 
 	public function getRowspan() {
 		$rowspan=1;
-		if (\array_key_exists("rowspan", $this->properties))
-			$rowspan=$this->getProperty("rowspan");
+		if (\array_key_exists("rowspan", $this->properties)) {
+					$rowspan=$this->getProperty("rowspan");
+		}
 		return $rowspan;
 	}