phpMv / phpMv-UI

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

Spacing +1 added lines, -1 removed lines

@@ -16,6 +16,6 @@
 		if (isset($toElement)) {
 			$toElement->setAttached(true);
 		}
-		return $this->addToPropertyCtrl("class", $side . " attached", Side::getConstantValues("attached"));
+		return $this->addToPropertyCtrl("class", $side." attached", Side::getConstantValues("attached"));
 	}
 }
\ No newline at end of file

Ajax/semantic/html/collections/table/traits/TableTrait.php

Braces +6 added lines, -4 removed lines

@@ -17,15 +17,17 @@
 
 	public function setBasic($very=false) {
 		$table=$this->getTable();
-		if ($very)
-			$table->addToPropertyCtrl("class", "very", array ("very" ));
+		if ($very) {
+					$table->addToPropertyCtrl("class", "very", array ("very" ));
+		}
 		return $table->addToPropertyCtrl("class", "basic", array ("basic" ));
 	}
 
 	public function setCompact($very=false) {
 		$table=$this->getTable();
-		if ($very)
-			$table->addToPropertyCtrl("class", "very", array ("very" ));
+		if ($very) {
+					$table->addToPropertyCtrl("class", "very", array ("very" ));
+		}
 		return $table->addToPropertyCtrl("class", "compact", array ("compact" ));
 	}
 

Spacing +13 added lines, -13 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 namespace Ajax\semantic\html\collections\table\traits;
 
-trait TableTrait{
+trait TableTrait {
 	/**
 	 * @return HtmlTable
 	 */
@@ -9,7 +9,7 @@ 
 	abstract public function addEvent($event, $jsCode, $stopPropagation=false, $preventDefault=false);
 	abstract public function getOn($event, $url, $responseElement="", $parameters=array());
 
-	protected function addToPropertyTable($property,$value){
+	protected function addToPropertyTable($property, $value) {
 		return $this->getTable()->addToProperty($property, $value);
 	}
 
@@ -20,15 +20,15 @@ 
 	public function setBasic($very=false) {
 		$table=$this->getTable();
 		if ($very)
-			$table->addToPropertyCtrl("class", "very", array ("very" ));
-		return $table->addToPropertyCtrl("class", "basic", array ("basic" ));
+			$table->addToPropertyCtrl("class", "very", array("very"));
+		return $table->addToPropertyCtrl("class", "basic", array("basic"));
 	}
 
 	public function setCompact($very=false) {
 		$table=$this->getTable();
 		if ($very)
-			$table->addToPropertyCtrl("class", "very", array ("very" ));
-		return $table->addToPropertyCtrl("class", "compact", array ("compact" ));
+			$table->addToPropertyCtrl("class", "very", array("very"));
+		return $table->addToPropertyCtrl("class", "compact", array("compact"));
 	}
 
 	public function setCollapsing() {
@@ -67,16 +67,16 @@ 
 		return $this->addToPropertyTable("class", "striped");
 	}
 
-	public function onRowClick($jsCode, $stopPropagation=false, $preventDefault=false){
-		$this->onRowClick($jsCode,$stopPropagation,$preventDefault);
+	public function onRowClick($jsCode, $stopPropagation=false, $preventDefault=false) {
+		$this->onRowClick($jsCode, $stopPropagation, $preventDefault);
 	}
 
-	public function onRow($event,$jsCode, $stopPropagation=false, $preventDefault=false){
-		$this->getTable()->addEvent($event."{{tr}}",$jsCode,$stopPropagation,$preventDefault);
+	public function onRow($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
+		$this->getTable()->addEvent($event."{{tr}}", $jsCode, $stopPropagation, $preventDefault);
 	}
 
-	public function getOnRow($event, $url, $responseElement="", $parameters=array()){
-		$parameters=\array_merge($parameters,["stopPropagation"=>false,"preventDefault"=>false]);
-		return $this->getTable()->getOn($event."{{tbody tr}}", $url,$responseElement,$parameters);
+	public function getOnRow($event, $url, $responseElement="", $parameters=array()) {
+		$parameters=\array_merge($parameters, ["stopPropagation"=>false, "preventDefault"=>false]);
+		return $this->getTable()->getOn($event."{{tbody tr}}", $url, $responseElement, $parameters);
 	}
 }
\ No newline at end of file

Ajax/service/Javascript.php

Spacing +2 added lines, -2 removed lines

@@ -6,8 +6,8 @@
 	public static $preventDefault="\nif(event && event.preventDefault) event.preventDefault();\n";
 	public static $stopPropagation="\nif(event && event.stopPropagation) event.stopPropagation();\n";
 
-	public static function containsCode($expression){
-		return strrpos($expression, 'this')!==false||strrpos($expression, 'event')!==false||strrpos($expression, 'self')!==false;
+	public static function containsCode($expression) {
+		return strrpos($expression, 'this')!==false || strrpos($expression, 'event')!==false || strrpos($expression, 'self')!==false;
 	}
 
 	/**

Ajax/common/html/HtmlSingleElement.php

Spacing +3 added lines, -3 removed lines

@@ -13,7 +13,7 @@ 
 	}
 
 	public function setClass($classNames) {
-		if(\is_array($classNames)){
+		if (\is_array($classNames)) {
 			$classNames=implode(" ", $classNames);
 		}
 		$this->setProperty("class", $classNames);
@@ -21,7 +21,7 @@ 
 	}
 
 	public function addClass($classNames) {
-		if(\is_array($classNames)){
+		if (\is_array($classNames)) {
 			$classNames=implode(" ", $classNames);
 		}
 		$this->addToProperty("class", $classNames);
@@ -52,7 +52,7 @@ 
 	 */
 	public function fromArray($array) {
 		$array=parent::fromArray($array);
-		foreach ( $array as $key => $value ) {
+		foreach ($array as $key => $value) {
 			$this->setProperty($key, $value);
 		}
 		return $array;

Ajax/common/html/traits/BaseHtmlPropertiesTrait.php

Spacing +11 added lines, -11 removed lines

@@ -8,12 +8,12 @@ 
  * @author jc
  *
  */
-trait BaseHtmlPropertiesTrait{
+trait BaseHtmlPropertiesTrait {
 
-	protected $properties=array ();
+	protected $properties=array();
 	abstract protected function ctrl($name, $value, $typeCtrl);
 	abstract protected function removeOldValues(&$oldValue, $allValues);
-	abstract protected function _getElementBy($callback,$elements);
+	abstract protected function _getElementBy($callback, $elements);
 	public function getProperties() {
 		return $this->properties;
 	}
@@ -39,13 +39,13 @@ 
 
 	public function addToProperty($name, $value, $separator=" ") {
 		if (\is_array($value)) {
-			foreach ( $value as $v ) {
+			foreach ($value as $v) {
 				$this->addToProperty($name, $v, $separator);
 			}
-		} else if ($value !== "" && $this->propertyContains($name, $value) === false) {
+		} else if ($value!=="" && $this->propertyContains($name, $value)===false) {
 			$v=@$this->properties[$name];
-			if (isset($v) && $v !== "")
-				$v=$v . $separator . $value;
+			if (isset($v) && $v!=="")
+				$v=$v.$separator.$value;
 				else
 					$v=$value;
 
@@ -83,7 +83,7 @@ 
 	}
 
 	public function addToPropertyCtrlCheck($name, $value, $typeCtrl) {
-		if ($this->ctrl($name, $value, $typeCtrl) === true) {
+		if ($this->ctrl($name, $value, $typeCtrl)===true) {
 			return $this->addToProperty($name, $value);
 		}
 		return $this;
@@ -104,12 +104,12 @@ 
 	}
 
 	protected function setPropertyCtrl($name, $value, $typeCtrl) {
-		if ($this->ctrl($name, $value, $typeCtrl) === true)
+		if ($this->ctrl($name, $value, $typeCtrl)===true)
 			return $this->setProperty($name, $value);
 			return $this;
 	}
 
-	protected function getElementByPropertyValue($propertyName,$value, $elements) {
-		return $this->_getElementBy(function($element) use ($propertyName,$value){return $element->propertyContains($propertyName, $value) === true;}, $elements);
+	protected function getElementByPropertyValue($propertyName, $value, $elements) {
+		return $this->_getElementBy(function($element) use ($propertyName, $value){return $element->propertyContains($propertyName, $value)===true; }, $elements);
 	}
 }
\ No newline at end of file

Braces +17 added lines, -12 removed lines

@@ -33,8 +33,9 @@ 
 	}
 
 	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=" ") {
@@ -44,10 +45,11 @@ 
 			}
 		} else if ($value !== "" && $this->propertyContains($name, $value) === false) {
 			$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);
 		}
@@ -70,8 +72,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);
 			}
@@ -90,8 +93,9 @@ 
 	}
 
 	public function removeProperty($name) {
-		if (\array_key_exists($name, $this->properties))
-			unset($this->properties[$name]);
+		if (\array_key_exists($name, $this->properties)) {
+					unset($this->properties[$name]);
+		}
 			return $this;
 	}
 
@@ -104,8 +108,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;
 	}
 

Ajax/common/html/BaseHtml.php

Braces +12 added lines, -8 removed lines

@@ -99,15 +99,18 @@ 
 			$flag=false;
 			$index=0;
 			while ( !$flag && $index < sizeof($elements) ) {
-				if ($elements[$index] instanceof BaseHtml)
-					$flag=($callback($elements[$index]));
+				if ($elements[$index] instanceof BaseHtml) {
+									$flag=($callback($elements[$index]));
+				}
 					$index++;
 			}
-			if ($flag === true)
-				return $elements[$index - 1];
+			if ($flag === true) {
+							return $elements[$index - 1];
+			}
 		} elseif ($elements instanceof BaseHtml) {
-			if ($callback($elements))
-				return $elements;
+			if ($callback($elements)) {
+							return $elements;
+			}
 		}
 		return null;
 	}
@@ -140,8 +143,9 @@ 
 
 	public function fromArray($array) {
 		foreach ( $this as $key => $value ) {
-			if(array_key_exists($key, $array)===true)
-				$this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array);
+			if(array_key_exists($key, $array)===true) {
+							$this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array);
+			}
 		}
 		foreach ( $array as $key => $value ) {
 			if($this->_callSetter($key, $key, $value, $array)===false){

Doc Comments +14 added lines

@@ -63,6 +63,10 @@ 
 
 
 
+	/**
+	 * @param string $name
+	 * @param string[] $typeCtrl
+	 */
 	protected function setMemberCtrl(&$name, $value, $typeCtrl) {
 		if ($this->ctrl($name, $value, $typeCtrl) === true) {
 			return $name=$value;
@@ -80,6 +84,10 @@ 
 
 
 
+	/**
+	 * @param string $name
+	 * @param string[] $typeCtrl
+	 */
 	protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") {
 		if ($this->ctrl($name, $value, $typeCtrl) === true) {
 			if (\is_array($typeCtrl)) {
@@ -90,6 +98,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param string $name
+	 */
 	protected function addToMember(&$name, $value, $separator=" ") {
 		$name=str_ireplace($value, "", $name) . $separator . $value;
 		return $this;
@@ -102,6 +113,9 @@ 
 		$oldValue=trim($oldValue);
 	}
 
+	/**
+	 * @param \Closure $callback
+	 */
 	protected function _getElementBy($callback,$elements){
 		if (\is_array($elements)) {
 			$elements=\array_values($elements);

Spacing +32 added lines, -32 removed lines

@@ -15,11 +15,11 @@ 
  * @version 1.3
  */
 abstract class BaseHtml extends BaseWidget {
-	use BaseHtmlEventsTrait,BaseHtmlPropertiesTrait;
+	use BaseHtmlEventsTrait, BaseHtmlPropertiesTrait;
 	protected $_template;
 	protected $tagName;
-	protected $_wrapBefore=array ();
-	protected $_wrapAfter=array ();
+	protected $_wrapBefore=array();
+	protected $_wrapAfter=array();
 	protected $_bsComponent;
 	protected $_compiled=false;
 
@@ -30,14 +30,14 @@ 
 	 */
 	abstract public function run(JsUtils $js);
 
-	private function _callSetter($setter,$key,$value,&$array){
+	private function _callSetter($setter, $key, $value, &$array) {
 		$result=false;
 		if (method_exists($this, $setter) && !JString::startswith($key, "_")) {
 			try {
 				$this->$setter($value);
 				unset($array[$key]);
 				$result=true;
-			} catch ( \Exception $e ) {
+			}catch (\Exception $e) {
 				$result=false;
 			}
 		}
@@ -45,17 +45,17 @@ 
 	}
 
 	protected function getTemplate(JsUtils $js=NULL) {
-		return PropertyWrapper::wrap($this->_wrapBefore, $js) . $this->_template . PropertyWrapper::wrap($this->_wrapAfter, $js);
+		return PropertyWrapper::wrap($this->_wrapBefore, $js).$this->_template.PropertyWrapper::wrap($this->_wrapAfter, $js);
 	}
 
 	protected function ctrl($name, $value, $typeCtrl) {
 		if (\is_array($typeCtrl)) {
-			if (array_search($value, $typeCtrl) === false) {
-				throw new \Exception("La valeur passée `" . $value . "` à la propriété `" . $name . "` ne fait pas partie des valeurs possibles : {" . implode(",", $typeCtrl) . "}");
+			if (array_search($value, $typeCtrl)===false) {
+				throw new \Exception("La valeur passée `".$value."` à la propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
 			}
 		} else {
 			if (!$typeCtrl($value)) {
-				throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $name);
+				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name);
 			}
 		}
 		return true;
@@ -64,7 +64,7 @@ 
 
 
 	protected function setMemberCtrl(&$name, $value, $typeCtrl) {
-		if ($this->ctrl($name, $value, $typeCtrl) === true) {
+		if ($this->ctrl($name, $value, $typeCtrl)===true) {
 			return $name=$value;
 		}
 		return $this;
@@ -73,7 +73,7 @@ 
 	protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") {
 		if (\is_array($typeCtrl)) {
 			$this->removeOldValues($name, $typeCtrl);
-			$name.=$separator . $value;
+			$name.=$separator.$value;
 		}
 		return $this;
 	}
@@ -81,17 +81,17 @@ 
 
 
 	protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") {
-		if ($this->ctrl($name, $value, $typeCtrl) === true) {
+		if ($this->ctrl($name, $value, $typeCtrl)===true) {
 			if (\is_array($typeCtrl)) {
 				$this->removeOldValues($name, $typeCtrl);
 			}
-			$name.=$separator . $value;
+			$name.=$separator.$value;
 		}
 		return $this;
 	}
 
 	protected function addToMember(&$name, $value, $separator=" ") {
-		$name=str_ireplace($value, "", $name) . $separator . $value;
+		$name=str_ireplace($value, "", $name).$separator.$value;
 		return $this;
 	}
 
@@ -102,18 +102,18 @@ 
 		$oldValue=trim($oldValue);
 	}
 
-	protected function _getElementBy($callback,$elements){
+	protected function _getElementBy($callback, $elements) {
 		if (\is_array($elements)) {
 			$elements=\array_values($elements);
 			$flag=false;
 			$index=0;
-			while ( !$flag && $index < sizeof($elements) ) {
+			while (!$flag && $index<sizeof($elements)) {
 				if ($elements[$index] instanceof BaseHtml)
 					$flag=($callback($elements[$index]));
 					$index++;
 			}
-			if ($flag === true)
-				return $elements[$index - 1];
+			if ($flag===true)
+				return $elements[$index-1];
 		} elseif ($elements instanceof BaseHtml) {
 			if ($callback($elements))
 				return $elements;
@@ -141,13 +141,13 @@ 
 	}
 
 	public function fromArray($array) {
-		foreach ( $this as $key => $value ) {
-			if(array_key_exists($key, $array)===true)
-				$this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array);
+		foreach ($this as $key => $value) {
+			if (array_key_exists($key, $array)===true)
+				$this->_callSetter("set".ucfirst($key), $key, $array[$key], $array);
 		}
-		foreach ( $array as $key => $value ) {
-			if($this->_callSetter($key, $key, $value, $array)===false){
-				$this->_callSetter("set" . ucfirst($key), $key, $value, $array);
+		foreach ($array as $key => $value) {
+			if ($this->_callSetter($key, $key, $value, $array)===false) {
+				$this->_callSetter("set".ucfirst($key), $key, $value, $array);
 			}
 		}
 		return $array;
@@ -155,7 +155,7 @@ 
 
 	public function fromDatabaseObjects($objects, $function) {
 		if (isset($objects)) {
-			foreach ( $objects as $object ) {
+			foreach ($objects as $object) {
 				$this->fromDatabaseObject($object, $function);
 			}
 		}
@@ -176,7 +176,7 @@ 
 
 
 	public function getElementById($identifier, $elements) {
-		return $this->_getElementBy(function($element) use ($identifier){return $element->getIdentifier()===$identifier;}, $elements);
+		return $this->_getElementBy(function($element) use ($identifier){return $element->getIdentifier()===$identifier; }, $elements);
 	}
 
 	public function getBsComponent() {
@@ -191,24 +191,24 @@ 
 	protected function compile_once(JsUtils $js=NULL, &$view=NULL) {
 	}
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if(!$this->_compiled){
-			$this->compile_once($js,$view);
+		if (!$this->_compiled) {
+			$this->compile_once($js, $view);
 			$this->_compiled=true;
 		}
 		$result=$this->getTemplate($js);
-		foreach ( $this as $key => $value ) {
-			if (JString::startswith($key, "_") === false && $key !== "events") {
+		foreach ($this as $key => $value) {
+			if (JString::startswith($key, "_")===false && $key!=="events") {
 				if (\is_array($value)) {
 					$v=PropertyWrapper::wrap($value, $js);
 				} else {
 					$v=$value;
 				}
-				$result=str_ireplace("%" . $key . "%", $v, $result);
+				$result=str_ireplace("%".$key."%", $v, $result);
 			}
 		}
 		if (isset($js)===true) {
 			$this->run($js);
-			if (isset($view) === true) {
+			if (isset($view)===true) {
 				$js->addViewElement($this->_identifier, $result, $view);
 			}
 		}

Ajax/bootstrap/html/HtmlButtongroups.php

Doc Comments +6 added lines

@@ -53,6 +53,9 @@ 
 			$element->setStyle($value);
 	}
 
+	/**
+	 * @param HtmlDropdown $bt
+	 */
 	private function dropdownAsButton($bt) {
 		$this->addExistingDropDown($bt);
 		$bt->setTagName("button");
@@ -81,6 +84,9 @@ 
 		return $result;
 	}
 
+	/**
+	 * @param integer $iid
+	 */
 	private function _addArrayElement(array $element,$iid){
 		if (array_key_exists("glyph", $element))
 			$bt=new HtmlGlyphButton($this->identifier."-button-".$iid);

Spacing +12 added lines, -12 removed lines

@@ -39,7 +39,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)) {
@@ -49,7 +49,7 @@ 
 	}
 
 	public function setStyle($value) {
-		foreach ( $this->elements as $element )
+		foreach ($this->elements as $element)
 			$element->setStyle($value);
 	}
 
@@ -69,29 +69,29 @@ 
 	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);
 		} elseif (\is_array($element)) {
-			$result=$this->_addArrayElement($element,$iid);
+			$result=$this->_addArrayElement($element, $iid);
 		} elseif (is_string($element)) {
-			$result=new HtmlButton($this->identifier."-button-".$iid,$element);
+			$result=new HtmlButton($this->identifier."-button-".$iid, $element);
 		}
-		if($result instanceof HtmlButton)
+		if ($result instanceof HtmlButton)
 			$this->elements[]=$result;
 		return $result;
 	}
 
-	private function _addArrayElement(array $element,$iid){
+	private function _addArrayElement(array $element, $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{
+			else {
 				$bt=new HtmlDropdown($this->identifier."-dropdown-".$iid);
 				$this->dropdownAsButton($bt);
 			}
-		} else{
+		} else {
 			$bt=new HtmlButton($this->identifier."-button-".$iid);
 			$bt->fromArray($element);
 		}
@@ -99,7 +99,7 @@ 
 	}
 
 	public function addElements($elements) {
-		foreach ( $elements as $element ) {
+		foreach ($elements as $element) {
 			$this->addElement($element);
 		}
 		return $this;
@@ -119,7 +119,7 @@ 
 		} 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>');
 			}
 		}
@@ -150,7 +150,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 +18 added lines, -15 removed lines

@@ -49,8 +49,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) {
@@ -76,18 +77,19 @@ 
 		} elseif (is_string($element)) {
 			$result=new HtmlButton($this->identifier."-button-".$iid,$element);
 		}
-		if($result instanceof HtmlButton)
-			$this->elements[]=$result;
+		if($result instanceof HtmlButton) {
+					$this->elements[]=$result;
+		}
 		return $result;
 	}
 
 	private function _addArrayElement(array $element,$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{
+		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);
 			}
@@ -116,8 +118,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>');
@@ -132,9 +135,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/service/JQueryAjaxEffect.php

Spacing +3 added lines, -3 removed lines

@@ -1,15 +1,15 @@
 <?php
 namespace Ajax\service;
 class JQueryAjaxEffect {
-	public static function none($responseElement,$jqueryDone="html"){
+	public static function none($responseElement, $jqueryDone="html") {
 		return "\t$({$responseElement}).{$jqueryDone}( data );\n";
 	}
 
-	public static function fade($responseElement,$jqueryDone="html"){
+	public static function fade($responseElement, $jqueryDone="html") {
 		return "\t$({$responseElement}).hide().{$jqueryDone}( data ).fadeIn();\n";
 	}
 
-	public static function slide($responseElement,$jqueryDone="html"){
+	public static function slide($responseElement, $jqueryDone="html") {
 		return "\t$({$responseElement}).hide().{$jqueryDone}( data ).slideDown();\n";
 	}
 }
\ No newline at end of file

Ajax/semantic/widgets/datatable/DataTableFieldAsTrait.php

Braces +9 added lines, -6 removed lines

@@ -58,8 +58,9 @@ 
 	 */
 	private function getFieldButton($caption,$visibleHover=true){
 		$bt= new HtmlButton("",$caption);
-		if($visibleHover)
-			$this->_visibleOver($bt);
+		if($visibleHover) {
+					$this->_visibleOver($bt);
+		}
 			return $bt;
 	}
 
@@ -76,8 +77,9 @@ 
 		return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$index,$attributes){
 			$button=new HtmlButton($id,$value,$cssStyle);
 			$button->postOnClick($url,"$(event.target).closest('tr').find(':input').serialize()",$responseElement,$attributes["ajax"]);
-			if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"])
-				$this->_visibleOver($button);
+			if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"]) {
+							$this->_visibleOver($button);
+			}
 				return $button;
 		}, $index,$attributes);
 	}
@@ -136,8 +138,9 @@ 
 	private function getDefaultButton($icon,$class=null,$visibleHover=true){
 		$bt=$this->getFieldButton("",$visibleHover);
 		$bt->asIcon($icon);
-		if(isset($class))
-			$bt->addClass($class);
+		if(isset($class)) {
+					$bt->addClass($class);
+		}
 		return $bt;
 	}
 

Doc Comments +30 added lines, -6 removed lines

@@ -13,15 +13,28 @@ 
  * @property InstanceViewer $_instanceViewer
  */
 trait DataTableFieldAsTrait{
+
+	/**
+	 * @param \Closure $field
+	 */
 	abstract public function addField($field);
+
+	/**
+	 * @param integer $index
+	 * @param \Closure $field
+	 */
 	abstract public function insertField($index,$field);
+
+	/**
+	 * @param \Closure $field
+	 */
 	abstract public function insertInField($index,$field);
 	abstract public function fieldAs($index,$type,$attributes=NULL);
 	/**
 	 * @param string $caption
 	 * @param callable $callback
 	 * @param boolean $visibleHover
-	 * @return callable
+	 * @return \Closure
 	 */
 	private function getFieldButtonCallable($caption,$visibleHover=true,$callback=null){
 		return $this->getCallable("getFieldButton",[$caption,$visibleHover],$callback);
@@ -31,7 +44,7 @@ 
 	 * @param callable $thisCallback
 	 * @param array $parameters
 	 * @param callable $callback
-	 * @return callable
+	 * @return \Closure
 	 */
 	private function getCallable($thisCallback,$parameters,$callback=null){
 		$result=function($instance) use($thisCallback,$parameters,$callback){
@@ -83,6 +96,9 @@ 
 		}, $index,$attributes);
 	}
 
+	/**
+	 * @param HtmlButton $element
+	 */
 	protected function _visibleOver($element){
 		$this->_visibleHover=true;
 		return $element->addToProperty("class", "visibleover")->setProperty("style","visibility:hidden;");
@@ -93,7 +109,7 @@ 
 	 * @param string $caption
 	 * @param callable $callback
 	 * @param boolean $visibleHover
-	 * @return \Ajax\semantic\widgets\datatable\DataTable
+	 * @return DataTableFieldAsTrait
 	 */
 	public function addFieldButton($caption,$visibleHover=true,$callback=null){
 		$this->addField($this->getCallable("getFieldButton",[$caption,$visibleHover],$callback));
@@ -105,7 +121,7 @@ 
 	 * @param int $index
 	 * @param string $caption
 	 * @param callable $callback
-	 * @return \Ajax\semantic\widgets\datatable\DataTable
+	 * @return DataTableFieldAsTrait
 	 */
 	public function insertFieldButton($index,$caption,$visibleHover=true,$callback=null){
 		$this->insertField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback));
@@ -117,18 +133,26 @@ 
 	 * @param int $index
 	 * @param string $caption
 	 * @param callable $callback
-	 * @return \Ajax\semantic\widgets\datatable\DataTable
+	 * @return DataTableFieldAsTrait
 	 */
 	public function insertInFieldButton($index,$caption,$visibleHover=true,$callback=null){
 		$this->insertInField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback));
 		return $this;
 	}
 
+	/**
+	 * @param string $icon
+	 * @param string $class
+	 */
 	private function addDefaultButton($icon,$class=null,$visibleHover=true,$callback=null){
 		$this->addField($this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback));
 		return $this;
 	}
 
+	/**
+	 * @param string $icon
+	 * @param string $class
+	 */
 	private function insertDefaultButtonIn($index,$icon,$class=null,$visibleHover=true,$callback=null){
 		$this->insertInField($index,$this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback));
 		return $this;
@@ -146,7 +170,7 @@ 
 	 * @param boolean $visibleHover
 	 * @param array $deleteBehavior
 	 * @param callable $callback
-	 * @return DataTable
+	 * @return DataTableFieldAsTrait
 	 */
 	public function addDeleteButton($visibleHover=true,$deleteBehavior=[],$callback=null){
 		$this->_deleteBehavior=$deleteBehavior;

Spacing +51 added lines, -51 removed lines

@@ -12,19 +12,19 @@ 
  * @property boolean $_visibleHover
  * @property InstanceViewer $_instanceViewer
  */
-trait DataTableFieldAsTrait{
+trait DataTableFieldAsTrait {
 	abstract public function addField($field);
-	abstract public function insertField($index,$field);
-	abstract public function insertInField($index,$field);
-	abstract public function fieldAs($index,$type,$attributes=NULL);
+	abstract public function insertField($index, $field);
+	abstract public function insertInField($index, $field);
+	abstract public function fieldAs($index, $type, $attributes=NULL);
 	/**
 	 * @param string $caption
 	 * @param callable $callback
 	 * @param boolean $visibleHover
 	 * @return callable
 	 */
-	private function getFieldButtonCallable($caption,$visibleHover=true,$callback=null){
-		return $this->getCallable("getFieldButton",[$caption,$visibleHover],$callback);
+	private function getFieldButtonCallable($caption, $visibleHover=true, $callback=null) {
+		return $this->getCallable("getFieldButton", [$caption, $visibleHover], $callback);
 	}
 
 	/**
@@ -33,19 +33,19 @@ 
 	 * @param callable $callback
 	 * @return callable
 	 */
-	private function getCallable($thisCallback,$parameters,$callback=null){
-		$result=function($instance) use($thisCallback,$parameters,$callback){
-			$object=call_user_func_array(array($this,$thisCallback), $parameters);
-			if(isset($callback)){
-				if(\is_callable($callback)){
-					$callback($object,$instance);
+	private function getCallable($thisCallback, $parameters, $callback=null) {
+		$result=function($instance) use($thisCallback, $parameters, $callback){
+			$object=call_user_func_array(array($this, $thisCallback), $parameters);
+			if (isset($callback)) {
+				if (\is_callable($callback)) {
+					$callback($object, $instance);
 				}
 			}
-			if($object instanceof HtmlSemDoubleElement){
-				$object->setProperty("data-ajax",$this->_instanceViewer->getIdentifier());
-				if($object->propertyContains("class","visibleover")){
+			if ($object instanceof HtmlSemDoubleElement) {
+				$object->setProperty("data-ajax", $this->_instanceViewer->getIdentifier());
+				if ($object->propertyContains("class", "visibleover")) {
 					$this->_visibleHover=true;
-					$object->setProperty("style","visibility:hidden;");
+					$object->setProperty("style", "visibility:hidden;");
 				}
 			}
 			return $object;
@@ -57,9 +57,9 @@ 
 	 * @param string $caption
 	 * @return HtmlButton
 	 */
-	private function getFieldButton($caption,$visibleHover=true){
-		$bt= new HtmlButton("",$caption);
-		if($visibleHover)
+	private function getFieldButton($caption, $visibleHover=true) {
+		$bt=new HtmlButton("", $caption);
+		if ($visibleHover)
 			$this->_visibleOver($bt);
 			return $bt;
 	}
@@ -73,19 +73,19 @@ 
 	 * @param array $attributes associative array (<b>ajax</b> key is for ajax post)
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
-	public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$index,$attributes){
-			$button=new HtmlButton($id,$value,$cssStyle);
-			$button->postOnClick($url,"$(event.target).closest('tr').find(':input').serialize()",$responseElement,$attributes["ajax"]);
-			if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"])
+	public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle, $index, $attributes){
+			$button=new HtmlButton($id, $value, $cssStyle);
+			$button->postOnClick($url, "$(event.target).closest('tr').find(':input').serialize()", $responseElement, $attributes["ajax"]);
+			if (!isset($attributes["visibleHover"]) || $attributes["visibleHover"])
 				$this->_visibleOver($button);
 				return $button;
-		}, $index,$attributes);
+		}, $index, $attributes);
 	}
 
-	protected function _visibleOver($element){
+	protected function _visibleOver($element) {
 		$this->_visibleHover=true;
-		return $element->addToProperty("class", "visibleover")->setProperty("style","visibility:hidden;");
+		return $element->addToProperty("class", "visibleover")->setProperty("style", "visibility:hidden;");
 	}
 
 	/**
@@ -95,8 +95,8 @@ 
 	 * @param boolean $visibleHover
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
-	public function addFieldButton($caption,$visibleHover=true,$callback=null){
-		$this->addField($this->getCallable("getFieldButton",[$caption,$visibleHover],$callback));
+	public function addFieldButton($caption, $visibleHover=true, $callback=null) {
+		$this->addField($this->getCallable("getFieldButton", [$caption, $visibleHover], $callback));
 		return $this;
 	}
 
@@ -107,8 +107,8 @@ 
 	 * @param callable $callback
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
-	public function insertFieldButton($index,$caption,$visibleHover=true,$callback=null){
-		$this->insertField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback));
+	public function insertFieldButton($index, $caption, $visibleHover=true, $callback=null) {
+		$this->insertField($index, $this->getFieldButtonCallable($caption, $visibleHover, $callback));
 		return $this;
 	}
 
@@ -119,25 +119,25 @@ 
 	 * @param callable $callback
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
-	public function insertInFieldButton($index,$caption,$visibleHover=true,$callback=null){
-		$this->insertInField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback));
+	public function insertInFieldButton($index, $caption, $visibleHover=true, $callback=null) {
+		$this->insertInField($index, $this->getFieldButtonCallable($caption, $visibleHover, $callback));
 		return $this;
 	}
 
-	private function addDefaultButton($icon,$class=null,$visibleHover=true,$callback=null){
-		$this->addField($this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback));
+	private function addDefaultButton($icon, $class=null, $visibleHover=true, $callback=null) {
+		$this->addField($this->getCallable("getDefaultButton", [$icon, $class, $visibleHover], $callback));
 		return $this;
 	}
 
-	private function insertDefaultButtonIn($index,$icon,$class=null,$visibleHover=true,$callback=null){
-		$this->insertInField($index,$this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback));
+	private function insertDefaultButtonIn($index, $icon, $class=null, $visibleHover=true, $callback=null) {
+		$this->insertInField($index, $this->getCallable("getDefaultButton", [$icon, $class, $visibleHover], $callback));
 		return $this;
 	}
 
-	private function getDefaultButton($icon,$class=null,$visibleHover=true){
-		$bt=$this->getFieldButton("",$visibleHover);
+	private function getDefaultButton($icon, $class=null, $visibleHover=true) {
+		$bt=$this->getFieldButton("", $visibleHover);
 		$bt->asIcon($icon);
-		if(isset($class))
+		if (isset($class))
 			$bt->addClass($class);
 		return $bt;
 	}
@@ -148,30 +148,30 @@ 
 	 * @param callable $callback
 	 * @return DataTable
 	 */
-	public function addDeleteButton($visibleHover=true,$deleteBehavior=[],$callback=null){
+	public function addDeleteButton($visibleHover=true, $deleteBehavior=[], $callback=null) {
 		$this->_deleteBehavior=$deleteBehavior;
-		return $this->addDefaultButton("remove","_delete red basic",$visibleHover,$callback);
+		return $this->addDefaultButton("remove", "_delete red basic", $visibleHover, $callback);
 	}
 
-	public function addEditButton($visibleHover=true,$editBehavior=[],$callback=null){
+	public function addEditButton($visibleHover=true, $editBehavior=[], $callback=null) {
 		$this->_editBehavior=$editBehavior;
-		return $this->addDefaultButton("edit","_edit basic",$visibleHover,$callback);
+		return $this->addDefaultButton("edit", "_edit basic", $visibleHover, $callback);
 	}
 
-	public function addEditDeleteButtons($visibleHover=true,$behavior=[],$callbackEdit=null,$callbackDelete=null){
-		$this->addEditButton($visibleHover,$behavior,$callbackEdit);
+	public function addEditDeleteButtons($visibleHover=true, $behavior=[], $callbackEdit=null, $callbackDelete=null) {
+		$this->addEditButton($visibleHover, $behavior, $callbackEdit);
 		$index=$this->_instanceViewer->visiblePropertiesCount()-1;
-		$this->insertDeleteButtonIn($index,$visibleHover,$behavior,$callbackDelete);
+		$this->insertDeleteButtonIn($index, $visibleHover, $behavior, $callbackDelete);
 		return $this;
 	}
 
-	public function insertDeleteButtonIn($index,$visibleHover=true,$deleteBehavior=[],$callback=null){
+	public function insertDeleteButtonIn($index, $visibleHover=true, $deleteBehavior=[], $callback=null) {
 		$this->_deleteBehavior=$deleteBehavior;
-		return $this->insertDefaultButtonIn($index,"remove","_delete red basic",$visibleHover,$callback);
+		return $this->insertDefaultButtonIn($index, "remove", "_delete red basic", $visibleHover, $callback);
 	}
 
-	public function insertEditButtonIn($index,$visibleHover=true,$editBehavior=[],$callback=null){
+	public function insertEditButtonIn($index, $visibleHover=true, $editBehavior=[], $callback=null) {
 		$this->_editBehavior=$editBehavior;
-		return $this->insertDefaultButtonIn($index,"edit","_edit basic",$visibleHover,$callback);
+		return $this->insertDefaultButtonIn($index, "edit", "_edit basic", $visibleHover, $callback);
 	}
 }
\ No newline at end of file